UI: tweak image menu layout to match file menu more.

2 files changed, 19 insertions, 16 deletions

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index e20c3ccd7f5..1303e46ab6c 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -191,30 +191,33 @@ class IMAGE_MT_image(Menu):
 
         sima = context.space_data
         ima = sima.image
-
-        layout.operator("image.new")
-        layout.operator("image.open")
-
         show_render = sima.show_render
 
-        layout.operator("image.read_viewlayers")
+        layout.operator("image.new", text="New")
+        layout.operator("image.open", text="Open...")
 
-        layout.operator("image.save_dirty", text="Save All Images")
+        layout.operator("image.read_viewlayers")
 
         if ima:
             if not show_render:
-                layout.operator("image.replace")
-                layout.operator("image.reload")
+                layout.operator("image.replace", text="Replace...")
+                layout.operator("image.reload", text="Reload")
 
-            layout.operator("image.save")
-            layout.operator("image.save_as")
-            layout.operator("image.save_as", text="Save a Copy").copy = True
+            layout.operator("image.external_edit", "Edit Externally")
 
-            if ima.source == 'SEQUENCE':
-                layout.operator("image.save_sequence")
+        layout.separator()
 
-            layout.operator("image.external_edit", "Edit Externally")
+        if ima:
+            layout.operator("image.save", text="Save")
+            layout.operator("image.save_as", text="Save As...")
+            layout.operator("image.save_as", text="Save a Copy...").copy = True
+
+        if ima and ima.source == 'SEQUENCE':
+            layout.operator("image.save_sequence")
 
+        layout.operator("image.save_dirty", text="Save All Images")
+
+        if ima:
             layout.separator()
 
             layout.menu("IMAGE_MT_image_invert")
@@ -222,7 +225,7 @@ class IMAGE_MT_image(Menu):
             if not show_render:
                 if not ima.packed_file:
                     layout.separator()
-                    layout.operator("image.pack")
+                    layout.operator("image.pack", text="Pack")
 
                 # only for dirty && specific image types, perhaps
                 # this could be done in operator poll too
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index f852f601db2..650b48b3b1c 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -3700,7 +3700,7 @@ static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
 
 void IMAGE_OT_read_viewlayers(wmOperatorType *ot)
 {
-	ot->name = "Read View Layers";
+	ot->name = "Open Cached Render";
 	ot->idname = "IMAGE_OT_read_viewlayers";
 	ot->description = "Read all the current scene's view layers from cache, as needed";