UI: add support for defining any icon as a mono icon.

Previously it was hardcoded to one row. These icons are colored with the
text color. Changes include some refactoring.

5 files changed, 33 insertions, 42 deletions

diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 613454e2f33..56b82c6c2f9 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -181,7 +181,6 @@ extern const EnumPropertyItem rna_enum_navigation_mode_items[];
 extern const EnumPropertyItem rna_enum_file_sort_items[];
 
 extern const EnumPropertyItem rna_enum_node_socket_in_out_items[];
-extern const EnumPropertyItem rna_enum_node_icon_items[];
 
 extern const EnumPropertyItem rna_enum_node_math_items[];
 extern const EnumPropertyItem rna_enum_node_vec_math_items[];
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index efd571d2b18..56565de37a8 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -72,11 +72,11 @@ const EnumPropertyItem rna_enum_fmodifier_type_items[] = {
 };
 
 const EnumPropertyItem rna_enum_beztriple_keyframe_type_items[] = {
-	{BEZT_KEYTYPE_KEYFRAME, "KEYFRAME", VICO_KEYTYPE_KEYFRAME_VEC, "Keyframe", "Normal keyframe - e.g. for key poses"},
-	{BEZT_KEYTYPE_BREAKDOWN, "BREAKDOWN", VICO_KEYTYPE_BREAKDOWN_VEC, "Breakdown", "A breakdown pose - e.g. for transitions between key poses"},
-	{BEZT_KEYTYPE_MOVEHOLD, "MOVING_HOLD", VICO_KEYTYPE_MOVING_HOLD_VEC, "Moving Hold", "A keyframe that is part of a moving hold"},
-	{BEZT_KEYTYPE_EXTREME, "EXTREME", VICO_KEYTYPE_EXTREME_VEC, "Extreme", "An 'extreme' pose, or some other purpose as needed"},
-	{BEZT_KEYTYPE_JITTER, "JITTER", VICO_KEYTYPE_JITTER_VEC, "Jitter", "A filler or baked keyframe for keying on ones, or some other purpose as needed"},
+	{BEZT_KEYTYPE_KEYFRAME, "KEYFRAME", ICON_KEYTYPE_KEYFRAME_VEC, "Keyframe", "Normal keyframe - e.g. for key poses"},
+	{BEZT_KEYTYPE_BREAKDOWN, "BREAKDOWN", ICON_KEYTYPE_BREAKDOWN_VEC, "Breakdown", "A breakdown pose - e.g. for transitions between key poses"},
+	{BEZT_KEYTYPE_MOVEHOLD, "MOVING_HOLD", ICON_KEYTYPE_MOVING_HOLD_VEC, "Moving Hold", "A keyframe that is part of a moving hold"},
+	{BEZT_KEYTYPE_EXTREME, "EXTREME", ICON_KEYTYPE_EXTREME_VEC, "Extreme", "An 'extreme' pose, or some other purpose as needed"},
+	{BEZT_KEYTYPE_JITTER, "JITTER", ICON_KEYTYPE_JITTER_VEC, "Jitter", "A filler or baked keyframe for keying on ones, or some other purpose as needed"},
 	{0, NULL, 0, NULL, NULL}
 };
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 3cc8bac13e2..6d72d337a07 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -113,16 +113,6 @@ static const EnumPropertyItem node_chunksize_items[] = {
 };
 #endif
 
-#define DEF_ICON_BLANK_SKIP
-#define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""},
-#define DEF_VICO(name)
-const EnumPropertyItem rna_enum_node_icon_items[] = {
-#include "UI_icons.h"
-	{0, NULL, 0, NULL, NULL}};
-#undef DEF_ICON_BLANK_SKIP
-#undef DEF_ICON
-#undef DEF_VICO
-
 const EnumPropertyItem rna_enum_node_math_items[] = {
 	{NODE_MATH_ADD,     "ADD",          0, "Add",          ""},
 	{NODE_MATH_SUB,     "SUBTRACT",     0, "Subtract",     ""},
@@ -8021,7 +8011,7 @@ static void rna_def_node(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "bl_icon", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "typeinfo->ui_icon");
-	RNA_def_property_enum_items(prop, rna_enum_node_icon_items);
+	RNA_def_property_enum_items(prop, rna_enum_icon_items);
 	RNA_def_property_enum_default(prop, ICON_NODE);
 	RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
 	RNA_def_property_ui_text(prop, "Icon", "The node icon");
@@ -8409,7 +8399,7 @@ static void rna_def_nodetree(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "bl_icon", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "typeinfo->ui_icon");
-	RNA_def_property_enum_items(prop, rna_enum_node_icon_items);
+	RNA_def_property_enum_items(prop, rna_enum_icon_items);
 	RNA_def_property_enum_default(prop, ICON_NODETREE);
 	RNA_def_property_flag(prop, PROP_REGISTER);
 	RNA_def_property_ui_text(prop, "Icon", "The node tree icon");
diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c
index 322f5a02f57..d263e02d3f8 100644
--- a/source/blender/makesrna/intern/rna_pose.c
+++ b/source/blender/makesrna/intern/rna_pose.c
@@ -68,26 +68,26 @@ const EnumPropertyItem rna_enum_posebone_rotmode_items[] = {
 /* Bone and Group Color Sets */
 const EnumPropertyItem rna_enum_color_sets_items[] = {
 	{0, "DEFAULT", 0, "Default Colors", ""},
-	{1, "THEME01", VICO_COLORSET_01_VEC, "01 - Theme Color Set", ""},
-	{2, "THEME02", VICO_COLORSET_02_VEC, "02 - Theme Color Set", ""},
-	{3, "THEME03", VICO_COLORSET_03_VEC, "03 - Theme Color Set", ""},
-	{4, "THEME04", VICO_COLORSET_04_VEC, "04 - Theme Color Set", ""},
-	{5, "THEME05", VICO_COLORSET_05_VEC, "05 - Theme Color Set", ""},
-	{6, "THEME06", VICO_COLORSET_06_VEC, "06 - Theme Color Set", ""},
-	{7, "THEME07", VICO_COLORSET_07_VEC, "07 - Theme Color Set", ""},
-	{8, "THEME08", VICO_COLORSET_08_VEC, "08 - Theme Color Set", ""},
-	{9, "THEME09", VICO_COLORSET_09_VEC, "09 - Theme Color Set", ""},
-	{10, "THEME10", VICO_COLORSET_10_VEC, "10 - Theme Color Set", ""},
-	{11, "THEME11", VICO_COLORSET_11_VEC, "11 - Theme Color Set", ""},
-	{12, "THEME12", VICO_COLORSET_12_VEC, "12 - Theme Color Set", ""},
-	{13, "THEME13", VICO_COLORSET_13_VEC, "13 - Theme Color Set", ""},
-	{14, "THEME14", VICO_COLORSET_14_VEC, "14 - Theme Color Set", ""},
-	{15, "THEME15", VICO_COLORSET_15_VEC, "15 - Theme Color Set", ""},
-	{16, "THEME16", VICO_COLORSET_16_VEC, "16 - Theme Color Set", ""},
-	{17, "THEME17", VICO_COLORSET_17_VEC, "17 - Theme Color Set", ""},
-	{18, "THEME18", VICO_COLORSET_18_VEC, "18 - Theme Color Set", ""},
-	{19, "THEME19", VICO_COLORSET_19_VEC, "19 - Theme Color Set", ""},
-	{20, "THEME20", VICO_COLORSET_20_VEC, "20 - Theme Color Set", ""},
+	{1, "THEME01", ICON_COLORSET_01_VEC, "01 - Theme Color Set", ""},
+	{2, "THEME02", ICON_COLORSET_02_VEC, "02 - Theme Color Set", ""},
+	{3, "THEME03", ICON_COLORSET_03_VEC, "03 - Theme Color Set", ""},
+	{4, "THEME04", ICON_COLORSET_04_VEC, "04 - Theme Color Set", ""},
+	{5, "THEME05", ICON_COLORSET_05_VEC, "05 - Theme Color Set", ""},
+	{6, "THEME06", ICON_COLORSET_06_VEC, "06 - Theme Color Set", ""},
+	{7, "THEME07", ICON_COLORSET_07_VEC, "07 - Theme Color Set", ""},
+	{8, "THEME08", ICON_COLORSET_08_VEC, "08 - Theme Color Set", ""},
+	{9, "THEME09", ICON_COLORSET_09_VEC, "09 - Theme Color Set", ""},
+	{10, "THEME10", ICON_COLORSET_10_VEC, "10 - Theme Color Set", ""},
+	{11, "THEME11", ICON_COLORSET_11_VEC, "11 - Theme Color Set", ""},
+	{12, "THEME12", ICON_COLORSET_12_VEC, "12 - Theme Color Set", ""},
+	{13, "THEME13", ICON_COLORSET_13_VEC, "13 - Theme Color Set", ""},
+	{14, "THEME14", ICON_COLORSET_14_VEC, "14 - Theme Color Set", ""},
+	{15, "THEME15", ICON_COLORSET_15_VEC, "15 - Theme Color Set", ""},
+	{16, "THEME16", ICON_COLORSET_16_VEC, "16 - Theme Color Set", ""},
+	{17, "THEME17", ICON_COLORSET_17_VEC, "17 - Theme Color Set", ""},
+	{18, "THEME18", ICON_COLORSET_18_VEC, "18 - Theme Color Set", ""},
+	{19, "THEME19", ICON_COLORSET_19_VEC, "19 - Theme Color Set", ""},
+	{20, "THEME20", ICON_COLORSET_20_VEC, "20 - Theme Color Set", ""},
 	{-1, "CUSTOM", 0, "Custom Color Set", ""},
 	{0, NULL, 0, NULL, NULL}
 };
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index f340b471455..ec0349e2a4b 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -47,16 +47,18 @@
 
 #include "rna_internal.h"
 
-#define DEF_ICON_BLANK_SKIP
 #define DEF_ICON(name) {ICON_##name, (#name), 0, (#name), ""},
-#define DEF_VICO(name) {VICO_##name, (#name), 0, (#name), ""},
+#define DEF_ICON_VECTOR(name) {ICON_##name, (#name), 0, (#name), ""},
+#define DEF_ICON_MONO(name) {ICON_##name, (#name), 0, (#name), ""},
+#define DEF_ICON_BLANK(name)
 const EnumPropertyItem rna_enum_icon_items[] = {
 #include "UI_icons.h"
 	{0, NULL, 0, NULL, NULL}
 };
-#undef DEF_ICON_BLANK_SKIP
 #undef DEF_ICON
-#undef DEF_VICO
+#undef DEF_ICON_VECTOR
+#undef DEF_ICON_MONO
+#undef DEF_ICON_BLANK
 
 #ifdef RNA_RUNTIME