From 76770acc3341d86e83057f1e7f36fe7f588ecad7 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sun, 8 Oct 2023 13:19:23 -0400
Subject: [PATCH] Fix various typos and text label improvements

---
 launcher/include/gameinstaller.h | 2 +-
 launcher/include/launchercore.h  | 2 +-
 launcher/include/profile.h       | 4 ++--
 launcher/src/assetupdater.cpp    | 2 +-
 launcher/src/launchercore.cpp    | 2 +-
 launcher/src/main.cpp            | 2 +-
 launcher/ui/Main.qml             | 5 ++---
 launcher/ui/Pages/StatusPage.qml | 4 +++-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/launcher/include/gameinstaller.h b/launcher/include/gameinstaller.h
index 8adeb8a..c02376a 100644
--- a/launcher/include/gameinstaller.h
+++ b/launcher/include/gameinstaller.h
@@ -14,7 +14,7 @@ class GameInstaller : public QObject
 {
     Q_OBJECT
     QML_ELEMENT
-    QML_UNCREATABLE("Use Launchercore.createInstaller")
+    QML_UNCREATABLE("Use LauncherCore.createInstaller")
 
 public:
     GameInstaller(LauncherCore &launcher, Profile &profile, QObject *parent = nullptr);
diff --git a/launcher/include/launchercore.h b/launcher/include/launchercore.h
index 0cbf86e..6337928 100755
--- a/launcher/include/launchercore.h
+++ b/launcher/include/launchercore.h
@@ -47,7 +47,7 @@ struct LoginAuth {
     int region = 2; // america?
     int maxExpansion = 1;
 
-    // if empty, dont set on the client
+    // if empty, don't set on the client
     QString lobbyhost, frontierHost;
 };
 
diff --git a/launcher/include/profile.h b/launcher/include/profile.h
index e975e5f..e60f1a9 100644
--- a/launcher/include/profile.h
+++ b/launcher/include/profile.h
@@ -48,8 +48,8 @@ public:
     enum class WineType {
         System,
         Custom,
-        Builtin, // macos only
-        XIVOnMac // macos only
+        Builtin, // macOS only
+        XIVOnMac // macOS only
     };
     Q_ENUM(WineType)
 
diff --git a/launcher/src/assetupdater.cpp b/launcher/src/assetupdater.cpp
index 8d6cab6..8a9d9df 100644
--- a/launcher/src/assetupdater.cpp
+++ b/launcher/src/assetupdater.cpp
@@ -94,7 +94,7 @@ QCoro::Task<> AssetUpdater::checkRemoteDalamudVersion()
 
     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
     // start at the first character of the json '{' and work our way up.
     QString reassmbled;
diff --git a/launcher/src/launchercore.cpp b/launcher/src/launchercore.cpp
index 576c95b..3f1de92 100755
--- a/launcher/src/launchercore.cpp
+++ b/launcher/src/launchercore.cpp
@@ -136,7 +136,7 @@ void LauncherCore::beginDalamudGame(const QString &gameExecutablePath, Profile &
     const QDir dalamudBasePluginDir = dalamudDir.absoluteFilePath(QStringLiteral("plugins"));
     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.
     const QDir dalamudPluginDir = dalamudUserPluginDir.absoluteFilePath(QStringLiteral("installedPlugins"));
 
diff --git a/launcher/src/main.cpp b/launcher/src/main.cpp
index 76f128c..bc8ab47 100755
--- a/launcher/src/main.cpp
+++ b/launcher/src/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 #ifdef ENABLE_STEAM
     if (parser.isSet(steamOption)) {
         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"))) {
             return 0;
         }
diff --git a/launcher/ui/Main.qml b/launcher/ui/Main.qml
index a86600a..ab01255 100644
--- a/launcher/ui/Main.qml
+++ b/launcher/ui/Main.qml
@@ -19,8 +19,7 @@ Kirigami.ApplicationWindow {
     minimumWidth: 800
     minimumHeight: 500
 
-    visible: true
-    title: LauncherCore.isSteam ? "Astra (Steam)" : "Astra"
+    title: "Astra"
 
     property bool checkedAutoLogin: false
 
@@ -104,7 +103,7 @@ Kirigami.ApplicationWindow {
         }
 
         function onShowNewsChanged() {
-            // workaround annoying Qt layouting bug
+            // workaround annoying Qt layout bug
             // TODO: see if this changed in Qt6
             pageStack.layers.replace(Qt.createComponent("zone.xiv.astra", "MainPage"))
         }
diff --git a/launcher/ui/Pages/StatusPage.qml b/launcher/ui/Pages/StatusPage.qml
index 77642e0..1f80ccd 100644
--- a/launcher/ui/Pages/StatusPage.qml
+++ b/launcher/ui/Pages/StatusPage.qml
@@ -15,12 +15,14 @@ Kirigami.Page {
     Kirigami.LoadingPlaceholder {
         id: placeholder
 
+        text: "Logging in..."
+
         anchors.centerIn: parent
     }
 
     Kirigami.PromptDialog {
         id: errorDialog
-        title: i18n("Login error")
+        title: i18n("Login Error")
 
         showCloseButton: false
         standardButtons: Kirigami.Dialog.Ok