From 8a364c503dc3496dbbd428617bb4c78997472263 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Mon, 24 Aug 2020 07:33:01 -0400 Subject: [PATCH] Base: Rename icon subdirectories by explicit app name Renames widgets/ to hackstudio/, vbwidgets/ to visualbuilder/ and paintbrush/ to pixelpaint/. --- Applications/PixelPaint/ToolboxWidget.cpp | 2 +- .../icons/{widgets => hackstudio}/Cursor.png | Bin .../icons/{widgets => hackstudio}/GButton.png | Bin .../{widgets => hackstudio}/GCheckBox.png | Bin .../{widgets => hackstudio}/GGroupBox.png | Bin .../icons/{widgets => hackstudio}/GLabel.png | Bin .../{widgets => hackstudio}/GProgressBar.png | Bin .../{widgets => hackstudio}/GRadioButton.png | Bin .../{widgets => hackstudio}/GScrollBar.png | Bin .../icons/{widgets => hackstudio}/GSlider.png | Bin .../{widgets => hackstudio}/GSpinBox.png | Bin .../{widgets => hackstudio}/GTextBox.png | Bin .../{paintbrush => pixelpaint}/bucket.png | Bin .../{paintbrush => pixelpaint}/circle.png | Bin .../{paintbrush => pixelpaint}/eraser.png | Bin .../icons/{paintbrush => pixelpaint}/line.png | Bin .../icons/{paintbrush => pixelpaint}/move.png | Bin .../icons/{paintbrush => pixelpaint}/pen.png | Bin .../{paintbrush => pixelpaint}/picker.png | Bin .../{paintbrush => pixelpaint}/rectangle.png | Bin .../{paintbrush => pixelpaint}/spray.png | Bin .../{vbwidgets => visualbuilder}/button.png | Bin .../{vbwidgets => visualbuilder}/checkbox.png | Bin .../{vbwidgets => visualbuilder}/groupbox.png | Bin .../{vbwidgets => visualbuilder}/label.png | Bin .../progressbar.png | Bin .../scrollbar.png | Bin .../{vbwidgets => visualbuilder}/slider.png | Bin .../{vbwidgets => visualbuilder}/spinbox.png | Bin .../{vbwidgets => visualbuilder}/textbox.png | Bin DevTools/HackStudio/main.cpp | 4 ++-- DevTools/VisualBuilder/main.cpp | 18 +++++++++--------- 32 files changed, 12 insertions(+), 12 deletions(-) rename Base/res/icons/{widgets => hackstudio}/Cursor.png (100%) rename Base/res/icons/{widgets => hackstudio}/GButton.png (100%) rename Base/res/icons/{widgets => hackstudio}/GCheckBox.png (100%) rename Base/res/icons/{widgets => hackstudio}/GGroupBox.png (100%) rename Base/res/icons/{widgets => hackstudio}/GLabel.png (100%) rename Base/res/icons/{widgets => hackstudio}/GProgressBar.png (100%) rename Base/res/icons/{widgets => hackstudio}/GRadioButton.png (100%) rename Base/res/icons/{widgets => hackstudio}/GScrollBar.png (100%) rename Base/res/icons/{widgets => hackstudio}/GSlider.png (100%) rename Base/res/icons/{widgets => hackstudio}/GSpinBox.png (100%) rename Base/res/icons/{widgets => hackstudio}/GTextBox.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/bucket.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/circle.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/eraser.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/line.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/move.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/pen.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/picker.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/rectangle.png (100%) rename Base/res/icons/{paintbrush => pixelpaint}/spray.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/button.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/checkbox.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/groupbox.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/label.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/progressbar.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/scrollbar.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/slider.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/spinbox.png (100%) rename Base/res/icons/{vbwidgets => visualbuilder}/textbox.png (100%) diff --git a/Applications/PixelPaint/ToolboxWidget.cpp b/Applications/PixelPaint/ToolboxWidget.cpp index c6e6399282..1a74ff0d93 100644 --- a/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Applications/PixelPaint/ToolboxWidget.cpp @@ -121,7 +121,7 @@ void ToolboxWidget::setup_tools() button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); button.set_preferred_size(0, 32); button.set_checkable(true); - button.set_icon(Gfx::Bitmap::load_from_file(String::format("/res/icons/paintbrush/%s.png", icon_name.to_string().characters()))); + button.set_icon(Gfx::Bitmap::load_from_file(String::format("/res/icons/pixelpaint/%s.png", icon_name.to_string().characters()))); return button; }; diff --git a/Base/res/icons/widgets/Cursor.png b/Base/res/icons/hackstudio/Cursor.png similarity index 100% rename from Base/res/icons/widgets/Cursor.png rename to Base/res/icons/hackstudio/Cursor.png diff --git a/Base/res/icons/widgets/GButton.png b/Base/res/icons/hackstudio/GButton.png similarity index 100% rename from Base/res/icons/widgets/GButton.png rename to Base/res/icons/hackstudio/GButton.png diff --git a/Base/res/icons/widgets/GCheckBox.png b/Base/res/icons/hackstudio/GCheckBox.png similarity index 100% rename from Base/res/icons/widgets/GCheckBox.png rename to Base/res/icons/hackstudio/GCheckBox.png diff --git a/Base/res/icons/widgets/GGroupBox.png b/Base/res/icons/hackstudio/GGroupBox.png similarity index 100% rename from Base/res/icons/widgets/GGroupBox.png rename to Base/res/icons/hackstudio/GGroupBox.png diff --git a/Base/res/icons/widgets/GLabel.png b/Base/res/icons/hackstudio/GLabel.png similarity index 100% rename from Base/res/icons/widgets/GLabel.png rename to Base/res/icons/hackstudio/GLabel.png diff --git a/Base/res/icons/widgets/GProgressBar.png b/Base/res/icons/hackstudio/GProgressBar.png similarity index 100% rename from Base/res/icons/widgets/GProgressBar.png rename to Base/res/icons/hackstudio/GProgressBar.png diff --git a/Base/res/icons/widgets/GRadioButton.png b/Base/res/icons/hackstudio/GRadioButton.png similarity index 100% rename from Base/res/icons/widgets/GRadioButton.png rename to Base/res/icons/hackstudio/GRadioButton.png diff --git a/Base/res/icons/widgets/GScrollBar.png b/Base/res/icons/hackstudio/GScrollBar.png similarity index 100% rename from Base/res/icons/widgets/GScrollBar.png rename to Base/res/icons/hackstudio/GScrollBar.png diff --git a/Base/res/icons/widgets/GSlider.png b/Base/res/icons/hackstudio/GSlider.png similarity index 100% rename from Base/res/icons/widgets/GSlider.png rename to Base/res/icons/hackstudio/GSlider.png diff --git a/Base/res/icons/widgets/GSpinBox.png b/Base/res/icons/hackstudio/GSpinBox.png similarity index 100% rename from Base/res/icons/widgets/GSpinBox.png rename to Base/res/icons/hackstudio/GSpinBox.png diff --git a/Base/res/icons/widgets/GTextBox.png b/Base/res/icons/hackstudio/GTextBox.png similarity index 100% rename from Base/res/icons/widgets/GTextBox.png rename to Base/res/icons/hackstudio/GTextBox.png diff --git a/Base/res/icons/paintbrush/bucket.png b/Base/res/icons/pixelpaint/bucket.png similarity index 100% rename from Base/res/icons/paintbrush/bucket.png rename to Base/res/icons/pixelpaint/bucket.png diff --git a/Base/res/icons/paintbrush/circle.png b/Base/res/icons/pixelpaint/circle.png similarity index 100% rename from Base/res/icons/paintbrush/circle.png rename to Base/res/icons/pixelpaint/circle.png diff --git a/Base/res/icons/paintbrush/eraser.png b/Base/res/icons/pixelpaint/eraser.png similarity index 100% rename from Base/res/icons/paintbrush/eraser.png rename to Base/res/icons/pixelpaint/eraser.png diff --git a/Base/res/icons/paintbrush/line.png b/Base/res/icons/pixelpaint/line.png similarity index 100% rename from Base/res/icons/paintbrush/line.png rename to Base/res/icons/pixelpaint/line.png diff --git a/Base/res/icons/paintbrush/move.png b/Base/res/icons/pixelpaint/move.png similarity index 100% rename from Base/res/icons/paintbrush/move.png rename to Base/res/icons/pixelpaint/move.png diff --git a/Base/res/icons/paintbrush/pen.png b/Base/res/icons/pixelpaint/pen.png similarity index 100% rename from Base/res/icons/paintbrush/pen.png rename to Base/res/icons/pixelpaint/pen.png diff --git a/Base/res/icons/paintbrush/picker.png b/Base/res/icons/pixelpaint/picker.png similarity index 100% rename from Base/res/icons/paintbrush/picker.png rename to Base/res/icons/pixelpaint/picker.png diff --git a/Base/res/icons/paintbrush/rectangle.png b/Base/res/icons/pixelpaint/rectangle.png similarity index 100% rename from Base/res/icons/paintbrush/rectangle.png rename to Base/res/icons/pixelpaint/rectangle.png diff --git a/Base/res/icons/paintbrush/spray.png b/Base/res/icons/pixelpaint/spray.png similarity index 100% rename from Base/res/icons/paintbrush/spray.png rename to Base/res/icons/pixelpaint/spray.png diff --git a/Base/res/icons/vbwidgets/button.png b/Base/res/icons/visualbuilder/button.png similarity index 100% rename from Base/res/icons/vbwidgets/button.png rename to Base/res/icons/visualbuilder/button.png diff --git a/Base/res/icons/vbwidgets/checkbox.png b/Base/res/icons/visualbuilder/checkbox.png similarity index 100% rename from Base/res/icons/vbwidgets/checkbox.png rename to Base/res/icons/visualbuilder/checkbox.png diff --git a/Base/res/icons/vbwidgets/groupbox.png b/Base/res/icons/visualbuilder/groupbox.png similarity index 100% rename from Base/res/icons/vbwidgets/groupbox.png rename to Base/res/icons/visualbuilder/groupbox.png diff --git a/Base/res/icons/vbwidgets/label.png b/Base/res/icons/visualbuilder/label.png similarity index 100% rename from Base/res/icons/vbwidgets/label.png rename to Base/res/icons/visualbuilder/label.png diff --git a/Base/res/icons/vbwidgets/progressbar.png b/Base/res/icons/visualbuilder/progressbar.png similarity index 100% rename from Base/res/icons/vbwidgets/progressbar.png rename to Base/res/icons/visualbuilder/progressbar.png diff --git a/Base/res/icons/vbwidgets/scrollbar.png b/Base/res/icons/visualbuilder/scrollbar.png similarity index 100% rename from Base/res/icons/vbwidgets/scrollbar.png rename to Base/res/icons/visualbuilder/scrollbar.png diff --git a/Base/res/icons/vbwidgets/slider.png b/Base/res/icons/visualbuilder/slider.png similarity index 100% rename from Base/res/icons/vbwidgets/slider.png rename to Base/res/icons/visualbuilder/slider.png diff --git a/Base/res/icons/vbwidgets/spinbox.png b/Base/res/icons/visualbuilder/spinbox.png similarity index 100% rename from Base/res/icons/vbwidgets/spinbox.png rename to Base/res/icons/visualbuilder/spinbox.png diff --git a/Base/res/icons/vbwidgets/textbox.png b/Base/res/icons/visualbuilder/textbox.png similarity index 100% rename from Base/res/icons/vbwidgets/textbox.png rename to Base/res/icons/visualbuilder/textbox.png diff --git a/DevTools/HackStudio/main.cpp b/DevTools/HackStudio/main.cpp index 6faa0172f4..d250f04d46 100644 --- a/DevTools/HackStudio/main.cpp +++ b/DevTools/HackStudio/main.cpp @@ -332,7 +332,7 @@ int main_impl(int argc, char** argv) GUI::ActionGroup tool_actions; tool_actions.set_exclusive(true); - auto cursor_tool_action = GUI::Action::create_checkable("Cursor", Gfx::Bitmap::load_from_file("/res/icons/widgets/Cursor.png"), [&](auto&) { + auto cursor_tool_action = GUI::Action::create_checkable("Cursor", Gfx::Bitmap::load_from_file("/res/icons/hackstudio/Cursor.png"), [&](auto&) { g_form_editor_widget->set_tool(make(*g_form_editor_widget)); }); cursor_tool_action->set_checked(true); @@ -341,7 +341,7 @@ int main_impl(int argc, char** argv) form_widgets_toolbar.add_action(cursor_tool_action); GUI::WidgetClassRegistration::for_each([&](const GUI::WidgetClassRegistration& reg) { - auto icon_path = String::format("/res/icons/widgets/G%s.png", reg.class_name().characters()); + auto icon_path = String::format("/res/icons/hackstudio/G%s.png", reg.class_name().characters()); auto action = GUI::Action::create_checkable(reg.class_name(), Gfx::Bitmap::load_from_file(icon_path), [®](auto&) { g_form_editor_widget->set_tool(make(*g_form_editor_widget, reg)); auto widget = reg.construct(); diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp index e2530a1c13..916b3e4be0 100644 --- a/DevTools/VisualBuilder/main.cpp +++ b/DevTools/VisualBuilder/main.cpp @@ -111,7 +111,7 @@ RefPtr make_toolbox_window() auto& label_button = widget.add(); label_button.set_button_style(Gfx::ButtonStyle::CoolBar); label_button.set_tooltip("GLabel"); - label_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/label.png")); + label_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/label.png")); label_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GLabel); @@ -120,7 +120,7 @@ RefPtr make_toolbox_window() auto& button_button = widget.add(); button_button.set_button_style(Gfx::ButtonStyle::CoolBar); button_button.set_tooltip("GButton"); - button_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/button.png")); + button_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/button.png")); button_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GButton); @@ -128,7 +128,7 @@ RefPtr make_toolbox_window() auto& spinbox_button = widget.add(); spinbox_button.set_button_style(Gfx::ButtonStyle::CoolBar); spinbox_button.set_tooltip("GSpinBox"); - spinbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/spinbox.png")); + spinbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/spinbox.png")); spinbox_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSpinBox); @@ -136,7 +136,7 @@ RefPtr make_toolbox_window() auto& editor_button = widget.add(); editor_button.set_button_style(Gfx::ButtonStyle::CoolBar); editor_button.set_tooltip("GTextEditor"); - editor_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/textbox.png")); + editor_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/textbox.png")); editor_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GTextEditor); @@ -144,7 +144,7 @@ RefPtr make_toolbox_window() auto& progress_bar_button = widget.add(); progress_bar_button.set_button_style(Gfx::ButtonStyle::CoolBar); progress_bar_button.set_tooltip("GProgressBar"); - progress_bar_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/progressbar.png")); + progress_bar_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/progressbar.png")); progress_bar_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GProgressBar); @@ -152,7 +152,7 @@ RefPtr make_toolbox_window() auto& slider_button = widget.add(); slider_button.set_button_style(Gfx::ButtonStyle::CoolBar); slider_button.set_tooltip("GSlider"); - slider_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/slider.png")); + slider_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/slider.png")); slider_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GSlider); @@ -160,7 +160,7 @@ RefPtr make_toolbox_window() auto& checkbox_button = widget.add(); checkbox_button.set_button_style(Gfx::ButtonStyle::CoolBar); checkbox_button.set_tooltip("GCheckBox"); - checkbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/checkbox.png")); + checkbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/checkbox.png")); checkbox_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GCheckBox); @@ -176,7 +176,7 @@ RefPtr make_toolbox_window() auto& scrollbar_button = widget.add(); scrollbar_button.set_button_style(Gfx::ButtonStyle::CoolBar); scrollbar_button.set_tooltip("GScrollBar"); - scrollbar_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/scrollbar.png")); + scrollbar_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/scrollbar.png")); scrollbar_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GScrollBar); @@ -184,7 +184,7 @@ RefPtr make_toolbox_window() auto& groupbox_button = widget.add(); groupbox_button.set_button_style(Gfx::ButtonStyle::CoolBar); groupbox_button.set_tooltip("GGroupBox"); - groupbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/groupbox.png")); + groupbox_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/visualbuilder/groupbox.png")); groupbox_button.on_click = [](auto) { if (auto* form = VBForm::current()) form->insert_widget(VBWidgetType::GGroupBox);