From 7cfb55a4defe8fafb526b8144cf51c001eab2aec Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Wed, 6 Mar 2024 23:13:18 -0600
Subject: [PATCH] Add map logo and attribution toggle to settings

---
 .../scwx/qt/settings/general_settings.cpp      | 18 ++++++++++++++++++
 .../scwx/qt/settings/general_settings.hpp      |  2 ++
 scwx-qt/source/scwx/qt/ui/settings_dialog.cpp  | 11 +++++++++++
 scwx-qt/source/scwx/qt/ui/settings_dialog.ui   | 18 ++++++++++++++++--
 test/data                                      |  2 +-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/settings/general_settings.cpp b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
index bcf5f5ad..b2f597a3 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.cpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.cpp
@@ -46,6 +46,8 @@ public:
       mapProvider_.SetDefault(defaultMapProviderValue);
       mapboxApiKey_.SetDefault("?");
       maptilerApiKey_.SetDefault("?");
+      showMapAttribution_.SetDefault(true);
+      showMapLogo_.SetDefault(true);
       theme_.SetDefault(defaultThemeValue);
       trackLocation_.SetDefault(false);
       updateNotificationsEnabled_.SetDefault(true);
@@ -142,6 +144,8 @@ public:
    SettingsVariable<std::string>                mapProvider_ {"map_provider"};
    SettingsVariable<std::string> mapboxApiKey_ {"mapbox_api_key"};
    SettingsVariable<std::string> maptilerApiKey_ {"maptiler_api_key"};
+   SettingsVariable<bool>        showMapAttribution_ {"show_map_attribution"};
+   SettingsVariable<bool>        showMapLogo_ {"show_map_logo"};
    SettingsVariable<std::string> theme_ {"theme"};
    SettingsVariable<bool>        trackLocation_ {"track_location"};
    SettingsVariable<bool> updateNotificationsEnabled_ {"update_notifications"};
@@ -163,6 +167,8 @@ GeneralSettings::GeneralSettings() :
                       &p->mapProvider_,
                       &p->mapboxApiKey_,
                       &p->maptilerApiKey_,
+                      &p->showMapAttribution_,
+                      &p->showMapLogo_,
                       &p->theme_,
                       &p->trackLocation_,
                       &p->updateNotificationsEnabled_});
@@ -240,6 +246,16 @@ SettingsVariable<std::string>& GeneralSettings::maptiler_api_key() const
    return p->maptilerApiKey_;
 }
 
+SettingsVariable<bool>& GeneralSettings::show_map_attribution() const
+{
+   return p->showMapAttribution_;
+}
+
+SettingsVariable<bool>& GeneralSettings::show_map_logo() const
+{
+   return p->showMapLogo_;
+}
+
 SettingsVariable<std::string>& GeneralSettings::theme() const
 {
    return p->theme_;
@@ -289,6 +305,8 @@ bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
            lhs.p->mapProvider_ == rhs.p->mapProvider_ &&
            lhs.p->mapboxApiKey_ == rhs.p->mapboxApiKey_ &&
            lhs.p->maptilerApiKey_ == rhs.p->maptilerApiKey_ &&
+           lhs.p->showMapAttribution_ == rhs.p->showMapAttribution_ &&
+           lhs.p->showMapLogo_ == rhs.p->showMapLogo_ &&
            lhs.p->theme_ == rhs.p->theme_ &&
            lhs.p->trackLocation_ == rhs.p->trackLocation_ &&
            lhs.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 90c47e5d..984fa995 100644
--- a/scwx-qt/source/scwx/qt/settings/general_settings.hpp
+++ b/scwx-qt/source/scwx/qt/settings/general_settings.hpp
@@ -38,6 +38,8 @@ public:
    SettingsVariable<std::string>&                map_provider() const;
    SettingsVariable<std::string>&                mapbox_api_key() const;
    SettingsVariable<std::string>&                maptiler_api_key() const;
+   SettingsVariable<bool>&                       show_map_attribution() const;
+   SettingsVariable<bool>&                       show_map_logo() const;
    SettingsVariable<std::string>&                theme() const;
    SettingsVariable<bool>&                       track_location() const;
    SettingsVariable<bool>& update_notifications_enabled() const;
diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
index 8d8c89ec..b7053c0c 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -130,6 +130,8 @@ public:
           &theme_,
           &defaultAlertAction_,
           &antiAliasingEnabled_,
+          &showMapAttribution_,
+          &showMapLogo_,
           &updateNotificationsEnabled_,
           &debugEnabled_,
           &alertAudioSoundFile_,
@@ -220,6 +222,8 @@ public:
    settings::SettingsInterface<std::string>  defaultAlertAction_ {};
    settings::SettingsInterface<std::string>  theme_ {};
    settings::SettingsInterface<bool>         antiAliasingEnabled_ {};
+   settings::SettingsInterface<bool>         showMapAttribution_ {};
+   settings::SettingsInterface<bool>         showMapLogo_ {};
    settings::SettingsInterface<bool>         updateNotificationsEnabled_ {};
    settings::SettingsInterface<bool>         debugEnabled_ {};
 
@@ -617,6 +621,13 @@ void SettingsDialogImpl::SetupGeneralTab()
       generalSettings.anti_aliasing_enabled());
    antiAliasingEnabled_.SetEditWidget(self_->ui->antiAliasingEnabledCheckBox);
 
+   showMapAttribution_.SetSettingsVariable(
+      generalSettings.show_map_attribution());
+   showMapAttribution_.SetEditWidget(self_->ui->showMapAttributionCheckBox);
+
+   showMapLogo_.SetSettingsVariable(generalSettings.show_map_logo());
+   showMapLogo_.SetEditWidget(self_->ui->showMapLogoCheckBox);
+
    updateNotificationsEnabled_.SetSettingsVariable(
       generalSettings.update_notifications_enabled());
    updateNotificationsEnabled_.SetEditWidget(
diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
index faf8437e..35f8fcad 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.ui
@@ -322,6 +322,20 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QCheckBox" name="showMapAttributionCheckBox">
+             <property name="text">
+              <string>Show Map Attribution</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="showMapLogoCheckBox">
+             <property name="text">
+              <string>Show Map Logo</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QCheckBox" name="enableUpdateNotificationsCheckBox">
              <property name="text">
@@ -373,8 +387,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>514</width>
-                    <height>382</height>
+                    <width>66</width>
+                    <height>18</height>
                    </rect>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_3">
diff --git a/test/data b/test/data
index 08d481f3..9cef3730 160000
--- a/test/data
+++ b/test/data
@@ -1 +1 @@
-Subproject commit 08d481f3bf96ebd44825359082cfd1243c09a72c
+Subproject commit 9cef3730c84d22803ea433fba8111826327dd82f