From abcb9824856ab9bde7f96163c3565763391cadf2 Mon Sep 17 00:00:00 2001 From: Tobias Christiansen Date: Tue, 31 Aug 2021 18:09:09 +0200 Subject: [PATCH] PixelPaint: Rename CreateNewGuideDialog to EditGuideDialog This doesn't change the behavior at all but sets the naming up be more descriptive on what it does in the next patches. --- Userland/Applications/PixelPaint/CMakeLists.txt | 6 +++--- .../{CreateNewGuideDialog.cpp => EditGuideDialog.cpp} | 8 ++++---- .../{CreateNewGuideDialog.gml => EditGuideDialog.gml} | 0 .../{CreateNewGuideDialog.h => EditGuideDialog.h} | 7 ++++--- Userland/Applications/PixelPaint/main.cpp | 4 ++-- 5 files changed, 13 insertions(+), 12 deletions(-) rename Userland/Applications/PixelPaint/{CreateNewGuideDialog.cpp => EditGuideDialog.cpp} (89%) rename Userland/Applications/PixelPaint/{CreateNewGuideDialog.gml => EditGuideDialog.gml} (100%) rename Userland/Applications/PixelPaint/{CreateNewGuideDialog.h => EditGuideDialog.h} (76%) diff --git a/Userland/Applications/PixelPaint/CMakeLists.txt b/Userland/Applications/PixelPaint/CMakeLists.txt index 617ed9a98a..fa7cf8e41d 100644 --- a/Userland/Applications/PixelPaint/CMakeLists.txt +++ b/Userland/Applications/PixelPaint/CMakeLists.txt @@ -6,15 +6,15 @@ serenity_component( ) compile_gml(PixelPaintWindow.gml PixelPaintWindowGML.h pixel_paint_window_gml) -compile_gml(CreateNewGuideDialog.gml CreateNewGuideDialogGML.h create_new_guide_dialog_gml) +compile_gml(EditGuideDialog.gml EditGuideDialogGML.h edit_guide_dialog_gml) set(SOURCES BrushTool.cpp BucketTool.cpp - CreateNewGuideDialog.cpp - CreateNewGuideDialogGML.h CreateNewImageDialog.cpp CreateNewLayerDialog.cpp + EditGuideDialog.cpp + EditGuideDialogGML.h EllipseTool.cpp EraseTool.cpp GuideTool.cpp diff --git a/Userland/Applications/PixelPaint/CreateNewGuideDialog.cpp b/Userland/Applications/PixelPaint/EditGuideDialog.cpp similarity index 89% rename from Userland/Applications/PixelPaint/CreateNewGuideDialog.cpp rename to Userland/Applications/PixelPaint/EditGuideDialog.cpp index 5ea5283665..9b9c32785b 100644 --- a/Userland/Applications/PixelPaint/CreateNewGuideDialog.cpp +++ b/Userland/Applications/PixelPaint/EditGuideDialog.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "CreateNewGuideDialog.h" -#include +#include "EditGuideDialog.h" +#include #include #include #include @@ -13,7 +13,7 @@ namespace PixelPaint { -CreateNewGuideDialog::CreateNewGuideDialog(GUI::Window* parent_window) +EditGuideDialog::EditGuideDialog(GUI::Window* parent_window) : Dialog(parent_window) { set_title("Create new Guide"); @@ -22,7 +22,7 @@ CreateNewGuideDialog::CreateNewGuideDialog(GUI::Window* parent_window) set_resizable(false); auto& main_widget = set_main_widget(); - if (!main_widget.load_from_gml(create_new_guide_dialog_gml)) + if (!main_widget.load_from_gml(edit_guide_dialog_gml)) VERIFY_NOT_REACHED(); auto horizontal_radio = main_widget.find_descendant_of_type_named("orientation_horizontal_radio"); diff --git a/Userland/Applications/PixelPaint/CreateNewGuideDialog.gml b/Userland/Applications/PixelPaint/EditGuideDialog.gml similarity index 100% rename from Userland/Applications/PixelPaint/CreateNewGuideDialog.gml rename to Userland/Applications/PixelPaint/EditGuideDialog.gml diff --git a/Userland/Applications/PixelPaint/CreateNewGuideDialog.h b/Userland/Applications/PixelPaint/EditGuideDialog.h similarity index 76% rename from Userland/Applications/PixelPaint/CreateNewGuideDialog.h rename to Userland/Applications/PixelPaint/EditGuideDialog.h index 2250816216..a221d96f30 100644 --- a/Userland/Applications/PixelPaint/CreateNewGuideDialog.h +++ b/Userland/Applications/PixelPaint/EditGuideDialog.h @@ -7,19 +7,20 @@ #pragma once #include "Guide.h" +#include "ImageEditor.h" #include namespace PixelPaint { -class CreateNewGuideDialog final : public GUI::Dialog { - C_OBJECT(CreateNewGuideDialog); +class EditGuideDialog final : public GUI::Dialog { + C_OBJECT(EditGuideDialog); public: String const offset() const { return m_offset; } Guide::Orientation orientation() const { return m_orientation; } private: - CreateNewGuideDialog(GUI::Window* parent_window); + EditGuideDialog(GUI::Window* parent_window); String m_offset; Guide::Orientation m_orientation; diff --git a/Userland/Applications/PixelPaint/main.cpp b/Userland/Applications/PixelPaint/main.cpp index 7ed498e4a5..27fa7ae9d6 100644 --- a/Userland/Applications/PixelPaint/main.cpp +++ b/Userland/Applications/PixelPaint/main.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "CreateNewGuideDialog.h" #include "CreateNewImageDialog.h" #include "CreateNewLayerDialog.h" +#include "EditGuideDialog.h" #include "FilterParams.h" #include "Guide.h" #include "Image.h" @@ -371,7 +371,7 @@ int main(int argc, char** argv) auto add_guide_action = GUI::Action::create( "Add Guide", [&](auto&) { - auto dialog = PixelPaint::CreateNewGuideDialog::construct(window); + auto dialog = PixelPaint::EditGuideDialog::construct(window); if (dialog->exec() == GUI::Dialog::ExecOK) { if (auto* editor = current_image_editor()) { auto specified_offset = dialog->offset();