From ec50af5f5f224e9fa4dc5d17410da1f2a2f709a2 Mon Sep 17 00:00:00 2001 From: redstrate Date: Tue, 9 Nov 2021 12:50:37 -0500 Subject: [PATCH] Make lobby URL field functional again --- src/settingswindow.cpp | 8 ++++++-- src/settingswindow.h | 1 + src/xivlauncher.cpp | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/settingswindow.cpp b/src/settingswindow.cpp index 913021f..7b2bb79 100644 --- a/src/settingswindow.cpp +++ b/src/settingswindow.cpp @@ -100,8 +100,11 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window loginBoxLayout->addRow("Server Lobby", serverType); - auto lobbyServerURL = new QLineEdit(); - //lobbyServerURL->setText(savedLobbyURL); + lobbyServerURL = new QLineEdit(); + connect(lobbyServerURL, &QLineEdit::editingFinished, [=] { + getCurrentProfile().lobbyURL = lobbyServerURL->text(); + this->window.saveSettings(); + }); loginBoxLayout->addRow("Lobby URL", lobbyServerURL); rememberUsernameBox = new QCheckBox(); @@ -266,6 +269,7 @@ void SettingsWindow::reloadControls() { currentGameDirectory->setText(profile.gamePath); serverType->setCurrentIndex(profile.isSapphire ? 1 : 0); + lobbyServerURL->setText(profile.lobbyURL); rememberUsernameBox->setChecked(profile.rememberUsername); rememberPasswordBox->setChecked(profile.rememberPassword); diff --git a/src/settingswindow.h b/src/settingswindow.h index 6db1c15..6112fd6 100644 --- a/src/settingswindow.h +++ b/src/settingswindow.h @@ -28,6 +28,7 @@ private: QLabel* currentGameDirectory = nullptr; QComboBox* serverType = nullptr; + QLineEdit* lobbyServerURL = nullptr; QCheckBox* rememberUsernameBox = nullptr, *rememberPasswordBox = nullptr; bool currentlyReloadingControls = false; diff --git a/src/xivlauncher.cpp b/src/xivlauncher.cpp index e3bc861..7b80607 100755 --- a/src/xivlauncher.cpp +++ b/src/xivlauncher.cpp @@ -188,6 +188,7 @@ void LauncherWindow::readInitialInformation() { profile.gameVersion = readVersion(profile.gamePath + "/game/ffxivgame.ver"); profile.isSapphire = settings.value("isSapphire", false).toBool(); + profile.lobbyURL = settings.value("lobbyURL", "").toString(); profile.rememberUsername = settings.value("rememberUsername", false).toBool(); profile.rememberPassword = settings.value("rememberPassword", false).toBool(); @@ -388,6 +389,7 @@ void LauncherWindow::saveSettings() { settings.setValue("gamePath", profile.gamePath); settings.setValue("isSapphire", profile.isSapphire); + settings.setValue("lobbyURL", profile.lobbyURL); settings.setValue("rememberUsername", profile.rememberUsername); settings.setValue("rememberPassword", profile.rememberPassword);