From: Jean-Marc Lasgouttes Date: Fri, 3 Nov 2000 11:04:15 +0000 (+0000) Subject: New menu layout from Rob X-Git-Tag: 1.6.10~21847 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=792d84249e3804b5d413c43719cbb109669aa792;p=features.git New menu layout from Rob git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1188 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/ChangeLog b/ChangeLog index f998452fbf..34ad0b8332 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-11-03 Jean-Marc Lasgouttes + + * lib/bind/menus.bind: remove the Layout menu entries, which I + somehow forgot earlier. + +2000-11-03 Rob Lahaye + + * lib/ui/old-default.ui: keep the old one here for reference (to + be deleted later). + + * lib/ui/default.ui: update the menu layout + 2000-11-02 Angus Leeming * src/frontends/xforms/FormCitation.C: made use of ButtonController. @@ -7,7 +19,8 @@ Can't actually DO anything with them yet, but I'd like a little feedback. - * src/frontends/xforms/input_validators.[ch] (fl_lowercase_filter): new. + * src/frontends/xforms/input_validators.[ch] + (fl_lowercase_filter): new. 2000-10-27 Dekel Tsur diff --git a/lib/bind/menus.bind b/lib/bind/menus.bind index dcf5883804..81a8969cf1 100644 --- a/lib/bind/menus.bind +++ b/lib/bind/menus.bind @@ -9,23 +9,6 @@ # Key bindings for so-called "invisible" menus -# -# Layout menu -# - -\bind "M-l c" "layout-character" -\bind "M-l p" "layout-paragraph" -\bind "M-l d" "layout-document" -\bind "M-l m" "font-emph" -\bind "M-l n" "font-noun" -\bind "M-l b" "font-bold" -\bind "M-l t" "tex-mode" -\bind "M-l v" "depth-next" -\bind "M-l l" "layout-preamble" -\bind "M-l s" "layout-save-default" -\bind "M-l space" "menu-open Layout" -\bind "M-l x" "appendix" - # # Insert menu # diff --git a/lib/ui/default.ui b/lib/ui/default.ui index c328a9f389..41c62ae0a0 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -5,86 +5,97 @@ Menuset + Menubar "main_nobuffer" + Submenu "File|F" "file_nobuffer" + Submenu "Edit|E" "edit_nobuffer" + Submenu "Help|H" "help" + End + Menubar "main" Submenu "File|F" "file" Submenu "Edit|E" "edit" - Submenu "Toc|T" "toc" - Submenu "Refs|R" "refs" - Submenu "Layout|L" "layout" Submenu "Insert|I" "insert" - Submenu "Math|a" "math" - Submenu "Options|O" "options" + Submenu "Layout|L" "layout" + Submenu "View|V" "view" + Submenu "Navigate|N" "navigate" Submenu "Documents|D" "documents" Submenu "Help|H" "help" End - Menubar "main_nobuffer" - Submenu "File|F" "file_nobuffer" - Submenu "Options|O" "options" - Submenu "Help|H" "help" - End - - Menu "file" +# +# FILE MENU +# + Menu "file_nobuffer" Item "New...|N" "buffer-new" Item "New from template...|t" "buffer-new-template" Item "Open...|O" "buffer-open" - Separator - Item "Close|C" "buffer-close" - Item "Save|S" "buffer-write" - Item "Save As...|A" "buffer-write-as" - Item "Revert to saved|R" "buffer-reload" - Separator - Item "View dvi|d" "buffer-view dvi" - Item "View Postscript|w" "buffer-view ps" - Submenu "View|V" "view" - Item "Update dvi" "buffer-update dvi" - Item "Update Postscript" "buffer-update ps" - Submenu "Update|U" "update" - OptItem "Build program|B" "build-program" - Separator - Item "Print...|P" "buffer-print" -# Item "Fax...|F" "buffer-fax" - Submenu "Import|I" "import" - Submenu "Export|E" "export" + Submenu "Import|I" "fileimport" Separator Item "Exit|x" "lyx-quit" Separator Lastfiles End - Menu "file_nobuffer" + Menu "file" Item "New...|N" "buffer-new" Item "New from template...|t" "buffer-new-template" Item "Open...|O" "buffer-open" + Submenu "Import|m" "fileimport" + Submenu "Insert|I" "fileinsert" + Separator + Item "Close|C" "buffer-close" + Item "Save|S" "buffer-write" + Item "Save As...|A" "buffer-write-as" + Item "Revert to saved|R" "buffer-reload" + Submenu "Version control|V" "file_vc" Separator - Submenu "Import|I" "import" + Item "Print...|P" "buffer-print" + Submenu "Export|E" "exportfile" Separator Item "Exit|x" "lyx-quit" Separator Lastfiles End - Menu "view" - ViewFormats + Menu "fileimport" + OptItem "LaTeX...|L" "buffer-import latex" + OptItem "Ascii text as lines...|A" "buffer-import text" + OptItem "Ascii text as paragraphs...|p" "buffer-import textparagraph" + OptItem "HTML...|H" "buffer-import html" + OptItem "Noweb...|N" "buffer-import literate" + OptItem "LinuxDoc...|D" "buffer-import linuxdoc" End - Menu "update" - UpdateFormats + Menu "fileinsert" + Item "File...|F" "buffer-child-insert" + Item "LyX file...|X" "file-insert" + Item "Ascii as lines...|l" "file-insert-ascii lines" + Item "Ascii as paragraphs...|p" "file-insert-ascii paragraphs" + Item "External material...|E" "external-insert" End - Menu "import" - OptItem "LaTeX|L" "buffer-import latex" - OptItem "Ascii text as lines|A" "buffer-import text" - OptItem "Ascii text as paragraphs|p" "buffer-import textparagraph" - OptItem "HTML|H" "buffer-import html" - OptItem "Noweb|N" "buffer-import literate" - OptItem "LinuxDoc|D" "buffer-import linuxdoc" + + Menu "file_vc" + OptItem "Register|R" "vc-register" + OptItem "Check In Changes|I" "vc-check-in" + OptItem "Check Out for Edit|O" "vc-check-out" + OptItem "Revert to last version|l" "vc-revert" + OptItem "Undo last check in|U" "vc-undo-last" + OptItem "Show History|H" "vc-history" End - Menu "export" + Menu "exportfile" ExportFormats End +# +# EDIT MENU +# + Menu "edit_nobuffer" + Item "Reconfigure|R" "reconfigure" + Item "Preferences...|P" "dialog-preferences" + End + Menu "edit" Item "Undo|U" "undo" Item "Redo|R" "redo" @@ -92,24 +103,25 @@ Menuset Item "Cut|C" "cut" Item "Copy|o" "copy" Item "Paste|P" "paste" - Separator Item "Find & Replace...|F" "find-replace" - Item "Go to Error|E" "error-next" - Item "Go to Note|N" "note-next" + Submenu "Paste external selection|s" "edit_paste" + Separator Submenu "Floats & Insets|I" "edit_floats" - Submenu "Tabular" "edit_tabular" + Submenu "Tabular|T" "edit_tabular" Item "Spellchecker...|S" "spellchecker" Item "Check TeX|h" "buffer-chktex" - Item "Table of Contents|b" "toc-view" - Separator - Submenu "Version control" "vc" - Separator - Item "View LaTeX log file|w" "latex-view-log" - Separator - Submenu "Paste primary selection" "edit_paste" + Separator + Item "Reconfigure|R" "reconfigure" + Item "Preferences...|P" "dialog-preferences" + End + + Menu "edit_paste" + Item "as Lines|L" "primary-selection-paste" + Item "as Paragraphs|P" "primary-selection-paste paragraph" End Menu "edit_floats" + Item "? What should go here ?" "" End Menu "edit_tabular" @@ -135,76 +147,31 @@ Menuset Item "Delete Column|D" "tabular-feature delete-column" End - Menu "edit_paste" - Item "as Lines|L" "primary-selection-paste" - Item "as Paragraphs|g" "primary-selection-paste paragraph" - End - - Menu "vc" - OptItem "Register|R" "vc-register" - OptItem "Check In Changes|I" "vc-check-in" - OptItem "Check Out for Edit|O" "vc-check-out" - OptItem "Revert to last version|l" "vc-revert" - OptItem "Undo last check in|U" "vc-undo-last" - OptItem "Show History|H" "vc-history" - End - - Menu toc - Toc - End - - Menu refs - References - Separator - Item "Go Back|B" "reference-back" - End - - Menu "layout" - Item "Character...|C" "layout-character" - Item "Paragraph...|P" "layout-paragraph" - Item "Document...|D" "layout-document" - OptItem "Tabular...|a" "layout-tabular" - Separator - Item "Emphasize Style|E" "font-emph" - Item "Noun Style|N" "font-noun" - Item "Bold Style|B" "font-bold" - Item "TeX Style|X" "tex-mode" - Item "Change environment depth|v" "depth-increment" - Item "LaTeX preamble...|a" "layout-preamble" - Item "Start of Appendix|x" "appendix" - Separator - Item "Save layout as default|S" "layout-save-default" - End - +# +# INSERT MENU +# Menu "insert" - Item "Figure...|g" "figure-insert" - Item "Tabular...|T" "dialog-tabular-insert" - Separator - Item "Include File...|c" "buffer-child-insert" - Submenu "Import ascii file|a" "insert_ascii" - Item "Insert LyX file...|X" "file-insert" - Item "Insert external material...|e" "external-insert" - Separator - Item "Footnote|F" "footnote-insert" - Item "Marginnote|M" "marginpar-insert" - Submenu "Floats|a" "insert_floats" - Separator - Submenu "Lists & TOC|T" "insert_toc" - Separator + Item "Math text|M" "math-mode" + Item "Math Display|D" "math-display" + Item "Math Panel...|P" "math-panel" + Submenu "Math elements|e" "insert-math" + Separator Submenu "Special character|S" "insert_special" - Separator - Item "Note...|N" "note-insert" - Item "Label...|L" "label-insert" - Item "Cross reference...|r" "reference-insert" Item "Citation reference...|i" "citation-insert" + Item "Cross reference...|r" "reference-insert" + Item "Label...|L" "label-insert" + Item "Footnote|F" "footnote-insert" + Item "Marginal note|M" "marginpar-insert" Item "Index entry...|d" "index-insert" Item "Index entry of last word|w" "index-insert-last" Item "URL...|U" "url-insert" - End - - Menu "insert_ascii" - Item "As lines...|l" "file-insert-ascii lines" - Item "As paragraphs...|p" "file-insert-ascii paragraphs" + Item "Note...|N" "note-insert" + Separator + Item "Figure...|g" "figure-insert" + Item "Tabular...|T" "dialog-tabular-insert" + Submenu "Floats|a" "insert_floats" + Separator + Submenu "Lists & TOC|T" "insert_toc" End Menu "insert_floats" @@ -216,6 +183,15 @@ Menuset Item "Algorithm float|A" "buffer-float-insert algorithm" End + Menu "insert-math" + Item "Fraction|F" "math-insert frac" + Item "Square root|S" "math-insert sqrt" + Item "Exponent|E" "math-insert ^" + Item "Index|x" "math-insert -" + Item "Sum|u" "math-insert sum" + Item "Integral|I" "math-insert int" + End + Menu "insert_toc" Item "Table of Contents|C" "toc-insert" Item "List of Figures|F" "lof-insert" @@ -236,25 +212,54 @@ Menuset Item "Menu Separator|M" "menu-separator-insert" End - Menu "math" - Item "Fraction|F" "math-insert frac" - Item "Square root|S" "math-insert sqrt" - Item "Exponent|E" "math-insert ^" - Item "Index|x" "math-insert -" - Item "Sum|u" "math-insert sum" - Item "Integral|I" "math-insert int" +# +# LAYOUT MENU +# + Menu "layout" + Item "Character...|C" "layout-character" + Item "Paragraph...|P" "layout-paragraph" + Item "Document...|D" "layout-document" + OptItem "Tabular...|a" "layout-tabular" Separator - Item "Math mode|M" "math-mode" - Item "Display|D" "math-display" + Item "Emphasize Style|E" "font-emph" + Item "Noun Style|N" "font-noun" + Item "Bold Style|B" "font-bold" + Item "TeX Style|X" "tex-mode" + Separator + Item "Change environment depth|v" "depth-increment" + Item "LaTeX preamble...|a" "layout-preamble" + Item "Start of Appendix|x" "appendix" Separator - Item "Math Panel...|P" "math-panel" + Item "Save layout as default|S" "layout-save-default" End - Menu "options" - Item "Reconfigure|R" "reconfigure" - Item "Preferences...|P" "dialog-preferences" + +# +# VIEW MENU +# + Menu "view" + ViewFormats + OptItem "Build program|B" "build-program" + Submenu "Update|U" "update" + Separator + Item "LaTeX log file|w" "latex-view-log" + Item "Table of Contents|b" "toc-view" + End + + Menu "update" + UpdateFormats + End + +# +# NAVIGATE MENU +# + Menu "navigate" + Item "Error|E" "error-next" + Item "Note|N" "note-next" + Separator + Toc End - + Menu "documents" Documents End @@ -322,4 +327,3 @@ Toolbar Icon "figure-insert" Icon "dialog-tabular-insert" End - diff --git a/lib/ui/old-default.ui b/lib/ui/old-default.ui new file mode 100644 index 0000000000..c328a9f389 --- /dev/null +++ b/lib/ui/old-default.ui @@ -0,0 +1,325 @@ +# This is the default LyX user interface definition file. The syntax +# should be straightforward enough. The menubar "main_nobuffer" (if it +# exists) is used when there is no buffer open; otherwise, the menubar +# "main" is used. + +Menuset + + Menubar "main" + Submenu "File|F" "file" + Submenu "Edit|E" "edit" + Submenu "Toc|T" "toc" + Submenu "Refs|R" "refs" + Submenu "Layout|L" "layout" + Submenu "Insert|I" "insert" + Submenu "Math|a" "math" + Submenu "Options|O" "options" + Submenu "Documents|D" "documents" + Submenu "Help|H" "help" + End + + Menubar "main_nobuffer" + Submenu "File|F" "file_nobuffer" + Submenu "Options|O" "options" + Submenu "Help|H" "help" + End + + Menu "file" + Item "New...|N" "buffer-new" + Item "New from template...|t" "buffer-new-template" + Item "Open...|O" "buffer-open" + Separator + Item "Close|C" "buffer-close" + Item "Save|S" "buffer-write" + Item "Save As...|A" "buffer-write-as" + Item "Revert to saved|R" "buffer-reload" + Separator + Item "View dvi|d" "buffer-view dvi" + Item "View Postscript|w" "buffer-view ps" + Submenu "View|V" "view" + Item "Update dvi" "buffer-update dvi" + Item "Update Postscript" "buffer-update ps" + Submenu "Update|U" "update" + OptItem "Build program|B" "build-program" + Separator + Item "Print...|P" "buffer-print" +# Item "Fax...|F" "buffer-fax" + Submenu "Import|I" "import" + Submenu "Export|E" "export" + Separator + Item "Exit|x" "lyx-quit" + Separator + Lastfiles + End + + Menu "file_nobuffer" + Item "New...|N" "buffer-new" + Item "New from template...|t" "buffer-new-template" + Item "Open...|O" "buffer-open" + Separator + Submenu "Import|I" "import" + Separator + Item "Exit|x" "lyx-quit" + Separator + Lastfiles + End + + Menu "view" + ViewFormats + End + + Menu "update" + UpdateFormats + End + + Menu "import" + OptItem "LaTeX|L" "buffer-import latex" + OptItem "Ascii text as lines|A" "buffer-import text" + OptItem "Ascii text as paragraphs|p" "buffer-import textparagraph" + OptItem "HTML|H" "buffer-import html" + OptItem "Noweb|N" "buffer-import literate" + OptItem "LinuxDoc|D" "buffer-import linuxdoc" + End + + Menu "export" + ExportFormats + End + + Menu "edit" + Item "Undo|U" "undo" + Item "Redo|R" "redo" + Separator + Item "Cut|C" "cut" + Item "Copy|o" "copy" + Item "Paste|P" "paste" + Separator + Item "Find & Replace...|F" "find-replace" + Item "Go to Error|E" "error-next" + Item "Go to Note|N" "note-next" + Submenu "Floats & Insets|I" "edit_floats" + Submenu "Tabular" "edit_tabular" + Item "Spellchecker...|S" "spellchecker" + Item "Check TeX|h" "buffer-chktex" + Item "Table of Contents|b" "toc-view" + Separator + Submenu "Version control" "vc" + Separator + Item "View LaTeX log file|w" "latex-view-log" + Separator + Submenu "Paste primary selection" "edit_paste" + End + + Menu "edit_floats" + End + + Menu "edit_tabular" + Item "Multicolumn|M" "tabular-feature multicolumn" + Separator + Item "Line Top|T" "tabular-feature toggle-line-top" + Item "Line Bottom|B" "tabular-feature toggle-line-bottom" + Item "Line Left|L" "tabular-feature toggle-line-left" + Item "Line Right|R" "tabular-feature toggle-line-right" + Separator + Item "Align Left|e" "tabular-feature align-left" + Item "Align Center|C" "tabular-feature align-center" + Item "Align Right|i" "tabular-feature align-right" + Separator + Item "V.Align Top|o" "tabular-feature valign-top" + Item "V.Align Center|n" "tabular-feature valign-center" + Item "V.Align Bottom|v" "tabular-feature valign-bottom" + Separator + Item "Append Row|A" "tabular-feature append-row" + Item "Append Column|u" "tabular-feature append-column" + Separator + Item "Delete Row|w" "tabular-feature delete-row" + Item "Delete Column|D" "tabular-feature delete-column" + End + + Menu "edit_paste" + Item "as Lines|L" "primary-selection-paste" + Item "as Paragraphs|g" "primary-selection-paste paragraph" + End + + Menu "vc" + OptItem "Register|R" "vc-register" + OptItem "Check In Changes|I" "vc-check-in" + OptItem "Check Out for Edit|O" "vc-check-out" + OptItem "Revert to last version|l" "vc-revert" + OptItem "Undo last check in|U" "vc-undo-last" + OptItem "Show History|H" "vc-history" + End + + Menu toc + Toc + End + + Menu refs + References + Separator + Item "Go Back|B" "reference-back" + End + + Menu "layout" + Item "Character...|C" "layout-character" + Item "Paragraph...|P" "layout-paragraph" + Item "Document...|D" "layout-document" + OptItem "Tabular...|a" "layout-tabular" + Separator + Item "Emphasize Style|E" "font-emph" + Item "Noun Style|N" "font-noun" + Item "Bold Style|B" "font-bold" + Item "TeX Style|X" "tex-mode" + Item "Change environment depth|v" "depth-increment" + Item "LaTeX preamble...|a" "layout-preamble" + Item "Start of Appendix|x" "appendix" + Separator + Item "Save layout as default|S" "layout-save-default" + End + + Menu "insert" + Item "Figure...|g" "figure-insert" + Item "Tabular...|T" "dialog-tabular-insert" + Separator + Item "Include File...|c" "buffer-child-insert" + Submenu "Import ascii file|a" "insert_ascii" + Item "Insert LyX file...|X" "file-insert" + Item "Insert external material...|e" "external-insert" + Separator + Item "Footnote|F" "footnote-insert" + Item "Marginnote|M" "marginpar-insert" + Submenu "Floats|a" "insert_floats" + Separator + Submenu "Lists & TOC|T" "insert_toc" + Separator + Submenu "Special character|S" "insert_special" + Separator + Item "Note...|N" "note-insert" + Item "Label...|L" "label-insert" + Item "Cross reference...|r" "reference-insert" + Item "Citation reference...|i" "citation-insert" + Item "Index entry...|d" "index-insert" + Item "Index entry of last word|w" "index-insert-last" + Item "URL...|U" "url-insert" + End + + Menu "insert_ascii" + Item "As lines...|l" "file-insert-ascii lines" + Item "As paragraphs...|p" "file-insert-ascii paragraphs" + End + + Menu "insert_floats" + Item "Figure float|F" "buffer-float-insert figure" + Item "Table float|T" "buffer-float-insert table" + Item "Wide figure float|W" "buffer-float-insert wide-fig" + Item "Wide table float|d" "buffer-float-insert wide-tab" + Separator + Item "Algorithm float|A" "buffer-float-insert algorithm" + End + + Menu "insert_toc" + Item "Table of Contents|C" "toc-insert" + Item "List of Figures|F" "lof-insert" + Item "List of Tables|T" "lot-insert" + Item "List of Algorithms|A" "loa-insert" + Item "Index List|I" "index-print" + Item "BibTeX reference...|B" "bibtex-insert" + End + + Menu "insert_special" + Item "HFill|H" "hfill-insert" + Item "Hyphenation point|p" "hyphenation-point-insert" + Item "Protected blank|b" "protected-space-insert" + Item "Linebreak|L" "break-line" + Item "Ellipsis|i" "dots-insert" + Item "End of sentence|E" "end-of-sentence-period-insert" + Item "Ordinary Quote|Q" "quote-insert" + Item "Menu Separator|M" "menu-separator-insert" + End + + Menu "math" + Item "Fraction|F" "math-insert frac" + Item "Square root|S" "math-insert sqrt" + Item "Exponent|E" "math-insert ^" + Item "Index|x" "math-insert -" + Item "Sum|u" "math-insert sum" + Item "Integral|I" "math-insert int" + Separator + Item "Math mode|M" "math-mode" + Item "Display|D" "math-display" + Separator + Item "Math Panel...|P" "math-panel" + End + + Menu "options" + Item "Reconfigure|R" "reconfigure" + Item "Preferences...|P" "dialog-preferences" + End + + Menu "documents" + Documents + End + + Menu "help" + Item "Introduction|I" "help-open Intro" + Item "Tutorial|T" "help-open Tutorial" + Item "User's Guide|U" "help-open UserGuide" + Item "Extended Features|x" "help-open Extended" + Item "Customization|C" "help-open Customization" + Item "Reference Manual|R" "help-open Reference" + Item "FAQ|F" "help-open FAQ" + Item "Table of contents|a" "help-open TOC" + Item "Known Bugs|K" "help-open BUGS" + Item "LaTeX Configuration|L" "help-open LaTeXConfig" + Separator + Item "Copyright and Warranty...|o" "help-copyright" + Item "Credits...|e" "help-credits" + Item "Version...|V" "help-version" + End + +End + +# Setup your favorite Toolbar here: +# Only three commands are allowed inside the begin_toolbar and end_toolbar +# directives: +# Icon " []" adds an icon to the toolbar performing +# " " +# Examples: +# Icon "font-size small" +# Icon set-emph +# +# Layouts adds the layouts combo-box to the toolbar +# +# Separator adds some spacing to the toolbar +# +# 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 + Layouts + Icon "buffer-open" + Icon "buffer-write" + Icon "buffer-print" + Separator + Icon "cut" + Icon "copy" + Icon "paste" + Separator + Icon "font-emph" + Icon "font-noun" + Icon "font-free" + Separator + Icon "footnote-insert" + Icon "marginpar-insert" + Icon "depth-next" + Separator + Icon "tex-mode" + Icon "math-mode" + Separator + Icon "figure-insert" + Icon "dialog-tabular-insert" +End +