anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* some UI clarification on \enspace vs. \enskip

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24087 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-04-01 14:53:29 +00:00
parent 73ad1dd688
commit c2ebb0b952
3 changed files with 74 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
lib/ui/stdcontext.inc
View File

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

6
src/frontends/qt4/GuiHSpace.cpp
View File

@ -96,6 +96,12 @@ void GuiHSpace::enableWidgets(int selection)
selection == 0 || selection == 3 || selection == 0 || selection == 3 ||
(selection == 6 && pattern == 0) || selection == 7; (selection == 6 && pattern == 0) || selection == 7;
keepCB->setEnabled(enable_keep); 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(); changed();
} }

4
src/frontends/qt4/ui/HSpaceUi.ui
View File

@ -76,7 +76,7 @@
</item> </item>
<item> <item>
<property name="text" > <property name="text" >
<string>Enspace (0.5 em)</string> <string>Half Quad (0.5 em)</string>
</property> </property>
</item> </item>
<item> <item>
@ -86,7 +86,7 @@
</item> </item>
<item> <item>
<property name="text" > <property name="text" >
<string>QQuad (2 em)</string> <string>Double Quad (2 em)</string>
</property> </property>
</item> </item>
<item> <item>