From 3bbda4803e3006ca0b649a943cecee2d78b8f3f9 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Sat, 30 Nov 2024 16:41:38 +0100 Subject: [PATCH] frontend: Add renamed Qt UI components This commit only contains Qt UI components that are self-contained, i.e. the translation units only contain code for a single class or interface and don't mix implementations. --- .../components/AbsoluteSlider.cpp | 3 ++- .../components/AbsoluteSlider.hpp | 1 - .../components/BalanceSlider.hpp | 2 +- .../components/ClickableLabel.hpp | 0 .../components/FocusList.cpp | 5 ++++- .../components/FocusList.hpp | 2 -- .../components/HScrollArea.cpp | 5 ++++- .../components/HScrollArea.hpp | 0 .../components/MediaControls.cpp | 14 ++++++------- .../components/MediaControls.hpp | 7 +++---- .../components/MenuButton.cpp | 6 ++++-- .../components/MenuButton.hpp | 0 .../components/Multiview.cpp | 11 +++++----- .../components/Multiview.hpp | 1 + .../components/MuteCheckBox.hpp | 0 .../components/NonCheckableButton.hpp | 2 ++ .../components/OBSAdvAudioCtrl.cpp | 20 +++++++++---------- .../components/OBSAdvAudioCtrl.hpp | 16 ++++++++------- .../components/OBSSourceLabel.cpp | 3 ++- .../components/OBSSourceLabel.hpp | 3 ++- .../components/SceneTree.cpp | 8 +++----- .../components/SceneTree.hpp | 5 +++-- .../components/UIValidation.cpp | 9 ++++----- .../components/UIValidation.hpp | 5 ++--- .../components/UrlPushButton.cpp | 6 +++--- .../components/UrlPushButton.hpp | 2 ++ 26 files changed, 74 insertions(+), 62 deletions(-) rename UI/absolute-slider.cpp => frontend/components/AbsoluteSlider.cpp (97%) rename UI/absolute-slider.hpp => frontend/components/AbsoluteSlider.hpp (96%) rename UI/balance-slider.hpp => frontend/components/BalanceSlider.hpp (100%) rename UI/clickable-label.hpp => frontend/components/ClickableLabel.hpp (100%) rename UI/focus-list.cpp => frontend/components/FocusList.cpp (89%) rename UI/focus-list.hpp => frontend/components/FocusList.hpp (92%) rename UI/horizontal-scroll-area.cpp => frontend/components/HScrollArea.cpp (75%) rename UI/horizontal-scroll-area.hpp => frontend/components/HScrollArea.hpp (100%) rename UI/media-controls.cpp => frontend/components/MediaControls.cpp (99%) rename UI/media-controls.hpp => frontend/components/MediaControls.hpp (97%) rename UI/menu-button.cpp => frontend/components/MenuButton.cpp (90%) rename UI/menu-button.hpp => frontend/components/MenuButton.hpp (100%) rename UI/multiview.cpp => frontend/components/Multiview.cpp (99%) rename UI/multiview.hpp => frontend/components/Multiview.hpp (99%) rename UI/mute-checkbox.hpp => frontend/components/MuteCheckBox.hpp (100%) rename UI/noncheckable-button.hpp => frontend/components/NonCheckableButton.hpp (92%) rename UI/adv-audio-control.cpp => frontend/components/OBSAdvAudioCtrl.cpp (98%) rename UI/adv-audio-control.hpp => frontend/components/OBSAdvAudioCtrl.hpp (96%) rename UI/source-label.cpp => frontend/components/OBSSourceLabel.cpp (95%) rename UI/source-label.hpp => frontend/components/OBSSourceLabel.hpp (99%) rename UI/scene-tree.cpp => frontend/components/SceneTree.cpp (98%) rename UI/scene-tree.hpp => frontend/components/SceneTree.hpp (95%) rename UI/ui-validation.cpp => frontend/components/UIValidation.cpp (96%) rename UI/ui-validation.hpp => frontend/components/UIValidation.hpp (97%) rename UI/url-push-button.cpp => frontend/components/UrlPushButton.cpp (83%) rename UI/url-push-button.hpp => frontend/components/UrlPushButton.hpp (90%) diff --git a/UI/absolute-slider.cpp b/frontend/components/AbsoluteSlider.cpp similarity index 97% rename from UI/absolute-slider.cpp rename to frontend/components/AbsoluteSlider.cpp index 8aedba825..9f2e76656 100644 --- a/UI/absolute-slider.cpp +++ b/frontend/components/AbsoluteSlider.cpp @@ -1,4 +1,5 @@ -#include "moc_absolute-slider.cpp" +#include "AbsoluteSlider.hpp" +#include "moc_AbsoluteSlider.cpp" AbsoluteSlider::AbsoluteSlider(QWidget *parent) : SliderIgnoreScroll(parent) { diff --git a/UI/absolute-slider.hpp b/frontend/components/AbsoluteSlider.hpp similarity index 96% rename from UI/absolute-slider.hpp rename to frontend/components/AbsoluteSlider.hpp index 67e0adb1f..8345037fe 100644 --- a/UI/absolute-slider.hpp +++ b/frontend/components/AbsoluteSlider.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include class AbsoluteSlider : public SliderIgnoreScroll { diff --git a/UI/balance-slider.hpp b/frontend/components/BalanceSlider.hpp similarity index 100% rename from UI/balance-slider.hpp rename to frontend/components/BalanceSlider.hpp index 06be1b5f8..780eb6310 100644 --- a/UI/balance-slider.hpp +++ b/frontend/components/BalanceSlider.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include class BalanceSlider : public QSlider { Q_OBJECT diff --git a/UI/clickable-label.hpp b/frontend/components/ClickableLabel.hpp similarity index 100% rename from UI/clickable-label.hpp rename to frontend/components/ClickableLabel.hpp diff --git a/UI/focus-list.cpp b/frontend/components/FocusList.cpp similarity index 89% rename from UI/focus-list.cpp rename to frontend/components/FocusList.cpp index d5148b3a1..ea65cf207 100644 --- a/UI/focus-list.cpp +++ b/frontend/components/FocusList.cpp @@ -1,6 +1,9 @@ -#include "moc_focus-list.cpp" +#include "FocusList.hpp" + #include +#include "moc_FocusList.cpp" + FocusList::FocusList(QWidget *parent) : QListWidget(parent) {} void FocusList::focusInEvent(QFocusEvent *event) diff --git a/UI/focus-list.hpp b/frontend/components/FocusList.hpp similarity index 92% rename from UI/focus-list.hpp rename to frontend/components/FocusList.hpp index 370dcbcc1..83c44419c 100644 --- a/UI/focus-list.hpp +++ b/frontend/components/FocusList.hpp @@ -2,8 +2,6 @@ #include -class QDragMoveEvent; - class FocusList : public QListWidget { Q_OBJECT diff --git a/UI/horizontal-scroll-area.cpp b/frontend/components/HScrollArea.cpp similarity index 75% rename from UI/horizontal-scroll-area.cpp rename to frontend/components/HScrollArea.cpp index 82ffc0d28..01d804dca 100644 --- a/UI/horizontal-scroll-area.cpp +++ b/frontend/components/HScrollArea.cpp @@ -1,5 +1,8 @@ +#include "HScrollArea.hpp" + #include -#include "moc_horizontal-scroll-area.cpp" + +#include "moc_HScrollArea.cpp" void HScrollArea::resizeEvent(QResizeEvent *event) { diff --git a/UI/horizontal-scroll-area.hpp b/frontend/components/HScrollArea.hpp similarity index 100% rename from UI/horizontal-scroll-area.hpp rename to frontend/components/HScrollArea.hpp diff --git a/UI/media-controls.cpp b/frontend/components/MediaControls.cpp similarity index 99% rename from UI/media-controls.cpp rename to frontend/components/MediaControls.cpp index df720cc3c..d19951dca 100644 --- a/UI/media-controls.cpp +++ b/frontend/components/MediaControls.cpp @@ -1,12 +1,12 @@ -#include "window-basic-main.hpp" -#include "moc_media-controls.cpp" -#include "obs-app.hpp" -#include -#include -#include - +#include "MediaControls.hpp" #include "ui_media-controls.h" +#include + +#include + +#include "moc_MediaControls.cpp" + void MediaControls::OBSMediaStopped(void *data, calldata_t *) { MediaControls *media = static_cast(data); diff --git a/UI/media-controls.hpp b/frontend/components/MediaControls.hpp similarity index 97% rename from UI/media-controls.hpp rename to frontend/components/MediaControls.hpp index 6a5ec5953..5a246facc 100644 --- a/UI/media-controls.hpp +++ b/frontend/components/MediaControls.hpp @@ -1,10 +1,9 @@ #pragma once -#include -#include -#include #include -#include + +#include +#include class Ui_MediaControls; diff --git a/UI/menu-button.cpp b/frontend/components/MenuButton.cpp similarity index 90% rename from UI/menu-button.cpp rename to frontend/components/MenuButton.cpp index 8c22efcfa..b67459563 100644 --- a/UI/menu-button.cpp +++ b/frontend/components/MenuButton.cpp @@ -1,7 +1,9 @@ -#include +#include "MenuButton.hpp" + #include #include -#include "moc_menu-button.cpp" + +#include "moc_MenuButton.cpp" void MenuButton::keyPressEvent(QKeyEvent *event) { diff --git a/UI/menu-button.hpp b/frontend/components/MenuButton.hpp similarity index 100% rename from UI/menu-button.hpp rename to frontend/components/MenuButton.hpp diff --git a/UI/multiview.cpp b/frontend/components/Multiview.cpp similarity index 99% rename from UI/multiview.cpp rename to frontend/components/Multiview.cpp index 9fc8883dc..c32c49377 100644 --- a/UI/multiview.cpp +++ b/frontend/components/Multiview.cpp @@ -1,8 +1,9 @@ -#include "multiview.hpp" -#include "window-basic-main.hpp" -#include "obs-app.hpp" -#include "platform.hpp" -#include "display-helpers.hpp" +#include "Multiview.hpp" + +#include +#include + +#include Multiview::Multiview() { diff --git a/UI/multiview.hpp b/frontend/components/Multiview.hpp similarity index 99% rename from UI/multiview.hpp rename to frontend/components/Multiview.hpp index 61abd690b..5c62ee5b3 100644 --- a/UI/multiview.hpp +++ b/frontend/components/Multiview.hpp @@ -1,6 +1,7 @@ #pragma once #include + #include enum class MultiviewLayout : uint8_t { diff --git a/UI/mute-checkbox.hpp b/frontend/components/MuteCheckBox.hpp similarity index 100% rename from UI/mute-checkbox.hpp rename to frontend/components/MuteCheckBox.hpp diff --git a/UI/noncheckable-button.hpp b/frontend/components/NonCheckableButton.hpp similarity index 92% rename from UI/noncheckable-button.hpp rename to frontend/components/NonCheckableButton.hpp index d5ef59a37..5892e996c 100644 --- a/UI/noncheckable-button.hpp +++ b/frontend/components/NonCheckableButton.hpp @@ -1,6 +1,8 @@ #pragma once #include +#include +#include /* Button with its checked property not changed when clicked. * Meant to be used in situations where manually changing the property diff --git a/UI/adv-audio-control.cpp b/frontend/components/OBSAdvAudioCtrl.cpp similarity index 98% rename from UI/adv-audio-control.cpp rename to frontend/components/OBSAdvAudioCtrl.cpp index 80c0a5c1c..01aa2e727 100644 --- a/UI/adv-audio-control.cpp +++ b/frontend/components/OBSAdvAudioCtrl.cpp @@ -1,14 +1,13 @@ -#include -#include -#include -#include -#include -#include -#include +#include "OBSAdvAudioCtrl.hpp" + +#include +#include + #include -#include "obs-app.hpp" -#include "moc_adv-audio-control.cpp" -#include "window-basic-main.hpp" + +#include + +#include "moc_OBSAdvAudioCtrl.cpp" #ifndef NSEC_PER_MSEC #define NSEC_PER_MSEC 1000000 @@ -16,6 +15,7 @@ #define MIN_DB -96.0 #define MAX_DB 26.0 + static inline void setMixer(obs_source_t *source, const int mixerIdx, const bool checked); OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_) : source(source_) diff --git a/UI/adv-audio-control.hpp b/frontend/components/OBSAdvAudioCtrl.hpp similarity index 96% rename from UI/adv-audio-control.hpp rename to frontend/components/OBSAdvAudioCtrl.hpp index 143b66222..6d12b3044 100644 --- a/UI/adv-audio-control.hpp +++ b/frontend/components/OBSAdvAudioCtrl.hpp @@ -1,17 +1,19 @@ #pragma once #include -#include -#include -#include -#include -#include "balance-slider.hpp" +#include +#include + +class BalanceSlider; +class QCheckBox; +class QComboBox; +class QDoubleSpinBox; class QGridLayout; class QLabel; class QSpinBox; -class QCheckBox; -class QComboBox; +class QStackedWidget; +class QWidget; enum class VolumeType { dB, diff --git a/UI/source-label.cpp b/frontend/components/OBSSourceLabel.cpp similarity index 95% rename from UI/source-label.cpp rename to frontend/components/OBSSourceLabel.cpp index 1abc1fa9a..efe81d958 100644 --- a/UI/source-label.cpp +++ b/frontend/components/OBSSourceLabel.cpp @@ -15,7 +15,8 @@ along with this program. If not, see . ******************************************************************************/ -#include "moc_source-label.cpp" +#include "OBSSourceLabel.hpp" +#include "moc_OBSSourceLabel.cpp" void OBSSourceLabel::SourceRenamed(void *data, calldata_t *params) { diff --git a/UI/source-label.hpp b/frontend/components/OBSSourceLabel.hpp similarity index 99% rename from UI/source-label.hpp rename to frontend/components/OBSSourceLabel.hpp index a73fa3c6d..c0e9f434f 100644 --- a/UI/source-label.hpp +++ b/frontend/components/OBSSourceLabel.hpp @@ -17,9 +17,10 @@ #pragma once -#include #include +#include + class OBSSourceLabel : public QLabel { Q_OBJECT; diff --git a/UI/scene-tree.cpp b/frontend/components/SceneTree.cpp similarity index 98% rename from UI/scene-tree.cpp rename to frontend/components/SceneTree.cpp index fc64b11f7..f96dce68c 100644 --- a/UI/scene-tree.cpp +++ b/frontend/components/SceneTree.cpp @@ -1,11 +1,9 @@ -#include "moc_scene-tree.cpp" +#include "SceneTree.hpp" -#include #include -#include -#include #include -#include + +#include "moc_SceneTree.cpp" SceneTree::SceneTree(QWidget *parent_) : QListWidget(parent_) { diff --git a/UI/scene-tree.hpp b/frontend/components/SceneTree.hpp similarity index 95% rename from UI/scene-tree.hpp rename to frontend/components/SceneTree.hpp index 5fc765a92..b4fb7dc67 100644 --- a/UI/scene-tree.hpp +++ b/frontend/components/SceneTree.hpp @@ -1,8 +1,9 @@ #pragma once #include -#include -#include +#include +#include +#include class SceneTree : public QListWidget { Q_OBJECT diff --git a/UI/ui-validation.cpp b/frontend/components/UIValidation.cpp similarity index 96% rename from UI/ui-validation.cpp rename to frontend/components/UIValidation.cpp index 482951604..3597949d0 100644 --- a/UI/ui-validation.cpp +++ b/frontend/components/UIValidation.cpp @@ -1,12 +1,11 @@ -#include "moc_ui-validation.cpp" +#include "UIValidation.hpp" + +#include -#include -#include #include #include -#include -#include +#include "moc_UIValidation.cpp" static int CountVideoSources() { diff --git a/UI/ui-validation.hpp b/frontend/components/UIValidation.hpp similarity index 97% rename from UI/ui-validation.hpp rename to frontend/components/UIValidation.hpp index 505db851d..dabccabd9 100644 --- a/UI/ui-validation.hpp +++ b/frontend/components/UIValidation.hpp @@ -1,10 +1,9 @@ #pragma once -#include -#include - #include +#include + enum class StreamSettingsAction { OpenSettings, Cancel, diff --git a/UI/url-push-button.cpp b/frontend/components/UrlPushButton.cpp similarity index 83% rename from UI/url-push-button.cpp rename to frontend/components/UrlPushButton.cpp index 32c39620d..1e7b68d04 100644 --- a/UI/url-push-button.cpp +++ b/frontend/components/UrlPushButton.cpp @@ -1,9 +1,9 @@ -#include "moc_url-push-button.cpp" +#include "UrlPushButton.hpp" -#include -#include #include +#include "moc_UrlPushButton.cpp" + void UrlPushButton::setTargetUrl(QUrl url) { setToolTip(url.toString()); diff --git a/UI/url-push-button.hpp b/frontend/components/UrlPushButton.hpp similarity index 90% rename from UI/url-push-button.hpp rename to frontend/components/UrlPushButton.hpp index 2668ade27..bcf331738 100644 --- a/UI/url-push-button.hpp +++ b/frontend/components/UrlPushButton.hpp @@ -1,7 +1,9 @@ #pragma once +#include #include #include +#include class UrlPushButton : public QPushButton { Q_OBJECT