mirror of
https://github.com/redstrate/Astra.git
synced 2025-04-22 12:47:44 +00:00
Fix various typos and text label improvements
This commit is contained in:
parent
ea16fb8f1a
commit
76770acc33
8 changed files with 12 additions and 11 deletions
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"));
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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"))
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue