redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 03:37:47 +00:00
Code Activity

Remove "Show News" setting

Browse source 
I think this was rarely used, and it just complicates some things.
This commit is contained in:
Joshua Goins 2025-02-01 10:20:39 -05:00
parent a106f01697
commit 27ee80522b
6 changed files with 4 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
launcher/config.kcfg
View file

@ -13,9 +13,6 @@ SPDX-License-Identifier: CC0-1.0
<entry name="CloseWhenLaunched" type="bool"> <entry name="CloseWhenLaunched" type="bool">
<default>true</default> <default>true</default>
</entry> </entry>
<entry name="ShowNews" type="bool">
<default>true</default>
</entry>
<entry name="AutoLogin" type="string"> <entry name="AutoLogin" type="string">
</entry> </entry>
<entry name="ShowDevTools" type="bool"> <entry name="ShowDevTools" type="bool">

7
launcher/include/launchersettings.h
View file

@ -15,7 +15,6 @@ class LauncherSettings : public QObject
QML_UNCREATABLE("Use LauncherCore.settings") QML_UNCREATABLE("Use LauncherCore.settings")
Q_PROPERTY(bool closeWhenLaunched READ closeWhenLaunched WRITE setCloseWhenLaunched NOTIFY closeWhenLaunchedChanged) 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 showDevTools READ showDevTools WRITE setShowDevTools NOTIFY showDevToolsChanged)
Q_PROPERTY(bool keepPatches READ keepPatches WRITE setKeepPatches NOTIFY keepPatchesChanged) Q_PROPERTY(bool keepPatches READ keepPatches WRITE setKeepPatches NOTIFY keepPatchesChanged)
Q_PROPERTY(QString dalamudDistribServer READ dalamudDistribServer WRITE setDalamudDistribServer NOTIFY dalamudDistribServerChanged) Q_PROPERTY(QString dalamudDistribServer READ dalamudDistribServer WRITE setDalamudDistribServer NOTIFY dalamudDistribServerChanged)
@ -34,9 +33,6 @@ public:
[[nodiscard]] bool closeWhenLaunched() const; [[nodiscard]] bool closeWhenLaunched() const;
void setCloseWhenLaunched(bool value); void setCloseWhenLaunched(bool value);
[[nodiscard]] bool showNews() const;
void setShowNews(bool value);
[[nodiscard]] bool showDevTools() const; [[nodiscard]] bool showDevTools() const;
void setShowDevTools(bool value); void setShowDevTools(bool value);
@ -82,7 +78,6 @@ public:
Q_SIGNALS: Q_SIGNALS:
void closeWhenLaunchedChanged(); void closeWhenLaunchedChanged();
void showNewsChanged();
void showDevToolsChanged(); void showDevToolsChanged();
void keepPatchesChanged(); void keepPatchesChanged();
void dalamudDistribServerChanged(); void dalamudDistribServerChanged();
@ -97,4 +92,4 @@ Q_SIGNALS:
private: private:
Config *m_config = nullptr; Config *m_config = nullptr;
}; };

16
launcher/src/launchersettings.cpp
View file

@ -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 bool LauncherSettings::showDevTools() const
{ {
return m_config->showDevTools(); return m_config->showDevTools();
@ -233,4 +219,4 @@ Config *LauncherSettings::config()
return m_config; return m_config;
} }
#include "moc_launchersettings.cpp" #include "moc_launchersettings.cpp"

10
launcher/ui/Main.qml
View file

@ -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() Component.onCompleted: checkSetup()
} }

7
launcher/ui/Pages/MainPage.qml
View file

@ -41,8 +41,7 @@ Kirigami.Page {
id: loginPage id: loginPage
Layout.alignment: Qt.AlignTop | Qt.AlignHCenter Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
Layout.minimumWidth: LauncherCore.settings.showNews ? Kirigami.Units.gridUnit * 26 : 0 Layout.minimumWidth: Kirigami.Units.gridUnit * 26
Layout.fillWidth: !LauncherCore.settings.showNews
Layout.topMargin: Kirigami.Units.largeSpacing Layout.topMargin: Kirigami.Units.largeSpacing
Layout.fillHeight: true Layout.fillHeight: true
} }
@ -52,8 +51,6 @@ Kirigami.Page {
} }
Loader { Loader {
active: LauncherCore.settings.showNews
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
@ -67,4 +64,4 @@ Kirigami.Page {
} }
} }
} }
} }

18
launcher/ui/Settings/GeneralSettings.qml
View file

@ -31,24 +31,6 @@ FormCard.FormCardPage {
FormCard.FormDelegateSeparator { FormCard.FormDelegateSeparator {
above: closeAstraDelegate 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 below: showDevToolsDelegate
} }