From fa4d6355aa0a2ba7a15b245013ce235ea7ca643f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Tue, 25 Mar 2008 16:18:15 +0000
Subject: [PATCH] * stdcontext.inc: 	- honour JMarc's suggestions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23951 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/ui/stdcontext.inc | 53 ++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 873710e663..e15d9bdae4 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -28,17 +28,19 @@ Menuset
 	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"
+		Separator
 		Item "<reference>|r" "next-inset-modify changetype ref"
 		Item "(<reference>)|e" "next-inset-modify changetype eqref"
 		Item "<page>|p" "next-inset-modify changetype pageref"
 		Item "on page <page>|o" "next-inset-modify changetype vpageref"
 		Item "<reference> on page <page>|f" "next-inset-modify changetype vref"
 		Item "Formatted reference|t" "next-inset-modify changetype prettyref"
+		Separator
+		Item "Properties...|P" "next-inset-toggle"
+	End
+
+	Menu "edit_reftype"
+		
 	End
 
 #
@@ -47,7 +49,8 @@ Menuset
 	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"
+		Separator
+		Item "Properties...|P" "next-inset-toggle"
 	End
 
 #
@@ -57,14 +60,14 @@ Menuset
 		OptItem "Open Inset|O" "next-inset-toggle open"
 		OptItem "Close Inset|C" "next-inset-toggle close"
 		Separator
-		OptItem "Settings...|S" "inset-settings"
+		OptItem "Properties...|P" "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"
+		OptItem "Properties...|P" "inset-settings"
 	End
 
 #
@@ -72,11 +75,6 @@ Menuset
 #
 
 	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"
@@ -85,9 +83,10 @@ Menuset
 		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"
+		Separator
+		Item "Properties...|P" "inset-settings box"
 	End
 
-
 #
 # InsetNote context menu
 #
@@ -103,13 +102,8 @@ Menuset
 # 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 "Protected Space|o" "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{}"
@@ -121,23 +115,26 @@ Menuset
 		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"
+		Separator
+		Item "Properties...|P" "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"
+		Separator
+		Item "Properties...|P" "next-inset-toggle"
+	End
+
+	Menu "edit_vspacetype"
+		
 	End
 
 #
@@ -199,7 +196,7 @@ Menuset
 		Item "Paste" "paste"
 		Submenu "Paste Recent|e" "edit_pasterecent"
 		Separator
-		Item "Settings...|S" "inset-settings listings"
+		Item "Properties...|P" "inset-settings listings"
 	End
 
 #
@@ -207,9 +204,9 @@ Menuset
 #
 
 	Menu "context-graphics"
-		Item "Edit...|E" "graphics-edit"
+		Item "Properties...|P" "next-inset-toggle"
 		Separator
-		Item "Settings...|S" "next-inset-toggle"
+		Item "Edit externally...|x" "graphics-edit"
 	End
 
 End
\ No newline at end of file