space_view3d_spacebar_menu: fix context "no object selected"

1 files changed, 699 insertions, 697 deletions

diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 673febc0..5521723b 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -20,7 +20,7 @@
 bl_info = {
     "name": "Dynamic Context Menu",
     "author": "meta-androcto",
-    "version": (1, 8, 9),
+    "version": (1, 9, 0),
     "blender": (2, 80, 0),
     "location": "View3D > Spacebar",
     "description": "Object Mode Context Sensitive Spacebar Menu",
@@ -57,15 +57,16 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
         obj = context.active_object
         view = context.space_data
 # No Object Selected #
-        if not obj:
+        ob = bpy.context.object
+        if not ob.select_get():
 
             layout.operator_context = 'INVOKE_REGION_WIN'
             layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
             UseSeparator(self, context)
+            layout.menu("INFO_MT_area", icon='WORKSPACE')
             layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
             layout.menu("VIEW3D_MT_View_Directions", icon='ZOOM_ALL')
             layout.menu("VIEW3D_MT_View_Navigation", icon='PIVOT_BOUNDBOX')
-            layout.menu("VIEW3D_MT_View_Toggle", icon='WORKSPACE')
             layout.operator("view3d.snap_cursor_to_center",
                             text="Cursor to World Origin")
             layout.operator("view3d.snap_cursor_to_grid",
@@ -76,701 +77,702 @@ class VIEW3D_MT_Space_Dynamic_Menu(Menu):
             layout.prop(view, "show_region_ui", icon='MENU_PANEL')
             if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
                 layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
-
+        else:
 # Mesh Object Mode #
-        if obj and obj.type == 'MESH' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
-                layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Mesh Edit Mode #
-        if obj and obj.type == 'MESH' and obj.mode in {'EDIT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF')
-            layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
-            layout.menu("VIEW3D_MT_Edit_Mesh", text="Mesh", icon='MESH_DATA')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuEdit", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_EditCursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UV_Map", icon='MOD_UVPROJECT')
-            layout.menu("VIEW3D_MT_edit_mesh_context_menu",  text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='XRAY')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_edit_mesh_delete", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Sculpt Mode #
-        if obj and obj.type == 'MESH' and obj.mode in {'SCULPT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_Sculpts", icon='SCULPTMODE_HLT')
-#            layout.menu("VIEW3D_MT_Brush_Selection", text="Sculpt Tool", icon='BRUSH_SCULPT_DRAW')
-            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
-            layout.menu("VIEW3D_MT_Hide_Masks", icon='RESTRICT_VIEW_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_Sculpt_Specials", icon='SOLO_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Vertex Paint #
-        if obj and obj.type == 'MESH' and obj.mode in {'VERTEX_PAINT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            UseSeparator(self, context)
-#            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
-            layout.menu("VIEW3D_MT_Brush_Selection",
-                        text="Vertex Paint Tool")
-            layout.menu("VIEW3D_MT_Vertex_Colors", icon='GROUP_VCOL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Weight Paint Menu #
-        if obj and obj.type == 'MESH' and obj.mode in {'WEIGHT_PAINT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_Paint_Weights", icon='WPAINT_HLT')
-#            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
-            layout.menu("VIEW3D_MT_Brush_Selection",
-                        text="Weight Paint Tool", icon='BRUSH_TEXMASK')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Texture Paint #
-        if obj and obj.type == 'MESH' and obj.mode in {'TEXTURE_PAINT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-#            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
-            layout.menu("VIEW3D_MT_Brush_Selection",
-                        text="Texture Paint Tool", icon='SCULPTMODE_HLT')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Curve Object Mode #
-        if obj and obj.type == 'CURVE' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Edit Curve #
-        if obj and obj.type == 'CURVE' and obj.mode in {'EDIT'}:
 
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Edit_Curve",
-                        icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_curve_add", text="Add Curve",
-                        icon='OUTLINER_OB_CURVE')
-            layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            layout.menu("VIEW3D_MT_EditCurveCtrlpoints",
-                        icon='CURVE_BEZCURVE')
-            layout.menu("VIEW3D_MT_EditCurveSpecials",
-                        icon='SOLO_OFF')
-            UseSeparator(self, context)
-            layout.operator("curve.delete", text="Delete Object",
-                            icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Surface Object Mode #
-        if obj and obj.type == 'SURFACE' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Edit Surface #
-        if obj and obj.type == 'SURFACE' and obj.mode in {'EDIT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Edit_Surface", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_surface_add", text="Add Surface",
-                        icon='OUTLINER_OB_SURFACE')
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.prop_menu_enum(settings, "proportional_edit",
-                                  icon="PROP_CON")
-            layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                                  icon="SMOOTHCURVE")
-            layout.menu("VIEW3D_MT_EditCurveSpecials",
-                        icon='SOLO_OFF')
-            UseSeparator(self, context)
-            layout.operator("curve.delete", text="Delete Object",
-                            icon='CANCEL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Metaball Object Mode #
-        if obj and obj.type == 'META' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Edit Metaball #
-        if obj and obj.type == 'META' and obj.mode in {'EDIT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_SelectMetaball", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.metaball_add", "type",
-                                      text="Add Metaball",
-                                      icon='OUTLINER_OB_META')
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.prop_menu_enum(settings, "proportional_edit",
-                                  icon="PROP_CON")
-            layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                                  icon="SMOOTHCURVE")
-            UseSeparator(self, context)
-            layout.operator("mball.delete_metaelems", text="Delete Object",
-                            icon='CANCEL')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Text Object Mode #
-        if obj and obj.type == 'FONT' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            # New Entry For Switching to Editmode
-            layout.operator("view3d.interactive_mode_text", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Text Edit Mode #
-        # To Do: Space is already reserved for the typing tool
-        if obj and obj.type == 'FONT' and obj.mode in {'EDIT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_select_edit_text", icon='VIEW3D')
-            layout.menu("VIEW3D_MT_edit_font", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.operator("object.editmode_toggle", text="Enter Object Mode",
-                            icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Camera Object Mode #
-        if obj and obj.type == 'CAMERA' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Lamp Object Mode #
-        if obj and obj.type == 'LIGHT' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Armature Object Mode #
-        if obj and obj.type == 'ARMATURE' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuArmature", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Armature Edit #
-        if obj and obj.type == 'ARMATURE' and obj.mode in {'EDIT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Edit_Armature",
-                        icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_armature_add", text="Add Armature",
-                        icon='ARMATURE_DATA')
-            layout.menu("VIEW3D_MT_Edit_Armature", text="Armature",
-                        icon='OUTLINER_DATA_ARMATURE')
-            layout.menu("VIEW3D_MT_EditArmatureTK",
-                        icon='ARMATURE_DATA')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuArmatureEdit", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_armature_context_menu", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_edit_armature_roll",
-                        icon='BONE_DATA')
-            UseSeparator(self, context)
-            layout.operator("armature.delete", text="Delete Object",
-                            icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Armature Pose #
-        if obj and obj.type == 'ARMATURE' and obj.mode in {'POSE'}:
-
-            arm = context.active_object.data
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Pose", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_Pose", icon='ARMATURE_DATA')
-            layout.menu("VIEW3D_MT_TransformMenuArmaturePose", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_pose_transform", icon='EMPTY_DATA')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            layout.menu("VIEW3D_MT_PoseCopy", icon='FILE')
-
-            if arm.display_type in {'BBONE', 'ENVELOPE'}:
-                layout.operator("transform.transform",
-                                text="Scale Envelope Distance").mode = 'BONE_SIZE'
-
-            layout.menu("VIEW3D_MT_pose_apply", icon='AUTO')
-            layout.operator("pose.relax", icon='ARMATURE_DATA')
-            layout.menu("VIEW3D_MT_KeyframeMenu", icon='KEY_HLT')
-            layout.menu("VIEW3D_MT_pose_context_menu", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_pose_group", icon='GROUP_BONE')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("pose.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT_BONE')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Lattice Object Mode #
-        if obj and obj.type == 'LATTICE' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Edit Lattice #
-        if obj and obj.type == 'LATTICE' and obj.mode in {'EDIT'}:
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Edit_Lattice",
-                        icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.prop_menu_enum(settings, "proportional_edit",
-                                  icon="PROP_CON")
-            layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                                  icon="SMOOTHCURVE")
-            UseSeparator(self, context)
-            layout.operator("lattice.make_regular")
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Empty Object Mode #
-        if obj and obj.type == 'EMPTY' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
-            layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Speaker Object Mode #
-        if obj and obj.type == 'SPEAKER' and obj.mode in {'OBJECT'}:
-
-            layout.operator_context = 'INVOKE_REGION_WIN'
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
-            layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
-            layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
-            UseSeparator(self, context)
-            layout.operator_menu_enum("object.constraint_add",
-                                      "type", text="Add Constraint", icon='CONSTRAINT')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
-
-# Particle Menu #
-        if obj and context.mode == 'PARTICLE':
-
-            layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
-            layout.menu("VIEW3D_MT_Select_Particle",
-                        icon='RESTRICT_SELECT_OFF')
-            layout.menu("VIEW3D_MT_Selection_Mode_Particle",
-                        text="Select and Display Mode", icon='PARTICLE_PATH')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
-            layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
-            layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
-            UseSeparator(self, context)
-            layout.prop_menu_enum(settings, "proportional_edit",
-                                  icon="PROP_CON")
-            layout.prop_menu_enum(settings, "proportional_edit_falloff",
-                                  icon="SMOOTHCURVE")
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_particle", icon='PARTICLEMODE')
-            layout.menu("VIEW3D_MT_particle_context_menu", text="Hair Specials", icon='HAIR')
-            UseSeparator(self, context)
-            layout.operator("object.delete", text="Delete Object", icon='X')
-            UseSeparator(self, context)
-            layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
-            layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='VIEW3D')
-            UseSeparator(self, context)
-            layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
-            layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+            if obj and obj.type == 'MESH' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+                    layout.menu("VIEW3D_MT_Edit_Gpencil", icon='GREASEPENCIL')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Mesh Edit Mode #
+            if obj and obj.type == 'MESH' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Edit_Mesh", icon='RESTRICT_SELECT_OFF')
+                layout.menu("VIEW3D_MT_Edit_Multi", icon='VERTEXSEL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
+                layout.menu("VIEW3D_MT_Edit_Mesh", text="Mesh", icon='MESH_DATA')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuEdit", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_EditCursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UV_Map", icon='MOD_UVPROJECT')
+                layout.menu("VIEW3D_MT_edit_mesh_context_menu",  text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_edit_mesh_extrude", icon='XRAY')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_edit_mesh_delete", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Sculpt Mode #
+            if obj and obj.type == 'MESH' and obj.mode in {'SCULPT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Sculpts", icon='SCULPTMODE_HLT')
+    #            layout.menu("VIEW3D_MT_Brush_Selection", text="Sculpt Tool", icon='BRUSH_SCULPT_DRAW')
+                layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
+                layout.menu("VIEW3D_MT_Hide_Masks", icon='RESTRICT_VIEW_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Sculpt_Specials", icon='SOLO_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Vertex Paint #
+            if obj and obj.type == 'MESH' and obj.mode in {'VERTEX_PAINT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                UseSeparator(self, context)
+    #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
+                layout.menu("VIEW3D_MT_Brush_Selection",
+                            text="Vertex Paint Tool")
+                layout.menu("VIEW3D_MT_Vertex_Colors", icon='GROUP_VCOL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Weight Paint Menu #
+            if obj and obj.type == 'MESH' and obj.mode in {'WEIGHT_PAINT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Paint_Weights", icon='WPAINT_HLT')
+    #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
+                layout.menu("VIEW3D_MT_Brush_Selection",
+                            text="Weight Paint Tool", icon='BRUSH_TEXMASK')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Texture Paint #
+            if obj and obj.type == 'MESH' and obj.mode in {'TEXTURE_PAINT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+    #            layout.menu("VIEW3D_MT_Brush_Settings", icon='BRUSH_DATA')
+                layout.menu("VIEW3D_MT_Brush_Selection",
+                            text="Texture Paint Tool", icon='SCULPTMODE_HLT')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_InteractiveMode", icon='EDITMODE_HLT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Curve Object Mode #
+            if obj and obj.type == 'CURVE' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Edit Curve #
+            if obj and obj.type == 'CURVE' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Edit_Curve",
+                            icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_curve_add", text="Add Curve",
+                            icon='OUTLINER_OB_CURVE')
+                layout.menu("VIEW3D_MT_Edit_Curve", icon='CURVE_DATA')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                layout.menu("VIEW3D_MT_EditCurveCtrlpoints",
+                            icon='CURVE_BEZCURVE')
+                layout.menu("VIEW3D_MT_EditCurveSpecials",
+                            icon='SOLO_OFF')
+                UseSeparator(self, context)
+                layout.operator("curve.delete", text="Delete Object",
+                                icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Surface Object Mode #
+            if obj and obj.type == 'SURFACE' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Edit Surface #
+            if obj and obj.type == 'SURFACE' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Edit_Surface", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_surface_add", text="Add Surface",
+                            icon='OUTLINER_OB_SURFACE')
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.prop_menu_enum(settings, "proportional_edit",
+                                      icon="PROP_CON")
+                layout.prop_menu_enum(settings, "proportional_edit_falloff",
+                                      icon="SMOOTHCURVE")
+                layout.menu("VIEW3D_MT_EditCurveSpecials",
+                            icon='SOLO_OFF')
+                UseSeparator(self, context)
+                layout.operator("curve.delete", text="Delete Object",
+                                icon='CANCEL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Metaball Object Mode #
+            if obj and obj.type == 'META' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Edit Metaball #
+            if obj and obj.type == 'META' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_SelectMetaball", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.metaball_add", "type",
+                                          text="Add Metaball",
+                                          icon='OUTLINER_OB_META')
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.prop_menu_enum(settings, "proportional_edit",
+                                      icon="PROP_CON")
+                layout.prop_menu_enum(settings, "proportional_edit_falloff",
+                                      icon="SMOOTHCURVE")
+                UseSeparator(self, context)
+                layout.operator("mball.delete_metaelems", text="Delete Object",
+                                icon='CANCEL')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Text Object Mode #
+            if obj and obj.type == 'FONT' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                # New Entry For Switching to Editmode
+                layout.operator("view3d.interactive_mode_text", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Text Edit Mode #
+            # To Do: Space is already reserved for the typing tool
+            if obj and obj.type == 'FONT' and obj.mode in {'EDIT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_select_edit_text", icon='VIEW3D')
+                layout.menu("VIEW3D_MT_edit_font", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.operator("object.editmode_toggle", text="Enter Object Mode",
+                                icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Camera Object Mode #
+            if obj and obj.type == 'CAMERA' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Lamp Object Mode #
+            if obj and obj.type == 'LIGHT' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Armature Object Mode #
+            if obj and obj.type == 'ARMATURE' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuArmature", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Armature Edit #
+            if obj and obj.type == 'ARMATURE' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Edit_Armature",
+                            icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_armature_add", text="Add Armature",
+                            icon='ARMATURE_DATA')
+                layout.menu("VIEW3D_MT_Edit_Armature", text="Armature",
+                            icon='OUTLINER_DATA_ARMATURE')
+                layout.menu("VIEW3D_MT_EditArmatureTK",
+                            icon='ARMATURE_DATA')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuArmatureEdit", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_armature_context_menu", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_edit_armature_roll",
+                            icon='BONE_DATA')
+                UseSeparator(self, context)
+                layout.operator("armature.delete", text="Delete Object",
+                                icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Armature Pose #
+            if obj and obj.type == 'ARMATURE' and obj.mode in {'POSE'}:
+
+                arm = context.active_object.data
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Pose", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_Pose", icon='ARMATURE_DATA')
+                layout.menu("VIEW3D_MT_TransformMenuArmaturePose", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_pose_transform", icon='EMPTY_DATA')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                layout.menu("VIEW3D_MT_PoseCopy", icon='FILE')
+
+                if arm.display_type in {'BBONE', 'ENVELOPE'}:
+                    layout.operator("transform.transform",
+                                    text="Scale Envelope Distance").mode = 'BONE_SIZE'
+
+                layout.menu("VIEW3D_MT_pose_apply", icon='AUTO')
+                layout.operator("pose.relax", icon='ARMATURE_DATA')
+                layout.menu("VIEW3D_MT_KeyframeMenu", icon='KEY_HLT')
+                layout.menu("VIEW3D_MT_pose_context_menu", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_pose_group", icon='GROUP_BONE')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("pose.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT_BONE')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Armature", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Lattice Object Mode #
+            if obj and obj.type == 'LATTICE' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.modifier_add", "type", icon='MODIFIER')
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Edit Lattice #
+            if obj and obj.type == 'LATTICE' and obj.mode in {'EDIT'}:
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Edit_Lattice",
+                            icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenu", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.prop_menu_enum(settings, "proportional_edit",
+                                      icon="PROP_CON")
+                layout.prop_menu_enum(settings, "proportional_edit_falloff",
+                                      icon="SMOOTHCURVE")
+                UseSeparator(self, context)
+                layout.operator("lattice.make_regular")
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Other", icon='OBJECT_DATA')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Empty Object Mode #
+            if obj and obj.type == 'EMPTY' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_object_context_menu", text="Specials", icon='SOLO_OFF')
+                layout.menu("VIEW3D_MT_Camera_Options", icon='OUTLINER_OB_CAMERA')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Speaker Object Mode #
+            if obj and obj.type == 'SPEAKER' and obj.mode in {'OBJECT'}:
+
+                layout.operator_context = 'INVOKE_REGION_WIN'
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Object", icon='RESTRICT_SELECT_OFF')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_AddMenu", icon='OBJECT_DATAMODE')
+                layout.menu("VIEW3D_MT_Object", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenuLite", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_ParentMenu", icon='PIVOT_ACTIVE')
+                layout.menu("VIEW3D_MT_GroupMenu", icon='GROUP')
+                UseSeparator(self, context)
+                layout.operator_menu_enum("object.constraint_add",
+                                          "type", text="Add Constraint", icon='CONSTRAINT')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
+
+    # Particle Menu #
+            if obj and context.mode == 'PARTICLE':
+
+                layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_View_Menu", icon='ZOOM_ALL')
+                layout.menu("VIEW3D_MT_Select_Particle",
+                            icon='RESTRICT_SELECT_OFF')
+                layout.menu("VIEW3D_MT_Selection_Mode_Particle",
+                            text="Select and Display Mode", icon='PARTICLE_PATH')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_TransformMenu", icon='EMPTY_ARROWS')
+                layout.menu("VIEW3D_MT_MirrorMenu", icon='MOD_MIRROR')
+                layout.menu("VIEW3D_MT_CursorMenuLite", icon='PIVOT_CURSOR')
+                UseSeparator(self, context)
+                layout.prop_menu_enum(settings, "proportional_edit",
+                                      icon="PROP_CON")
+                layout.prop_menu_enum(settings, "proportional_edit_falloff",
+                                      icon="SMOOTHCURVE")
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_particle", icon='PARTICLEMODE')
+                layout.menu("VIEW3D_MT_particle_context_menu", text="Hair Specials", icon='HAIR')
+                UseSeparator(self, context)
+                layout.operator("object.delete", text="Delete Object", icon='X')
+                UseSeparator(self, context)
+                layout.menu("VIEW3D_MT_UndoS", icon='ARROW_LEFTRIGHT')
+                layout.menu("VIEW3D_MT_Object_Interactive_Mode", icon='VIEW3D')
+                UseSeparator(self, context)
+                layout.prop(view, "show_region_toolbar", icon='MENU_PANEL')
+                layout.prop(view, "show_region_ui", icon='MENU_PANEL')
 
 
 # Object Menus #
@@ -2028,6 +2030,7 @@ class VIEW3D_MT_View_Menu(Menu):
         layout = self.layout
         view = context.space_data
 
+        layout.menu("INFO_MT_area")
         layout.operator("view3d.view_selected", text="Frame Selected").use_all_regions = False
         if view.region_quadviews:
             layout.operator("view3d.view_selected", text="Frame Selected (Quad View)").use_all_regions = True
@@ -2039,7 +2042,6 @@ class VIEW3D_MT_View_Menu(Menu):
         layout.menu("VIEW3D_MT_View_Navigation")
         UseSeparator(self, context)
         layout.menu("VIEW3D_MT_View_Align")
-        layout.menu("INFO_MT_area")
         layout.menu("VIEW3D_MT_Shade")
         UseSeparator(self, context)
         layout.menu("VIEW3D_MT_View_Local")