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

Move a lot of buttons in profile settings into a nice horizontal layout

Browse source
This commit is contained in:
Joshua Goins 2022-02-24 08:25:46 -05:00
parent ba5de2a3cf
commit 73ef1c87e2
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/settingswindow.cpp
View file

@ -76,6 +76,11 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, LauncherCore& core, QWidg
currentGameDirectory->setReadOnly(true); currentGameDirectory->setReadOnly(true);
gameBoxLayout->addRow("Game Directory", currentGameDirectory); gameBoxLayout->addRow("Game Directory", currentGameDirectory);
auto gameDirButtonLayout = new QHBoxLayout();
auto gameDirButtonContainer = new QWidget();
gameDirButtonContainer->setLayout(gameDirButtonLayout);
gameBoxLayout->addWidget(gameDirButtonContainer);
auto selectDirectoryButton = new QPushButton("Select Game Directory"); auto selectDirectoryButton = new QPushButton("Select Game Directory");
connect(selectDirectoryButton, &QPushButton::pressed, [this] { connect(selectDirectoryButton, &QPushButton::pressed, [this] {
getCurrentProfile().gamePath = QFileDialog::getExistingDirectory(this, "Open Game Directory"); getCurrentProfile().gamePath = QFileDialog::getExistingDirectory(this, "Open Game Directory");
@ -85,13 +90,13 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, LauncherCore& core, QWidg
this->core.readGameVersion(); this->core.readGameVersion();
}); });
gameBoxLayout->addWidget(selectDirectoryButton); gameDirButtonLayout->addWidget(selectDirectoryButton);
auto gameDirectoryButton = new QPushButton("Open Game Directory"); auto gameDirectoryButton = new QPushButton("Open Game Directory");
connect(gameDirectoryButton, &QPushButton::pressed, [this] { connect(gameDirectoryButton, &QPushButton::pressed, [this] {
openPath(getCurrentProfile().gamePath); openPath(getCurrentProfile().gamePath);
}); });
gameBoxLayout->addWidget(gameDirectoryButton); gameDirButtonLayout->addWidget(gameDirectoryButton);
#ifdef ENABLE_WATCHDOG #ifdef ENABLE_WATCHDOG
enableWatchdog = new QCheckBox("Enable Watchdog (X11 only)"); enableWatchdog = new QCheckBox("Enable Watchdog (X11 only)");
@ -209,6 +214,11 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, LauncherCore& core, QWidg
winePrefixDirectory->setReadOnly(true); winePrefixDirectory->setReadOnly(true);
wineBoxLayout->addRow("Wine Prefix", winePrefixDirectory); wineBoxLayout->addRow("Wine Prefix", winePrefixDirectory);
auto winePrefixButtonLayout = new QHBoxLayout();
auto winePrefixButtonContainer = new QWidget();
winePrefixButtonContainer->setLayout(winePrefixButtonLayout);
wineBoxLayout->addWidget(winePrefixButtonContainer);
auto selectPrefixButton = new QPushButton("Select Wine Prefix"); auto selectPrefixButton = new QPushButton("Select Wine Prefix");
connect(selectPrefixButton, &QPushButton::pressed, [this] { connect(selectPrefixButton, &QPushButton::pressed, [this] {
getCurrentProfile().winePrefixPath = QFileDialog::getExistingDirectory(this, "Open Wine Prefix"); getCurrentProfile().winePrefixPath = QFileDialog::getExistingDirectory(this, "Open Wine Prefix");
@ -216,13 +226,13 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, LauncherCore& core, QWidg
this->core.saveSettings(); this->core.saveSettings();
this->reloadControls(); this->reloadControls();
}); });
wineBoxLayout->addWidget(selectPrefixButton); winePrefixButtonLayout->addWidget(selectPrefixButton);
auto openPrefixButton = new QPushButton("Open Wine Prefix"); auto openPrefixButton = new QPushButton("Open Wine Prefix");
connect(openPrefixButton, &QPushButton::pressed, [this] { connect(openPrefixButton, &QPushButton::pressed, [this] {
openPath(getCurrentProfile().winePrefixPath); openPath(getCurrentProfile().winePrefixPath);
}); });
wineBoxLayout->addWidget(openPrefixButton); winePrefixButtonLayout->addWidget(openPrefixButton);
auto enableDXVKhud = new QCheckBox("Enable DXVK HUD"); auto enableDXVKhud = new QCheckBox("Enable DXVK HUD");
wineBoxLayout->addRow("Wine Tweaks", enableDXVKhud); wineBoxLayout->addRow("Wine Tweaks", enableDXVKhud);
@ -252,18 +262,23 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, LauncherCore& core, QWidg
useGamescope = new QCheckBox("Use Gamescope"); useGamescope = new QCheckBox("Use Gamescope");
wineBoxLayout->addWidget(useGamescope); wineBoxLayout->addWidget(useGamescope);
auto gamescopeButtonLayout = new QHBoxLayout();
auto gamescopeButtonContainer = new QWidget();
gamescopeButtonContainer->setLayout(gamescopeButtonLayout);
wineBoxLayout->addWidget(gamescopeButtonContainer);
auto gamescopeLabel = new QPushButton("?"); auto gamescopeLabel = new QPushButton("?");
connect(gamescopeLabel, &QPushButton::pressed, [gamescopeLabel] { connect(gamescopeLabel, &QPushButton::pressed, [gamescopeLabel] {
QToolTip::showText(gamescopeLabel->mapToGlobal(QPoint()), "Use the SteamOS compositor that uses Wayland.\nIf you are experiencing input issues on XWayland, try this option if you have it installed."); QToolTip::showText(gamescopeLabel->mapToGlobal(QPoint()), "Use the SteamOS compositor that uses Wayland.\nIf you are experiencing input issues on XWayland, try this option if you have it installed.");
}); });
wineBoxLayout->addWidget(gamescopeLabel); gamescopeButtonLayout->addWidget(gamescopeLabel);
auto gamescopeCfg = new QPushButton("Configure..."); auto gamescopeCfg = new QPushButton("Configure...");
connect(gamescopeCfg, &QPushButton::pressed, [&] { connect(gamescopeCfg, &QPushButton::pressed, [&] {
auto gamescopeSettingsWindow = new GamescopeSettingsWindow(getCurrentProfile(), this); auto gamescopeSettingsWindow = new GamescopeSettingsWindow(getCurrentProfile(), this);
gamescopeSettingsWindow->show(); gamescopeSettingsWindow->show();
}); });
wineBoxLayout->addWidget(gamescopeCfg); gamescopeButtonLayout->addWidget(gamescopeCfg);
connect(useGamescope, &QCheckBox::stateChanged, [this](int state) { connect(useGamescope, &QCheckBox::stateChanged, [this](int state) {
getCurrentProfile().useGamescope = state; getCurrentProfile().useGamescope = state;