Remove the .aux and .bbl files and update the citation labels

[lyx.git] / src / frontends / qt4 / LengthCombo.cpp

diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp
index 648bc7a246fb15a8adec891e8e76644e6ee69f3f..8e57af1ca6958cbf5ac6a1ac32e440e252bc7016 100644 (file)
--- a/src/frontends/qt4/LengthCombo.cpp
+++ b/src/frontends/qt4/LengthCombo.cpp
@@ -4,36 +4,48 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Herbert Voß
+ * \author Jürgen Spitzmüller
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
+#include "support/qstring_helpers.h"
+
 #include "LengthCombo.h"
-#include "lengthcommon.h"
+
 #include "qt_helpers.h"
 
+#include <string>
+
 
 LengthCombo::LengthCombo(QWidget * parent)
        : QComboBox(parent)
 {
-       for (int i = 0; i < lyx::num_units; i++)
-               addItem(lyx::qt_(lyx::unit_name_gui[i]));
+       for (int i = 0; i < lyx::num_units; i++) {
+               // mu does not make sense usually
+               // so it must be added manually, if needed
+               if (QLatin1String(lyx::unit_name[i]) == "mu")
+                       continue;
+               QComboBox::addItem(lyx::qt_(lyx::unit_name_gui[i]),
+                       lyx::toqstr(lyx::unit_name[i]));
+       }
 
        connect(this, SIGNAL(activated(int)),
-               this, SLOT(has_activated(int)));
+               this, SLOT(hasActivated(int)));
 }
 
 
 lyx::Length::UNIT LengthCombo::currentLengthItem() const
 {
-       return static_cast<lyx::Length::UNIT>(currentIndex());
+       QString const val = itemData(currentIndex()).toString();
+       return lyx::unitFromString(lyx::fromqstr(val));
 }
 
 
-void LengthCombo::has_activated(int)
+void LengthCombo::hasActivated(int)
 {
   // emit signal
        selectionChanged(currentLengthItem());
@@ -42,7 +54,19 @@ void LengthCombo::has_activated(int)
 
 void LengthCombo::setCurrentItem(lyx::Length::UNIT unit)
 {
-       QComboBox::setCurrentIndex(int(unit));
+       setCurrentItem(lyx::toqstr(lyx::stringFromUnit(unit)));
+}
+
+
+void LengthCombo::setCurrentItem(QString const item)
+{
+       int num = QComboBox::count();
+       for (int i = 0; i < num; i++) {
+               if (QComboBox::itemData(i).toString() == item) {
+                       QComboBox::setCurrentIndex(i);
+                       break;
+               }
+       }
 }
 
 
@@ -62,7 +86,7 @@ void LengthCombo::noPercents()
 {
        int num = QComboBox::count();
        for (int i = 0; i < num; i++) {
-               if (QComboBox::itemText(i).contains('%') > 0) {
+               if (QComboBox::itemData(i).toString().contains('%')) {
                        QComboBox::removeItem(i);
                        --i;
                        --num;
@@ -70,4 +94,33 @@ void LengthCombo::noPercents()
        }
 }
 
-#include "LengthCombo_moc.cpp"
+
+void LengthCombo::removeUnit(lyx::Length::UNIT unit)
+{
+       QString const val = lyx::toqstr(lyx::stringFromUnit(unit));
+       int num = QComboBox::count();
+       for (int i = 0; i < num; i++) {
+               if (QComboBox::itemData(i).toString() == val) {
+                       QComboBox::removeItem(i);
+                       break;
+               }
+       }
+}
+
+
+void LengthCombo::addUnit(lyx::Length::UNIT unit)
+{
+       QString const val = lyx::toqstr(lyx::stringFromUnit(unit));
+       int num = QComboBox::count();
+       for (int i = 0; i < num; i++) {
+               if (QComboBox::itemData(i).toString() == val) {
+                       // already there, nothing to do
+                       return;
+               }
+       }
+       insertItem(int(unit), lyx::qt_(lyx::unit_name_gui[int(unit)]),
+                  lyx::toqstr(lyx::unit_name[int(unit)]));
+}
+
+
+#include "moc_LengthCombo.cpp"