From fd2ec47ec91e5dc96b0854958b5b75dad2aaf48b Mon Sep 17 00:00:00 2001 From: Yuri Sizov Date: Mon, 28 Aug 2023 00:23:38 +0200 Subject: [PATCH] Move default theme files to scene/theme This also puts the default theme icons into their own folder. --- .github/CODEOWNERS | 2 +- editor/editor_fonts.cpp | 1 - editor/editor_themes.cpp | 2 +- editor/icons/editor_icons_builders.py | 2 +- scene/register_scene_types.cpp | 1 - scene/resources/SCsub | 2 -- scene/resources/default_theme/SCsub | 32 ------------------- scene/theme/SCsub | 13 ++++++++ .../default_theme => theme}/default_theme.cpp | 0 .../default_theme => theme}/default_theme.h | 0 .../default_theme_builders.py | 0 scene/theme/icons/SCsub | 22 +++++++++++++ .../default_theme => theme/icons}/add.svg | 0 .../icons}/arrow_down.svg | 0 .../icons}/arrow_left.svg | 0 .../icons}/arrow_right.svg | 0 .../icons}/bookmark.svg | 0 .../icons}/breakpoint.svg | 0 .../default_theme => theme/icons}/checked.svg | 0 .../icons}/checked_disabled.svg | 0 .../default_theme => theme/icons}/close.svg | 0 .../icons}/close_hl.svg | 0 .../icons}/color_picker_bar_arrow.svg | 0 .../icons}/color_picker_cursor.svg | 0 .../icons}/color_picker_overbright.svg | 0 .../icons}/color_picker_pipette.svg | 0 .../icons}/default_theme_icons_builders.py | 0 .../icons}/error_icon.svg | 0 .../default_theme => theme/icons}/file.svg | 0 .../default_theme => theme/icons}/folder.svg | 0 .../icons}/folder_up.svg | 0 .../icons}/graph_port.svg | 0 .../icons}/grid_layout.svg | 0 .../icons}/grid_minimap.svg | 0 .../icons}/grid_snap.svg | 0 .../icons}/grid_toggle.svg | 0 .../icons}/hslider_tick.svg | 0 .../icons}/hsplitter.svg | 0 .../icons}/indeterminate.svg | 0 .../icons}/line_edit_clear.svg | 0 .../icons}/mini_checkerboard.svg | 0 .../icons}/option_button_arrow.svg | 0 .../icons}/picker_shape_circle.svg | 0 .../icons}/picker_shape_rectangle.svg | 0 .../icons}/picker_shape_rectangle_wheel.svg | 0 .../icons}/popup_menu_arrow_left.svg | 0 .../icons}/popup_menu_arrow_right.svg | 0 .../icons}/radio_checked.svg | 0 .../icons}/radio_checked_disabled.svg | 0 .../icons}/radio_unchecked.svg | 0 .../icons}/radio_unchecked_disabled.svg | 0 .../default_theme => theme/icons}/reload.svg | 0 .../icons}/resizer_nw.svg | 0 .../icons}/resizer_se.svg | 0 .../icons}/scroll_button_left.svg | 0 .../icons}/scroll_button_left_hl.svg | 0 .../icons}/scroll_button_right.svg | 0 .../icons}/scroll_button_right_hl.svg | 0 .../icons}/slider_grabber.svg | 0 .../icons}/slider_grabber_disabled.svg | 0 .../icons}/slider_grabber_hl.svg | 0 .../icons}/tabs_drop_mark.svg | 0 .../icons}/tabs_menu.svg | 0 .../icons}/tabs_menu_hl.svg | 0 .../icons}/text_edit_ellipsis.svg | 0 .../icons}/text_edit_space.svg | 0 .../icons}/text_edit_tab.svg | 0 .../icons}/toggle_off.svg | 0 .../icons}/toggle_off_disabled.svg | 0 .../icons}/toggle_off_disabled_mirrored.svg | 0 .../icons}/toggle_off_mirrored.svg | 0 .../icons}/toggle_on.svg | 0 .../icons}/toggle_on_disabled.svg | 0 .../icons}/toggle_on_disabled_mirrored.svg | 0 .../icons}/toggle_on_mirrored.svg | 0 .../icons}/unchecked.svg | 0 .../icons}/unchecked_disabled.svg | 0 .../default_theme => theme/icons}/updown.svg | 0 .../icons}/visibility_visible.svg | 0 .../icons}/vslider_tick.svg | 0 .../icons}/vsplitter.svg | 0 .../icons}/zoom_less.svg | 0 .../icons}/zoom_more.svg | 0 .../icons}/zoom_reset.svg | 0 scene/theme/theme_db.cpp | 2 +- 85 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 scene/resources/default_theme/SCsub rename scene/{resources/default_theme => theme}/default_theme.cpp (100%) rename scene/{resources/default_theme => theme}/default_theme.h (100%) rename scene/{resources/default_theme => theme}/default_theme_builders.py (100%) create mode 100644 scene/theme/icons/SCsub rename scene/{resources/default_theme => theme/icons}/add.svg (100%) rename scene/{resources/default_theme => theme/icons}/arrow_down.svg (100%) rename scene/{resources/default_theme => theme/icons}/arrow_left.svg (100%) rename scene/{resources/default_theme => theme/icons}/arrow_right.svg (100%) rename scene/{resources/default_theme => theme/icons}/bookmark.svg (100%) rename scene/{resources/default_theme => theme/icons}/breakpoint.svg (100%) rename scene/{resources/default_theme => theme/icons}/checked.svg (100%) rename scene/{resources/default_theme => theme/icons}/checked_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/close.svg (100%) rename scene/{resources/default_theme => theme/icons}/close_hl.svg (100%) rename scene/{resources/default_theme => theme/icons}/color_picker_bar_arrow.svg (100%) rename scene/{resources/default_theme => theme/icons}/color_picker_cursor.svg (100%) rename scene/{resources/default_theme => theme/icons}/color_picker_overbright.svg (100%) rename scene/{resources/default_theme => theme/icons}/color_picker_pipette.svg (100%) rename scene/{resources/default_theme => theme/icons}/default_theme_icons_builders.py (100%) rename scene/{resources/default_theme => theme/icons}/error_icon.svg (100%) rename scene/{resources/default_theme => theme/icons}/file.svg (100%) rename scene/{resources/default_theme => theme/icons}/folder.svg (100%) rename scene/{resources/default_theme => theme/icons}/folder_up.svg (100%) rename scene/{resources/default_theme => theme/icons}/graph_port.svg (100%) rename scene/{resources/default_theme => theme/icons}/grid_layout.svg (100%) rename scene/{resources/default_theme => theme/icons}/grid_minimap.svg (100%) rename scene/{resources/default_theme => theme/icons}/grid_snap.svg (100%) rename scene/{resources/default_theme => theme/icons}/grid_toggle.svg (100%) rename scene/{resources/default_theme => theme/icons}/hslider_tick.svg (100%) rename scene/{resources/default_theme => theme/icons}/hsplitter.svg (100%) rename scene/{resources/default_theme => theme/icons}/indeterminate.svg (100%) rename scene/{resources/default_theme => theme/icons}/line_edit_clear.svg (100%) rename scene/{resources/default_theme => theme/icons}/mini_checkerboard.svg (100%) rename scene/{resources/default_theme => theme/icons}/option_button_arrow.svg (100%) rename scene/{resources/default_theme => theme/icons}/picker_shape_circle.svg (100%) rename scene/{resources/default_theme => theme/icons}/picker_shape_rectangle.svg (100%) rename scene/{resources/default_theme => theme/icons}/picker_shape_rectangle_wheel.svg (100%) rename scene/{resources/default_theme => theme/icons}/popup_menu_arrow_left.svg (100%) rename scene/{resources/default_theme => theme/icons}/popup_menu_arrow_right.svg (100%) rename scene/{resources/default_theme => theme/icons}/radio_checked.svg (100%) rename scene/{resources/default_theme => theme/icons}/radio_checked_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/radio_unchecked.svg (100%) rename scene/{resources/default_theme => theme/icons}/radio_unchecked_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/reload.svg (100%) rename scene/{resources/default_theme => theme/icons}/resizer_nw.svg (100%) rename scene/{resources/default_theme => theme/icons}/resizer_se.svg (100%) rename scene/{resources/default_theme => theme/icons}/scroll_button_left.svg (100%) rename scene/{resources/default_theme => theme/icons}/scroll_button_left_hl.svg (100%) rename scene/{resources/default_theme => theme/icons}/scroll_button_right.svg (100%) rename scene/{resources/default_theme => theme/icons}/scroll_button_right_hl.svg (100%) rename scene/{resources/default_theme => theme/icons}/slider_grabber.svg (100%) rename scene/{resources/default_theme => theme/icons}/slider_grabber_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/slider_grabber_hl.svg (100%) rename scene/{resources/default_theme => theme/icons}/tabs_drop_mark.svg (100%) rename scene/{resources/default_theme => theme/icons}/tabs_menu.svg (100%) rename scene/{resources/default_theme => theme/icons}/tabs_menu_hl.svg (100%) rename scene/{resources/default_theme => theme/icons}/text_edit_ellipsis.svg (100%) rename scene/{resources/default_theme => theme/icons}/text_edit_space.svg (100%) rename scene/{resources/default_theme => theme/icons}/text_edit_tab.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_off.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_off_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_off_disabled_mirrored.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_off_mirrored.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_on.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_on_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_on_disabled_mirrored.svg (100%) rename scene/{resources/default_theme => theme/icons}/toggle_on_mirrored.svg (100%) rename scene/{resources/default_theme => theme/icons}/unchecked.svg (100%) rename scene/{resources/default_theme => theme/icons}/unchecked_disabled.svg (100%) rename scene/{resources/default_theme => theme/icons}/updown.svg (100%) rename scene/{resources/default_theme => theme/icons}/visibility_visible.svg (100%) rename scene/{resources/default_theme => theme/icons}/vslider_tick.svg (100%) rename scene/{resources/default_theme => theme/icons}/vsplitter.svg (100%) rename scene/{resources/default_theme => theme/icons}/zoom_less.svg (100%) rename scene/{resources/default_theme => theme/icons}/zoom_more.svg (100%) rename scene/{resources/default_theme => theme/icons}/zoom_reset.svg (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 031582bc637..06aa5731b42 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -154,11 +154,11 @@ doc_classes/* @godotengine/documentation /scene/debugger/ @godotengine/debugger /scene/gui/ @godotengine/gui-nodes /scene/main/ @godotengine/core -/scene/resources/default_theme/ @godotengine/gui-nodes /scene/resources/font.* @godotengine/gui-nodes /scene/resources/text_line.* @godotengine/gui-nodes /scene/resources/text_paragraph.* @godotengine/gui-nodes /scene/resources/visual_shader*.* @godotengine/shaders +/scene/theme/ @godotengine/gui-nodes # Servers diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 74616bc0ce6..bc8bcb1134d 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -34,7 +34,6 @@ #include "core/io/dir_access.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" -#include "scene/resources/default_theme/default_theme.h" #include "scene/resources/font.h" Ref load_external_font(const String &p_path, TextServer::Hinting p_hinting, TextServer::FontAntialiasing p_aa, bool p_autohint, TextServer::SubpixelPositioning p_font_subpixel_positioning, bool p_msdf = false, TypedArray *r_fallbacks = nullptr) { diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 6087ea3abc8..4f39e79252a 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -245,7 +245,7 @@ static Ref make_line_stylebox(Color p_color, int p_thickness = 1, return style; } -// See also `generate_icon()` in `scene/resources/default_theme.cpp`. +// See also `generate_icon()` in `scene/theme/default_theme.cpp`. static Ref editor_generate_icon(int p_index, float p_scale, float p_saturation, const HashMap &p_convert_colors = HashMap()) { Ref img = memnew(Image); diff --git a/editor/icons/editor_icons_builders.py b/editor/icons/editor_icons_builders.py index ae25072a9ea..359245b6d7f 100644 --- a/editor/icons/editor_icons_builders.py +++ b/editor/icons/editor_icons_builders.py @@ -9,7 +9,7 @@ from io import StringIO from platform_methods import subprocess_main -# See also `scene/resources/default_theme/default_theme_icons_builders.py`. +# See also `scene/theme/icons/default_theme_icons_builders.py`. def make_editor_icons_action(target, source, env): dst = target[0] svg_icons = source diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 4d5d287fbe4..5a29e5ff370 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -159,7 +159,6 @@ #include "scene/resources/convex_polygon_shape_3d.h" #include "scene/resources/curve_texture.h" #include "scene/resources/cylinder_shape_3d.h" -#include "scene/resources/default_theme/default_theme.h" #include "scene/resources/environment.h" #include "scene/resources/font.h" #include "scene/resources/gradient.h" diff --git a/scene/resources/SCsub b/scene/resources/SCsub index f4dc7a46fb0..9e21c627f94 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -22,5 +22,3 @@ env.scene_sources += scene_obj # Needed to force rebuilding the scene files when the thirdparty code is updated. env.Depends(scene_obj, thirdparty_obj) - -SConscript("default_theme/SCsub") diff --git a/scene/resources/default_theme/SCsub b/scene/resources/default_theme/SCsub deleted file mode 100644 index 5bef7e5a6c5..00000000000 --- a/scene/resources/default_theme/SCsub +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python - -Import("env") - -from platform_methods import run_in_subprocess -import default_theme_builders -import default_theme_icons_builders - -env.add_source_files(env.scene_sources, "*.cpp") - -env.Depends("#scene/resources/default_theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2") -env.CommandNoCache( - "#scene/resources/default_theme/default_font.gen.h", - "#thirdparty/fonts/OpenSans_SemiBold.woff2", - run_in_subprocess(default_theme_builders.make_fonts_header), -) - -env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder( - action=env.Run( - default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header." - ), - suffix=".h", - src_suffix=".svg", -) - -# Default theme icons -icon_sources = Glob("*.svg") - -env.Alias( - "default_theme_icons", - [env.MakeDefaultThemeIconsBuilder("#scene/resources/default_theme/default_theme_icons.gen.h", icon_sources)], -) diff --git a/scene/theme/SCsub b/scene/theme/SCsub index fc61250247d..34f60b449d9 100644 --- a/scene/theme/SCsub +++ b/scene/theme/SCsub @@ -2,4 +2,17 @@ Import("env") +from platform_methods import run_in_subprocess +import default_theme_builders + + env.add_source_files(env.scene_sources, "*.cpp") + +SConscript("icons/SCsub") + +env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2") +env.CommandNoCache( + "#scene/theme/default_font.gen.h", + "#thirdparty/fonts/OpenSans_SemiBold.woff2", + run_in_subprocess(default_theme_builders.make_fonts_header), +) diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/theme/default_theme.cpp similarity index 100% rename from scene/resources/default_theme/default_theme.cpp rename to scene/theme/default_theme.cpp diff --git a/scene/resources/default_theme/default_theme.h b/scene/theme/default_theme.h similarity index 100% rename from scene/resources/default_theme/default_theme.h rename to scene/theme/default_theme.h diff --git a/scene/resources/default_theme/default_theme_builders.py b/scene/theme/default_theme_builders.py similarity index 100% rename from scene/resources/default_theme/default_theme_builders.py rename to scene/theme/default_theme_builders.py diff --git a/scene/theme/icons/SCsub b/scene/theme/icons/SCsub new file mode 100644 index 00000000000..fa9f3cb1ceb --- /dev/null +++ b/scene/theme/icons/SCsub @@ -0,0 +1,22 @@ +#!/usr/bin/env python + +Import("env") + +import default_theme_icons_builders + + +env["BUILDERS"]["MakeDefaultThemeIconsBuilder"] = Builder( + action=env.Run( + default_theme_icons_builders.make_default_theme_icons_action, "Generating default project theme icons header." + ), + suffix=".h", + src_suffix=".svg", +) + +# Default theme icons +icon_sources = Glob("*.svg") + +env.Alias( + "default_theme_icons", + [env.MakeDefaultThemeIconsBuilder("#scene/theme/default_theme_icons.gen.h", icon_sources)], +) diff --git a/scene/resources/default_theme/add.svg b/scene/theme/icons/add.svg similarity index 100% rename from scene/resources/default_theme/add.svg rename to scene/theme/icons/add.svg diff --git a/scene/resources/default_theme/arrow_down.svg b/scene/theme/icons/arrow_down.svg similarity index 100% rename from scene/resources/default_theme/arrow_down.svg rename to scene/theme/icons/arrow_down.svg diff --git a/scene/resources/default_theme/arrow_left.svg b/scene/theme/icons/arrow_left.svg similarity index 100% rename from scene/resources/default_theme/arrow_left.svg rename to scene/theme/icons/arrow_left.svg diff --git a/scene/resources/default_theme/arrow_right.svg b/scene/theme/icons/arrow_right.svg similarity index 100% rename from scene/resources/default_theme/arrow_right.svg rename to scene/theme/icons/arrow_right.svg diff --git a/scene/resources/default_theme/bookmark.svg b/scene/theme/icons/bookmark.svg similarity index 100% rename from scene/resources/default_theme/bookmark.svg rename to scene/theme/icons/bookmark.svg diff --git a/scene/resources/default_theme/breakpoint.svg b/scene/theme/icons/breakpoint.svg similarity index 100% rename from scene/resources/default_theme/breakpoint.svg rename to scene/theme/icons/breakpoint.svg diff --git a/scene/resources/default_theme/checked.svg b/scene/theme/icons/checked.svg similarity index 100% rename from scene/resources/default_theme/checked.svg rename to scene/theme/icons/checked.svg diff --git a/scene/resources/default_theme/checked_disabled.svg b/scene/theme/icons/checked_disabled.svg similarity index 100% rename from scene/resources/default_theme/checked_disabled.svg rename to scene/theme/icons/checked_disabled.svg diff --git a/scene/resources/default_theme/close.svg b/scene/theme/icons/close.svg similarity index 100% rename from scene/resources/default_theme/close.svg rename to scene/theme/icons/close.svg diff --git a/scene/resources/default_theme/close_hl.svg b/scene/theme/icons/close_hl.svg similarity index 100% rename from scene/resources/default_theme/close_hl.svg rename to scene/theme/icons/close_hl.svg diff --git a/scene/resources/default_theme/color_picker_bar_arrow.svg b/scene/theme/icons/color_picker_bar_arrow.svg similarity index 100% rename from scene/resources/default_theme/color_picker_bar_arrow.svg rename to scene/theme/icons/color_picker_bar_arrow.svg diff --git a/scene/resources/default_theme/color_picker_cursor.svg b/scene/theme/icons/color_picker_cursor.svg similarity index 100% rename from scene/resources/default_theme/color_picker_cursor.svg rename to scene/theme/icons/color_picker_cursor.svg diff --git a/scene/resources/default_theme/color_picker_overbright.svg b/scene/theme/icons/color_picker_overbright.svg similarity index 100% rename from scene/resources/default_theme/color_picker_overbright.svg rename to scene/theme/icons/color_picker_overbright.svg diff --git a/scene/resources/default_theme/color_picker_pipette.svg b/scene/theme/icons/color_picker_pipette.svg similarity index 100% rename from scene/resources/default_theme/color_picker_pipette.svg rename to scene/theme/icons/color_picker_pipette.svg diff --git a/scene/resources/default_theme/default_theme_icons_builders.py b/scene/theme/icons/default_theme_icons_builders.py similarity index 100% rename from scene/resources/default_theme/default_theme_icons_builders.py rename to scene/theme/icons/default_theme_icons_builders.py diff --git a/scene/resources/default_theme/error_icon.svg b/scene/theme/icons/error_icon.svg similarity index 100% rename from scene/resources/default_theme/error_icon.svg rename to scene/theme/icons/error_icon.svg diff --git a/scene/resources/default_theme/file.svg b/scene/theme/icons/file.svg similarity index 100% rename from scene/resources/default_theme/file.svg rename to scene/theme/icons/file.svg diff --git a/scene/resources/default_theme/folder.svg b/scene/theme/icons/folder.svg similarity index 100% rename from scene/resources/default_theme/folder.svg rename to scene/theme/icons/folder.svg diff --git a/scene/resources/default_theme/folder_up.svg b/scene/theme/icons/folder_up.svg similarity index 100% rename from scene/resources/default_theme/folder_up.svg rename to scene/theme/icons/folder_up.svg diff --git a/scene/resources/default_theme/graph_port.svg b/scene/theme/icons/graph_port.svg similarity index 100% rename from scene/resources/default_theme/graph_port.svg rename to scene/theme/icons/graph_port.svg diff --git a/scene/resources/default_theme/grid_layout.svg b/scene/theme/icons/grid_layout.svg similarity index 100% rename from scene/resources/default_theme/grid_layout.svg rename to scene/theme/icons/grid_layout.svg diff --git a/scene/resources/default_theme/grid_minimap.svg b/scene/theme/icons/grid_minimap.svg similarity index 100% rename from scene/resources/default_theme/grid_minimap.svg rename to scene/theme/icons/grid_minimap.svg diff --git a/scene/resources/default_theme/grid_snap.svg b/scene/theme/icons/grid_snap.svg similarity index 100% rename from scene/resources/default_theme/grid_snap.svg rename to scene/theme/icons/grid_snap.svg diff --git a/scene/resources/default_theme/grid_toggle.svg b/scene/theme/icons/grid_toggle.svg similarity index 100% rename from scene/resources/default_theme/grid_toggle.svg rename to scene/theme/icons/grid_toggle.svg diff --git a/scene/resources/default_theme/hslider_tick.svg b/scene/theme/icons/hslider_tick.svg similarity index 100% rename from scene/resources/default_theme/hslider_tick.svg rename to scene/theme/icons/hslider_tick.svg diff --git a/scene/resources/default_theme/hsplitter.svg b/scene/theme/icons/hsplitter.svg similarity index 100% rename from scene/resources/default_theme/hsplitter.svg rename to scene/theme/icons/hsplitter.svg diff --git a/scene/resources/default_theme/indeterminate.svg b/scene/theme/icons/indeterminate.svg similarity index 100% rename from scene/resources/default_theme/indeterminate.svg rename to scene/theme/icons/indeterminate.svg diff --git a/scene/resources/default_theme/line_edit_clear.svg b/scene/theme/icons/line_edit_clear.svg similarity index 100% rename from scene/resources/default_theme/line_edit_clear.svg rename to scene/theme/icons/line_edit_clear.svg diff --git a/scene/resources/default_theme/mini_checkerboard.svg b/scene/theme/icons/mini_checkerboard.svg similarity index 100% rename from scene/resources/default_theme/mini_checkerboard.svg rename to scene/theme/icons/mini_checkerboard.svg diff --git a/scene/resources/default_theme/option_button_arrow.svg b/scene/theme/icons/option_button_arrow.svg similarity index 100% rename from scene/resources/default_theme/option_button_arrow.svg rename to scene/theme/icons/option_button_arrow.svg diff --git a/scene/resources/default_theme/picker_shape_circle.svg b/scene/theme/icons/picker_shape_circle.svg similarity index 100% rename from scene/resources/default_theme/picker_shape_circle.svg rename to scene/theme/icons/picker_shape_circle.svg diff --git a/scene/resources/default_theme/picker_shape_rectangle.svg b/scene/theme/icons/picker_shape_rectangle.svg similarity index 100% rename from scene/resources/default_theme/picker_shape_rectangle.svg rename to scene/theme/icons/picker_shape_rectangle.svg diff --git a/scene/resources/default_theme/picker_shape_rectangle_wheel.svg b/scene/theme/icons/picker_shape_rectangle_wheel.svg similarity index 100% rename from scene/resources/default_theme/picker_shape_rectangle_wheel.svg rename to scene/theme/icons/picker_shape_rectangle_wheel.svg diff --git a/scene/resources/default_theme/popup_menu_arrow_left.svg b/scene/theme/icons/popup_menu_arrow_left.svg similarity index 100% rename from scene/resources/default_theme/popup_menu_arrow_left.svg rename to scene/theme/icons/popup_menu_arrow_left.svg diff --git a/scene/resources/default_theme/popup_menu_arrow_right.svg b/scene/theme/icons/popup_menu_arrow_right.svg similarity index 100% rename from scene/resources/default_theme/popup_menu_arrow_right.svg rename to scene/theme/icons/popup_menu_arrow_right.svg diff --git a/scene/resources/default_theme/radio_checked.svg b/scene/theme/icons/radio_checked.svg similarity index 100% rename from scene/resources/default_theme/radio_checked.svg rename to scene/theme/icons/radio_checked.svg diff --git a/scene/resources/default_theme/radio_checked_disabled.svg b/scene/theme/icons/radio_checked_disabled.svg similarity index 100% rename from scene/resources/default_theme/radio_checked_disabled.svg rename to scene/theme/icons/radio_checked_disabled.svg diff --git a/scene/resources/default_theme/radio_unchecked.svg b/scene/theme/icons/radio_unchecked.svg similarity index 100% rename from scene/resources/default_theme/radio_unchecked.svg rename to scene/theme/icons/radio_unchecked.svg diff --git a/scene/resources/default_theme/radio_unchecked_disabled.svg b/scene/theme/icons/radio_unchecked_disabled.svg similarity index 100% rename from scene/resources/default_theme/radio_unchecked_disabled.svg rename to scene/theme/icons/radio_unchecked_disabled.svg diff --git a/scene/resources/default_theme/reload.svg b/scene/theme/icons/reload.svg similarity index 100% rename from scene/resources/default_theme/reload.svg rename to scene/theme/icons/reload.svg diff --git a/scene/resources/default_theme/resizer_nw.svg b/scene/theme/icons/resizer_nw.svg similarity index 100% rename from scene/resources/default_theme/resizer_nw.svg rename to scene/theme/icons/resizer_nw.svg diff --git a/scene/resources/default_theme/resizer_se.svg b/scene/theme/icons/resizer_se.svg similarity index 100% rename from scene/resources/default_theme/resizer_se.svg rename to scene/theme/icons/resizer_se.svg diff --git a/scene/resources/default_theme/scroll_button_left.svg b/scene/theme/icons/scroll_button_left.svg similarity index 100% rename from scene/resources/default_theme/scroll_button_left.svg rename to scene/theme/icons/scroll_button_left.svg diff --git a/scene/resources/default_theme/scroll_button_left_hl.svg b/scene/theme/icons/scroll_button_left_hl.svg similarity index 100% rename from scene/resources/default_theme/scroll_button_left_hl.svg rename to scene/theme/icons/scroll_button_left_hl.svg diff --git a/scene/resources/default_theme/scroll_button_right.svg b/scene/theme/icons/scroll_button_right.svg similarity index 100% rename from scene/resources/default_theme/scroll_button_right.svg rename to scene/theme/icons/scroll_button_right.svg diff --git a/scene/resources/default_theme/scroll_button_right_hl.svg b/scene/theme/icons/scroll_button_right_hl.svg similarity index 100% rename from scene/resources/default_theme/scroll_button_right_hl.svg rename to scene/theme/icons/scroll_button_right_hl.svg diff --git a/scene/resources/default_theme/slider_grabber.svg b/scene/theme/icons/slider_grabber.svg similarity index 100% rename from scene/resources/default_theme/slider_grabber.svg rename to scene/theme/icons/slider_grabber.svg diff --git a/scene/resources/default_theme/slider_grabber_disabled.svg b/scene/theme/icons/slider_grabber_disabled.svg similarity index 100% rename from scene/resources/default_theme/slider_grabber_disabled.svg rename to scene/theme/icons/slider_grabber_disabled.svg diff --git a/scene/resources/default_theme/slider_grabber_hl.svg b/scene/theme/icons/slider_grabber_hl.svg similarity index 100% rename from scene/resources/default_theme/slider_grabber_hl.svg rename to scene/theme/icons/slider_grabber_hl.svg diff --git a/scene/resources/default_theme/tabs_drop_mark.svg b/scene/theme/icons/tabs_drop_mark.svg similarity index 100% rename from scene/resources/default_theme/tabs_drop_mark.svg rename to scene/theme/icons/tabs_drop_mark.svg diff --git a/scene/resources/default_theme/tabs_menu.svg b/scene/theme/icons/tabs_menu.svg similarity index 100% rename from scene/resources/default_theme/tabs_menu.svg rename to scene/theme/icons/tabs_menu.svg diff --git a/scene/resources/default_theme/tabs_menu_hl.svg b/scene/theme/icons/tabs_menu_hl.svg similarity index 100% rename from scene/resources/default_theme/tabs_menu_hl.svg rename to scene/theme/icons/tabs_menu_hl.svg diff --git a/scene/resources/default_theme/text_edit_ellipsis.svg b/scene/theme/icons/text_edit_ellipsis.svg similarity index 100% rename from scene/resources/default_theme/text_edit_ellipsis.svg rename to scene/theme/icons/text_edit_ellipsis.svg diff --git a/scene/resources/default_theme/text_edit_space.svg b/scene/theme/icons/text_edit_space.svg similarity index 100% rename from scene/resources/default_theme/text_edit_space.svg rename to scene/theme/icons/text_edit_space.svg diff --git a/scene/resources/default_theme/text_edit_tab.svg b/scene/theme/icons/text_edit_tab.svg similarity index 100% rename from scene/resources/default_theme/text_edit_tab.svg rename to scene/theme/icons/text_edit_tab.svg diff --git a/scene/resources/default_theme/toggle_off.svg b/scene/theme/icons/toggle_off.svg similarity index 100% rename from scene/resources/default_theme/toggle_off.svg rename to scene/theme/icons/toggle_off.svg diff --git a/scene/resources/default_theme/toggle_off_disabled.svg b/scene/theme/icons/toggle_off_disabled.svg similarity index 100% rename from scene/resources/default_theme/toggle_off_disabled.svg rename to scene/theme/icons/toggle_off_disabled.svg diff --git a/scene/resources/default_theme/toggle_off_disabled_mirrored.svg b/scene/theme/icons/toggle_off_disabled_mirrored.svg similarity index 100% rename from scene/resources/default_theme/toggle_off_disabled_mirrored.svg rename to scene/theme/icons/toggle_off_disabled_mirrored.svg diff --git a/scene/resources/default_theme/toggle_off_mirrored.svg b/scene/theme/icons/toggle_off_mirrored.svg similarity index 100% rename from scene/resources/default_theme/toggle_off_mirrored.svg rename to scene/theme/icons/toggle_off_mirrored.svg diff --git a/scene/resources/default_theme/toggle_on.svg b/scene/theme/icons/toggle_on.svg similarity index 100% rename from scene/resources/default_theme/toggle_on.svg rename to scene/theme/icons/toggle_on.svg diff --git a/scene/resources/default_theme/toggle_on_disabled.svg b/scene/theme/icons/toggle_on_disabled.svg similarity index 100% rename from scene/resources/default_theme/toggle_on_disabled.svg rename to scene/theme/icons/toggle_on_disabled.svg diff --git a/scene/resources/default_theme/toggle_on_disabled_mirrored.svg b/scene/theme/icons/toggle_on_disabled_mirrored.svg similarity index 100% rename from scene/resources/default_theme/toggle_on_disabled_mirrored.svg rename to scene/theme/icons/toggle_on_disabled_mirrored.svg diff --git a/scene/resources/default_theme/toggle_on_mirrored.svg b/scene/theme/icons/toggle_on_mirrored.svg similarity index 100% rename from scene/resources/default_theme/toggle_on_mirrored.svg rename to scene/theme/icons/toggle_on_mirrored.svg diff --git a/scene/resources/default_theme/unchecked.svg b/scene/theme/icons/unchecked.svg similarity index 100% rename from scene/resources/default_theme/unchecked.svg rename to scene/theme/icons/unchecked.svg diff --git a/scene/resources/default_theme/unchecked_disabled.svg b/scene/theme/icons/unchecked_disabled.svg similarity index 100% rename from scene/resources/default_theme/unchecked_disabled.svg rename to scene/theme/icons/unchecked_disabled.svg diff --git a/scene/resources/default_theme/updown.svg b/scene/theme/icons/updown.svg similarity index 100% rename from scene/resources/default_theme/updown.svg rename to scene/theme/icons/updown.svg diff --git a/scene/resources/default_theme/visibility_visible.svg b/scene/theme/icons/visibility_visible.svg similarity index 100% rename from scene/resources/default_theme/visibility_visible.svg rename to scene/theme/icons/visibility_visible.svg diff --git a/scene/resources/default_theme/vslider_tick.svg b/scene/theme/icons/vslider_tick.svg similarity index 100% rename from scene/resources/default_theme/vslider_tick.svg rename to scene/theme/icons/vslider_tick.svg diff --git a/scene/resources/default_theme/vsplitter.svg b/scene/theme/icons/vsplitter.svg similarity index 100% rename from scene/resources/default_theme/vsplitter.svg rename to scene/theme/icons/vsplitter.svg diff --git a/scene/resources/default_theme/zoom_less.svg b/scene/theme/icons/zoom_less.svg similarity index 100% rename from scene/resources/default_theme/zoom_less.svg rename to scene/theme/icons/zoom_less.svg diff --git a/scene/resources/default_theme/zoom_more.svg b/scene/theme/icons/zoom_more.svg similarity index 100% rename from scene/resources/default_theme/zoom_more.svg rename to scene/theme/icons/zoom_more.svg diff --git a/scene/resources/default_theme/zoom_reset.svg b/scene/theme/icons/zoom_reset.svg similarity index 100% rename from scene/resources/default_theme/zoom_reset.svg rename to scene/theme/icons/zoom_reset.svg diff --git a/scene/theme/theme_db.cpp b/scene/theme/theme_db.cpp index 9b85a62c6ec..39a4f078b5c 100644 --- a/scene/theme/theme_db.cpp +++ b/scene/theme/theme_db.cpp @@ -32,11 +32,11 @@ #include "core/config/project_settings.h" #include "core/io/resource_loader.h" -#include "scene/resources/default_theme/default_theme.h" #include "scene/resources/font.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" #include "scene/resources/theme.h" +#include "scene/theme/default_theme.h" #include "servers/text_server.h" // Default engine theme creation and configuration.