diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index c768786c3..66b771447 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -7,6 +7,9 @@ AchievementLoginDialog::AchievementLoginDialog(QWidget* parent) : QDialog(parent { m_ui.setupUi(this); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + m_login = m_ui.buttonBox->addButton(tr("&Login"), QDialogButtonBox::AcceptRole); + m_login->setEnabled(false); connectUi(); } @@ -48,10 +51,10 @@ void AchievementLoginDialog::processLoginResult(bool result) void AchievementLoginDialog::connectUi() { - connect(m_ui.login, &QPushButton::clicked, this, &AchievementLoginDialog::loginClicked); - connect(m_ui.cancel, &QPushButton::clicked, this, &AchievementLoginDialog::cancelClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &AchievementLoginDialog::loginClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &AchievementLoginDialog::cancelClicked); - auto enableLoginButton = [this](const QString&) { m_ui.login->setEnabled(canEnableLoginButton()); }; + auto enableLoginButton = [this](const QString&) { m_login->setEnabled(canEnableLoginButton()); }; connect(m_ui.userName, &QLineEdit::textChanged, enableLoginButton); connect(m_ui.password, &QLineEdit::textChanged, enableLoginButton); } @@ -60,8 +63,8 @@ void AchievementLoginDialog::enableUI(bool enabled) { m_ui.userName->setEnabled(enabled); m_ui.password->setEnabled(enabled); - m_ui.cancel->setEnabled(enabled); - m_ui.login->setEnabled(enabled && canEnableLoginButton()); + m_ui.buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(enabled); + m_login->setEnabled(enabled && canEnableLoginButton()); } bool AchievementLoginDialog::canEnableLoginButton() const diff --git a/src/duckstation-qt/achievementlogindialog.h b/src/duckstation-qt/achievementlogindialog.h index cd980c650..332989bb6 100644 --- a/src/duckstation-qt/achievementlogindialog.h +++ b/src/duckstation-qt/achievementlogindialog.h @@ -1,6 +1,7 @@ #pragma once #include "ui_achievementlogindialog.h" #include +#include class AchievementLoginDialog : public QDialog { @@ -21,4 +22,5 @@ private: bool canEnableLoginButton() const; Ui::AchievementLoginDialog m_ui; + QPushButton* m_login; }; diff --git a/src/duckstation-qt/achievementlogindialog.ui b/src/duckstation-qt/achievementlogindialog.ui index 2fff2ca59..c17571c81 100644 --- a/src/duckstation-qt/achievementlogindialog.ui +++ b/src/duckstation-qt/achievementlogindialog.ui @@ -115,7 +115,7 @@ - + @@ -124,22 +124,9 @@ - - - false - - - &Login - - - true - - - - - - - &Cancel + + + QDialogButtonBox::Cancel diff --git a/src/duckstation-qt/cheatcodeeditordialog.cpp b/src/duckstation-qt/cheatcodeeditordialog.cpp index 5fe10b9f8..2b7f1aa12 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.cpp +++ b/src/duckstation-qt/cheatcodeeditordialog.cpp @@ -84,6 +84,6 @@ void CheatCodeEditorDialog::fillUi() void CheatCodeEditorDialog::connectUi() { - connect(m_ui.save, &QPushButton::clicked, this, &CheatCodeEditorDialog::saveClicked); - connect(m_ui.cancel, &QPushButton::clicked, this, &CheatCodeEditorDialog::cancelClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &CheatCodeEditorDialog::saveClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &CheatCodeEditorDialog::cancelClicked); } diff --git a/src/duckstation-qt/cheatcodeeditordialog.ui b/src/duckstation-qt/cheatcodeeditordialog.ui index a9fdb75c9..f6d6ab193 100644 --- a/src/duckstation-qt/cheatcodeeditordialog.ui +++ b/src/duckstation-qt/cheatcodeeditordialog.ui @@ -61,38 +61,11 @@ - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Save - - - true - - - - - - - Cancel - - - - + + + QDialogButtonBox::Cancel|QDialogButtonBox::Save + + diff --git a/src/duckstation-qt/gamepropertiesdialog.cpp b/src/duckstation-qt/gamepropertiesdialog.cpp index 89f5bd812..bdb6df412 100644 --- a/src/duckstation-qt/gamepropertiesdialog.cpp +++ b/src/duckstation-qt/gamepropertiesdialog.cpp @@ -90,7 +90,7 @@ void GamePropertiesDialog::populate(const GameListEntry* ge) m_ui.comments->setDisabled(true); m_ui.versionTested->setDisabled(true); m_ui.setToCurrent->setDisabled(true); - m_ui.exportCompatibilityInfo->setDisabled(true); + m_exportCompatibilityInfo->setDisabled(true); } else { @@ -127,6 +127,9 @@ void GamePropertiesDialog::populateCompatibilityInfo(const std::string& game_cod void GamePropertiesDialog::setupAdditionalUi() { + m_computeHashes = m_ui.buttonBox->addButton(tr("Compute && Verify Hashes"), QDialogButtonBox::ActionRole); + m_exportCompatibilityInfo = m_ui.buttonBox->addButton(tr("Export Compatibility Info"), QDialogButtonBox::ActionRole); + for (u8 i = 0; i < static_cast(DiscRegion::Count); i++) m_ui.region->addItem(qApp->translate("DiscRegion", Settings::GetDiscRegionDisplayName(static_cast(i)))); @@ -555,14 +558,14 @@ void GamePropertiesDialog::connectUi() connect(m_ui.upscalingIssues, &QLineEdit::editingFinished, this, &GamePropertiesDialog::saveCompatibilityInfoIfChanged); connect(m_ui.setToCurrent, &QPushButton::clicked, this, &GamePropertiesDialog::onSetVersionTestedToCurrentClicked); - connect(m_ui.computeHashes, &QPushButton::clicked, this, &GamePropertiesDialog::onComputeHashClicked); - connect(m_ui.exportCompatibilityInfo, &QPushButton::clicked, this, + connect(m_computeHashes, &QPushButton::clicked, this, &GamePropertiesDialog::onComputeHashClicked); + connect(m_exportCompatibilityInfo, &QPushButton::clicked, this, &GamePropertiesDialog::onExportCompatibilityInfoClicked); - connect(m_ui.close, &QPushButton::clicked, this, &QDialog::close); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &QDialog::close); connect(m_ui.tabWidget, &QTabWidget::currentChanged, [this](int index) { const bool show_buttons = index == 0; - m_ui.computeHashes->setVisible(show_buttons); - m_ui.exportCompatibilityInfo->setVisible(show_buttons); + m_computeHashes->setVisible(show_buttons); + m_exportCompatibilityInfo->setVisible(show_buttons); }); connect(m_ui.userRunaheadFrames, QOverload::of(&QComboBox::currentIndexChanged), [this](int index) { @@ -937,7 +940,7 @@ void GamePropertiesDialog::onComputeHashClicked() computeTrackHashes(m_redump_search_keyword); if (!m_redump_search_keyword.empty()) - m_ui.computeHashes->setText(tr("Search on Redump.org")); + m_computeHashes->setText(tr("Search on Redump.org")); } else { diff --git a/src/duckstation-qt/gamepropertiesdialog.h b/src/duckstation-qt/gamepropertiesdialog.h index aa93be22f..221296e7d 100644 --- a/src/duckstation-qt/gamepropertiesdialog.h +++ b/src/duckstation-qt/gamepropertiesdialog.h @@ -2,6 +2,7 @@ #include "frontend-common/game_settings.h" #include "ui_gamepropertiesdialog.h" #include +#include #include struct GameListEntry; @@ -54,6 +55,8 @@ private: Ui::GamePropertiesDialog m_ui; std::array(GameSettings::Trait::Count)> m_trait_checkboxes{}; + QPushButton* m_exportCompatibilityInfo; + QPushButton* m_computeHashes; QtHostInterface* m_host_interface; diff --git a/src/duckstation-qt/gamepropertiesdialog.ui b/src/duckstation-qt/gamepropertiesdialog.ui index b32c8ce7d..dfcaca2cc 100644 --- a/src/duckstation-qt/gamepropertiesdialog.ui +++ b/src/duckstation-qt/gamepropertiesdialog.ui @@ -1124,45 +1124,11 @@ - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Compute && Verify Hashes - - - - - - - Export Compatibility Info - - - - - - - Close - - - true - - - - + + + QDialogButtonBox::Close + + diff --git a/src/duckstation-qt/inputbindingdialog.ui b/src/duckstation-qt/inputbindingdialog.ui index e9d720d6e..c951b5a37 100644 --- a/src/duckstation-qt/inputbindingdialog.ui +++ b/src/duckstation-qt/inputbindingdialog.ui @@ -60,19 +60,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - diff --git a/src/duckstation-qt/memorycardeditordialog.cpp b/src/duckstation-qt/memorycardeditordialog.cpp index 8b9dad13e..a21aa82a6 100644 --- a/src/duckstation-qt/memorycardeditordialog.cpp +++ b/src/duckstation-qt/memorycardeditordialog.cpp @@ -19,16 +19,24 @@ MemoryCardEditorDialog::MemoryCardEditorDialog(QWidget* parent) : QDialog(parent m_ui.setupUi(this); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + m_deleteFile = m_ui.centerButtonBox->addButton(tr("Delete File"), QDialogButtonBox::ActionRole); + m_undeleteFile = m_ui.centerButtonBox->addButton(tr("Undelete File"), QDialogButtonBox::ActionRole); + m_exportFile = m_ui.centerButtonBox->addButton(tr("Export File"), QDialogButtonBox::ActionRole); + m_moveLeft = m_ui.centerButtonBox->addButton(tr("<<"), QDialogButtonBox::ActionRole); + m_moveRight = m_ui.centerButtonBox->addButton(tr(">>"), QDialogButtonBox::ActionRole); + m_card_a.path_cb = m_ui.cardAPath; m_card_a.table = m_ui.cardA; m_card_a.blocks_free_label = m_ui.cardAUsage; - m_card_a.save_button = m_ui.saveCardA; m_card_b.path_cb = m_ui.cardBPath; m_card_b.table = m_ui.cardB; m_card_b.blocks_free_label = m_ui.cardBUsage; - m_card_b.save_button = m_ui.saveCardB; + createCardButtons(&m_card_a, m_ui.buttonBoxA); + createCardButtons(&m_card_b, m_ui.buttonBoxB); connectUi(); + connectCardUi(&m_card_a, m_ui.buttonBoxA); + connectCardUi(&m_card_b, m_ui.buttonBoxB); populateComboBox(m_ui.cardAPath); populateComboBox(m_ui.cardBPath); @@ -98,14 +106,30 @@ void MemoryCardEditorDialog::closeEvent(QCloseEvent* ev) m_card_b.path_cb->setCurrentIndex(0); } +void MemoryCardEditorDialog::createCardButtons(Card* card, QDialogButtonBox* buttonBox) +{ + card->format_button = buttonBox->addButton(tr("Format Card"), QDialogButtonBox::ActionRole); + card->import_file_button = buttonBox->addButton(tr("Import File..."), QDialogButtonBox::ActionRole); + card->import_button = buttonBox->addButton(tr("Import Card..."), QDialogButtonBox::ActionRole); + card->save_button = buttonBox->addButton(tr("Save"), QDialogButtonBox::ActionRole); +} + +void MemoryCardEditorDialog::connectCardUi(Card* card, QDialogButtonBox* buttonBox) +{ + connect(card->save_button, &QPushButton::clicked, [this, card] { saveCard(card); }); + connect(card->format_button, &QPushButton::clicked, [this, card] { formatCard(card); }); + connect(card->import_file_button, &QPushButton::clicked, [this, card] { importSaveFile(card); }); + connect(card->import_button, &QPushButton::clicked, [this, card] { importCard(card); }); +} + void MemoryCardEditorDialog::connectUi() { connect(m_ui.cardA, &QTableWidget::itemSelectionChanged, this, &MemoryCardEditorDialog::onCardASelectionChanged); connect(m_ui.cardB, &QTableWidget::itemSelectionChanged, this, &MemoryCardEditorDialog::onCardBSelectionChanged); - connect(m_ui.moveLeft, &QPushButton::clicked, this, &MemoryCardEditorDialog::doCopyFile); - connect(m_ui.moveRight, &QPushButton::clicked, this, &MemoryCardEditorDialog::doCopyFile); - connect(m_ui.deleteFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doDeleteFile); - connect(m_ui.undeleteFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doUndeleteFile); + connect(m_moveLeft, &QPushButton::clicked, this, &MemoryCardEditorDialog::doCopyFile); + connect(m_moveRight, &QPushButton::clicked, this, &MemoryCardEditorDialog::doCopyFile); + connect(m_deleteFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doDeleteFile); + connect(m_undeleteFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doUndeleteFile); connect(m_ui.cardAPath, QOverload::of(&QComboBox::currentIndexChanged), [this](int index) { loadCardFromComboBox(&m_card_a, index); }); @@ -115,15 +139,7 @@ void MemoryCardEditorDialog::connectUi() connect(m_ui.newCardB, &QPushButton::clicked, [this]() { newCard(&m_card_b); }); connect(m_ui.openCardA, &QPushButton::clicked, [this]() { openCard(&m_card_a); }); connect(m_ui.openCardB, &QPushButton::clicked, [this]() { openCard(&m_card_b); }); - connect(m_ui.saveCardA, &QPushButton::clicked, [this]() { saveCard(&m_card_a); }); - connect(m_ui.saveCardB, &QPushButton::clicked, [this]() { saveCard(&m_card_b); }); - connect(m_ui.importCardA, &QPushButton::clicked, [this]() { importCard(&m_card_a); }); - connect(m_ui.importCardB, &QPushButton::clicked, [this]() { importCard(&m_card_b); }); - connect(m_ui.formatCardA, &QPushButton::clicked, [this]() { formatCard(&m_card_a); }); - connect(m_ui.formatCardB, &QPushButton::clicked, [this]() { formatCard(&m_card_b); }); - connect(m_ui.exportFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doExportSaveFile); - connect(m_ui.importFileToCardA, &QPushButton::clicked, [this]() { importSaveFile(&m_card_a); }); - connect(m_ui.importFileToCardB, &QPushButton::clicked, [this]() { importSaveFile(&m_card_b); }); + connect(m_exportFile, &QPushButton::clicked, this, &MemoryCardEditorDialog::doExportSaveFile); } void MemoryCardEditorDialog::populateComboBox(QComboBox* cb) @@ -222,6 +238,7 @@ bool MemoryCardEditorDialog::loadCard(const QString& filename, Card* card) static void setCardTableItemProperties(QTableWidgetItem* item, const MemoryCardImage::FileInfo& fi) { + item->setFlags(item->flags() & ~(Qt::ItemIsEditable)); if (fi.deleted) { item->setBackground(Qt::darkRed); @@ -579,15 +596,11 @@ void MemoryCardEditorDialog::updateButtonState() const bool card_a_present = !m_card_a.filename.empty(); const bool card_b_present = !m_card_b.filename.empty(); const bool both_cards_present = card_a_present && card_b_present; - m_ui.deleteFile->setEnabled(has_selection); - m_ui.undeleteFile->setEnabled(is_deleted); - m_ui.exportFile->setEnabled(has_selection); - m_ui.moveLeft->setEnabled(both_cards_present && has_selection && is_card_b); - m_ui.moveRight->setEnabled(both_cards_present && has_selection && !is_card_b); - m_ui.importCardA->setEnabled(card_a_present); - m_ui.importCardB->setEnabled(card_b_present); - m_ui.importFileToCardA->setEnabled(card_a_present); - m_ui.importFileToCardB->setEnabled(card_b_present); - m_ui.formatCardA->setEnabled(card_a_present); - m_ui.formatCardB->setEnabled(card_b_present); + m_deleteFile->setEnabled(has_selection); + m_undeleteFile->setEnabled(is_deleted); + m_exportFile->setEnabled(has_selection); + m_moveLeft->setEnabled(both_cards_present && has_selection && is_card_b); + m_moveRight->setEnabled(both_cards_present && has_selection && !is_card_b); + m_ui.buttonBoxA->setEnabled(card_a_present); + m_ui.buttonBoxB->setEnabled(card_b_present); } diff --git a/src/duckstation-qt/memorycardeditordialog.h b/src/duckstation-qt/memorycardeditordialog.h index e5435e7c9..6f59b68b0 100644 --- a/src/duckstation-qt/memorycardeditordialog.h +++ b/src/duckstation-qt/memorycardeditordialog.h @@ -3,6 +3,7 @@ #include "ui_memorycardeditordialog.h" #include #include +#include #include #include #include @@ -44,8 +45,14 @@ private: QTableWidget* table = nullptr; QLabel* blocks_free_label = nullptr; QPushButton* save_button = nullptr; + QPushButton* import_button = nullptr; + QPushButton* import_file_button = nullptr; + QPushButton* format_button = nullptr; }; + void createCardButtons(Card* card, QDialogButtonBox* buttonBox); + void connectCardUi(Card* card, QDialogButtonBox* buttonBox); + void connectUi(); void populateComboBox(QComboBox* cb); void clearSelection(); @@ -68,6 +75,11 @@ private: void updateButtonState(); Ui::MemoryCardEditorDialog m_ui; + QPushButton* m_deleteFile; + QPushButton* m_undeleteFile; + QPushButton* m_exportFile; + QPushButton* m_moveLeft; + QPushButton* m_moveRight; Card m_card_a; Card m_card_b; diff --git a/src/duckstation-qt/memorycardeditordialog.ui b/src/duckstation-qt/memorycardeditordialog.ui index 74f2425d2..ad3958c0a 100644 --- a/src/duckstation-qt/memorycardeditordialog.ui +++ b/src/duckstation-qt/memorycardeditordialog.ui @@ -97,7 +97,7 @@ - + @@ -106,49 +106,16 @@ - - - false - - - Format Card - - - - - - - false - - - Import File... - - - - - - - false - - - Import Card... - - - - - - - false - - - Save + + + QDialogButtonBox::NoButton - + @@ -157,42 +124,9 @@ - - - false - - - Format Card - - - - - - - false - - - Import File... - - - - - - - false - - - Import Card... - - - - - - - false - - - Save + + + QDialogButtonBox::NoButton @@ -276,72 +210,15 @@ - - - - - - false - - - Delete File - - - - - - - false - - - Undelete File - - - - - - - false - - - Export File - - - - - - - false - - - << - - - - - - - false - - - >> - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + Qt::Vertical + + + QDialogButtonBox::NoButton + + diff --git a/src/duckstation-qt/postprocessingshaderconfigwidget.cpp b/src/duckstation-qt/postprocessingshaderconfigwidget.cpp index 9a1fd5aa9..c913450cc 100644 --- a/src/duckstation-qt/postprocessingshaderconfigwidget.cpp +++ b/src/duckstation-qt/postprocessingshaderconfigwidget.cpp @@ -1,8 +1,8 @@ #include "postprocessingshaderconfigwidget.h" #include +#include #include #include -#include #include using FrontendCommon::PostProcessingShader; @@ -129,9 +129,9 @@ void PostProcessingShaderConfigWidget::createUi() } } - QPushButton* reset_button = new QPushButton(tr("Reset to Defaults"), this); - connect(reset_button, &QPushButton::clicked, this, &PostProcessingShaderConfigWidget::onResetToDefaultsClicked); - m_layout->addWidget(reset_button, row, 0, 1, 1); + QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::RestoreDefaults, this); + connect(button_box, &QDialogButtonBox::clicked, this, &PostProcessingShaderConfigWidget::onResetToDefaultsClicked); + m_layout->addWidget(button_box, row, 0, 1, -1); row++; m_layout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding), row, 0, 1, 3); @@ -157,9 +157,9 @@ PostProcessingShaderConfigDialog::PostProcessingShaderConfigDialog(QWidget* pare connect(m_widget, &PostProcessingShaderConfigWidget::configChanged, this, &PostProcessingShaderConfigDialog::onConfigChanged); - QPushButton* close_button = new QPushButton(tr("Close"), this); - connect(close_button, &QPushButton::clicked, this, &PostProcessingShaderConfigDialog::onCloseClicked); - m_widget->getLayout()->addWidget(close_button, m_widget->getLayout()->rowCount() - 1, 2, 1, 2); + QDialogButtonBox* button_box = new QDialogButtonBox(QDialogButtonBox::Close, this); + connect(button_box, &QDialogButtonBox::rejected, this, &PostProcessingShaderConfigDialog::onCloseClicked); + m_widget->getLayout()->addWidget(button_box, m_widget->getLayout()->rowCount() - 1, 2, 1, 2); } PostProcessingShaderConfigDialog::~PostProcessingShaderConfigDialog() = default; diff --git a/src/duckstation-qt/settingsdialog.cpp b/src/duckstation-qt/settingsdialog.cpp index 7da9b4510..18efae9db 100644 --- a/src/duckstation-qt/settingsdialog.cpp +++ b/src/duckstation-qt/settingsdialog.cpp @@ -76,8 +76,13 @@ SettingsDialog::SettingsDialog(QtHostInterface* host_interface, QWidget* parent m_ui.settingsContainer->setCurrentIndex(0); m_ui.helpText->setText(m_category_help_text[0]); connect(m_ui.settingsCategory, &QListWidget::currentRowChanged, this, &SettingsDialog::onCategoryCurrentRowChanged); - connect(m_ui.closeButton, &QPushButton::clicked, this, &SettingsDialog::accept); - connect(m_ui.restoreDefaultsButton, &QPushButton::clicked, this, &SettingsDialog::onRestoreDefaultsClicked); + connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &SettingsDialog::accept); + connect(m_ui.buttonBox, &QDialogButtonBox::clicked, this, [this](QAbstractButton* button) { + if (m_ui.buttonBox->buttonRole(button) == QDialogButtonBox::ResetRole) + { + onRestoreDefaultsClicked(); + } + }); connect(m_console_settings, &ConsoleSettingsWidget::multitapModeChanged, m_controller_settings, &ControllerSettingsWidget::updateMultitapControllerTitles); diff --git a/src/duckstation-qt/settingsdialog.ui b/src/duckstation-qt/settingsdialog.ui index 73fc5952e..2f47ed198 100644 --- a/src/duckstation-qt/settingsdialog.ui +++ b/src/duckstation-qt/settingsdialog.ui @@ -27,6 +27,21 @@ :/icons/duck.png:/icons/duck.png + + + + + 500 + 0 + + + + 0 + + + + + @@ -58,7 +73,8 @@ General Settings - + + .. @@ -66,7 +82,8 @@ BIOS Settings - + + .. @@ -74,7 +91,8 @@ Console Settings - + + .. @@ -82,7 +100,8 @@ Emulation Settings - + + .. @@ -90,7 +109,8 @@ Game List Settings - + + .. @@ -98,7 +118,8 @@ Hotkey Settings - + + .. @@ -106,7 +127,8 @@ Controller Settings - + + .. @@ -114,7 +136,8 @@ Memory Card Settings - + + .. @@ -122,7 +145,8 @@ Display Settings - + + .. @@ -130,7 +154,8 @@ Enhancement Settings - + + .. @@ -138,7 +163,8 @@ Post-Processing Settings - + + .. @@ -146,7 +172,8 @@ Audio Settings - + + .. @@ -154,7 +181,8 @@ Achievement Settings - + + .. @@ -162,24 +190,17 @@ Advanced Settings - + + .. - - - - - 500 - 0 - + + + + QDialogButtonBox::Close|QDialogButtonBox::RestoreDefaults - - 0 - - - @@ -201,40 +222,6 @@ - - - - - - Restore Defaults - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Close - - - true - - - - -