From ccf5f6a3d827172bb97359d3699bb19de3be8c3d Mon Sep 17 00:00:00 2001
From: AdenKoperczak <awkoperczak@gmail.com>
Date: Mon, 28 Oct 2024 13:00:39 -0400
Subject: [PATCH] Added custom theme file selection dialog

---
 scwx-qt/source/scwx/qt/main/main.cpp          |  16 +-
 .../scwx/qt/settings/general_settings.cpp     |   9 +
 .../scwx/qt/settings/general_settings.hpp     |   1 +
 scwx-qt/source/scwx/qt/types/qt_types.cpp     |   3 +
 scwx-qt/source/scwx/qt/types/qt_types.hpp     |   3 +-
 scwx-qt/source/scwx/qt/ui/settings_dialog.cpp |  41 ++
 scwx-qt/source/scwx/qt/ui/settings_dialog.ui  | 460 ++++++++++--------
 7 files changed, 311 insertions(+), 222 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp
index 11b7f098..05b7c933 100644
--- a/scwx-qt/source/scwx/qt/main/main.cpp
+++ b/scwx-qt/source/scwx/qt/main/main.cpp
@@ -166,14 +166,20 @@ static void ConfigureTheme(const std::vector<std::string>& args)
 
    QGuiApplication::styleHints()->setColorScheme(qtColorScheme);
 
-   std::optional<std::string> paletteFile =
-      scwx::qt::types::GetQtPaletteFile(uiStyle);
+   std::optional<std::string> paletteFile;
+   if (uiStyle == scwx::qt::types::UiStyle::FusionCustom) {
+      paletteFile = generalSettings.theme_file().GetValue();
+   }
+   else
+   {
+      paletteFile = scwx::qt::types::GetQtPaletteFile(uiStyle);
+   }
+
    if (paletteFile)
    {
       QPalette defaultPalette = QApplication::style()->standardPalette();
-      QPalette palette =
-         Qt6CT::loadColorScheme(QString::fromStdString(*paletteFile),
-                                defaultPalette);
+      QPalette palette        = Qt6CT::loadColorScheme(
+         QString::fromStdString(*paletteFile), defaultPalette);
 
       if (defaultPalette == palette)
       {
diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
index fe3982e2..9eca4348 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
@@ -73,6 +73,7 @@ public:
       showMapCenter_.SetDefault(false);
       showMapLogo_.SetDefault(true);
       theme_.SetDefault(defaultThemeValue);
+      themeFile_.SetDefault("");
       trackLocation_.SetDefault(false);
       updateNotificationsEnabled_.SetDefault(true);
       warningsProvider_.SetDefault(defaultWarningsProviderValue);
@@ -161,6 +162,7 @@ public:
    SettingsVariable<bool>         showMapCenter_ {"show_map_center"};
    SettingsVariable<bool>         showMapLogo_ {"show_map_logo"};
    SettingsVariable<std::string>  theme_ {"theme"};
+   SettingsVariable<std::string>  themeFile_ {"theme_file"};
    SettingsVariable<bool>         trackLocation_ {"track_location"};
    SettingsVariable<bool> updateNotificationsEnabled_ {"update_notifications"};
    SettingsVariable<std::string> warningsProvider_ {"warnings_provider"};
@@ -193,6 +195,7 @@ GeneralSettings::GeneralSettings() :
                       &p->showMapCenter_,
                       &p->showMapLogo_,
                       &p->theme_,
+                      &p->themeFile_,
                       &p->trackLocation_,
                       &p->updateNotificationsEnabled_,
                       &p->warningsProvider_});
@@ -325,6 +328,11 @@ SettingsVariable<std::string>& GeneralSettings::theme() const
    return p->theme_;
 }
 
+SettingsVariable<std::string>& GeneralSettings::theme_file() const
+{
+   return p->themeFile_;
+}
+
 SettingsVariable<bool>& GeneralSettings::track_location() const
 {
    return p->trackLocation_;
@@ -385,6 +393,7 @@ bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
            lhs.p->showMapCenter_ == rhs.p->showMapCenter_ &&
            lhs.p->showMapLogo_ == rhs.p->showMapLogo_ &&
            lhs.p->theme_ == rhs.p->theme_ &&
+           lhs.p->themeFile_ == rhs.p->themeFile_ &&
            lhs.p->trackLocation_ == rhs.p->trackLocation_ &&
            lhs.p->updateNotificationsEnabled_ ==
               rhs.p->updateNotificationsEnabled_ &&
diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.hpp b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
index 2628aef1..3e527238 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
@@ -49,6 +49,7 @@ public:
    SettingsVariable<bool>&                       show_map_center() const;
    SettingsVariable<bool>&                       show_map_logo() const;
    SettingsVariable<std::string>&                theme() const;
+   SettingsVariable<std::string>&                theme_file() const;
    SettingsVariable<bool>&                       track_location() const;
    SettingsVariable<bool>&        update_notifications_enabled() const;
    SettingsVariable<std::string>& warnings_provider() const;
diff --git a/scwx-qt/source/scwx/qt/types/qt_types.cpp b/scwx-qt/source/scwx/qt/types/qt_types.cpp
index 5e5a96a7..0c10feb2 100644
--- a/scwx-qt/source/scwx/qt/types/qt_types.cpp
+++ b/scwx-qt/source/scwx/qt/types/qt_types.cpp
@@ -21,6 +21,7 @@ static const std::unordered_map<UiStyle, std::string> qtStyleName_ {
    {UiStyle::FusionIaOra, "Fusion"},
    {UiStyle::FusionSand, "Fusion"},
    {UiStyle::FusionWaves, "Fusion"},
+   {UiStyle::FusionCustom, "Fusion"},
    {UiStyle::Unknown, "?"}};
 
 static const std::unordered_map<UiStyle, std::string> uiStyleName_ {
@@ -34,6 +35,7 @@ static const std::unordered_map<UiStyle, std::string> uiStyleName_ {
    {UiStyle::FusionIaOra, "Fusion IA Ora"},
    {UiStyle::FusionSand, "Fusion Sand"},
    {UiStyle::FusionWaves, "Fusion Waves"},
+   {UiStyle::FusionCustom, "Fusion Custom"},
    {UiStyle::Unknown, "?"}};
 
 static const std::unordered_map<UiStyle, Qt::ColorScheme> qtColorSchemeMap_ {
@@ -47,6 +49,7 @@ static const std::unordered_map<UiStyle, Qt::ColorScheme> qtColorSchemeMap_ {
    {UiStyle::FusionIaOra, Qt::ColorScheme::Unknown},
    {UiStyle::FusionSand, Qt::ColorScheme::Unknown},
    {UiStyle::FusionWaves, Qt::ColorScheme::Unknown},
+   {UiStyle::FusionCustom, Qt::ColorScheme::Unknown},
    {UiStyle::Unknown, Qt::ColorScheme::Unknown}};
 
 static const std::unordered_map<UiStyle, std::string> paletteFile_ {
diff --git a/scwx-qt/source/scwx/qt/types/qt_types.hpp b/scwx-qt/source/scwx/qt/types/qt_types.hpp
index 9bb7ed5d..b5779ff1 100644
--- a/scwx-qt/source/scwx/qt/types/qt_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/qt_types.hpp
@@ -33,9 +33,10 @@ enum class UiStyle
    FusionIaOra,
    FusionSand,
    FusionWaves,
+   FusionCustom,
    Unknown
 };
-typedef scwx::util::Iterator<UiStyle, UiStyle::Default, UiStyle::FusionWaves>
+typedef scwx::util::Iterator<UiStyle, UiStyle::Default, UiStyle::FusionCustom>
    UiStyleIterator;
 
 Qt::ColorScheme            GetQtColorScheme(UiStyle uiStyle);
diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
index d4f4f096..20616204 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -121,6 +121,7 @@ public:
           &mapboxApiKey_,
           &mapTilerApiKey_,
           &theme_,
+          &themeFile_,
           &defaultAlertAction_,
           &clockFormat_,
           &customStyleDrawLayer_,
@@ -242,6 +243,7 @@ public:
    settings::SettingsInterface<std::int64_t> nmeaBaudRate_ {};
    settings::SettingsInterface<std::string>  nmeaSource_ {};
    settings::SettingsInterface<std::string>  theme_ {};
+   settings::SettingsInterface<std::string>  themeFile_ {};
    settings::SettingsInterface<std::string>  warningsProvider_ {};
    settings::SettingsInterface<bool>         antiAliasingEnabled_ {};
    settings::SettingsInterface<bool>         showMapAttribution_ {};
@@ -526,6 +528,45 @@ void SettingsDialogImpl::SetupGeneralTab()
                            types::GetUiStyleName);
    theme_.SetResetButton(self_->ui->resetThemeButton);
 
+   themeFile_.SetSettingsVariable(generalSettings.theme_file());
+   themeFile_.SetEditWidget(self_->ui->themeFileLineEdit);
+   themeFile_.SetResetButton(self_->ui->resetThemeFileButton);
+   //themeFile_.EnableTrimming();
+
+   QObject::connect(
+      self_->ui->themeFileSelectButton,
+      &QAbstractButton::clicked,
+      self_,
+      [this]()
+      {
+         static const std::string themeFilter = "Qt6Ct Theme File (*.conf)";
+         static const std::string allFilter   = "All Files (*)";
+
+         QFileDialog* dialog = new QFileDialog(self_);
+
+         dialog->setFileMode(QFileDialog::ExistingFile);
+
+         dialog->setNameFilters(
+            {QObject::tr(themeFilter.c_str()), QObject::tr(allFilter.c_str())});
+         dialog->setAttribute(Qt::WA_DeleteOnClose);
+
+         QObject::connect(
+            dialog,
+            &QFileDialog::fileSelected,
+            self_,
+            [this](const QString& file)
+            {
+               QString path = QDir::toNativeSeparators(file);
+               logger_->info("Selected theme file: {}", path.toStdString());
+               self_->ui->themeFileLineEdit->setText(path);
+
+               // setText dows not emit the textEdited signal
+               Q_EMIT self_->ui->themeFileLineEdit->textEdited(path);
+            });
+
+         dialog->open();
+      });
+
    auto radarSites = config::RadarSite::GetAll();
 
    // Sort radar sites by ID
diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
index 444e6705..f66aba6c 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
@@ -135,9 +135,9 @@
               <property name="geometry">
                <rect>
                 <x>0</x>
-                <y>0</y>
-                <width>513</width>
-                <height>622</height>
+                <y>-133</y>
+                <width>511</width>
+                <height>676</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout">
@@ -159,15 +159,39 @@
                   <property name="bottomMargin">
                    <number>0</number>
                   </property>
-                  <item row="13" column="0">
-                   <widget class="QLabel" name="label_6">
+                  <item row="3" column="3">
+                   <widget class="QToolButton" name="radarSiteSelectButton">
                     <property name="text">
-                     <string>MapTiler API Key</string>
+                     <string>...</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="6" column="4">
-                   <widget class="QToolButton" name="resetGridHeightButton">
+                  <item row="12" column="0">
+                   <widget class="QLabel" name="label_4">
+                    <property name="text">
+                     <string>Mapbox API Key</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="15" column="0">
+                   <widget class="QLabel" name="label_27">
+                    <property name="text">
+                     <string>Custom Map Layer</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="3" column="2">
+                   <widget class="QComboBox" name="radarSiteComboBox"/>
+                  </item>
+                  <item row="8" column="0">
+                   <widget class="QLabel" name="label_23">
+                    <property name="text">
+                     <string>GPS Plugin</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="9" column="4">
+                   <widget class="QToolButton" name="resetNmeaSourceButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -180,15 +204,18 @@
                   <item row="11" column="2">
                    <widget class="QComboBox" name="mapProviderComboBox"/>
                   </item>
-                  <item row="4" column="0">
-                   <widget class="QLabel" name="label_21">
+                  <item row="14" column="2">
+                   <widget class="QLineEdit" name="customMapUrlLineEdit"/>
+                  </item>
+                  <item row="9" column="3">
+                   <widget class="QToolButton" name="gpsSourceSelectButton">
                     <property name="text">
-                     <string>Default Time Zone</string>
+                     <string>...</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="12" column="4">
-                   <widget class="QToolButton" name="resetMapboxApiKeyButton">
+                  <item row="15" column="4">
+                   <widget class="QToolButton" name="resetCustomMapLayerButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -198,30 +225,34 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="6" column="2">
-                   <widget class="QSpinBox" name="gridHeightSpinBox"/>
-                  </item>
-                  <item row="4" column="4">
-                   <widget class="QToolButton" name="resetDefaultTimeZoneButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="11" column="0">
-                   <widget class="QLabel" name="label_7">
-                    <property name="text">
-                     <string>Map Provider</string>
-                    </property>
-                   </widget>
-                  </item>
                   <item row="4" column="2">
                    <widget class="QComboBox" name="defaultTimeZoneComboBox"/>
                   </item>
+                  <item row="6" column="2">
+                   <widget class="QSpinBox" name="gridHeightSpinBox"/>
+                  </item>
+                  <item row="11" column="4">
+                   <widget class="QToolButton" name="resetMapProviderButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="14" column="4">
+                   <widget class="QToolButton" name="resetCustomMapUrlButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="18" column="4">
                    <widget class="QToolButton" name="resetThemeButton">
                     <property name="text">
@@ -233,77 +264,9 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="1" column="2">
-                   <widget class="QComboBox" name="clockFormatComboBox"/>
-                  </item>
-                  <item row="3" column="2">
-                   <widget class="QComboBox" name="radarSiteComboBox"/>
-                  </item>
-                  <item row="9" column="3">
-                   <widget class="QToolButton" name="gpsSourceSelectButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="12" column="2">
-                   <widget class="QLineEdit" name="mapboxApiKeyLineEdit">
-                    <property name="echoMode">
-                     <enum>QLineEdit::EchoMode::Password</enum>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="8" column="0">
-                   <widget class="QLabel" name="label_23">
-                    <property name="text">
-                     <string>GPS Plugin</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="10" column="0">
-                   <widget class="QLabel" name="label_24">
-                    <property name="text">
-                     <string>GPS Baud Rate</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="5" column="2">
-                   <widget class="QSpinBox" name="gridWidthSpinBox"/>
-                  </item>
-                  <item row="3" column="3">
-                   <widget class="QToolButton" name="radarSiteSelectButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="21" column="4">
-                   <widget class="QToolButton" name="resetWarningsProviderButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="5" column="0">
-                   <widget class="QLabel" name="label_2">
-                    <property name="text">
-                     <string>Grid Width</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="9" column="2">
-                   <widget class="QLineEdit" name="nmeaSourceLineEdit"/>
-                  </item>
                   <item row="18" column="2">
                    <widget class="QComboBox" name="themeComboBox"/>
                   </item>
-                  <item row="8" column="2">
-                   <widget class="QComboBox" name="positioningPluginComboBox"/>
-                  </item>
                   <item row="9" column="0">
                    <widget class="QLabel" name="label_25">
                     <property name="text">
@@ -311,9 +274,16 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="21" column="2">
+                  <item row="22" column="2">
                    <widget class="QLineEdit" name="warningsProviderLineEdit"/>
                   </item>
+                  <item row="22" column="0">
+                   <widget class="QLabel" name="label_22">
+                    <property name="text">
+                     <string>Warnings Provider</string>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="3" column="0">
                    <widget class="QLabel" name="label">
                     <property name="text">
@@ -339,8 +309,8 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="2" column="4">
-                   <widget class="QToolButton" name="resetDefaultAlertActionButton">
+                  <item row="13" column="4">
+                   <widget class="QToolButton" name="resetMapTilerApiKeyButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -350,45 +320,66 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="18" column="0">
-                   <widget class="QLabel" name="label_5">
-                    <property name="text">
-                     <string>Theme</string>
+                  <item row="10" column="2">
+                   <widget class="QSpinBox" name="nmeaBaudRateSpinBox">
+                    <property name="minimum">
+                     <number>1</number>
+                    </property>
+                    <property name="maximum">
+                     <number>999999999</number>
                     </property>
                    </widget>
                   </item>
-                  <item row="1" column="4">
-                   <widget class="QToolButton" name="resetClockFormatButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="12" column="0">
-                   <widget class="QLabel" name="label_4">
-                    <property name="text">
-                     <string>Mapbox API Key</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="label_20">
-                    <property name="text">
-                     <string>Clock Format</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="13" column="2">
-                   <widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
+                  <item row="12" column="2">
+                   <widget class="QLineEdit" name="mapboxApiKeyLineEdit">
                     <property name="echoMode">
                      <enum>QLineEdit::EchoMode::Password</enum>
                     </property>
                    </widget>
                   </item>
+                  <item row="22" column="4">
+                   <widget class="QToolButton" name="resetWarningsProviderButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="9" column="2">
+                   <widget class="QLineEdit" name="nmeaSourceLineEdit"/>
+                  </item>
+                  <item row="10" column="0">
+                   <widget class="QLabel" name="label_24">
+                    <property name="text">
+                     <string>GPS Baud Rate</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="6" column="4">
+                   <widget class="QToolButton" name="resetGridHeightButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="12" column="4">
+                   <widget class="QToolButton" name="resetMapboxApiKeyButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="5" column="4">
                    <widget class="QToolButton" name="resetGridWidthButton">
                     <property name="text">
@@ -400,8 +391,8 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="13" column="4">
-                   <widget class="QToolButton" name="resetMapTilerApiKeyButton">
+                  <item row="4" column="4">
+                   <widget class="QToolButton" name="resetDefaultTimeZoneButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -411,35 +402,56 @@
                     </property>
                    </widget>
                   </item>
+                  <item row="11" column="0">
+                   <widget class="QLabel" name="label_7">
+                    <property name="text">
+                     <string>Map Provider</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="5" column="2">
+                   <widget class="QSpinBox" name="gridWidthSpinBox"/>
+                  </item>
+                  <item row="18" column="0">
+                   <widget class="QLabel" name="label_5">
+                    <property name="text">
+                     <string>Theme</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="13" column="0">
+                   <widget class="QLabel" name="label_6">
+                    <property name="text">
+                     <string>MapTiler API Key</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="1" column="4">
+                   <widget class="QToolButton" name="resetClockFormatButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="15" column="2">
+                   <widget class="QLineEdit" name="customMapLayerLineEdit"/>
+                  </item>
+                  <item row="14" column="0">
+                   <widget class="QLabel" name="label_26">
+                    <property name="text">
+                     <string>Custom Map URL</string>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="2" column="2">
                    <widget class="QComboBox" name="defaultAlertActionComboBox"/>
                   </item>
-                  <item row="21" column="0">
-                   <widget class="QLabel" name="label_22">
-                    <property name="text">
-                     <string>Warnings Provider</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="10" column="2">
-                   <widget class="QSpinBox" name="nmeaBaudRateSpinBox">
-                    <property name="minimum">
-                     <number>1</number>
-                    </property>
-                    <property name="maximum">
-                     <number>999999999</number>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="defaultAlertActionLabel">
-                    <property name="text">
-                     <string>Default Alert Action</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="11" column="4">
-                   <widget class="QToolButton" name="resetMapProviderButton">
+                  <item row="10" column="4">
+                   <widget class="QToolButton" name="resetNmeaBaudRateButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -449,6 +461,38 @@
                     </property>
                    </widget>
                   </item>
+                  <item row="1" column="0">
+                   <widget class="QLabel" name="label_20">
+                    <property name="text">
+                     <string>Clock Format</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="4">
+                   <widget class="QToolButton" name="resetDefaultAlertActionButton">
+                    <property name="text">
+                     <string>...</string>
+                    </property>
+                    <property name="icon">
+                     <iconset resource="../../../../scwx-qt.qrc">
+                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="5" column="0">
+                   <widget class="QLabel" name="label_2">
+                    <property name="text">
+                     <string>Grid Width</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="13" column="2">
+                   <widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
+                    <property name="echoMode">
+                     <enum>QLineEdit::EchoMode::Password</enum>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="8" column="4">
                    <widget class="QToolButton" name="resetPositioningPluginButton">
                     <property name="text">
@@ -460,61 +504,45 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="9" column="4">
-                   <widget class="QToolButton" name="resetNmeaSourceButton">
+                  <item row="4" column="0">
+                   <widget class="QLabel" name="label_21">
+                    <property name="text">
+                     <string>Default Time Zone</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="2" column="0">
+                   <widget class="QLabel" name="defaultAlertActionLabel">
+                    <property name="text">
+                     <string>Default Alert Action</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="8" column="2">
+                   <widget class="QComboBox" name="positioningPluginComboBox"/>
+                  </item>
+                  <item row="1" column="2">
+                   <widget class="QComboBox" name="clockFormatComboBox"/>
+                  </item>
+                  <item row="19" column="0">
+                   <widget class="QLabel" name="label_30">
+                    <property name="text">
+                     <string>Theme File</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="19" column="2">
+                   <widget class="QLineEdit" name="themeFileLineEdit"/>
+                  </item>
+                  <item row="19" column="3">
+                   <widget class="QToolButton" name="themeFileSelectButton">
                     <property name="text">
                      <string>...</string>
                     </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
                    </widget>
                   </item>
-                  <item row="10" column="4">
-                   <widget class="QToolButton" name="resetNmeaBaudRateButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="14" column="2">
-                   <widget class="QLineEdit" name="customMapUrlLineEdit"/>
-                  </item>
-                  <item row="15" column="2">
-                   <widget class="QLineEdit" name="customMapLayerLineEdit"/>
-                  </item>
-                  <item row="14" column="0">
-                   <widget class="QLabel" name="label_26">
-                    <property name="text">
-                     <string>Custom Map URL</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="15" column="0">
-                   <widget class="QLabel" name="label_27">
-                    <property name="text">
-                     <string>Custom Map Layer</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="14" column="4">
-                   <widget class="QToolButton" name="resetCustomMapUrlButton">
-                    <property name="text">
-                     <string>...</string>
-                    </property>
-                    <property name="icon">
-                     <iconset resource="../../../../scwx-qt.qrc">
-                      <normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="15" column="4">
-                   <widget class="QToolButton" name="resetCustomMapLayerButton">
+                  <item row="19" column="4">
+                   <widget class="QToolButton" name="resetThemeFileButton">
                     <property name="text">
                      <string>...</string>
                     </property>
@@ -610,8 +638,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>506</width>
-                    <height>383</height>
+                    <width>98</width>
+                    <height>28</height>
                    </rect>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_3">