]> git.lyx.org Git - lyx.git/blobdiff - lib/ui/stdmenus.ui
Fix small menu mess-up (double Note item)
[lyx.git] / lib / ui / stdmenus.ui
index 8c3134d3c0eeae4894af10d00fb8854383c3b5f1..629c5d26fe465c417fb68edf28ba90846a5b067d 100644 (file)
@@ -93,6 +93,7 @@ Menuset
                OptItem "Minipage Settings...|M" "inset-settings minipage"
                OptItem "Text Wrap Settings...|W" "inset-settings wrap"
                OptItem "Note Settings...|N" "inset-settings note"
+               OptItem "Branch Settings...|B" "inset-settings branch"
 # Hey, guess what's broken ? Surprise surprise, it's tabular stuff
 # This is in the Table submenu instead for now.
 #      OptItem "Table Settings...|a" "inset-settings tabular"
@@ -118,12 +119,17 @@ Menuset
                Item "Left Line|L" "tabular-feature toggle-line-left"
                Item "Right Line|R" "tabular-feature toggle-line-right"
                Separator
-               Item "Left aligned|e" "tabular-feature align-left"
-               Item "Centered|C" "tabular-feature align-center"
-               Item "Right aligned|i" "tabular-feature align-right"
-               Item "Top aligned|o" "tabular-feature valign-top"
-               Item "Vertically Centered|V" "tabular-feature valign-center"
-               Item "Bottom aligned|g" "tabular-feature valign-bottom"
+               Submenu "Alignment|i" "edit_align"
+       End
+
+       Menu "edit_align"
+               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"
        End
 
        Menu "edit_math"
@@ -135,7 +141,7 @@ Menuset
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
-               Submenu "Alignment|A" "edit_math_align"
+               Submenu "Alignment|A" "edit_align"
                Separator
                Item "Add Row|R" "tabular-feature append-row"
                Item "Delete Row|D" "tabular-feature delete-row"
@@ -176,16 +182,6 @@ Menuset
                Item "AMS multline Environment|m" "math-mutate multline"
        End
 
-       Menu "edit_math_align"
-               Item "Left-aligned|L" "tabular-feature align-left"
-               Item "Centered|C" "tabular-feature align-center"
-               Item "Right-aligned|R" "tabular-feature align-right"
-               Separator
-               Item "Top-aligned|T" "tabular-feature valign-top"
-               Item "Centered Vertically|e" "tabular-feature valign-center"
-               Item "Bottom-aligned|B" "tabular-feature valign-bottom"
-       End
-
 #
 # VIEW MENU
 #
@@ -217,15 +213,18 @@ Menuset
 # most people using mathed learn key shortcuts quite quickly anyway)
                Submenu "Math|h" "insert_math"
                Submenu "Special Character|S" "insert_special"
+               Submenu "Special Formatting|o" "insert_formatting"
+               Submenu "List / TOC|i" "insert_toc"
                Submenu "Float|a" "insert_float"
-               Submenu "List / TOC|O" "insert_toc"
 # YUCK
+               Submenu "Note|N" "insert_note"
+               Submenu "Branch|B" "branches"
                Submenu "File|e" "insert_file"
                Separator
                Item "Citation Reference...|C" "dialog-show-new-inset citation"
                Item "Cross Reference...|R" "dialog-show-new-inset ref"
                Item "Label...|L" "label-insert"
-               Item "Index Entry|I" "index-insert"
+               Item "Index Entry|d" "index-insert"
 # I'm going to kill this dumb dialog, but for now ...
                Separator
                Item "Table...|T" "tabular-insert"
@@ -233,28 +232,30 @@ Menuset
                Item "URL...|U" "url-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
-               Item "Note|N" "note-insert"
                Item "Minipage|p" "minipage-insert"
                Item "Short Title" "optional-insert"
                Item "TeX|X" "ert-insert"
-               Item "External Material..." "dialog-show-new-inset external"
-               Item "Child Document...|d" "dialog-show-new-inset include"
        End
 
        Menu "insert_special"
+               Item "Ellipsis|i" "dots-insert"
+               Item "End of Sentence|E" "end-of-sentence-period-insert"
+               Item "Ordinary Quote|Q" "self-insert \""
+               Item "Menu Separator|M" "menu-separator-insert"
+       End
+
+       Menu "insert_formatting"
                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 "Horizontal Fill|H" "hfill-insert"
-               Item "Hyphenation Point|P" "hyphenation-point-insert"
-               Item "Ligature Break|k" "ligature-break-insert"
+               Separator
                Item "Protected Space|r" "space-insert protected"
                Item "Inter-word Space|w" "space-insert normal"
                Item "Thin Space|T" "space-insert thin"
+               Item "Horizontal Fill|H" "hfill-insert"
+               Separator
+               Item "Hyphenation Point|P" "hyphenation-point-insert"
+               Item "Ligature Break|k" "ligature-break-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" "self-insert \""
-               Item "Menu Separator|M" "menu-separator-insert"
        End
 
        Menu "insert_math"
@@ -275,28 +276,28 @@ Menuset
        End
 
        Menu "insert_math_font"
-               Item "Math normal font" "math-insert \mathnormal"
+               Item "Math Normal Font" "math-insert \mathnormal"
                Separator
-               Item "Math calligraphic family" "math-insert \mathcal"
-               Item "Math fraktur family" "math-insert \mathfrak"
-               Item "Math roman family" "math-insert \mathrm"
-               Item "Math sans serif family" "math-insert \mathsf"
+               Item "Math Calligraphic Family" "math-insert \mathcal"
+               Item "Math Fraktur Family" "math-insert \mathfrak"
+               Item "Math Roman Family" "math-insert \mathrm"
+               Item "Math Sans Serif Family" "math-insert \mathsf"
                Separator
-               Item "Math bold series" "math-insert \mathbf"
+               Item "Math Bold Series" "math-insert \mathbf"
                Separator
-               Item "Text normal font" "math-insert \textnormal"
+               Item "Text Normal Font" "math-insert \textnormal"
                Separator
-               Item "Text roman family" "math-insert \textrm"
-               Item "Text sans serif family" "math-insert \textsf"
-               Item "Text typewriter family" "math-insert \texttt"
+               Item "Text Roman Family" "math-insert \textrm"
+               Item "Text Sans Serif Family" "math-insert \textsf"
+               Item "Text Typewriter Family" "math-insert \texttt"
                Separator
-               Item "Text bold series" "math-insert \textbf"
-               Item "Text medium series" "math-insert \textmd"
+               Item "Text Bold Series" "math-insert \textbf"
+               Item "Text Medium Series" "math-insert \textmd"
                Separator
-               Item "Text italic shape" "math-insert \textit"
-               Item "Text small caps shape" "math-insert \textsc"
-               Item "Text slanted shape" "math-insert \textsl"
-               Item "Text upright shape" "math-insert \textup"
+               Item "Text Italic Shape" "math-insert \textit"
+               Item "Text Small Caps Shape" "math-insert \textsc"
+               Item "Text Slanted Shape" "math-insert \textsl"
+               Item "Text Upright Shape" "math-insert \textup"
                        End
 
        Menu "insert_float"
@@ -316,6 +317,19 @@ Menuset
                Item "LyX Document...|X" "file-insert"
                Item "ASCII as Lines...|L" "file-insert-ascii"
                Item "ASCII as Paragraphs...|P" "file-insert-ascii-para"
+               Separator
+               Item "External Material..." "dialog-show-new-inset external"
+               Item "Child Document...|d" "dialog-show-new-inset include"
+       End
+
+       Menu "insert_note"
+               Item "LyX Note|N" "note-insert Note"
+               Item "Comment|C" "note-insert Comment"
+               Item "Greyed Out|G" "note-insert Greyedout"
+       End
+
+       Menu "branches"
+               Branches
        End
 
 #
@@ -323,7 +337,7 @@ Menuset
 #
  
        Menu "document"
-               Submenu "Change tracking|C" "edit_change"
+               Submenu "Change Tracking|C" "edit_change"
                OptItem "Build Program|B" "build-program"
                Item "LaTeX Log File...|L" "dialog-show latexlog"
                Item "Table of Contents...|T" "toc-view"
@@ -334,10 +348,10 @@ Menuset
        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"
+               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
 
 #