Fix readability

[lyx.git] / src / frontends / qt / GuiCounter.cpp

diff --git a/src/frontends/qt/GuiCounter.cpp b/src/frontends/qt/GuiCounter.cpp
index c3e3265d3e1853efa020a8e84c547040075a83d9..04fab3a664baccb166f763d3ec82f6bde42f00da 100644 (file)
--- a/src/frontends/qt/GuiCounter.cpp
+++ b/src/frontends/qt/GuiCounter.cpp
@@ -12,6 +12,7 @@
 
 #include "GuiCounter.h"
 
+#include "GuiView.h"
 #include "qt_helpers.h"
 
 #include "Buffer.h"
@@ -22,6 +23,7 @@
 #include "insets/InsetCommandParams.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
@@ -46,7 +48,7 @@ GuiCounter::GuiCounter(GuiView & lv, QWidget * parent) :
                this, SIGNAL(changed()));
 
        // These are hardcoded and do not change
-       std::map<std::string, std::string> const & ct =
+       std::vector<std::pair<std::string, std::string>> const & ct =
                        InsetCounter::counterTable;
        actionCB->clear();
        for (auto const & c : ct) {
@@ -59,7 +61,7 @@ GuiCounter::GuiCounter(GuiView & lv, QWidget * parent) :
 void GuiCounter::processParams(InsetCommandParams const & params)
 {
        QString const & counter = toqstr(params["counter"]);
-       int c = counterCB->findText(counter);
+       int c = counterCB->findData(counter);
        counterCB->setCurrentIndex(c);
 
        QString cmd = toqstr(params.getCmdName());
@@ -85,10 +87,18 @@ void GuiCounter::fillCombos()
        if (!bv)
                return;
        
-       std::vector<docstring> counts = 
-               bv->buffer().params().documentClass().counters().listOfCounters();
-       for (auto const & c : counts)
-               counterCB->addItem(toqstr(c));
+       Counters const & cntrs =
+               bv->buffer().params().documentClass().counters();
+       std::vector<docstring> counts = cntrs.listOfCounters();
+       // We use an intermediate map in order to sort at translated GUI strings.
+       QMap<QString, QString> items;
+       for (auto const & c : counts) {
+               docstring const & guiname = cntrs.guiName(c);
+               items.insert(qt_(toqstr(guiname)), toqstr(c));
+       }
+       for (QMap<QString, QString>::const_iterator it = items.constBegin();
+            it != items.constEnd(); ++it)
+               counterCB->addItem(it.key(), it.value());
 }
 
 
@@ -118,7 +128,7 @@ docstring GuiCounter::dialogToParams() const
 {
        InsetCommandParams params(insetCode());
 
-       params["counter"] = qstring_to_ucs4(counterCB->currentText());
+       params["counter"] = qstring_to_ucs4(counterCB->itemData(counterCB->currentIndex()).toString());
        params["value"] = convert<docstring>(valueSB->value());
        params.setCmdName(fromqstr(actionCB->itemData(actionCB->currentIndex()).toString()));
        params["lyxonly"] = from_ascii(lyxonlyXB->isChecked() ? "true" : "false");
@@ -133,10 +143,8 @@ bool GuiCounter::checkWidgets(bool readonly) const
        counterCB->setEnabled(!readonly);
        actionCB->setEnabled(!readonly);
        valueSB->setEnabled(!readonly && (cmdIsSet || cmdIsAddTo));
-       if (cmdIsAddTo)
-               valueSB->setRange(-10000, 10000);
-       else
-               valueSB->setRange(0, 10000);
+       // enumi, for example, can be negative.
+       valueSB->setRange(-10000, 10000);
 
        return InsetParamsWidget::checkWidgets() && !readonly &&
                        !counterCB->currentText().isEmpty() &&