diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 6f904d3854..0ecc4eb2ba 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1323,6 +1323,7 @@ lib_templates_files = Split(''' lib_ui_files = Split(''' classic.ui default.ui + stdcontext.inc stdmenus.inc stdtoolbars.inc ''') diff --git a/lib/Makefile.am b/lib/Makefile.am index 0471abe676..7b3c78ce1f 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1129,6 +1129,7 @@ uidir = $(pkgdatadir)/ui dist_ui_DATA = \ ui/classic.ui \ ui/default.ui \ + ui/stdcontext.inc \ ui/stdmenus.inc \ ui/stdtoolbars.inc diff --git a/lib/ui/default.ui b/lib/ui/default.ui index 95cf61761a..dec4723642 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -16,6 +16,8 @@ Include "stdmenus.inc" +Include "stdcontext.inc" + Include "stdtoolbars.inc" # Which toolbars to use. diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 733ccf6c87..1c2f29fcc2 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -531,203 +531,5 @@ Menuset Item "About LyX|X" "dialog-show aboutlyx" End -# -# InsetMath context menu -# - Menu "context-math" - Item "Equation Label|L" "label-insert" - Item "Toggle Labeling/Numbering|T" "math-number-toggle" - End - - -# -# InsetRef context menu -# - Menu "context-ref" - Item "Next Cross-Reference|N" "reference-next" - Item "Go to Label|G" "label-goto" - Submenu "Change Type|y" "edit_reftype" - Item "Edit...|E" "next-inset-toggle" - End - - Menu "edit_reftype" - Item "|r" "next-inset-modify changetype ref" - Item "()|e" "next-inset-modify changetype eqref" - Item "|p" "next-inset-modify changetype pageref" - Item "on page |o" "next-inset-modify changetype vpageref" - Item " on page |f" "next-inset-modify changetype vref" - Item "Formatted reference|t" "next-inset-modify changetype prettyref" - End - -# -# InsetLabel context menu -# - Menu "context-label" - Item "Next Cross-Reference|N" "reference-next" - Item "Go back to Reference|G" "bookmark-goto 0" - Item "Edit...|E" "next-inset-toggle" - End - -# -# InsetCollapsable context menu -# - Menu "context-collapsable" - Item "Open Inset|O" "next-inset-toggle open" - Item "Close Inset|C" "next-inset-toggle close" - Separator - OptItem "Settings...|S" "inset-settings" - End - - Menu "context-conglomerate" - Item "Toggle Label|L" "next-inset-toggle" - Item "Dissolve Inset|D" "inset-dissolve charstyle" - Separator - OptItem "Settings...|S" "inset-settings" - End - -# -# InsetBox context menu -# - - Menu "context-box" - Submenu "Change Type|y" "edit_boxtype" - Item "Settings...|S" "inset-settings box" - End - - Menu "edit_boxtype" - Item "Frameless|l" "next-inset-modify changetype Frameless" - Item "Simple frame|f" "next-inset-modify changetype Boxed" - Item "Simple frame, page breaks|p" "next-inset-modify changetype Framed" - Item "Oval, thin|O" "next-inset-modify changetype ovalbox" - Item "Oval, thick|v" "next-inset-modify changetype Ovalbox" - Item "Drop Shadow|w" "next-inset-modify changetype Shadowbox" - Item "Shaded background|b" "next-inset-modify changetype Shaded" - Item "Double frame|D" "next-inset-modify changetype Doublebox" - End - - -# -# InsetNote context menu -# - - Menu "context-note" - Item "LyX Note|N" "next-inset-modify note Note Note" - Item "Comment|C" "next-inset-modify note Note Comment" - Item "Greyed Out|G" "next-inset-modify note Note Greyedout" - End - - -# -# InsetSpace context menu -# - Menu "context-space" - Submenu "Change Type|y" "edit_spacetype" - Item "Edit...|E" "next-inset-toggle" - End - - Menu "edit_spacetype" - Item "Interword Space|w" "next-inset-modify space \space{}" - Item "Protected Space|P" "next-inset-modify space ~" - Item "Thin Space|T" "next-inset-modify space \thinspace{}" - Item "Quad Space|Q" "next-inset-modify space \quad{}" - Item "QQuad Space|u" "next-inset-modify space \qquad{}" - Item "Enspace|E" "next-inset-modify space \enspace{}" - Item "Enskip|k" "next-inset-modify space \enskip{}" - Item "Negative Thin Space|N" "next-inset-modify space \negthinspace{}" - Item "Horizontal Fill|F" "next-inset-modify space \hfill{}" - Item "Protected Horizontal Fill|i" "next-inset-modify space \hspace*{\fill}" - Item "Horizontal Fill (Dots)|D" "next-inset-modify space \dotfill{}" - Item "Horizontal Fill (Rule)|R" "next-inset-modify space \hrulefill{}" - Item "Custom Length|C" "command-sequence next-inset-modify space \hspace{} \length 1in; next-inset-toggle" - End - -# -# InsetVSpace context menu -# - Menu "context-vspace" - Submenu "Change Type|y" "edit_vspacetype" - Item "Edit...|E" "next-inset-toggle" - End - - Menu "edit_vspacetype" - Item "DefSkip|D" "next-inset-modify vspace defskip" - Item "SmallSkip|S" "next-inset-modify vspace smallskip" - Item "MedSkip|M" "next-inset-modify vspace medskip" - Item "BigSkip|B" "next-inset-modify vspace bigskip" - Item "VFill|F" "next-inset-modify vspace vfill" - Item "Custom|C" "command-sequence next-inset-modify vspace 1in; next-inset-toggle" - End - -# -# InsetNewpage context menu -# - Menu "context-newpage" - Item "New Page|N" "next-inset-modify newpage newpage" - Item "Page Break|a" "next-inset-modify newpage pagebreak" - Item "Clear Page|C" "next-inset-modify newpage clearpage" - Item "Clear Double Page|D" "next-inset-modify newpage cleardoublepage" - End - -# -# Edit context menu -# - Menu "context-edit" - Item "Cut" "cut" - Item "Copy" "copy" - Item "Paste" "paste" - Submenu "Paste Recent|e" "edit_pasterecent" - Separator - Item "Jump to Saved Bookmark|B" "bookmark-goto 0" - Separator - Item "Move Paragraph Up|o" "paragraph-move-up" - Item "Move Paragraph Down|v" "paragraph-move-down" - Separator - Item "Apply Last Text Style|A" "font-free-apply" - Submenu "Text Style|S" "edit_textstyles" - Item "Paragraph Settings...|P" "layout-paragraph" - Separator - Item "Fullscreen Mode" "ui-toggle fullscreen" - End - -# -# Math Macro context menu -# - - Menu "context-math-macro-definition" - Item "Append Parameter" "math-macro-add-param" - Item "Remove Last Parameter" "math-macro-remove-param" - Separator - Item "Make First Non-Optional into Optional Parameter" "math-macro-make-optional" - Item "Make Last Optional into Non-Optional Parameter" "math-macro-make-nonoptional" - Item "Insert Optional Parameter" "math-macro-add-optional-param" - Item "Remove Optional Parameter" "math-macro-remove-optional-param" - Separator - Item "Append Parameter Eating From The Right" "math-macro-append-greedy-param" - Item "Append Optional Parameter Eating From The Right" "math-macro-add-greedy-optional-param" - Item "Remove Last Parameter Spitting Out To The Right" "math-macro-remove-greedy-param" - End - -# -# InsetListing context menu -# - - Menu "context-listings" - Item "Cut" "cut" - Item "Copy" "copy" - Item "Paste" "paste" - Submenu "Paste Recent|e" "edit_pasterecent" - Separator - Item "Settings...|S" "inset-settings listings" - End - -# -# InsetGraphics context menu -# - - Menu "context-graphics" - Item "Edit...|E" "graphics-edit" - Separator - Item "Settings...|S" "next-inset-toggle" - End - End +