Graph Editor - iconize the Key menu

Issue: https://www.bforartists.de/content/graph-editor-iconize-key-menu
Bforartists · Nov 23, 2017 · 7c7f7f6 · 7c7f7f6
1 parent 37fecf5
commit 7c7f7f6
Show file tree

Hide file tree

Showing 21 changed files with 334 additions and 32 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_bake_curve.dat b/release/datafiles/blender_icons16/icon16_bake_curve.dat
diff --git a/release/datafiles/blender_icons16/icon16_bake_sound.dat b/release/datafiles/blender_icons16/icon16_bake_sound.dat
diff --git a/release/datafiles/blender_icons16/icon16_clean_channels.dat b/release/datafiles/blender_icons16/icon16_clean_channels.dat
diff --git a/release/datafiles/blender_icons16/icon16_clean_keys.dat b/release/datafiles/blender_icons16/icon16_clean_keys.dat
diff --git a/release/datafiles/blender_icons16/icon16_discontinue_euler.dat b/release/datafiles/blender_icons16/icon16_discontinue_euler.dat
diff --git a/release/datafiles/blender_icons16/icon16_jump_to_keyframes.dat b/release/datafiles/blender_icons16/icon16_jump_to_keyframes.dat
diff --git a/release/datafiles/blender_icons16/icon16_sample_keyframes.dat b/release/datafiles/blender_icons16/icon16_sample_keyframes.dat
diff --git a/release/datafiles/blender_icons16/icon16_smooth_keyframes.dat b/release/datafiles/blender_icons16/icon16_smooth_keyframes.dat
diff --git a/release/datafiles/blender_icons32.png b/release/datafiles/blender_icons32.png
diff --git a/release/datafiles/blender_icons32/icon32_bake_curve.dat b/release/datafiles/blender_icons32/icon32_bake_curve.dat
diff --git a/release/datafiles/blender_icons32/icon32_bake_sound.dat b/release/datafiles/blender_icons32/icon32_bake_sound.dat
diff --git a/release/datafiles/blender_icons32/icon32_clean_channels.dat b/release/datafiles/blender_icons32/icon32_clean_channels.dat
diff --git a/release/datafiles/blender_icons32/icon32_clean_keys.dat b/release/datafiles/blender_icons32/icon32_clean_keys.dat
diff --git a/release/datafiles/blender_icons32/icon32_discontinue_euler.dat b/release/datafiles/blender_icons32/icon32_discontinue_euler.dat
diff --git a/release/datafiles/blender_icons32/icon32_jump_to_keyframes.dat b/release/datafiles/blender_icons32/icon32_jump_to_keyframes.dat
diff --git a/release/datafiles/blender_icons32/icon32_sample_keyframes.dat b/release/datafiles/blender_icons32/icon32_sample_keyframes.dat
diff --git a/release/datafiles/blender_icons32/icon32_smooth_keyframes.dat b/release/datafiles/blender_icons32/icon32_smooth_keyframes.dat
diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py
@@ -288,34 +288,34 @@ def draw(self, context):
         layout.separator()
         layout.operator_menu_enum("graph.keyframe_insert", "type")
         layout.operator_menu_enum("graph.fmodifier_add", "type")
-        layout.operator("graph.sound_bake")
+        layout.operator("graph.sound_bake", icon = "BAKE_SOUND")
 
         layout.separator()
-        layout.operator("graph.frame_jump")
+        layout.operator("graph.frame_jump", icon= 'JUMP_TO_KEYFRAMES' )
 
         layout.separator()
-        layout.operator("graph.duplicate_move")
-        layout.operator("graph.delete")
+        layout.operator("graph.duplicate_move", icon = "DUPLICATE")
+        layout.operator("graph.delete", icon = "DELETE")
 
         layout.separator()
         layout.operator_menu_enum("graph.handle_type", "type", text="Handle Type")
         layout.operator_menu_enum("graph.interpolation_type", "type", text="Interpolation Mode")
         layout.operator_menu_enum("graph.easing_type", "type", text="Easing Type")
 
         layout.separator()
-        layout.operator("graph.clean").channels = False
-        layout.operator("graph.clean", text="Clean Channels").channels = True
-        layout.operator("graph.smooth")
-        layout.operator("graph.sample")
-        layout.operator("graph.bake")
+        layout.operator("graph.clean", icon = "CLEAN_KEYS").channels = False
+        layout.operator("graph.clean", text="Clean Channels", icon = "CLEAN_CHANNELS").channels = True
+        layout.operator("graph.smooth", icon = "SMOOTH_KEYFRAMES")
+        layout.operator("graph.sample", icon = "SAMPLE_KEYFRAMES")
+        layout.operator("graph.bake", icon = "BAKE_CURVE")
 
         layout.separator()
         layout.operator("graph.copy", text="Copy Keyframes", icon='COPYDOWN')
         layout.operator("graph.paste", text="Paste Keyframes", icon='PASTEDOWN')
         layout.operator("graph.paste", text="Paste Flipped", icon='PASTEFLIPDOWN').flipped = True
 
         layout.separator()
-        layout.operator("graph.euler_filter", text="Discontinuity (Euler) Filter")
+        layout.operator("graph.euler_filter", text="Discontinuity (Euler) Filter", icon = "DISCONTINUE_EULER")
 
 
 class GRAPH_MT_key_transform(Menu):

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
@@ -269,17 +269,12 @@ DEF_ICON(COLUMN_CURRENT_FRAME)
 DEF_ICON(COLUMNS_KEYS)
 DEF_ICON(COLUMNS_MARKERS)
 DEF_ICON(EXPANDMENU)
-
-#ifndef DEF_ICON_BLANK_SKIP
-
-	DEF_ICON(extend_045)
-	DEF_ICON(extend_046)
-	DEF_ICON(extend_047)
-	DEF_ICON(extend_048)
-	DEF_ICON(extend_049)
-	DEF_ICON(extend_050)
-
-#endif
+DEF_ICON(BAKE_CURVE)
+DEF_ICON(BAKE_SOUND)
+DEF_ICON(CLEAN_CHANNELS)
+DEF_ICON(CLEAN_KEYS)
+DEF_ICON(DISCONTINUE_EULER)
+DEF_ICON(JUMP_TO_KEYFRAMES)
 
 /* ------------------------- Row 6 --------------------------*/
 
@@ -322,11 +317,11 @@ DEF_ICON(VIEWALL)
 DEF_ICON(VIEWALL_RESETCURSOR)
 DEF_ICON(VIEW_GLOBAL_LOCAL)
 DEF_ICON(VIEW_SELECTED)
+DEF_ICON(SAMPLE_KEYFRAMES)
+DEF_ICON(SMOOTH_KEYFRAMES)
 
 #ifndef DEF_ICON_BLANK_SKIP
 
-	DEF_ICON(extend_051)
-	DEF_ICON(extend_052)
 	DEF_ICON(extend_053)
 	DEF_ICON(extend_054)
 	DEF_ICON(extend_055)