X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fui%2Fstdcontext.inc;h=58d2d40f9419ad40372f04471e9896dc819a6373;hb=25fce652fb31c938346aab25d72705e93ab95dad;hp=cbe65a8cee1dc0c41aab94c5d6a3bf554fa1874a;hpb=647b4efb1eee97922421f60018c65829f601571e;p=lyx.git

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index cbe65a8cee..58d2d40f94 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -19,7 +19,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
 
@@ -62,6 +62,8 @@ Menuset
 		Separator
 		Submenu "Insert|s" "insert_math_context"
 		Separator
+		OptSubmenu "Rows & Columns| " "edit_tabular_features"
+		Separator
 		OptItem "Add Line Above|o" "tabular-feature add-hline-above"
 		OptItem "Add Line Below|B" "tabular-feature add-hline-below"
 		OptItem "Delete Line Above|v" "tabular-feature delete-hline-above"
@@ -94,6 +96,11 @@ Menuset
 		Item "<Reference> on Page <Page>|f" "inset-modify changetype vref"
 		Item "Formatted Reference|t" "inset-modify changetype formatted"
 		Item "Textual Reference|x" "inset-modify changetype nameref"
+		Item "Label Only|L" "inset-modify changetype labelonly"
+		Separator
+		OptItem "Plural|a" "inset-modify ref toggle-plural"
+		OptItem "Capitalize|C" "inset-modify ref toggle-caps"
+		Item "No Prefix" "inset-modify ref toggle-noprefix"
 		Separator
 		Item "Settings...|S" "inset-settings"
 	End
@@ -138,9 +145,9 @@ Menuset
 	End
 
 #
-# InsetCollapsable context menu
+# InsetCollapsible context menu
 #
-	Menu "context-collapsable"
+	Menu "context-collapsible"
 		OptItem "Open Inset|O" "inset-toggle open"
 		OptItem "Close Inset|C" "inset-toggle close"
 		Separator
@@ -158,10 +165,18 @@ Menuset
 #
 # InsetArgument context menu
 #
+
 	Menu "context-argument"
+		Separator
 		SwitchArguments
 	End
 
+	Menu "context-argument-conglomerate"
+		Item "Show Label|L" "inset-toggle"
+		Item "Dissolve Inset|D" "inset-dissolve"
+		Separator
+		SwitchArguments
+	End
 
 #
 # InsetBox context menu
@@ -210,6 +225,14 @@ Menuset
 		Item "Vertical Phantom|V" "inset-modify phantom Phantom VPhantom"
 	End
 
+
+#
+# InsetQuotes context menu
+#
+	Menu "context-quote"
+		SwitchQuotes
+	End
+
 #
 # InsetSpace context menu
 #
@@ -315,6 +338,9 @@ Menuset
 	Menu "context-edit"
 		spellingsuggestions
 		Separator
+		OptItem "Edit Externally..." "inset-edit"
+		OptItem "End Editing Externally..." "inset-end-edit"
+		Separator
 		Item "Cut" "cut"
 		Item "Copy" "copy"
 		Item "Paste" "paste"
@@ -326,7 +352,7 @@ Menuset
 		Item "Move Paragraph Up|o" "paragraph-move-up"
 		Item "Move Paragraph Down|v" "paragraph-move-down"
 		Separator
-		EnvironmentSeparators
+		EnvironmentSeparatorsContext
 		Separator
 		OptItem "Promote Section|r" "outline-out"
 		OptItem "Demote Section|m" "outline-in"
@@ -338,9 +364,10 @@ Menuset
 		OptItem "Accept Change|c" "change-accept"
 		OptItem "Reject Change|j" "change-reject"
 		Separator
-		Item "Apply Last Text Style|A" "textstyle-apply"
-		Submenu "Text Style|x" "edit_textstyles"
+		Submenu "Text Properties|x" "edit_textprops"
+		OptSubmenu "Custom Text Styles|S" "edit_textstyles"
 		Item "Paragraph Settings...|P" "layout-paragraph"
+		OptItem "Unify Graphics Groups|U" "graphics-unify"
 		LanguageSelector
 		Separator
 		Item "Fullscreen Mode" "ui-toggle fullscreen"
@@ -410,6 +437,7 @@ Menuset
 		Item "Bottom|B" "tabular-feature toggle-line-bottom"
 		Item "Left|L" "tabular-feature toggle-line-left"
 		Item "Right|R" "tabular-feature toggle-line-right"
+		OptItem "Reset Formal Defaults|F" "tabular-feature reset-formal-default"
 	End
 
 	Menu "table-alignment"
@@ -455,23 +483,10 @@ Menuset
 # InsetInfo context menu
 #
 
-	Menu "buffer-info"
-		Item "File|F" "inset-modify buffer name"
-		Item "Path|P" "inset-modify buffer path"
-		Item "Class|C" "inset-modify buffer class"
-		Separator
-		Item "File Revision|R" "inset-modify buffer vcs-revision"
-		Item "Tree Revision|T" "inset-modify buffer vcs-tree-revision"
-		Item "Revision Author|A" "inset-modify buffer vcs-author"
-		Item "Revision Date|D" "inset-modify buffer vcs-date"
-		Item "Revision Time|i" "inset-modify buffer vcs-time"
-		Separator
-		Item "LyX Version|X" "inset-modify lyxinfo version"
-	End
-
 	Menu "context-info"
-		Submenu "Document Info|D" "buffer-info"
+		InfoArguments
 		Separator
+		Item "Transform Field to Static Text|T" "inset-dissolve"
 		Item "Copy Text|o" "inset-copy-as"
 		Item "Settings...|S" "inset-settings info"
 	End
@@ -485,6 +500,7 @@ Menuset
 		OptItem "Deactivate Branch|e" "branch-deactivate"
 		OptItem "Activate Branch in Master|M" "branch-master-activate"
 		OptItem "Deactivate Branch in Master|v" "branch-master-deactivate"
+		OptItem "Invert Inset|I" "branch-invert"
 		OptItem "Add Unknown Branch|w" "branch-add"
 	End
 
@@ -650,4 +666,19 @@ Menuset
 		Item "Settings...|S" "inset-settings"
 	End
 
+#
+# Toolbar context menu
+#
+	Menu "context-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"
+		Item "Huge-sized Icons" "icon-size huge"
+		Item "Giant-sized Icons" "icon-size giant"
+	End
+
 End