From 41b2fa5162db4233649e514fa12661bdf14492aa Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 10 Jul 2003 13:41:58 +0000 Subject: [PATCH] Some menu fixes, including fixing classic.ui git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7262 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/ChangeLog | 6 +++++ lib/ui/classic.ui | 67 +++++++++------------------------------------- lib/ui/stdmenus.ui | 2 +- 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index e3611a48d0..5c7261b538 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2003-07-10 John Levon + + * ui/classic.ui: fix toolbars to new scheme, fix space inserts + + * ui/stdmenus.ui: fix duplicate mnemonic in File menu + 2003-07-07 Adrien Rebollo * examples/fr_AlignementDecimal.lyx: diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui index 9e3441d12c..2d76211653 100644 --- a/lib/ui/classic.ui +++ b/lib/ui/classic.ui @@ -223,7 +223,9 @@ Menuset Item "HFill|H" "hfill-insert" Item "Hyphenation Point|P" "hyphenation-point-insert" Item "Ligature Break|k" "ligature-break-insert" - Item "Protected Blank|B" "protected-space-insert" + Item "Protected Space|r" "space-insert protected" + Item "Inter-word Space|w" "space-insert normal" + Item "Thin Space|T" "space-insert thin" Item "Linebreak|L" "break-line" Item "Ellipsis|i" "dots-insert" Item "End of Sentence|E" "end-of-sentence-period-insert" @@ -389,10 +391,10 @@ Menuset End -# A Toolbar starts like : -# -# Toolbar "Name" "on" -# +# Which toolbars to use. + +include "stdtoolbars.ui" + # The second parameter are the flags : # # on: the toolbar is visible @@ -404,53 +406,10 @@ End # left: the toolbar should be at the left of the window # right: the toolbar should be at the right of the window # -# Only four commands are allowed inside the begin_toolbar and end_toolbar -# directives: -# Item " []" adds an icon to the toolbar performing -# " " -# Examples: -# Item "font-size small" -# Item set-emph -# -# Layouts adds the layouts combo-box to the toolbar -# -# Separator adds some spacing to the toolbar -# -# Minibuffer adds the command buffer (Qt only, only one may exist) -# -# The icons are found in the lib/image direcory under the name -# action.xpm or action_parameter.xpm. -# -# All other lyx commands will get a "unknown" icon. -# -# This is the default toolbar: - -Toolbar "Standard" "on,top" - Layouts - Item "Open document" "file-open" - Item "Save document" "buffer-write" - Item "Print document" "dialog-show print" - Separator - Item "Cut selection" "cut" - Item "Copy selection" "copy" - Item "Paste" "paste" - Separator - Item "Toggle emphasis style" "font-emph" - Item "Toggle noun style" "font-noun" - Item "Toggle free style" "font-free-apply" - Separator - Item "Insert TeX" "ert-insert" - Item "Insert math" "math-mode" - #Item "dialog-show mathpanel" - Separator - Item "Insert footnote" "footnote-insert" - Item "Insert margin note" "marginalnote-insert" - Item "Increase depth" "depth-increment" - Separator - Item "Insert graphics" "dialog-show-new-inset graphics" - Item "Insert table" "tabular-insert" -End - -Toolbar "Command Buffer" "on,bottom" - Minibuffer +Toolbars + "Standard" "on,top" + "Extra" "on,top" + "Table" "off,bottom" + "Math" "off,bottom" + "Command Buffer" "off,bottom" End diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui index 36230beb47..5b5378b654 100644 --- a/lib/ui/stdmenus.ui +++ b/lib/ui/stdmenus.ui @@ -18,7 +18,7 @@ Menuset Menu "file" Item "New|N" "buffer-new" - Item "New from Template...|T" "buffer-new-template" + Item "New from Template...|m" "buffer-new-template" Item "Open...|O" "file-open" # This seems a much more sensible place to me Submenu "Open recent|t" "lastfiles" -- 2.39.5