redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-23 21:07:45 +00:00
Code Activity

Make lobby URL field functional again

Browse source
This commit is contained in:
redstrate 2021-11-09 12:50:37 -05:00
parent b4ee5d1a4d
commit ec50af5f5f
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/settingswindow.cpp
View file

@ -100,8 +100,11 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
loginBoxLayout->addRow("Server Lobby", serverType); loginBoxLayout->addRow("Server Lobby", serverType);
auto lobbyServerURL = new QLineEdit(); lobbyServerURL = new QLineEdit();
//lobbyServerURL->setText(savedLobbyURL); connect(lobbyServerURL, &QLineEdit::editingFinished, [=] {
getCurrentProfile().lobbyURL = lobbyServerURL->text();
this->window.saveSettings();
});
loginBoxLayout->addRow("Lobby URL", lobbyServerURL); loginBoxLayout->addRow("Lobby URL", lobbyServerURL);
rememberUsernameBox = new QCheckBox(); rememberUsernameBox = new QCheckBox();
@ -266,6 +269,7 @@ void SettingsWindow::reloadControls() {
currentGameDirectory->setText(profile.gamePath); currentGameDirectory->setText(profile.gamePath);
serverType->setCurrentIndex(profile.isSapphire ? 1 : 0); serverType->setCurrentIndex(profile.isSapphire ? 1 : 0);
lobbyServerURL->setText(profile.lobbyURL);
rememberUsernameBox->setChecked(profile.rememberUsername); rememberUsernameBox->setChecked(profile.rememberUsername);
rememberPasswordBox->setChecked(profile.rememberPassword); rememberPasswordBox->setChecked(profile.rememberPassword);

1
src/settingswindow.h
View file

@ -28,6 +28,7 @@ private:
QLabel* currentGameDirectory = nullptr; QLabel* currentGameDirectory = nullptr;
QComboBox* serverType = nullptr; QComboBox* serverType = nullptr;
QLineEdit* lobbyServerURL = nullptr;
QCheckBox* rememberUsernameBox = nullptr, *rememberPasswordBox = nullptr; QCheckBox* rememberUsernameBox = nullptr, *rememberPasswordBox = nullptr;
bool currentlyReloadingControls = false; bool currentlyReloadingControls = false;

2
src/xivlauncher.cpp
View file

@ -188,6 +188,7 @@ void LauncherWindow::readInitialInformation() {
profile.gameVersion = readVersion(profile.gamePath + "/game/ffxivgame.ver"); profile.gameVersion = readVersion(profile.gamePath + "/game/ffxivgame.ver");
profile.isSapphire = settings.value("isSapphire", false).toBool(); profile.isSapphire = settings.value("isSapphire", false).toBool();
profile.lobbyURL = settings.value("lobbyURL", "").toString();
profile.rememberUsername = settings.value("rememberUsername", false).toBool(); profile.rememberUsername = settings.value("rememberUsername", false).toBool();
profile.rememberPassword = settings.value("rememberPassword", false).toBool(); profile.rememberPassword = settings.value("rememberPassword", false).toBool();
@ -388,6 +389,7 @@ void LauncherWindow::saveSettings() {
settings.setValue("gamePath", profile.gamePath); settings.setValue("gamePath", profile.gamePath);
settings.setValue("isSapphire", profile.isSapphire); settings.setValue("isSapphire", profile.isSapphire);
settings.setValue("lobbyURL", profile.lobbyURL);
settings.setValue("rememberUsername", profile.rememberUsername); settings.setValue("rememberUsername", profile.rememberUsername);
settings.setValue("rememberPassword", profile.rememberPassword); settings.setValue("rememberPassword", profile.rememberPassword);