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

Fix various typos and text label improvements

Browse source
This commit is contained in:
Joshua Goins 2023-10-08 13:19:23 -04:00
parent ea16fb8f1a
commit 76770acc33
8 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launcher/include/gameinstaller.h
View file

@ -14,7 +14,7 @@ class GameInstaller : public QObject
{ {
Q_OBJECT Q_OBJECT
QML_ELEMENT QML_ELEMENT
QML_UNCREATABLE("Use Launchercore.createInstaller") QML_UNCREATABLE("Use LauncherCore.createInstaller")
public: public:
GameInstaller(LauncherCore &launcher, Profile &profile, QObject *parent = nullptr); GameInstaller(LauncherCore &launcher, Profile &profile, QObject *parent = nullptr);

2
launcher/include/launchercore.h
View file

@ -47,7 +47,7 @@ struct LoginAuth {
int region = 2; // america? int region = 2; // america?
int maxExpansion = 1; int maxExpansion = 1;
// if empty, dont set on the client // if empty, don't set on the client
QString lobbyhost, frontierHost; QString lobbyhost, frontierHost;
}; };

4
launcher/include/profile.h
View file

@ -48,8 +48,8 @@ public:
enum class WineType { enum class WineType {
System, System,
Custom, Custom,
Builtin, // macos only Builtin, // macOS only
XIVOnMac // macos only XIVOnMac // macOS only
}; };
Q_ENUM(WineType) Q_ENUM(WineType)

2
launcher/src/assetupdater.cpp
View file

@ -94,7 +94,7 @@ QCoro::Task<> AssetUpdater::checkRemoteDalamudVersion()
const QByteArray str = reply->readAll(); const QByteArray str = reply->readAll();
// for some god forsaken reason, the version string comes back as raw // for some godforsaken reason, the version string comes back as raw
// bytes, ex: \xFF\xFE{\x00\"\x00""A\x00s\x00s\x00""e\x00m\x00 so we // bytes, ex: \xFF\xFE{\x00\"\x00""A\x00s\x00s\x00""e\x00m\x00 so we
// start at the first character of the json '{' and work our way up. // start at the first character of the json '{' and work our way up.
QString reassmbled; QString reassmbled;

2
launcher/src/launchercore.cpp
View file

@ -136,7 +136,7 @@ void LauncherCore::beginDalamudGame(const QString &gameExecutablePath, Profile &
const QDir dalamudBasePluginDir = dalamudDir.absoluteFilePath(QStringLiteral("plugins")); const QDir dalamudBasePluginDir = dalamudDir.absoluteFilePath(QStringLiteral("plugins"));
const QDir dalamudUserPluginDir = dalamudBasePluginDir.absoluteFilePath(profile.account()->uuid()); const QDir dalamudUserPluginDir = dalamudBasePluginDir.absoluteFilePath(profile.account()->uuid());
// Some really dumb plugins check for "installedPlugins" in their assembly directory FOR SOME REASON // Some really dumb plugins check for "installedPlugins" in their assembly directory FOR SOME REASON,
// so we need to match typical XIVQuickLauncher behavior here. Why? I have no clue. // so we need to match typical XIVQuickLauncher behavior here. Why? I have no clue.
const QDir dalamudPluginDir = dalamudUserPluginDir.absoluteFilePath(QStringLiteral("installedPlugins")); const QDir dalamudPluginDir = dalamudUserPluginDir.absoluteFilePath(QStringLiteral("installedPlugins"));

2
launcher/src/main.cpp
View file

@ -70,7 +70,7 @@ int main(int argc, char *argv[])
#ifdef ENABLE_STEAM #ifdef ENABLE_STEAM
if (parser.isSet(steamOption)) { if (parser.isSet(steamOption)) {
const QStringList args = parser.positionalArguments(); const QStringList args = parser.positionalArguments();
// Steam tries to use as a compatibiltiy tool, running install scripts (like DirectX), so try to ignore it. // Steam tries to use as a compatibility tool, running installation scripts (like DirectX), so try to ignore it.
if (!args[0].contains(QLatin1String("ffxivboot.exe"))) { if (!args[0].contains(QLatin1String("ffxivboot.exe"))) {
return 0; return 0;
} }

5
launcher/ui/Main.qml
View file

@ -19,8 +19,7 @@ Kirigami.ApplicationWindow {
minimumWidth: 800 minimumWidth: 800
minimumHeight: 500 minimumHeight: 500
visible: true title: "Astra"
title: LauncherCore.isSteam ? "Astra (Steam)" : "Astra"
property bool checkedAutoLogin: false property bool checkedAutoLogin: false
@ -104,7 +103,7 @@ Kirigami.ApplicationWindow {
} }
function onShowNewsChanged() { function onShowNewsChanged() {
// workaround annoying Qt layouting bug // workaround annoying Qt layout bug
// TODO: see if this changed in Qt6 // TODO: see if this changed in Qt6
pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "MainPage")) pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
} }

4
launcher/ui/Pages/StatusPage.qml
View file

@ -15,12 +15,14 @@ Kirigami.Page {
Kirigami.LoadingPlaceholder { Kirigami.LoadingPlaceholder {
id: placeholder id: placeholder
text: "Logging in..."
anchors.centerIn: parent anchors.centerIn: parent
} }
Kirigami.PromptDialog { Kirigami.PromptDialog {
id: errorDialog id: errorDialog
title: i18n("Login error") title: i18n("Login Error")
showCloseButton: false showCloseButton: false
standardButtons: Kirigami.Dialog.Ok standardButtons: Kirigami.Dialog.Ok