From 7f6bee603b1114d96f0309c43a7ed6e5e3bf9a44 Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Mon, 2 Dec 2024 20:52:29 +0100
Subject: [PATCH] frontend: Add renamed Qt Settings UI implementation

---
 .../settings/OBSBasicSettings_A11y.cpp        |  9 +++---
 .../settings/OBSBasicSettings_Appearance.cpp  | 20 +++---------
 .../settings/OBSBasicSettings_Stream.cpp      | 31 +++++++------------
 3 files changed, 20 insertions(+), 40 deletions(-)
 rename UI/window-basic-settings-a11y.cpp => frontend/settings/OBSBasicSettings_A11y.cpp (98%)
 rename UI/window-basic-settings-appearance.cpp => frontend/settings/OBSBasicSettings_Appearance.cpp (88%)
 rename UI/window-basic-settings-stream.cpp => frontend/settings/OBSBasicSettings_Stream.cpp (99%)

diff --git a/UI/window-basic-settings-a11y.cpp b/frontend/settings/OBSBasicSettings_A11y.cpp
similarity index 98%
rename from UI/window-basic-settings-a11y.cpp
rename to frontend/settings/OBSBasicSettings_A11y.cpp
index d50cbfded..15bf42435 100644
--- a/UI/window-basic-settings-a11y.cpp
+++ b/frontend/settings/OBSBasicSettings_A11y.cpp
@@ -1,8 +1,7 @@
-#include "window-basic-settings.hpp"
-#include "window-basic-main.hpp"
-#include "obs-frontend-api.h"
-#include "obs-app.hpp"
-#include <qt-wrappers.hpp>
+#include "OBSBasicSettings.hpp"
+
+#include <widgets/OBSBasic.hpp>
+
 #include <QColorDialog>
 
 enum ColorPreset {
diff --git a/UI/window-basic-settings-appearance.cpp b/frontend/settings/OBSBasicSettings_Appearance.cpp
similarity index 88%
rename from UI/window-basic-settings-appearance.cpp
rename to frontend/settings/OBSBasicSettings_Appearance.cpp
index cdfbc92f5..80e3fc914 100644
--- a/UI/window-basic-settings-appearance.cpp
+++ b/frontend/settings/OBSBasicSettings_Appearance.cpp
@@ -1,21 +1,9 @@
-#include "window-basic-settings.hpp"
-#include "window-basic-main.hpp"
-#include "obs-frontend-api.h"
-#include "qt-wrappers.hpp"
-#include "platform.hpp"
-#include "obs-app.hpp"
+#include "OBSBasicSettings.hpp"
 
-#include <QColorDialog>
-#include <QDirIterator>
-#include <QFile>
-#include <QMetaEnum>
-#include <QObject>
-#include <QRandomGenerator>
-#include <QPainter>
+#include <OBSApp.hpp>
+#include <utility/platform.hpp>
 
-#include "util/profiler.hpp"
-
-using namespace std;
+#include <qt-wrappers.hpp>
 
 void OBSBasicSettings::InitAppearancePage()
 {
diff --git a/UI/window-basic-settings-stream.cpp b/frontend/settings/OBSBasicSettings_Stream.cpp
similarity index 99%
rename from UI/window-basic-settings-stream.cpp
rename to frontend/settings/OBSBasicSettings_Stream.cpp
index 885c49f8a..eff5d7de3 100644
--- a/UI/window-basic-settings-stream.cpp
+++ b/frontend/settings/OBSBasicSettings_Stream.cpp
@@ -1,25 +1,17 @@
-#include <QMessageBox>
-#include <QUrl>
-#include <QUuid>
-#include <qt-wrappers.hpp>
-
-#include "window-basic-settings.hpp"
-#include "obs-frontend-api.h"
-#include "obs-app.hpp"
-#include "window-basic-main.hpp"
-#include "url-push-button.hpp"
-
-#ifdef BROWSER_AVAILABLE
-#include <browser-panel.hpp>
-#endif
-
-#include "auth-oauth.hpp"
-
-#include "ui-config.h"
+#include "OBSBasicSettings.hpp"
 
 #ifdef YOUTUBE_ENABLED
-#include "youtube-api-wrappers.hpp"
+#include <docks/YouTubeAppDock.hpp>
 #endif
+#include <oauth/OAuth.hpp>
+#ifdef YOUTUBE_ENABLED
+#include <utility/YoutubeApiWrappers.hpp>
+#endif
+#include <widgets/OBSBasic.hpp>
+
+#include <qt-wrappers.hpp>
+
+#include <QUuid>
 
 static const QUuid &CustomServerUUID()
 {
@@ -32,6 +24,7 @@ struct QCefCookieManager;
 
 extern QCef *cef;
 extern QCefCookieManager *panel_cookies;
+extern bool cef_js_avail;
 
 enum class ListOpt : int {
 	ShowAll = 1,