TerminalSettings: Split TerminalSettingsWidget into different files

Userland/Applications/TerminalSettings/CMakeLists.txt

@@ -8,7 +8,8 @@ stringify_gml(TerminalSettingsMain.gml TerminalSettingsMainGML.h terminal_settin
 stringify_gml(TerminalSettingsView.gml TerminalSettingsViewGML.h terminal_settings_view_gml)
 
 set(SOURCES
-    TerminalSettingsWidget.cpp
+    MainWidget.cpp
+    ViewWidget.cpp
     main.cpp
 )
 

Userland/Applications/TerminalSettings/MainWidget.cpp

@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2018-2021, the SerenityOS developers.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include "MainWidget.h"
+#include <AK/Assertions.h>
+#include <AK/JsonObject.h>
+#include <AK/QuickSort.h>
+#include <Applications/TerminalSettings/TerminalSettingsMainGML.h>
+#include <LibConfig/Client.h>
+#include <LibCore/DirIterator.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/FontPicker.h>
+#include <LibGUI/ItemListModel.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/OpacitySlider.h>
+#include <LibGUI/RadioButton.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/Widget.h>
+#include <LibGfx/Font/Font.h>
+#include <LibGfx/Font/FontDatabase.h>
+#include <LibKeyboard/CharacterMap.h>
+#include <LibVT/TerminalWidget.h>
+#include <spawn.h>
+
+ErrorOr<NonnullRefPtr<TerminalSettingsMainWidget>> TerminalSettingsMainWidget::try_create()
+{
+    auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) TerminalSettingsMainWidget()));
+    TRY(widget->setup());
+    return widget;
+}
+
+ErrorOr<void> TerminalSettingsMainWidget::setup()
+{
+    TRY(load_from_gml(terminal_settings_main_gml));
+
+    auto& beep_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("beep_bell_radio");
+    auto& visual_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("visual_bell_radio");
+    auto& no_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("no_bell_radio");
+
+    m_bell_mode = parse_bell(Config::read_string("Terminal"sv, "Window"sv, "Bell"sv));
+    m_original_bell_mode = m_bell_mode;
+
+    switch (m_bell_mode) {
+    case VT::TerminalWidget::BellMode::Visible:
+        visual_bell_radio.set_checked(true, GUI::AllowCallback::No);
+        break;
+    case VT::TerminalWidget::BellMode::AudibleBeep:
+        beep_bell_radio.set_checked(true, GUI::AllowCallback::No);
+        break;
+    case VT::TerminalWidget::BellMode::Disabled:
+        no_bell_radio.set_checked(true, GUI::AllowCallback::No);
+        break;
+    }
+
+    beep_bell_radio.on_checked = [this](bool) {
+        m_bell_mode = VT::TerminalWidget::BellMode::AudibleBeep;
+        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
+        set_modified(true);
+    };
+    visual_bell_radio.on_checked = [this](bool) {
+        m_bell_mode = VT::TerminalWidget::BellMode::Visible;
+        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
+        set_modified(true);
+    };
+    no_bell_radio.on_checked = [this](bool) {
+        m_bell_mode = VT::TerminalWidget::BellMode::Disabled;
+        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
+        set_modified(true);
+    };
+
+    m_confirm_close = Config::read_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, true);
+    m_orignal_confirm_close = m_confirm_close;
+    auto& confirm_close_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("terminal_confirm_close");
+    confirm_close_checkbox.on_checked = [&](bool confirm_close) {
+        m_confirm_close = confirm_close;
+        Config::write_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, confirm_close);
+        set_modified(true);
+    };
+    confirm_close_checkbox.set_checked(m_confirm_close, GUI::AllowCallback::No);
+    return {};
+}
+
+VT::TerminalWidget::BellMode TerminalSettingsMainWidget::parse_bell(StringView bell_string)
+{
+    if (bell_string == "AudibleBeep")
+        return VT::TerminalWidget::BellMode::AudibleBeep;
+    if (bell_string == "Visible")
+        return VT::TerminalWidget::BellMode::Visible;
+    if (bell_string == "Disabled")
+        return VT::TerminalWidget::BellMode::Disabled;
+    VERIFY_NOT_REACHED();
+}
+
+ByteString TerminalSettingsMainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
+{
+    if (bell_mode == VT::TerminalWidget::BellMode::AudibleBeep)
+        return "AudibleBeep";
+    if (bell_mode == VT::TerminalWidget::BellMode::Disabled)
+        return "Disabled";
+    if (bell_mode == VT::TerminalWidget::BellMode::Visible)
+        return "Visible";
+    VERIFY_NOT_REACHED();
+}
+
+void TerminalSettingsMainWidget::apply_settings()
+{
+    m_original_bell_mode = m_bell_mode;
+    m_orignal_confirm_close = m_confirm_close;
+    write_back_settings();
+}
+void TerminalSettingsMainWidget::write_back_settings() const
+{
+    Config::write_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, m_orignal_confirm_close);
+    Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_original_bell_mode));
+}
+
+void TerminalSettingsMainWidget::cancel_settings()
+{
+    write_back_settings();
+}

Userland/Applications/TerminalSettings/MainWidget.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018-2021, the SerenityOS developers.
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/ComboBox.h>
+#include <LibGUI/SettingsWindow.h>
+#include <LibGUI/TextEditor.h>
+#include <LibVT/TerminalWidget.h>
+
+class TerminalSettingsMainWidget final : public GUI::SettingsWindow::Tab {
+    C_OBJECT_ABSTRACT(TerminalSettingsMainWidget)
+public:
+    static ErrorOr<NonnullRefPtr<TerminalSettingsMainWidget>> try_create();
+
+    virtual void apply_settings() override;
+    virtual void cancel_settings() override;
+
+private:
+    TerminalSettingsMainWidget() = default;
+    ErrorOr<void> setup();
+    void write_back_settings() const;
+
+    static VT::TerminalWidget::BellMode parse_bell(StringView bell_string);
+    static ByteString stringify_bell(VT::TerminalWidget::BellMode bell_mode);
+
+    VT::TerminalWidget::BellMode m_bell_mode { VT::TerminalWidget::BellMode::Disabled };
+    bool m_confirm_close { true };
+
+    VT::TerminalWidget::BellMode m_original_bell_mode;
+    bool m_orignal_confirm_close { true };
+};

Userland/Applications/TerminalSettings/ViewWidget.cpp

@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "TerminalSettingsWidget.h"
+#include "ViewWidget.h"
 #include <AK/Assertions.h>
 #include <AK/JsonObject.h>
 #include <AK/QuickSort.h>
-#include <Applications/TerminalSettings/TerminalSettingsMainGML.h>
 #include <Applications/TerminalSettings/TerminalSettingsViewGML.h>
 #include <LibConfig/Client.h>
 #include <LibCore/DirIterator.h>
@@ -29,64 +28,6 @@
 #include <LibVT/TerminalWidget.h>
 #include <spawn.h>
 
-ErrorOr<NonnullRefPtr<TerminalSettingsMainWidget>> TerminalSettingsMainWidget::try_create()
-{
-    auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) TerminalSettingsMainWidget()));
-    TRY(widget->setup());
-    return widget;
-}
-
-ErrorOr<void> TerminalSettingsMainWidget::setup()
-{
-    TRY(load_from_gml(terminal_settings_main_gml));
-
-    auto& beep_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("beep_bell_radio");
-    auto& visual_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("visual_bell_radio");
-    auto& no_bell_radio = *find_descendant_of_type_named<GUI::RadioButton>("no_bell_radio");
-
-    m_bell_mode = parse_bell(Config::read_string("Terminal"sv, "Window"sv, "Bell"sv));
-    m_original_bell_mode = m_bell_mode;
-
-    switch (m_bell_mode) {
-    case VT::TerminalWidget::BellMode::Visible:
-        visual_bell_radio.set_checked(true, GUI::AllowCallback::No);
-        break;
-    case VT::TerminalWidget::BellMode::AudibleBeep:
-        beep_bell_radio.set_checked(true, GUI::AllowCallback::No);
-        break;
-    case VT::TerminalWidget::BellMode::Disabled:
-        no_bell_radio.set_checked(true, GUI::AllowCallback::No);
-        break;
-    }
-
-    beep_bell_radio.on_checked = [this](bool) {
-        m_bell_mode = VT::TerminalWidget::BellMode::AudibleBeep;
-        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
-        set_modified(true);
-    };
-    visual_bell_radio.on_checked = [this](bool) {
-        m_bell_mode = VT::TerminalWidget::BellMode::Visible;
-        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
-        set_modified(true);
-    };
-    no_bell_radio.on_checked = [this](bool) {
-        m_bell_mode = VT::TerminalWidget::BellMode::Disabled;
-        Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_bell_mode));
-        set_modified(true);
-    };
-
-    m_confirm_close = Config::read_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, true);
-    m_orignal_confirm_close = m_confirm_close;
-    auto& confirm_close_checkbox = *find_descendant_of_type_named<GUI::CheckBox>("terminal_confirm_close");
-    confirm_close_checkbox.on_checked = [&](bool confirm_close) {
-        m_confirm_close = confirm_close;
-        Config::write_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, confirm_close);
-        set_modified(true);
-    };
-    confirm_close_checkbox.set_checked(m_confirm_close, GUI::AllowCallback::No);
-    return {};
-}
-
 ErrorOr<NonnullRefPtr<TerminalSettingsViewWidget>> TerminalSettingsViewWidget::try_create()
 {
     auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) TerminalSettingsViewWidget()));
@@ -225,45 +166,6 @@ ErrorOr<void> TerminalSettingsViewWidget::setup()
     return {};
 }
 
-VT::TerminalWidget::BellMode TerminalSettingsMainWidget::parse_bell(StringView bell_string)
-{
-    if (bell_string == "AudibleBeep")
-        return VT::TerminalWidget::BellMode::AudibleBeep;
-    if (bell_string == "Visible")
-        return VT::TerminalWidget::BellMode::Visible;
-    if (bell_string == "Disabled")
-        return VT::TerminalWidget::BellMode::Disabled;
-    VERIFY_NOT_REACHED();
-}
-
-ByteString TerminalSettingsMainWidget::stringify_bell(VT::TerminalWidget::BellMode bell_mode)
-{
-    if (bell_mode == VT::TerminalWidget::BellMode::AudibleBeep)
-        return "AudibleBeep";
-    if (bell_mode == VT::TerminalWidget::BellMode::Disabled)
-        return "Disabled";
-    if (bell_mode == VT::TerminalWidget::BellMode::Visible)
-        return "Visible";
-    VERIFY_NOT_REACHED();
-}
-
-void TerminalSettingsMainWidget::apply_settings()
-{
-    m_original_bell_mode = m_bell_mode;
-    m_orignal_confirm_close = m_confirm_close;
-    write_back_settings();
-}
-void TerminalSettingsMainWidget::write_back_settings() const
-{
-    Config::write_bool("Terminal"sv, "Terminal"sv, "ConfirmClose"sv, m_orignal_confirm_close);
-    Config::write_string("Terminal"sv, "Window"sv, "Bell"sv, stringify_bell(m_original_bell_mode));
-}
-
-void TerminalSettingsMainWidget::cancel_settings()
-{
-    write_back_settings();
-}
-
 void TerminalSettingsViewWidget::apply_settings()
 {
     m_original_opacity = m_opacity;

Userland/Applications/TerminalSettings/ViewWidget.h

@@ -13,29 +13,6 @@
 #include <LibGUI/TextEditor.h>
 #include <LibVT/TerminalWidget.h>
 
-class TerminalSettingsMainWidget final : public GUI::SettingsWindow::Tab {
-    C_OBJECT_ABSTRACT(TerminalSettingsMainWidget)
-public:
-    static ErrorOr<NonnullRefPtr<TerminalSettingsMainWidget>> try_create();
-
-    virtual void apply_settings() override;
-    virtual void cancel_settings() override;
-
-private:
-    TerminalSettingsMainWidget() = default;
-    ErrorOr<void> setup();
-    void write_back_settings() const;
-
-    static VT::TerminalWidget::BellMode parse_bell(StringView bell_string);
-    static ByteString stringify_bell(VT::TerminalWidget::BellMode bell_mode);
-
-    VT::TerminalWidget::BellMode m_bell_mode { VT::TerminalWidget::BellMode::Disabled };
-    bool m_confirm_close { true };
-
-    VT::TerminalWidget::BellMode m_original_bell_mode;
-    bool m_orignal_confirm_close { true };
-};
-
 class TerminalSettingsViewWidget final : public GUI::SettingsWindow::Tab {
     C_OBJECT_ABSTRACT(TerminalSettingsViewWidget)
 public:

Userland/Applications/TerminalSettings/main.cpp

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include "TerminalSettingsWidget.h"
+#include "MainWidget.h"
+#include "ViewWidget.h"
 #include <LibConfig/Client.h>
 #include <LibCore/ArgsParser.h>
 #include <LibCore/System.h>