diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-01 16:52:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-01 16:53:39 +0300 |
commit | 33b03f7f68922efada6ec7518c4fa60e9acb620a (patch) | |
tree | 369a3c221b204ea027337c94c523994b10c617d9 /source/blender/editors/interface | |
parent | 3804636ee57b58c0ca02dd5360f6df62603ae929 (diff) |
Cleanup: move theme reset into it's own operator file
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 26 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 5 |
3 files changed, 2 insertions, 31 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 656e7277fc2..19390a634fa 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -818,8 +818,6 @@ void icon_draw_rect_input( /* resources.c */ void init_userdef_do_versions(struct Main *bmain); -void ui_theme_init_default(void); -void ui_style_init_default(void); void ui_resources_init(void); void ui_resources_free(void); diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index fdf666564b9..615259077b5 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -70,31 +70,6 @@ #include "BKE_main.h" #include "BLI_ghash.h" -/* Reset Default Theme ------------------------ */ - -static int reset_default_theme_exec(bContext *C, wmOperator *UNUSED(op)) -{ - ui_theme_init_default(); - ui_style_init_default(); - WM_event_add_notifier(C, NC_WINDOW, NULL); - - return OPERATOR_FINISHED; -} - -static void UI_OT_reset_default_theme(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Reset to Default Theme"; - ot->idname = "UI_OT_reset_default_theme"; - ot->description = "Reset to the default theme colors"; - - /* callbacks */ - ot->exec = reset_default_theme_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER; -} - /* Copy Data Path Operator ------------------------ */ static bool copy_data_path_button_poll(bContext *C) @@ -1603,7 +1578,6 @@ static void UI_OT_drop_color(wmOperatorType *ot) void ED_operatortypes_ui(void) { - WM_operatortype_append(UI_OT_reset_default_theme); WM_operatortype_append(UI_OT_copy_data_path_button); WM_operatortype_append(UI_OT_copy_python_command_button); WM_operatortype_append(UI_OT_reset_default_button); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index eaa3da8c305..48b24da8f5c 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -744,9 +744,8 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) * \note: when you add new colors, created & saved themes need initialized * use function below, init_userdef_do_versions() */ -void ui_theme_init_default(void) +void UI_theme_init_default(void) { - /* we search for the theme with name Default */ bTheme *btheme = BLI_findstring(&U.themes, "Default", offsetof(bTheme, name)); if (btheme == NULL) { @@ -761,7 +760,7 @@ void ui_theme_init_default(void) btheme->active_theme_area = active_theme_area; } -void ui_style_init_default(void) +void UI_style_init_default(void) { BLI_freelistN(&U.uistyles); /* gets automatically re-allocated */ |