From cf6676beb2a12e2b5d28bed022d51f6482feda17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Thu, 9 Feb 2023 13:22:40 +0100 Subject: [PATCH] Piano: Rename KnobsWidget to TrackControlsWidget This more generic name will better reflect the purpose of the widget in the future, as this commit begins the long process of enhancing the widget into a container for all controls of Piano's currently selected track. --- Userland/Applications/Piano/CMakeLists.txt | 2 +- Userland/Applications/Piano/MainWidget.cpp | 4 ++-- Userland/Applications/Piano/MainWidget.h | 4 ++-- .../Piano/{KnobsWidget.cpp => TrackControlsWidget.cpp} | 6 +++--- .../Piano/{KnobsWidget.h => TrackControlsWidget.h} | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename Userland/Applications/Piano/{KnobsWidget.cpp => TrackControlsWidget.cpp} (93%) rename Userland/Applications/Piano/{KnobsWidget.h => TrackControlsWidget.h} (81%) diff --git a/Userland/Applications/Piano/CMakeLists.txt b/Userland/Applications/Piano/CMakeLists.txt index f6811145de..37048126cb 100644 --- a/Userland/Applications/Piano/CMakeLists.txt +++ b/Userland/Applications/Piano/CMakeLists.txt @@ -11,12 +11,12 @@ set(SOURCES AudioPlayerLoop.cpp ExportProgressWindow.cpp KeysWidget.cpp - KnobsWidget.cpp main.cpp MainWidget.cpp PlayerWidget.cpp RollWidget.cpp SamplerWidget.cpp + TrackControlsWidget.cpp TrackManager.cpp WaveWidget.cpp ProcessorParameterWidget/ParameterWidget.cpp diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index d60f0a3762..c7ad9050a7 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -8,10 +8,10 @@ #include "MainWidget.h" #include "KeysWidget.h" -#include "KnobsWidget.h" #include "PlayerWidget.h" #include "RollWidget.h" #include "SamplerWidget.h" +#include "TrackControlsWidget.h" #include "TrackManager.h" #include "WaveWidget.h" #include @@ -55,7 +55,7 @@ ErrorOr MainWidget::initialize() m_keys_widget = TRY(m_keys_and_knobs_container->try_add(m_track_manager.keyboard())); - m_knobs_widget = TRY(m_keys_and_knobs_container->try_add(m_track_manager, *this)); + m_knobs_widget = TRY(m_keys_and_knobs_container->try_add(m_track_manager, *this)); m_roll_widget->set_keys_widget(m_keys_widget); diff --git a/Userland/Applications/Piano/MainWidget.h b/Userland/Applications/Piano/MainWidget.h index 815a6461cd..2ec91dfc7f 100644 --- a/Userland/Applications/Piano/MainWidget.h +++ b/Userland/Applications/Piano/MainWidget.h @@ -19,7 +19,7 @@ class WaveWidget; class RollWidget; class SamplerWidget; class KeysWidget; -class KnobsWidget; +class TrackControlsWidget; class PlayerWidget; class MainWidget final : public GUI::Widget { @@ -57,7 +57,7 @@ private: RefPtr m_tab_widget; RefPtr m_keys_and_knobs_container; RefPtr m_keys_widget; - RefPtr m_knobs_widget; + RefPtr m_knobs_widget; RefPtr m_player_widget; // Not the piano keys, but the computer keyboard keys! diff --git a/Userland/Applications/Piano/KnobsWidget.cpp b/Userland/Applications/Piano/TrackControlsWidget.cpp similarity index 93% rename from Userland/Applications/Piano/KnobsWidget.cpp rename to Userland/Applications/Piano/TrackControlsWidget.cpp index cfa8c0d21f..f1d904940e 100644 --- a/Userland/Applications/Piano/KnobsWidget.cpp +++ b/Userland/Applications/Piano/TrackControlsWidget.cpp @@ -6,7 +6,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "KnobsWidget.h" +#include "TrackControlsWidget.h" #include "MainWidget.h" #include "ProcessorParameterWidget/ParameterWidget.h" #include "TrackManager.h" @@ -16,7 +16,7 @@ #include #include -KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) +TrackControlsWidget::TrackControlsWidget(TrackManager& track_manager, MainWidget& main_widget) : m_track_manager(track_manager) , m_main_widget(main_widget) { @@ -52,7 +52,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) m_parameter_widgets.append(add(parameter)); } -void KnobsWidget::update_knobs() +void TrackControlsWidget::update_knobs() { // FIXME: This is needed because when the slider is changed normally, we // need to change the underlying value, but if the keyboard was used, we diff --git a/Userland/Applications/Piano/KnobsWidget.h b/Userland/Applications/Piano/TrackControlsWidget.h similarity index 81% rename from Userland/Applications/Piano/KnobsWidget.h rename to Userland/Applications/Piano/TrackControlsWidget.h index 2165697317..ff0fbdb560 100644 --- a/Userland/Applications/Piano/KnobsWidget.h +++ b/Userland/Applications/Piano/TrackControlsWidget.h @@ -19,15 +19,15 @@ class TrackManager; class MainWidget; -class KnobsWidget final : public GUI::Frame { - C_OBJECT(KnobsWidget) +class TrackControlsWidget final : public GUI::Frame { + C_OBJECT(TrackControlsWidget) public: - virtual ~KnobsWidget() override = default; + virtual ~TrackControlsWidget() override = default; void update_knobs(); private: - KnobsWidget(TrackManager&, MainWidget&); + TrackControlsWidget(TrackManager&, MainWidget&); TrackManager& m_track_manager; MainWidget& m_main_widget;