]> git.lyx.org Git - lyx.git/blobdiff - lib/ui/default.ui
toolbar3.diff
[lyx.git] / lib / ui / default.ui
index a47527434be018d19167c6e388d83a788a7eb5bb..6a7cc5231ec374d3f496ab7f77131aa56b9c8814 100644 (file)
@@ -1,17 +1,9 @@
 # This is the default LyX user interface definition file.         -*- text -*-
-# 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. 
+# The syntax should be straightforward enough. 
 
 Menuset
 
-    Menubar "main_nobuffer"
-       Submenu "File|F" "file_nobuffer"
-       Submenu "Edit|E" "edit_nobuffer"
-       Submenu "Help|H" "help"
-    End
-
-    Menubar "main"
+    Menubar
        Submenu "File|F" "file"
        Submenu "Edit|E" "edit"
        Submenu "Insert|I" "insert"
@@ -25,17 +17,6 @@ Menuset
 #
 # FILE MENU
 #
-    Menu "file_nobuffer"
-       Item "New|N" "buffer-new"
-       Item "New from Template...|T" "buffer-new-template"
-       Item "Open...|O" "file-open"
-       Separator
-       Submenu "Import|I" "file_import"
-       Separator
-       Item "Exit|x" "lyx-quit"
-       Separator
-       Lastfiles
-    End
 
     Menu "file"
        Item "New|N" "buffer-new"
@@ -59,7 +40,7 @@ Menuset
     End
 
     Menu "file_vc"
-       OptItem "Register|R" "vc-register"
+       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"
@@ -79,10 +60,6 @@ Menuset
 #
 # EDIT MENU
 #
-    Menu "edit_nobuffer"
-       Item "Preferences|P" "dialog-preferences"
-       Item "Reconfigure|R" "reconfigure"
-    End
 
     Menu "edit"
        Item "Undo|U" "undo"
@@ -98,13 +75,14 @@ Menuset
        Submenu "Math|M" "edit_math"
        Separator
        #Item "Read Only" "buffer-toggle-read-only"
-       Item "Spellchecker|S" "spellchecker"
-       Item "Thesaurus" "thesaurus-entry"
+       Item "Spellchecker...|S" "spellchecker"
+       Item "Thesaurus..." "thesaurus-entry"
        Item "Check TeX|h" "buffer-chktex"
        Item "Remove All Error Boxes|E" "error-remove-all"
        Item "Open/Close float|l" "inset-toggle"
+       Submenu "Change tracking|g" "edit_change"
        Separator
-       Item "Preferences|P" "dialog-preferences"
+       Item "Preferences...|P" "dialog-preferences"
        Item "Reconfigure|R" "reconfigure"
     End
 
@@ -131,9 +109,13 @@ Menuset
        Separator
        Item "Add Row|A" "tabular-feature append-row"
        Item "Delete Row|w" "tabular-feature delete-row"
+       Item "Copy Row" "tabular-feature copy-row"
+       Item "Swap Rows" "tabular-feature swap-row"
        Separator
        Item "Add Column|u" "tabular-feature append-column"
        Item "Delete Column|D" "tabular-feature delete-column"
+       Item "Copy Column" "tabular-feature copy-column"
+       Item "Swap Columns" "tabular-feature swap-column"
     End
 
     Menu "edit_math"
@@ -145,33 +127,67 @@ Menuset
 #      Item "Make alignat 2 columns|2"  "break-line B"
 #      Item "Make alignat 3 columns|3"  "break-line C"
 #      Separator
-       Item "Toggle numbering|n" "math-number"
-       Item "Toggle numbering of line|u" "math-nonumber"
-       Item "Toggle limits|l" "math-limits"
-       Separator
-       Item "Inline formula|I" "math-mutate simple"
-       Item "Displayed formula|D" "math-mutate equation"
-       Item "Eqnarray environment|q" "math-mutate eqnarray"
-       Item "Align environment|A" "math-mutate align"
-       Item "AlignAt environment" "math-mutate alignat"
-       Item "XAlignAt environment" "math-mutate xalignat"
-       Item "XXAlignAt environment" "math-mutate xxalignat"
-       Separator
-       Item "Align Left|f" "math-halign left"
-       Item "Align Center|C" "math-halign center"
-       Item "Align Right|R" "math-halign right"
-       Separator
-       Item "V.Align Top|T" "math-valign top"
-       Item "V.Align Center|e" "math-valign center"
-       Item "V.Align Bottom|B" "math-valign bottom"
-       Separator
-       Item "Add Row" "math-row-insert"
-       Item "Delete Row" "math-row-delete"
-       Separator
-       Item "Add Column" "math-column-insert"
-       Item "Delete Column" "math-column-delete"
+       Item "Toggle Numbering|N" "math-number"
+       Item "Toggle Numbering of Line|u" "math-nonumber"
+#      Item "Toggle limits|l" "math-limits"
+       Submenu "Change Limits Type|L" "edit_math_limits"
+       Separator
+       Submenu "Change Formula Type|F" "edit_math_mutate"
+       Separator
+       Submenu "Use Computer Algebra System|S" "edit_math_extern"
+       Separator
+       Submenu "Alignment|A" "edit_math_align"
+       Separator
+       Item "Add Row|R" "tabular-feature append-row"
+       Item "Delete Row|D" "tabular-feature delete-row"
+       Item "Copy Row" "tabular-feature copy-row"
+       Item "Swap Rows" "tabular-feature swap-row"
+       Separator
+       Item "Add Column|C" "tabular-feature append-column"
+       Item "Delete Column|e" "tabular-feature delete-column"
+       Item "Copy Column" "tabular-feature copy-column"
+       Item "Swap Columns" "tabular-feature swap-column"
+    End
+
+    Menu "edit_math_limits"
+        Item "Default|t"  "math-limits empty"
+        Item "Display|D"  "math-limits limits"
+        Item "Inline|I"  "math-limits nolimits"
     End
 
+    Menu "edit_math_extern"
+       Item "Octave" "math-extern octave"
+       Item "Maxima" "math-extern maxima"
+       Item "Mathematica" "math-extern mathematica"
+       Separator
+       Item "Maple, simplify" "math-extern maple simplify"
+       Item "Maple, factor" "math-extern maple factor"
+       Item "Maple, evalm" "math-extern maple evalm"
+       Item "Maple, evalf" "math-extern maple evalf"
+    End
+
+    Menu "edit_math_mutate"
+       Item "Inline Formula|I" "math-mutate simple"
+       Item "Displayed Formula|D" "math-mutate equation"
+       Item "Eqnarray Environment|q" "math-mutate eqnarray"
+       Item "Align Environment|A" "math-mutate align"
+       Item "AlignAt Environment" "math-mutate alignat"
+       Item "Flalign Environment|f" "math-mutate flalign"
+       #Item "XAlignAt Environment" "math-mutate xalignat"
+       #Item "XXAlignAt Environment" "math-mutate xxalignat"
+       Item "Gather Environment" "math-mutate gather"
+       Item "Multline Environment" "math-mutate multline"
+    End
+
+    Menu "edit_math_align"
+       Item "Align Left|L" "tabular-feature align-left"
+       Item "Align Center|C" "tabular-feature align-center"
+       Item "Align Right|R" "tabular-feature align-right"
+       Separator
+       Item "V.Align Top|T" "tabular-feature valign-top"
+       Item "V.Align Center|e" "tabular-feature valign-center"
+       Item "V.Align Bottom|B" "tabular-feature valign-bottom"
+    End
 #
 # INSERT MENU
 #
@@ -179,33 +195,35 @@ Menuset
         Submenu "Math|h" "insert_math"
        Separator
        Submenu "Special Character|S" "insert_special"
-       Item "Citation Reference...|C" "citation-insert"
-       Item "Cross Reference...|R" "reference-insert"
+       Item "Citation Reference...|C" "dialog-show-new-inset citation"
+       Item "Cross Reference...|R" "dialog-show-new-inset ref"
        Item "Label...|L" "label-insert"
        Item "Footnote|F" "footnote-insert"
        Item "Marginal Note|M" "marginalnote-insert"
-       Item "Index Entry|I" "index-insert"
+       Item "Short Title" "optional-insert"
+       Item "Bibliography Key" "bibitem-insert"
+       Item "Index Entry...|I" "index-insert"
        Item "URL...|U" "url-insert"
        Item "Note|N" "note-insert"
        Submenu "Lists & TOC|O" "insert_toc"
        Separator
        Item "TeX|T" "ert-insert"
        Item "Minipage|p" "minipage-insert"
-       Item "Graphics...|G" "graphics-insert"
-       Item "Tabular Material...|b" "dialog-tabular-insert"
+       Item "Graphics...|G" "dialog-show-new-inset graphics"
+       Item "Tabular Material...|b" "tabular-insert"
        Submenu "Floats|a" "insert_floats"
        Separator
-       Item "Include File...|d" "buffer-child-insert"
+       Item "Include File...|d" "dialog-show-new-inset include"
        Submenu "Insert File|e" "insert_file"
-       Item "External Material...|x" "external-insert"
+       Item "External Material...|x" "dialog-show-new-inset external"
     End
 
     Menu "insert_special"
-       Item "Superscript|S" "command-sequence math-mode ; math-superscript ; font-free; "
-       Item "Subscript|u" "command-sequence math-mode ; math-subscript ; font-free; "
+       Item "Superscript|S" "command-sequence math-mode ; math-superscript ; font-free-apply; "
+       Item "Subscript|u" "command-sequence math-mode ; math-subscript ; font-free-apply; "
        Item "HFill|H" "hfill-insert"
        Item "Hyphenation Point|P" "hyphenation-point-insert"
-       Item "Ligature break|k" "ligature-break-insert"
+       Item "Ligature Break|k" "ligature-break-insert"
        Item "Protected Blank|B" "protected-space-insert"
        Item "Linebreak|L" "break-line"
        Item "Ellipsis|i" "dots-insert"
@@ -217,14 +235,18 @@ Menuset
     Menu "insert_math"
        Item "Inline Formula|I" "math-mode"
        Item "Display Formula|D" "math-display"
-       Item "Eqnarray environment|E" "command-sequence math-mode; math-mutate eqnarray;"
-       Item "AMS align environment|A" "command-sequence math-mode; math-mutate align;"
-       Item "AMS alignat environment|t" "command-sequence math-mode; math-mutate alignat;"
-       Item "AMS xalignat environment|x" "command-sequence math-mode; math-mutate xalignat;"
-       Item "AMS xxalignat environment" "command-sequence math-mode; math-mutate xxalignat;"
+       Item "Eqnarray Environment|E" "command-sequence math-mode; math-mutate eqnarray;"
+       Item "AMS align Environment|A" "command-sequence math-mode; math-mutate align;"
+       Item "AMS alignat Environment|t" "command-sequence math-mode; math-mutate alignat;"
+       Item "AMS flalign Environment|f" "command-sequence math-mode; math-mutate flalign;"
+       #Item "AMS xalignat Environment|x" "command-sequence math-mode; math-mutate xalignat;"
+       #Item "AMS xxalignat Environment" "command-sequence math-mode; math-mutate xxalignat;"
+       Item "AMS gather Environment" "command-sequence math-mode; math-mutate gather;"
+       Item "AMS multline Environment" "command-sequence math-mode; math-mutate multline;"
   Separator
-       Item "Array environment|y" "math-insert matrix 2 2"
-       Item "Cases environment|C" "math-insert cases 2"
+       Item "Array Environment|y" "math-matrix 2 2"
+       Item "Cases Environment|C" "math-insert \cases"
+       Item "Split Environment|S" "math-insert \split"
   Separator
        Submenu "Font Change|f" "insert_math_font"
        Item "Math Panel|l" "math-panel"
@@ -257,38 +279,46 @@ Menuset
 
     Menu "insert_floats"
        FloatInsert
+       Item "Floatflt Figure" "wrap-insert figure"
     End
 
     Menu "insert_toc"
        Item "Table of Contents|C" "toc-insert"
        FloatListInsert
        Item "Index List|I" "index-print"
-       Item "BibTeX Reference...|B" "bibtex-insert"
+       Item "BibTeX Reference...|B" "dialog-show-new-inset bibtex"
     End
 
     Menu "insert_file"
        Item "LyX Document...|X" "file-insert"
-       Item "Ascii as Lines...|L" "file-insert-ascii"
-       Item "Ascii as Paragraphs...|P" "file-insert-ascii-para"
+       Item "ASCII as Lines...|L" "file-insert-ascii"
+       Item "ASCII as Paragraphs...|P" "file-insert-ascii-para"
     End
 
+    Menu "edit_change"
+       Item "Track changes|T" "track-changes"
+       Item "Merge changes ...|M" "merge-changes"
+       Item "Accept all changes|A" "accept-all-changes"
+       Item "Reject all changes|R" "reject-all-changes"
+    End
 #
 # LAYOUT MENU
 #
     Menu "layout"
-       Item "Character|C" "layout-character"
-       Item "Paragraph|P" "layout-paragraph"
-       Item "Document|D" "layout-document"
-       OptItem "Tabular|T" "layout-tabular"
+       Item "Character...|C" "layout-character"
+       Item "Paragraph...|P" "layout-paragraph"
+       Item "Document...|D" "layout-document"
+       OptItem "Tabular...|T" "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"
        Separator
-       Item "Change Environment Depth|v" "depth-increment"
-       Item "Preamble|r" "layout-preamble"
-       Item "Start Appendix here|A" "appendix"
+       Item "Decrease Environment Depth|v" "depth-decrement"
+       Item "Increase Environment Depth|i" "depth-increment"
+       Item "Preamble...|r" "layout-preamble"
+       Item "Start Appendix Here|S" "appendix"
     End
 
 
@@ -302,7 +332,7 @@ Menuset
        Separator
        Item "LaTeX Logfile|L" "latex-view-log"
        Item "Table of Contents|T" "toc-view"
-       Item "Child processes|C" "show-forks"
+       Item "Child Processes|C" "show-forks"
        Item "TeX Information|X" "help-Texinfo"
     End
 
@@ -318,7 +348,7 @@ Menuset
        Separator
        Item "Error|E" "error-next"
        Item "Note|N" "note-next"
-       Item "Refs|R" "reference-next"
+       Item "Refs|R" "reference-goto"
        Submenu "Bookmarks|B" "navigate_bookmarks"
     End
 
@@ -361,14 +391,20 @@ Menuset
 
 End
 
-# Setup your favorite Toolbar here:
+# A Toolbar starts like :
+#
+# Toolbar "Name" "on" 
+#
+# The second parameter is the status, and can be "on", "off", "math"
+# or "table". The last two make the toolbars appear and disappear automatically.
+#
 # Only three commands are allowed inside the begin_toolbar and end_toolbar
 # directives: 
-#   Icon "<action> [<parameter>]" adds an icon to the toolbar performing
+#   Item "<action> [<parameter>]" adds an icon to the toolbar performing
 #          "<action> <parameter>"
 #      Examples:
-#      Icon "font-size small"
-#      Icon set-emph
+#      Item "font-size small"
+#      Item set-emph
 #
 #   Layouts adds the layouts combo-box to the toolbar
 #
@@ -381,28 +417,28 @@ End
 #
 # This is the default toolbar:
 
-Toolbar
+Toolbar "Standard" "on"
     Layouts
-    Icon "file-open"
-    Icon "buffer-write"
-    Icon "buffer-print"
+    Item "Open document" "file-open"
+    Item "Save document" "buffer-write"
+    Item "Print document" "buffer-print"
     Separator
-    Icon "cut"
-    Icon "copy"
-    Icon "paste"
+    Item "Cut selection" "cut"
+    Item "Copy selection" "copy"
+    Item "Paste" "paste"
     Separator
-    Icon "font-emph"
-    Icon "font-noun"
-    Icon "font-free"
+    Item "Toggle emphasis style" "font-emph"
+    Item "Toggle noun style" "font-noun"
+    Item "Toggle free style" "font-free-apply"
     Separator
-    Icon "ert-insert"
-    Icon "math-mode"
-    #Icon "math-panel"
+    Item "Insert TeX" "ert-insert"
+    Item "Insert math" "math-mode"
+    #Item "math-panel"
     Separator
-    Icon "footnote-insert"
-    Icon "marginalnote-insert"
-    Icon "depth-increment"
+    Item "Insert footnote" "footnote-insert"
+    Item "Insert margin note" "marginalnote-insert"
+    Item "Increase depth" "depth-increment"
     Separator
-    Icon "graphics-insert"
-    Icon "dialog-tabular-insert"
+    Item "Insert graphics" "dialog-show-new-inset graphics"
+    Item "Insert table" "tabular-insert"
 End