Let me propose to rework the menus arrangement:
-) move "new window" and "close window" from the File to the View menu
-) move the Insert menu right after the Edit one, so to keep editing
actions closer to each other
-) in View menu, clearly separate entries that affect the way LyX
appears, from those that actually render the document
(actually, I'd be tempted to reword the View [PDF, HTML, ...] as
"Render [PDF, HTML, ...]"
-) move Outline from Document to View menu
-) move "Start Appendix" from Document to Insert menu
-) move "latex log" from Document to View
-) move "change tracking" from Document to Edit
-) move "document settings" from Document to Edit
-) rename "Close Current View" to "Close View Split"
-) move Compressed from Document to the document settings dialog
-) kill the Document menu
Shortly, whatever can be shown or hidden is in View, whatever can be
edited is in Edit or Insert. As a side effect, the Document menu remains
empty and could be deleted, but there's a couple of stale entries out
there whose function is unknown to me.
Menu "document"
OptItem "Build Program|B" "build-program"
Separator
Item "Save in Bundled Format|F" "buffer-toggle-embedding"
Item "Compressed|m" "buffer-toggle-compression"
The last 2 should go into the document settings dialog, but what is
"build program" ?
Almost incorporated in the attached patch (just try it out and see if it
makes more sense to you as well).
Bye,
T.
diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index ddbab89..0fc9b05 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -29,8 +29,8 @@ Menuset
# Make the first 4 menus be as much as expected as possible
Submenu "File|F" "file"
Submenu "Edit|E" "edit"
- Submenu "View|V" "view"
Submenu "Insert|I" "insert"
+ Submenu "View|V" "view"
Submenu "Navigate|N" "navigate"
Submenu "Document|D" "document"
Submenu "Tools|T" "tools"
@@ -60,9 +60,6 @@ Menuset
Item "Print...|P" "dialog-show print"
OptItem "Fax...|F" "buffer-export fax"
Separator
- Item "New Window|W" "window-new"
- Item "Close Window|d" "window-close"
- Separator
Item "Exit|x" "lyx-quit"
End
@@ -106,6 +103,8 @@ Menuset
Submenu "Paste Recent|e" "edit_pasterecent"
Submenu "Paste Special" "edit_paste"
Separator
+ Submenu "Change Tracking|C" "document_change"
+ Separator
Item "Select Whole Inset" "inset-select-all"
Item "Select All" "command-sequence buffer-begin ; buffer-end-select"
Separator
@@ -118,6 +117,7 @@ Menuset
Submenu "Text Style|S" "edit_textstyles"
LanguageSelector
Item "Paragraph Settings...|P" "layout-paragraph"
+ Item "Document Settings...|S" "dialog-show document"
Separator
# Mathed b0rkage means these don't work properly
OptSubmenu "Table|T" "edit_tabular"
@@ -315,24 +315,31 @@ Menuset
#
Menu "view"
+ Submenu "Toolbars|b" "toolbars"
+ Item "Outline|O" "dialog-toggle toc"
+ Item "View Source|S" "dialog-toggle view-source"
+ Item "View Messages|g" "dialog-toggle progress"
+ Separator
Item "Open All Insets|O" "inset-forall * inset-toggle open"
Item "Close All Insets|C" "inset-forall * inset-toggle close"
Separator
Item "Unfold Math Macro|n" "math-macro-unfold"
Item "Fold Math Macro|d" "math-macro-fold"
Separator
- Item "View Source|S" "dialog-toggle view-source"
- Item "View Messages|g" "dialog-toggle progress"
+ Item "Split View Into Left and Right Half|i" "view-split horizontal"
+ Item "Split View Into Upper and Lower Half|e" "view-split vertical"
+ OptItem "Close View Split|w" "tab-group-close"
+ Separator
+ Item "Fullscreen|l" "ui-toggle fullscreen"
+ Separator
+ Item "New Window|W" "window-new"
+ Item "Close Window|d" "window-close"
+ Separator
ViewFormats
UpdateFormats
OptItem "View Master Document|M" "master-buffer-view"
OptItem "Update Master Document|a" "master-buffer-update"
- Separator
- Item "Split View Into Left and Right Half|i" "view-split horizontal"
- Item "Split View Into Upper and Lower Half|e" "view-split vertical"
- OptItem "Close Current View|w" "tab-group-close"
- Item "Fullscreen|l" "ui-toggle fullscreen"
- Submenu "Toolbars|b" "toolbars"
+ Item "LaTeX Log|L" "dialog-show latexlog"
Separator
Documents
End
@@ -377,6 +384,8 @@ Menuset
Item "Program Listing[[Menu]]" "listing-insert"
Item "Date" "date-insert"
Item "Preview|w" "preview-insert"
+ Separator
+ Item "Start Appendix Here|A" "appendix"
End
Menu "insert_special"
@@ -502,15 +511,10 @@ Menuset
#
Menu "document"
- Submenu "Change Tracking|C" "document_change"
OptItem "Build Program|B" "build-program"
- Item "LaTeX Log|L" "dialog-show latexlog"
- Item "Outline|O" "dialog-toggle toc"
- Item "Start Appendix Here|A" "appendix"
Separator
Item "Save in Bundled Format|F" "buffer-toggle-embedding"
Item "Compressed|m" "buffer-toggle-compression"
- Item "Settings...|S" "dialog-show document"
End
Menu "document_change"
diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 22d1d9e..28f6de7 100644
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1029,7 +1029,7 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
QString smenue;
if (view_update)
smenue = (kind == MenuItem::ViewFormats
- ? qt_("View (Other Formats)|F")
+ ? qt_("Render (Other Formats)|F")
: qt_("Update (Other Formats)|p"));
MenuItem item(MenuItem::Submenu, smenue);
item.setSubmenu(MenuDefinition(smenue));
@@ -1060,7 +1060,7 @@ void MenuDefinition::expandFormats(MenuItem::Kind const kind, Buffer const * buf
case MenuItem::UpdateFormats:
if ((*fit)->name() == buf->params().getDefaultOutputFormat()) {
docstring lbl = (kind == MenuItem::ViewFormats
- ? bformat(_("View [%1$s]|V"), label)
+ ? bformat(_("Render [%1$s]|V"), label)
: bformat(_("Update [%1$s]|U"), label));
add(MenuItem(MenuItem::Command, toqstr(lbl), FuncRequest(action)));
continue;
