Restore correct left/right navigation in root inset

[lyx.git] / lib / ui / stdmenus.inc

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index f134e4875ca54ec045e25bc7efbf56193a2e231d..b9f16b04040b84df625fb7257e669d02e3c64039 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -21,7 +21,7 @@
 #   (except when the preposition is part of a verb phrase, such as "Check In")
 # (http://library.gnome.org/devel/hig-book/stable/design-text-labels.html.en)
 
-Format 4
+Format 5
 
 Menuset
 
@@ -88,7 +88,9 @@ Menuset
        End
 
        Menu "file_export"
+               ExportFormat
                Item "Export As...|s" "buffer-export-as"
+               Separator
                ExportFormats
                Item "More Formats & Options...|r" "buffer-export custom"
        End
@@ -116,9 +118,10 @@ Menuset
                Item "Move Paragraph Up|o" "paragraph-move-up"
                Item "Move Paragraph Down|v" "paragraph-move-down"
                Separator
-               Submenu "Text Style|S" "edit_textstyles"
-               LanguageSelector
                Item "Paragraph Settings...|P" "layout-paragraph"
+               Submenu "Text Properties|x" "edit_textprops"
+               OptSubmenu "Custom Text Styles|S" "edit_textstyles"
+               LanguageSelector
                Separator
 # Mathed b0rkage means these don't work properly
                OptSubmenu "Table|T" "edit_tabular"
@@ -132,7 +135,6 @@ Menuset
 # obvious what the context is for the others)
                OptItem "Increase List Depth|I" "depth-increment"
                OptItem "Decrease List Depth|D" "depth-decrement"
-               EnvironmentSeparators
                OptItem "Dissolve Inset" "inset-dissolve"
                OptItem "TeX Code Settings...|C" "inset-settings ert"
 # 'a' shortcut to match Insert entry, shouldn't clash with Table Settings
@@ -141,9 +143,9 @@ Menuset
                OptItem "Note Settings...|N" "inset-settings note"
                OptItem "Phantom Settings...|h" "inset-settings phantom"
                OptItem "Branch Settings...|B" "inset-settings branch"
-               OptItem "Box Settings...|x" "inset-settings box"
+               OptItem "Box Settings...|S" "inset-settings box"
                OptItem "Index Entry Settings...|y" "inset-settings index"
-               OptItem "Index Settings...|x" "inset-settings index_print"
+               OptItem "Index Settings...|S" "inset-settings index_print"
                OptItem "Info Settings...|n" "inset-settings info"
                OptItem "Listings Settings...|g" "inset-settings listings"
 # Hey, guess what's broken ? Surprise surprise, it's tabular stuff
@@ -177,18 +179,21 @@ Menuset
                PasteRecent
        End
 
-       Menu "edit_textstyles"
-               Item "Dissolve Text Style" "inset-dissolve charstyle"
-               CharStyles
-               Elements
+       Menu "edit_textprops"
+               Item "Customize...|C" "dialog-show character"
+               Item "Apply Last Settings|A" "textstyle-apply"
                Separator
-               Item "Customized...|C" "dialog-show character"
-               Separator
-               Item "Capitalize|a" "word-capitalize"
+               Item "Capitalize|p" "word-capitalize"
                Item "Uppercase|U" "word-upcase"
                Item "Lowercase|L" "word-lowcase"
        End
 
+       Menu "edit_textstyles"
+               OptItem "Dissolve Text Style" "inset-dissolve charstyle"
+               CharStyles
+               Elements
+       End
+
 # not much we can do to help here
        Menu "edit_tabular"
                Item "Multi-page Table|g" "tabular-feature toggle-longtabular"
@@ -239,7 +244,7 @@ Menuset
                Separator
                Submenu "Change Formula Type|F" "edit_math_mutate"
                Separator
-               Submenu "Text Style|T" "edit_math_fontstyles"
+               Submenu "Text Properties|T" "edit_math_fontstyles"
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
@@ -351,6 +356,8 @@ Menuset
        Menu "toolbars"
                Toolbars
                Separator
+               Item "Lock Toolbars|L" "toolbar-movable *"
+               Separator
                Item "Small-sized Icons" "icon-size small"
                Item "Normal-sized Icons" "icon-size normal"
                Item "Big-sized Icons" "icon-size big"
@@ -367,7 +374,8 @@ Menuset
                Submenu "Math|h" "insert_math"
                Submenu "Special Character|p" "insert_special"
                Submenu "Formatting|o" "insert_formatting"
-               Submenu "List / TOC|i" "insert_toc"
+               Submenu "Field|i" "insert_fields"
+               Submenu "List / TOC|s" "insert_toc"
                Submenu "Float|a" "insert_float"
                Submenu "Note|N" "insert_note"
                Submenu "Branch|B" "insert_branches"
@@ -389,10 +397,13 @@ Menuset
                Item "Hyperlink...|k" "href-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
+               Item "Program Listing[[Menu]]" "listing-insert"
+               Separator
+               EnvironmentSeparators
+               Separator
                Arguments
+               Separator
                Item "TeX Code" "ert-insert"
-               Item "Program Listing[[Menu]]" "listing-insert"
-               Item "Date" "date-insert"
                Item "Preview|w" "preview-insert"
        End
 
@@ -410,6 +421,23 @@ Menuset
                Submenu "Logos|L" "insert_logos"
        End
 
+       Menu "insert_fields"
+               Item "Date (Current)|D" "info-insert date"
+               Item "Date (Last Modification)|L" "info-insert moddate"
+               Item "Date (Fix)|F" "info-insert fixdate"
+               Separator
+               Item "Time (Current)|T" "info-insert time"
+               Item "Time (Last Modification)|M" "info-insert modtime"
+               Item "Time (Fix)|x" "info-insert fixtime"
+               Separator
+               Item "File Name (Excl. Extension)|N" "info-insert buffer name-noext"
+               OptItem "Version Control Revision|V" "info-insert vcs revision"
+               Item "User Name|U" "info-insert lyxrc user_name"
+               Item "User Email|E" "info-insert lyxrc user_email"
+               Separator
+               Item "Other...|O" "info-insert"
+       End
+
        Menu "insert_logos"
                Item "LyX Logo|L" "specialchar-insert lyx"
                Item "TeX Logo|T" "specialchar-insert tex"
@@ -431,6 +459,7 @@ Menuset
                Separator
                Item "Hyphenation Point|H" "specialchar-insert hyphenation"
                Item "Ligature Break|k" "specialchar-insert ligature-break"
+               Item "Optional Line Break|B" "specialchar-insert allowbreak"
                Item "Ragged Line Break|R" "newline-insert newline"
                Item "Justified Line Break|J" "newline-insert linebreak"
                Separator
@@ -536,6 +565,7 @@ Menuset
                UpdateFormats
                OptItem "View Master Document|M" "master-buffer-view"
                OptItem "Update Master Document|a" "master-buffer-update"
+               OptItem "Cancel Background Process|P" "export-cancel"
                Separator
                Item "Compressed|o" "buffer-toggle-compression"
                Item "Disable Editing|E" "buffer-toggle-read-only"
@@ -586,7 +616,7 @@ Menuset
                Item "Spellchecker...|S" "dialog-show spellchecker"
                OptItem "Thesaurus...|T" "thesaurus-entry"
                Item "Statistics...|a" "statistics"
-               OptItem "Check TeX|h" "buffer-chktex"
+               Item "Check TeX|h" "buffer-chktex"
                Item "TeX Information|I" "dialog-show texinfo"
                Item "Compare...|C" "dialog-show compare"
                Separator