Show size of named spaces in dialog

Fix for bug #12467.

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index a9b73cbebd25d35a729025ec26e0c81d7808d5c2..e8a1d0a08be8f4c8a3878d122becde8cb406fe4f 100644 (file)
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -309,13 +309,13 @@ Menuset
 # InsetVSpace context menu
 #
        Menu "context-vspace"
-               Item "DefSkip|D" "inset-modify vspace defskip"
-               Item "SmallSkip|S" "inset-modify vspace smallskip"
-               Item "MedSkip|M" "inset-modify vspace medskip"
-               Item "BigSkip|B" "inset-modify vspace bigskip"
+               Item "Default Skip|D" "inset-modify vspace defskip"
+               Item "Small Skip|S" "inset-modify vspace smallskip"
+               Item "Medium Skip|M" "inset-modify vspace medskip"
+               Item "Big Skip|B" "inset-modify vspace bigskip"
                Item "Half line height|H" "inset-modify vspace halfline"
                Item "Line height|L" "inset-modify vspace fullline"
-               Item "VFill|F" "inset-modify vspace vfill"
+               Item "Vertical Fill|F" "inset-modify vspace vfill"
                Item "Custom|C" "command-sequence inset-modify vspace custom; inset-settings"
                Separator
                Item "Settings...|e" "inset-settings"

diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index 714953c0b6e7ef0ae83c5e0e4d02a461307c7c57..b3f31302ddbc58e8a10d2b9058fba28e4982607d 100644 (file)
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -867,9 +867,9 @@ GuiDocument::GuiDocument(GuiView & lv)
        textLayoutModule->indentCO->addItem(qt_("Custom"), toqstr("custom"));
        textLayoutModule->skipCO->addItem(qt_("Half line height"), VSpace::HALFLINE);
        textLayoutModule->skipCO->addItem(qt_("Line height"), VSpace::FULLLINE);
-       textLayoutModule->skipCO->addItem(qt_("SmallSkip"), VSpace::SMALLSKIP);
-       textLayoutModule->skipCO->addItem(qt_("MedSkip"), VSpace::MEDSKIP);
-       textLayoutModule->skipCO->addItem(qt_("BigSkip"), VSpace::BIGSKIP);
+       textLayoutModule->skipCO->addItem(qt_("Small Skip"), VSpace::SMALLSKIP);
+       textLayoutModule->skipCO->addItem(qt_("Medium Skip"), VSpace::MEDSKIP);
+       textLayoutModule->skipCO->addItem(qt_("Big Skip"), VSpace::BIGSKIP);
        textLayoutModule->skipCO->addItem(qt_("Custom"), VSpace::LENGTH);
        textLayoutModule->lspacingCO->insertItem(
                Spacing::Single, qt_("Single"));

diff --git a/src/frontends/qt/GuiHSpace.cpp b/src/frontends/qt/GuiHSpace.cpp
index ff7ed67e5576dca371f8c1603fc32f25275de836..3c4c62a5d7afc27481fae43f8cf37eab2deaa3bb 100644 (file)
--- a/src/frontends/qt/GuiHSpace.cpp
+++ b/src/frontends/qt/GuiHSpace.cpp
@@ -42,13 +42,13 @@ GuiHSpace::GuiHSpace(bool math_mode, QWidget * parent)
 
        spacingCO->clear();
        spacingCO->addItem(qt_("Interword Space"), "normal");
-       spacingCO->addItem(qt_("Thin Space"), "thinspace");
-       spacingCO->addItem(qt_("Medium Space"), "medspace");
-       spacingCO->addItem(qt_("Thick Space"), "thickspace");
-       spacingCO->addItem(qt_("Negative Thin Space"), "negthinspace");
-       spacingCO->addItem(qt_("Negative Medium Space"), "negmedspace");
-       spacingCO->addItem(qt_("Negative Thick Space"), "negthickspace");
-       spacingCO->addItem(qt_("Half Quad (0.5 em)"), "halfquad");
+       spacingCO->addItem(qt_("Thin Space (1/6 em)"), "thinspace");
+       spacingCO->addItem(qt_("Medium Space (2/9 em)"), "medspace");
+       spacingCO->addItem(qt_("Thick Space (5/18 em)"), "thickspace");
+       spacingCO->addItem(qt_("Negative Thin Space (−1/6 em)"), "negthinspace");
+       spacingCO->addItem(qt_("Negative Medium Space (−2/9 em)"), "negmedspace");
+       spacingCO->addItem(qt_("Negative Thick Space (−5/18 em)"), "negthickspace");
+       spacingCO->addItem(qt_("Half Quad (1/2 em)"), "halfquad");
        spacingCO->addItem(qt_("Quad (1 em)"), "quad");
        spacingCO->addItem(qt_("Double Quad (2 em)"), "qquad");
        spacingCO->addItem(qt_("Horizontal Fill"), "hfill");

diff --git a/src/frontends/qt/ui/VSpaceUi.ui b/src/frontends/qt/ui/VSpaceUi.ui
index 847c0dfbf81b2651878f2a484599b444af73c0ef..6e11b94d74124ee28ffd984eecb0fd63d406072e 100644 (file)
--- a/src/frontends/qt/ui/VSpaceUi.ui
+++ b/src/frontends/qt/ui/VSpaceUi.ui
@@ -80,22 +80,22 @@
      </property>
      <item>
       <property name="text">
-       <string>DefSkip</string>
+       <string>Default skip</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>SmallSkip</string>
+       <string>Small skip</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>MedSkip</string>
+       <string>Medium skip</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>BigSkip</string>
+       <string>Big skip</string>
       </property>
      </item>
      <item>
@@ -110,7 +110,7 @@
      </item>
      <item>
       <property name="text">
-       <string>VFill</string>
+       <string>Vertical fill</string>
       </property>
      </item>
      <item>