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

Reorganize settings window

Browse source 
* Moves lobby options to the settings, along with game directory options to their own group
This commit is contained in:
redstrate 2021-11-09 10:50:45 -05:00
parent 0675461999
commit 44ce6aa252
2 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/settingswindow.cpp
View file

@ -12,6 +12,7 @@
#include <QComboBox> #include <QComboBox>
#include <QGridLayout> #include <QGridLayout>
#include <QListWidget> #include <QListWidget>
#include <QLineEdit>
#include "xivlauncher.h" #include "xivlauncher.h"
@ -29,17 +30,53 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
profileWidget->addItem("Default"); profileWidget->addItem("Default");
mainLayout->addWidget(profileWidget, 0, 0); mainLayout->addWidget(profileWidget, 0, 0);
auto gameBox = new QGroupBox("Game Options");
auto gameBoxLayout = new QFormLayout();
gameBox->setLayout(gameBoxLayout);
layout->addRow(gameBox);
auto serverType = new QComboBox();
serverType->insertItem(0, "Square Enix");
serverType->insertItem(1, "Sapphire");
//serverType->setCurrentIndex(savedServerType);
gameBoxLayout->addRow("Server Lobby", serverType);
auto lobbyServerURL = new QLineEdit();
//lobbyServerURL->setText(savedLobbyURL);
gameBoxLayout->addRow("Lobby URL", lobbyServerURL);
auto directXCombo = new QComboBox(); auto directXCombo = new QComboBox();
directXCombo->setCurrentIndex(window.settings.value("directx", 0).toInt()); directXCombo->setCurrentIndex(window.settings.value("directx", 0).toInt());
directXCombo->addItem("DirectX 11"); directXCombo->addItem("DirectX 11");
directXCombo->addItem("DirectX 9"); directXCombo->addItem("DirectX 9");
layout->addRow("DirectX Version", directXCombo); gameBoxLayout->addRow("DirectX Version", directXCombo);
connect(directXCombo, &QComboBox::currentIndexChanged, [=](int index) { connect(directXCombo, &QComboBox::currentIndexChanged, [=](int index) {
this->window.settings.setValue("directx", directXCombo->currentIndex()); this->window.settings.setValue("directx", directXCombo->currentIndex());
this->window.useDX9 = directXCombo->currentIndex() == 1; this->window.useDX9 = directXCombo->currentIndex() == 1;
}); });
auto currentGameDirectory = new QLabel(window.gamePath);
currentGameDirectory->setWordWrap(true);
gameBoxLayout->addRow("Game Directory", currentGameDirectory);
auto selectDirectoryButton = new QPushButton("Select Game Directory");
connect(selectDirectoryButton, &QPushButton::pressed, [this, currentGameDirectory] {
this->window.gamePath = QFileDialog::getExistingDirectory(this, "Open Game Directory");
currentGameDirectory->setText(this->window.gamePath);
this->window.readInitialInformation();
});
gameBoxLayout->addWidget(selectDirectoryButton);
auto gameDirectoryButton = new QPushButton("Open Game Directory");
connect(gameDirectoryButton, &QPushButton::pressed, [this] {
openPath(this->window.gamePath);
});
gameBoxLayout->addWidget(gameDirectoryButton);
#if defined(Q_OS_MAC) || defined(Q_OS_LINUX) #if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
auto wineBox = new QGroupBox("Wine Options"); auto wineBox = new QGroupBox("Wine Options");
auto wineBoxLayout = new QFormLayout(); auto wineBoxLayout = new QFormLayout();
@ -159,25 +196,6 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
this->window.settings.setValue("useGamemode", static_cast<bool>(state)); this->window.settings.setValue("useGamemode", static_cast<bool>(state));
}); });
#endif #endif
auto currentGameDirectory = new QLabel(window.gamePath);
currentGameDirectory->setWordWrap(true);
layout->addRow("Game Directory", currentGameDirectory);
auto selectDirectoryButton = new QPushButton("Select Game Directory");
connect(selectDirectoryButton, &QPushButton::pressed, [this, currentGameDirectory] {
this->window.gamePath = QFileDialog::getExistingDirectory(this, "Open Game Directory");
currentGameDirectory->setText(this->window.gamePath);
this->window.readInitialInformation();
});
layout->addWidget(selectDirectoryButton);
auto gameDirectoryButton = new QPushButton("Open Game Directory");
connect(gameDirectoryButton, &QPushButton::pressed, [this] {
openPath(this->window.gamePath);
});
layout->addWidget(gameDirectoryButton);
} }
void SettingsWindow::openPath(const QString path) { void SettingsWindow::openPath(const QString path) {

31
src/xivlauncher.cpp
View file

@ -240,17 +240,6 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
profileSelect->addItem("Default"); profileSelect->addItem("Default");
layout->addRow("Profile", profileSelect); layout->addRow("Profile", profileSelect);
auto serverType = new QComboBox();
serverType->insertItem(0, "Square Enix");
serverType->insertItem(1, "Sapphire");
serverType->setCurrentIndex(savedServerType);
layout->addRow("Server Lobby", serverType);
auto lobbyServerURL = new QLineEdit();
lobbyServerURL->setText(savedLobbyURL);
layout->addRow("Lobby URL", lobbyServerURL);
auto usernameEdit = new QLineEdit(); auto usernameEdit = new QLineEdit();
layout->addRow("Username", usernameEdit); layout->addRow("Username", usernameEdit);
@ -295,7 +284,7 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
auto registerButton = new QPushButton("Register"); auto registerButton = new QPushButton("Register");
layout->addRow(registerButton); layout->addRow(registerButton);
const auto refreshControls = [=](int index) { /*const auto refreshControls = [=](int index) {
lobbyServerURL->setEnabled(index == 1); lobbyServerURL->setEnabled(index == 1);
registerButton->setEnabled(index == 1); registerButton->setEnabled(index == 1);
otpEdit->setEnabled(index == 0); otpEdit->setEnabled(index == 0);
@ -304,7 +293,7 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
connect(serverType, &QComboBox::currentIndexChanged, [=](int index) { connect(serverType, &QComboBox::currentIndexChanged, [=](int index) {
refreshControls(index); refreshControls(index);
}); });*/
auto emptyWidget = new QWidget(); auto emptyWidget = new QWidget();
emptyWidget->setLayout(layout); emptyWidget->setLayout(layout);
@ -334,23 +323,23 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
job->start(); job->start();
} }
settings.setValue("serverType", serverType->currentIndex()); //settings.setValue("serverType", serverType->currentIndex());
settings.setValue("lobbyURL", lobbyServerURL->text()); //settings.setValue("lobbyURL", lobbyServerURL->text());
if(serverType->currentIndex() == 0) { //if(serverType->currentIndex() == 0) {
// begin se's booting process // begin se's booting process
squareBoot->bootCheck(info); squareBoot->bootCheck(info);
} else { //} else {
sapphireLauncher->login(lobbyServerURL->text(), info); // sapphireLauncher->login(lobbyServerURL->text(), info);
} //}
}); });
connect(registerButton, &QPushButton::released, [=] { /*connect(registerButton, &QPushButton::released, [=] {
if(serverType->currentIndex() == 1) { if(serverType->currentIndex() == 1) {
auto info = LoginInformation{usernameEdit->text(), passwordEdit->text(), otpEdit->text()}; auto info = LoginInformation{usernameEdit->text(), passwordEdit->text(), otpEdit->text()};
sapphireLauncher->registerAccount(lobbyServerURL->text(), info); sapphireLauncher->registerAccount(lobbyServerURL->text(), info);
} }
}); });*/
} }
LauncherWindow::~LauncherWindow() = default; LauncherWindow::~LauncherWindow() = default;