* some UI clarification on \enspace vs. \enskip

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24087 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index b9a92c75f1e440e06b4f01fc33da5feea4ce0988..db8e1083429c9f80a743a1263c65675364febe32 100644 (file)
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -16,49 +16,49 @@ Menuset
 #
 # InsetMath context menu
 #
-       Menu "insert_math_context"\r
-               Item "Array Environment|y" "math-matrix 2 2"\r
-               Item "Cases Environment|C" "command-sequence math-mode on; math-insert \cases"\r
-               Item "Aligned Environment|l" "command-sequence math-mode on; math-insert \aligned; tabular-feature append-column"\r
-               Item "AlignedAt Environment|v" "command-sequence math-mode on; math-insert \alignedat; tabular-feature append-column"\r
-               Item "Gathered Environment|h" "command-sequence math-mode on; math-insert \gathered"\r
-               Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; tabular-feature append-column"\r
-               Separator\r
-               Item "Delimiters|r" "dialog-show mathdelimiter"\r
-               Item "Matrix|x" "dialog-show mathmatrix"\r
-               Item "Macro|o" "math-macro newmacroname newcommand"\r
-       End\r
-
-       Menu "ams_environment"\r
-               Item "AMS align Environment|a" "math-mutate align"\r
-               Item "AMS alignat Environment|t" "math-mutate alignat"\r
-               Item "AMS flalign Environment|f" "math-mutate flalign"\r
-               Item "AMS gather Environment|g" "math-mutate gather"\r
-               Item "AMS multline Environment|m" "math-mutate multline"\r
-       End\r
-       \r
+       Menu "insert_math_context"
+               Item "Array Environment|y" "math-matrix 2 2"
+               Item "Cases Environment|C" "command-sequence math-mode on; math-insert \cases"
+               Item "Aligned Environment|l" "command-sequence math-mode on; math-insert \aligned; tabular-feature append-column"
+               Item "AlignedAt Environment|v" "command-sequence math-mode on; math-insert \alignedat; tabular-feature append-column"
+               Item "Gathered Environment|h" "command-sequence math-mode on; math-insert \gathered"
+               Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; tabular-feature append-column"
+               Separator
+               Item "Delimiters|r" "dialog-show mathdelimiter"
+               Item "Matrix|x" "dialog-show mathmatrix"
+               Item "Macro|o" "math-macro newmacroname newcommand"
+       End
+
+       Menu "ams_environment"
+               Item "AMS align Environment|a" "math-mutate align"
+               Item "AMS alignat Environment|t" "math-mutate alignat"
+               Item "AMS flalign Environment|f" "math-mutate flalign"
+               Item "AMS gather Environment|g" "math-mutate gather"
+               Item "AMS multline Environment|m" "math-mutate multline"
+       End
+       
        Menu "context-math"
-               Item "Inline Formula|I" "math-mutate simple"\r
-               Item "Displayed Formula|D" "math-mutate equation"\r
-               Item "Eqnarray Environment|E" "math-mutate eqnarray"\r
-               SubMenu "AMS Environment|A" "ams_environment"\r
+               Item "Inline Formula|I" "math-mutate simple"
+               Item "Displayed Formula|D" "math-mutate equation"
+               Item "Eqnarray Environment|E" "math-mutate eqnarray"
+               SubMenu "AMS Environment|A" "ams_environment"
                Separator               
                OptItem "Equation Label|L" "label-insert"
                OptItem "Toggle Labeling/Numbering|T" "math-number-toggle"
-               Separator\r
-               Item "Split Cell|C" "cell-split"\r
-               Separator\r
-               Submenu "Insert|n" "insert_math_context"\r
-               Separator\r
-               OptItem "Add Line Above|o" "tabular-feature add-hline-above"\r
-               OptItem "Add Line Below|B" "tabular-feature add-hline-below"\r
-               OptItem "Delete Line Above|D" "tabular-feature delete-hline-above"\r
-               OptItem "Delete Line Below|e" "tabular-feature delete-hline-below"\r
-               Separator\r
-               OptItem "Add Line to Left" "tabular-feature add-vline-left"\r
-               OptItem "Add Line to Right" "tabular-feature add-vline-right"\r
-               OptItem "Delete Line to Left" "tabular-feature delete-vline-left"\r
-               OptItem "Delete Line to Right" "tabular-feature delete-vline-right"\r
+               Separator
+               Item "Split Cell|C" "cell-split"
+               Separator
+               Submenu "Insert|n" "insert_math_context"
+               Separator
+               OptItem "Add Line Above|o" "tabular-feature add-hline-above"
+               OptItem "Add Line Below|B" "tabular-feature add-hline-below"
+               OptItem "Delete Line Above|D" "tabular-feature delete-hline-above"
+               OptItem "Delete Line Below|e" "tabular-feature delete-hline-below"
+               Separator
+               OptItem "Add Line to Left" "tabular-feature add-vline-left"
+               OptItem "Add Line to Right" "tabular-feature add-vline-right"
+               OptItem "Delete Line to Left" "tabular-feature delete-vline-left"
+               OptItem "Delete Line to Right" "tabular-feature delete-vline-right"
                Separator
                Item "Toggle Math Toolbar" "toolbar-toggle math toggle"
                Item "Toggle Math-Panels Toolbar" "toolbar-toggle math_panels toggle"
@@ -149,11 +149,11 @@ Menuset
                Item "Interword Space|w" "next-inset-modify space \space{}"
                Item "Protected Space|o" "next-inset-modify space ~"
                Item "Thin Space|T" "next-inset-modify space \thinspace{}"
-               Item "Quad Space|Q" "next-inset-modify space \quad{}"
-               Item "QQuad Space|u" "next-inset-modify space \qquad{}"
-               Item "Enspace|E" "next-inset-modify space \enspace{}"
-               Item "Enskip|k" "next-inset-modify space \enskip{}"
                Item "Negative Thin Space|N" "next-inset-modify space \negthinspace{}"
+               Item "Half Quad Space (Enskip)|k" "next-inset-modify space \enskip{}"
+               Item "Protected Half Quad Space (Enspace)|E" "next-inset-modify space \enspace{}"
+               Item "Quad Space|Q" "next-inset-modify space \quad{}"
+               Item "Double Quad Space|u" "next-inset-modify space \qquad{}"
                Item "Horizontal Fill|F" "next-inset-modify space \hfill{}"
                Item "Protected Horizontal Fill|i" "next-inset-modify space \hspace*{\fill}"
                Item "Horizontal Fill (Dots)|D" "next-inset-modify space \dotfill{}"
@@ -266,30 +266,30 @@ Menuset
 #
 
        Menu "context-tabular"
-               Item "Multicolumn|M" "tabular-feature multicolumn"\r
-               Separator\r
-               Item "Top Line|T" "tabular-feature toggle-line-top"\r
-               Item "Bottom Line|B" "tabular-feature toggle-line-bottom"\r
-               Item "Left Line|L" "tabular-feature toggle-line-left"\r
-               Item "Right Line|R" "tabular-feature toggle-line-right"\r
-               Separator\r
-               Item "Left|L" "tabular-feature align-left"\r
-               Item "Center|C" "tabular-feature align-center"\r
-               Item "Right|R" "tabular-feature align-right"\r
-               Separator\r
-               Item "Top|T" "tabular-feature valign-top"\r
-               Item "Middle|M" "tabular-feature valign-middle"\r
-               Item "Bottom|B" "tabular-feature valign-bottom"\r
-               Separator\r
-               Item "Add Row|A" "tabular-feature append-row"\r
-               Item "Delete Row|D" "tabular-feature delete-row"\r
-               Item "Copy Row|o" "tabular-feature copy-row"\r
-               # Item "Swap Rows|S" "tabular-feature swap-row" # currently broken\r
-               Separator\r
-               Item "Add Column|u" "tabular-feature append-column"\r
-               Item "Delete Column|e" "tabular-feature delete-column"\r
-               Item "Copy Column|p" "tabular-feature copy-column"\r
-               # Item "Swap Columns|w" "tabular-feature swap-column" # currently broken\r
+               Item "Multicolumn|M" "tabular-feature multicolumn"
+               Separator
+               Item "Top Line|T" "tabular-feature toggle-line-top"
+               Item "Bottom Line|B" "tabular-feature toggle-line-bottom"
+               Item "Left Line|L" "tabular-feature toggle-line-left"
+               Item "Right Line|R" "tabular-feature toggle-line-right"
+               Separator
+               Item "Left|L" "tabular-feature align-left"
+               Item "Center|C" "tabular-feature align-center"
+               Item "Right|R" "tabular-feature align-right"
+               Separator
+               Item "Top|T" "tabular-feature valign-top"
+               Item "Middle|M" "tabular-feature valign-middle"
+               Item "Bottom|B" "tabular-feature valign-bottom"
+               Separator
+               Item "Add Row|A" "tabular-feature append-row"
+               Item "Delete Row|D" "tabular-feature delete-row"
+               Item "Copy Row|o" "tabular-feature copy-row"
+               # Item "Swap Rows|S" "tabular-feature swap-row" # currently broken
+               Separator
+               Item "Add Column|u" "tabular-feature append-column"
+               Item "Delete Column|e" "tabular-feature delete-column"
+               Item "Copy Column|p" "tabular-feature copy-column"
+               # Item "Swap Columns|w" "tabular-feature swap-column" # currently broken
                Separator
                Item "Settings...|S" "inset-settings tabular"
        End

diff --git a/src/frontends/qt4/GuiHSpace.cpp b/src/frontends/qt4/GuiHSpace.cpp
index 29f691f44cd59eee778c6b47641bb4baf0eecc36..5afc992532e35e9f378fa167650cb81f44d186d0 100644 (file)
--- a/src/frontends/qt4/GuiHSpace.cpp
+++ b/src/frontends/qt4/GuiHSpace.cpp
@@ -96,6 +96,12 @@ void GuiHSpace::enableWidgets(int selection)
                selection == 0 || selection == 3  ||
                (selection == 6 && pattern == 0) || selection == 7;
        keepCB->setEnabled(enable_keep);
+       if (selection == 3)
+               keepCB->setToolTip(qt_("Insert the spacing even after a line break.\n"
+                                      "Note that a protected Half Quad will be turned into\n"
+                                      "a vertical space if used at the beginning of a paragraph!"));
+       else
+               keepCB->setToolTip(qt_("Insert the spacing even after a line break"));
        changed();
 }
 

diff --git a/src/frontends/qt4/ui/HSpaceUi.ui b/src/frontends/qt4/ui/HSpaceUi.ui
index 2f9c4e951fda31daa15d8c7a6235c64b69df00a7..0c7184c6b6cd372224ce10e91f6cbaf0cdf64342 100644 (file)
--- a/src/frontends/qt4/ui/HSpaceUi.ui
+++ b/src/frontends/qt4/ui/HSpaceUi.ui
@@ -76,7 +76,7 @@
      </item>
      <item>
       <property name="text" >
-       <string>Enspace (0.5 em)</string>
+       <string>Half Quad (0.5 em)</string>
       </property>
      </item>
      <item>
@@ -86,7 +86,7 @@
      </item>
      <item>
       <property name="text" >
-       <string>QQuad (2 em)</string>
+       <string>Double Quad (2 em)</string>
       </property>
      </item>
      <item>