move character styles from "insert" to "edit";

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

diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui
index 078628a49e86f5d0e3d62a49524fee5a3605ef23..7640e1b835cac54b4a2da2e76902b27d1b9b6955 100644 (file)
--- a/lib/ui/stdmenus.ui
+++ b/lib/ui/stdmenus.ui
@@ -35,8 +35,7 @@ Menuset
                Item "New|N" "buffer-new"
                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"
+               Submenu "Open recent|t" "file_lastfiles"
                Separator
                Item "Close|C" "buffer-close"
                Item "Save|S" "buffer-write"
@@ -52,7 +51,7 @@ Menuset
                Item "Exit|x" "lyx-quit"
        End
 
-       Menu "lastfiles"
+       Menu "file_lastfiles"
                Lastfiles
        End
 
@@ -85,25 +84,25 @@ Menuset
                Item "Cut" "cut"
                Item "Copy" "copy"
                Item "Paste" "paste"
-               Submenu "Paste Recent" "pasterecent"
+               Submenu "Paste Recent" "edit_pasterecent"
                Submenu "Paste External Clipboard/Selection" "edit_paste"
                Separator
                Item "Find & Replace...|F" "dialog-show findreplace"
                Separator
-               Item "Word in Small Capitals" "word-capitalize"
-               Item "Word in Uppercase" "word-upcase"
-               Item "Word in Lowercase" "word-lowcase"
+               Item "Move Paragraph Up|o" "paragraph-move-up"
+               Item "Move Paragraph Down|v" "paragraph-move-down"
                Separator
-               Item "Text Style...|S" "dialog-show character"
+               Submenu "Text Style|S" "edit_textstyles"
                Item "Paragraph Settings...|P" "layout-paragraph"
                Separator
 # Mathed b0rkage means these don't work properly
                OptSubmenu "Table|T" "edit_tabular"
                OptSubmenu "Math|M" "edit_math"
-               OptSubmenu "Rows & Columns|C" "tabular_features"
+               OptSubmenu "Rows & Columns|C" "edit_tabular_features"
                Separator
                OptItem "Increase List Depth|I" "depth-increment"
                OptItem "Decrease List Depth|D" "depth-decrement"
+               OptItem "Dissolve Inset|s" "inset-dissolve"
 # This is where the context-specific stuff is supposed to go.
 # The idea is that everything on here can disappear and should
 # only appear when relevant (getStatus). Only stuff that needs
@@ -129,10 +128,20 @@ Menuset
                Item "Selection as Paragraphs|P" "primary-selection-paste paragraph"
        End
 
-       Menu "pasterecent"
+       Menu "edit_pasterecent"
                PasteRecent
        End
 
+       Menu "edit_textstyles"
+               CharStyles
+               Separator
+               Item "Customized...|C" "dialog-show character"
+               Separator
+               Item "Capitalize" "word-capitalize"
+               Item "Uppercase" "word-upcase"
+               Item "Lowercase" "word-lowcase"
+       End
+
 # not much we can do to help here
        Menu "edit_tabular"
                Item "Multicolumn|M" "tabular-feature multicolumn"
@@ -144,7 +153,7 @@ Menuset
                Separator
        End
 
-       Menu "tabular_features"
+       Menu "edit_tabular_features"
                Item "Left|L" "tabular-feature align-left"
                Item "Center|C" "tabular-feature align-center"
                Item "Right|R" "tabular-feature align-right"
@@ -173,6 +182,8 @@ Menuset
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
+               Item "Split Cell|C" "cell-split"
+               Separator
                Item "Add Line Above" "tabular-feature add-hline-above"
                Item "Add Line Below" "tabular-feature add-hline-below"
                Item "Delete Line Above" "tabular-feature delete-hline-above"
@@ -217,21 +228,19 @@ Menuset
 #
 
        Menu "view"
-# FIXME: this must become Open Footnote, Close Margin Note etc. as appropriate
-#      Item "Open Float|O" "inset-toggle"
-# A common feature request JMarc wants to see
-#      Item "Open All Footnotes|F" "open-footnotes"
-#      Item "Close All Footnotes|C" "close-footnotes"
+               Item "Open All Insets|O" "all-insets-toggle open"
+               Item "Close All Insets|C" "all-insets-toggle close"
+               Separator
                Item "Display Tooltips|i" "tooltips-toggle"
                Separator
                Item "View source|s" "dialog-show view-source"
-               Submenu "Update|U" "document_update"
+               Submenu "Update|U" "view_update"
                ViewFormats
                Separator
            Documents
        End
 
-       Menu "document_update"
+       Menu "view_update"
                UpdateFormats
        End
 
@@ -249,8 +258,7 @@ Menuset
                Submenu "Float|a" "insert_float"
 # YUCK
                Submenu "Note|N" "insert_note"
-               OptSubmenu "Branch|B" "branches"
-               OptSubmenu "Character Style|y" "charstyle"
+               OptSubmenu "Branch|B" "insert_branches"
                Submenu "File|e" "insert_file"
                Item "Box" "box-insert Frameless"
                Separator
@@ -370,31 +378,26 @@ Menuset
                Item "Greyed Out|G" "note-insert Greyedout"
        End
 
-       Menu "branches"
+       Menu "insert_branches"
                Branches
        End
 
-       Menu "charstyle"
-               CharStyles
-       End
-
 #
 # DOCUMENT MENU
 #
 
        Menu "document"
-               Submenu "Change Tracking|C" "edit_change"
+               Submenu "Change Tracking|C" "document_change"
                OptItem "Build Program|B" "build-program"
                Item "LaTeX Log|L" "dialog-show latexlog"
                Item "Table of Contents|T" "toc-view"
                Item "Start Appendix Here|A" "appendix"
                Separator
                Item "Compressed|o" "buffer-toggle-compression"
-               Item "Read-Only|R" "buffer-toggle-read-only"
                Item "Settings...|S" "dialog-show document"
        End
 
-       Menu "edit_change"
+       Menu "document_change"
                Item "Track Changes|T" "changes-track"
                Item "Merge Changes...|M" "changes-merge"
                Item "Accept Change|A" "change-accept"
@@ -410,6 +413,7 @@ Menuset
        Menu "navigate"
                Submenu "Bookmarks|B" "navigate_bookmarks"
                Item "Next Note|N" "note-next"
+               Item "Next Reference|R" "reference-next"
                Item "Go to Label|L" "label-goto"
                Separator
                Toc