Graph Editor - iconize the Select menu

Issue: https://www.bforartists.de/content/graph-editor-iconize-select-menu
Bforartists · Nov 22, 2017 · 48b841f · 48b841f
1 parent b639811
commit 48b841f
Show file tree

Hide file tree

Showing 17 changed files with 233 additions and 23 deletions.
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
diff --git a/release/datafiles/blender_icons16.png b/release/datafiles/blender_icons16.png
diff --git a/release/datafiles/blender_icons16/icon16_after_current_frame.dat b/release/datafiles/blender_icons16/icon16_after_current_frame.dat
diff --git a/release/datafiles/blender_icons16/icon16_before_current_frame.dat b/release/datafiles/blender_icons16/icon16_before_current_frame.dat
diff --git a/release/datafiles/blender_icons16/icon16_between_markers.dat b/release/datafiles/blender_icons16/icon16_between_markers.dat
diff --git a/release/datafiles/blender_icons16/icon16_column_current_frame.dat b/release/datafiles/blender_icons16/icon16_column_current_frame.dat
diff --git a/release/datafiles/blender_icons16/icon16_columns_keys.dat b/release/datafiles/blender_icons16/icon16_columns_keys.dat
diff --git a/release/datafiles/blender_icons16/icon16_columns_markers.dat b/release/datafiles/blender_icons16/icon16_columns_markers.dat
diff --git a/release/datafiles/blender_icons32.png b/release/datafiles/blender_icons32.png
diff --git a/release/datafiles/blender_icons32/icon32_after_current_frame.dat b/release/datafiles/blender_icons32/icon32_after_current_frame.dat
diff --git a/release/datafiles/blender_icons32/icon32_before_current_frame.dat b/release/datafiles/blender_icons32/icon32_before_current_frame.dat
diff --git a/release/datafiles/blender_icons32/icon32_between_markers.dat b/release/datafiles/blender_icons32/icon32_between_markers.dat
diff --git a/release/datafiles/blender_icons32/icon32_column_current_frame.dat b/release/datafiles/blender_icons32/icon32_column_current_frame.dat
diff --git a/release/datafiles/blender_icons32/icon32_columns_keys.dat b/release/datafiles/blender_icons32/icon32_columns_keys.dat
diff --git a/release/datafiles/blender_icons32/icon32_columns_markers.dat b/release/datafiles/blender_icons32/icon32_columns_markers.dat
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
@@ -186,29 +186,29 @@ def draw(self, context):
 
         layout.separator()
 
-        layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
-        layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
+        layout.operator("graph.select_column", text="Columns on Selected Keys", icon = "COLUMNS_KEYS").mode = 'KEYS'
+        layout.operator("graph.select_column", text="Column on Current Frame", icon = "COLUMN_CURRENT_FRAME").mode = 'CFRA'
 
-        layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
-        layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+        layout.operator("graph.select_column", text="Columns on Selected Markers", icon = "COLUMNS_MARKERS").mode = 'MARKERS_COLUMN'
+        layout.operator("graph.select_column", text="Between Selected Markers", icon = "BETWEEN_MARKERS").mode = 'MARKERS_BETWEEN'
 
         layout.separator()
 
-        layout.operator("graph.select_linked",text = "Linked")
+        layout.operator("graph.select_linked",text = "Linked", icon = "CONNECTED")   
 
         layout.separator()
 
-        props = layout.operator("graph.select_leftright", text="Before Current Frame")
+        props = layout.operator("graph.select_leftright", text="Before Current Frame", icon = "BEFORE_CURRENT_FRAME")
         props.extend = False
         props.mode = 'LEFT'
-        props = layout.operator("graph.select_leftright", text="After Current Frame")
+        props = layout.operator("graph.select_leftright", text="After Current Frame", icon = "AFTER_CURRENT_FRAME")
         props.extend = False
         props.mode = 'RIGHT'
 
         layout.separator()
 
-        layout.operator("graph.select_more",text = "More")
-        layout.operator("graph.select_less",text = "Less")
+        layout.operator("graph.select_more",text = "More", icon = "SELECTMORE")
+        layout.operator("graph.select_less",text = "Less", icon = "SELECTLESS")
 
 
 

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
@@ -226,14 +226,9 @@ DEF_ICON(MARKER_BIND)
 DEF_ICON(SET_START)
 DEF_ICON(SET_END)
 DEF_ICON(VIEW_FRAME)
-
-#ifndef DEF_ICON_BLANK_SKIP
-
-	DEF_ICON(extend_038)
-	DEF_ICON(extend_039)
-	DEF_ICON(extend_040)
-
-#endif
+DEF_ICON(AFTER_CURRENT_FRAME)
+DEF_ICON(BEFORE_CURRENT_FRAME)
+DEF_ICON(BETWEEN_MARKERS)
 
 /* ------------------------- Row 5 --------------------------*/
 
@@ -270,11 +265,12 @@ DEF_ICON(MAXIMIZE_AREA)
 DEF_ICON(NEW_WINDOW)
 DEF_ICON(QUADVIEW)
 
+DEF_ICON(COLUMN_CURRENT_FRAME)
+DEF_ICON(COLUMNS_KEYS)
+DEF_ICON(COLUMNS_MARKERS)
+
 #ifndef DEF_ICON_BLANK_SKIP
 
-	DEF_ICON(extend_041)
-	DEF_ICON(extend_042)
-	DEF_ICON(extend_043)
 	DEF_ICON(extend_044)
 	DEF_ICON(extend_045)
 	DEF_ICON(extend_046)