From 27ee80522b6f622d0101c3fb27de9427c03ba8d6 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sat, 1 Feb 2025 10:20:39 -0500
Subject: [PATCH] Remove "Show News" setting

I think this was rarely used, and it just complicates some things.
---
 launcher/config.kcfg                     |  3 ---
 launcher/include/launchersettings.h      |  7 +------
 launcher/src/launchersettings.cpp        | 16 +---------------
 launcher/ui/Main.qml                     | 10 ----------
 launcher/ui/Pages/MainPage.qml           |  7 ++-----
 launcher/ui/Settings/GeneralSettings.qml | 18 ------------------
 6 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/launcher/config.kcfg b/launcher/config.kcfg
index 7138ba5..09ba70f 100644
--- a/launcher/config.kcfg
+++ b/launcher/config.kcfg
@@ -13,9 +13,6 @@ SPDX-License-Identifier: CC0-1.0
     <entry name="CloseWhenLaunched" type="bool">
       <default>true</default>
     </entry>
-    <entry name="ShowNews" type="bool">
-      <default>true</default>
-    </entry>
     <entry name="AutoLogin" type="string">
     </entry>
     <entry name="ShowDevTools" type="bool">
diff --git a/launcher/include/launchersettings.h b/launcher/include/launchersettings.h
index f545fb6..a0cb2b8 100644
--- a/launcher/include/launchersettings.h
+++ b/launcher/include/launchersettings.h
@@ -15,7 +15,6 @@ class LauncherSettings : public QObject
     QML_UNCREATABLE("Use LauncherCore.settings")
 
     Q_PROPERTY(bool closeWhenLaunched READ closeWhenLaunched WRITE setCloseWhenLaunched NOTIFY closeWhenLaunchedChanged)
-    Q_PROPERTY(bool showNews READ showNews WRITE setShowNews NOTIFY showNewsChanged)
     Q_PROPERTY(bool showDevTools READ showDevTools WRITE setShowDevTools NOTIFY showDevToolsChanged)
     Q_PROPERTY(bool keepPatches READ keepPatches WRITE setKeepPatches NOTIFY keepPatchesChanged)
     Q_PROPERTY(QString dalamudDistribServer READ dalamudDistribServer WRITE setDalamudDistribServer NOTIFY dalamudDistribServerChanged)
@@ -34,9 +33,6 @@ public:
     [[nodiscard]] bool closeWhenLaunched() const;
     void setCloseWhenLaunched(bool value);
 
-    [[nodiscard]] bool showNews() const;
-    void setShowNews(bool value);
-
     [[nodiscard]] bool showDevTools() const;
     void setShowDevTools(bool value);
 
@@ -82,7 +78,6 @@ public:
 
 Q_SIGNALS:
     void closeWhenLaunchedChanged();
-    void showNewsChanged();
     void showDevToolsChanged();
     void keepPatchesChanged();
     void dalamudDistribServerChanged();
@@ -97,4 +92,4 @@ Q_SIGNALS:
 
 private:
     Config *m_config = nullptr;
-};
\ No newline at end of file
+};
diff --git a/launcher/src/launchersettings.cpp b/launcher/src/launchersettings.cpp
index fd9f5e9..b9c2807 100644
--- a/launcher/src/launchersettings.cpp
+++ b/launcher/src/launchersettings.cpp
@@ -23,20 +23,6 @@ void LauncherSettings::setCloseWhenLaunched(const bool value)
     }
 }
 
-bool LauncherSettings::showNews() const
-{
-    return m_config->showNews();
-}
-
-void LauncherSettings::setShowNews(const bool value)
-{
-    if (value != m_config->showNews()) {
-        m_config->setShowNews(value);
-        m_config->save();
-        Q_EMIT showNewsChanged();
-    }
-}
-
 bool LauncherSettings::showDevTools() const
 {
     return m_config->showDevTools();
@@ -233,4 +219,4 @@ Config *LauncherSettings::config()
     return m_config;
 }
 
-#include "moc_launchersettings.cpp"
\ No newline at end of file
+#include "moc_launchersettings.cpp"
diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml
index db88b20..92f7678 100644
--- a/launcher/ui/Main.qml
+++ b/launcher/ui/Main.qml
@@ -127,15 +127,5 @@ Kirigami.ApplicationWindow {
         }
     }
 
-    Connections {
-        target: LauncherCore.settings
-
-        function onShowNewsChanged(): void {
-            // workaround annoying Qt layout bug
-            // TODO: see if this changed in Qt7
-            appWindow.pageStack.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
-        }
-    }
-
     Component.onCompleted: checkSetup()
 }
diff --git a/launcher/ui/Pages/MainPage.qml b/launcher/ui/Pages/MainPage.qml
index 4fa2f8d..a68f65c 100644
--- a/launcher/ui/Pages/MainPage.qml
+++ b/launcher/ui/Pages/MainPage.qml
@@ -41,8 +41,7 @@ Kirigami.Page {
             id: loginPage
 
             Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-            Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0
-            Layout.fillWidth: !LauncherCore.settings.showNews
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 26
             Layout.topMargin: Kirigami.Units.largeSpacing
             Layout.fillHeight: true
         }
@@ -52,8 +51,6 @@ Kirigami.Page {
         }
 
         Loader {
-            active: LauncherCore.settings.showNews
-
             Layout.fillWidth: true
             Layout.fillHeight: true
 
@@ -67,4 +64,4 @@ Kirigami.Page {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/launcher/ui/Settings/GeneralSettings.qml b/launcher/ui/Settings/GeneralSettings.qml
index 5f7af34..be78d57 100644
--- a/launcher/ui/Settings/GeneralSettings.qml
+++ b/launcher/ui/Settings/GeneralSettings.qml
@@ -31,24 +31,6 @@ FormCard.FormCardPage {
 
         FormCard.FormDelegateSeparator {
             above: closeAstraDelegate
-            below: showNewsDelegate
-        }
-
-        FormCard.FormCheckDelegate {
-            id: showNewsDelegate
-
-            text: i18n("Enable and show news")
-            checked: LauncherCore.settings.showNews
-            onCheckedChanged: {
-                LauncherCore.settings.showNews = checked;
-                if (page.Window.window !== null) {
-                    page.Window.window.close(); // if we don't close the dialog it crashes!
-                }
-            }
-        }
-
-        FormCard.FormDelegateSeparator {
-            above: showNewsDelegate
             below: showDevToolsDelegate
         }