[Bf-blender-cvs] [a55ef183094] blender2.8: UI: Use icons for some operators.

Pablo Vazquez noreply at git.blender.org
Tue Nov 6 22:05:13 CET 2018


Commit: a55ef183094f72bb92c169ee0d3dce13374857ee
Author: Pablo Vazquez
Date:   Tue Nov 6 22:05:05 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBa55ef183094f72bb92c169ee0d3dce13374857ee

UI: Use icons for some operators.

* Area and Workspace duplicate.
* Toggle Area Fullscreen
* Operator Search
* Workspace reorder to front/back (arrows help to know which direction means front/back)

===================================================================

M	release/scripts/startup/bl_ui/space_info.py
M	release/scripts/startup/bl_ui/space_topbar.py
M	source/blender/editors/screen/workspace_edit.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py
index e5ef5f9a0da..829ccd706b9 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -39,11 +39,14 @@ class INFO_MT_area(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("screen.area_dupli")
         if context.space_data.type == 'VIEW_3D':
             layout.operator("screen.region_quadview")
+            layout.separator()
+
+        layout.operator("screen.area_dupli", icon='DUPLICATE')
+        layout.separator()
         layout.operator("screen.screen_full_area")
-        layout.operator("screen.screen_full_area", text="Toggle Fullscreen Area").use_hide_panels = True
+        layout.operator("screen.screen_full_area", text="Toggle Fullscreen Area", icon='FULLSCREEN_ENTER').use_hide_panels = True
 
 
 classes = (
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index f406fb78562..f343dae4076 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -775,7 +775,7 @@ class TOPBAR_MT_edit(Menu):
 
         layout.separator()
 
-        layout.operator("wm.search_menu", text="Operator Search...")
+        layout.operator("wm.search_menu", text="Operator Search...", icon='VIEWZOOM')
 
         layout.separator()
 
@@ -925,9 +925,7 @@ class TOPBAR_MT_window_specials(Menu):
 
         layout.operator_context = 'INVOKE_AREA'
 
-        layout.operator("screen.area_dupli")
-
-        layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER')
+        layout.operator("screen.area_dupli", icon='DUPLICATE')
 
         layout.separator()
 
@@ -936,6 +934,10 @@ class TOPBAR_MT_window_specials(Menu):
 
         layout.separator()
 
+        layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER')
+
+        layout.separator()
+
         layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
 
 
@@ -945,14 +947,14 @@ class TOPBAR_MT_workspace_menu(Menu):
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("workspace.duplicate", text="Duplicate")
+        layout.operator("workspace.duplicate", text="Duplicate", icon='DUPLICATE')
         if len(bpy.data.workspaces) > 1:
-            layout.operator("workspace.delete", text="Delete")
+            layout.operator("workspace.delete", text="Delete", icon='REMOVE')
 
         layout.separator()
 
-        layout.operator("workspace.reorder_to_front", text="Reorder to Front")
-        layout.operator("workspace.reorder_to_back", text="Reorder to Back")
+        layout.operator("workspace.reorder_to_front", text="Reorder to Front", icon='TRIA_LEFT_BAR')
+        layout.operator("workspace.reorder_to_back", text="Reorder to Back", icon='TRIA_RIGHT_BAR')
 
 
 class TOPBAR_PT_active_tool(Panel):
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index ea7ddd85852..31df1a44f89 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -502,7 +502,7 @@ static void workspace_add_menu(bContext *C, uiLayout *layout, void *template_v)
 
 static int workspace_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
-	uiPopupMenu *pup = UI_popup_menu_begin(C, op->type->name, ICON_NONE);
+	uiPopupMenu *pup = UI_popup_menu_begin(C, op->type->name, ICON_ADD);
 	uiLayout *layout = UI_popup_menu_layout(pup);
 
 	uiItemMenuF(layout, IFACE_("General"), ICON_NONE, workspace_add_menu, NULL);
@@ -523,7 +523,7 @@ static int workspace_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS
 	BLI_freelistN(&templates);
 
 	uiItemS(layout);
-	uiItemO(layout, "Duplicate Current", ICON_NONE, "WORKSPACE_OT_duplicate");
+	uiItemO(layout, "Duplicate Current", ICON_DUPLICATE, "WORKSPACE_OT_duplicate");
 
 	UI_popup_menu_end(C, pup);



More information about the Bf-blender-cvs mailing list