AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-09-18 00:20:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use OK and Cancel instead of Close in Settings dialog

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-03-22 17:00:02 +00:00
parent 3a508bdc78
commit a1baa5ff47
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/ui/pagedialog/PageDialog.cpp
View File

@ -29,34 +29,34 @@
PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidget* parent) : QDialog(parent) PageDialog::PageDialog(BasePageProvider* pageProvider, QString defaultId, QWidget* parent) : QDialog(parent)
{ {
setWindowTitle(pageProvider->dialogTitle()); setWindowTitle(pageProvider->dialogTitle());
m_container = new PageContainer(pageProvider, defaultId, this); m_container = new PageContainer(pageProvider, std::move(defaultId), this);
QVBoxLayout* mainLayout = new QVBoxLayout; QVBoxLayout* mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(m_container); mainLayout->addWidget(m_container);
mainLayout->setSpacing(0); mainLayout->setSpacing(0);
mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setContentsMargins(0, 0, 0, 0);
setLayout(mainLayout); setLayout(mainLayout);
QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Close); QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
buttons->button(QDialogButtonBox::Close)->setDefault(true); buttons->button(QDialogButtonBox::Ok)->setDefault(true);
buttons->button(QDialogButtonBox::Close)->setText(tr("Close"));
buttons->button(QDialogButtonBox::Help)->setText(tr("Help")); buttons->button(QDialogButtonBox::Help)->setText(tr("Help"));
buttons->setContentsMargins(6, 0, 6, 0); buttons->setContentsMargins(6, 0, 6, 0);
m_container->addButtons(buttons); m_container->addButtons(buttons);
connect(buttons->button(QDialogButtonBox::Close), SIGNAL(clicked()), this, SLOT(close())); connect(buttons->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &PageDialog::applyAndClose);
connect(buttons->button(QDialogButtonBox::Help), SIGNAL(clicked()), m_container, SLOT(help())); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &PageDialog::reject);
connect(buttons->button(QDialogButtonBox::Help), &QPushButton::clicked, m_container, &PageContainer::help);
restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray())); restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("PagedGeometry").toByteArray()));
} }
void PageDialog::applyAndClose()
void PageDialog::closeEvent(QCloseEvent* event)
{ {
qDebug() << "Paged dialog close requested"; qDebug() << "Paged dialog apply and close requested";
if (m_container->prepareToClose()) { if (m_container->prepareToClose()) {
qDebug() << "Paged dialog close approved"; qDebug() << "Paged dialog close approved";
APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64()); APPLICATION->settings()->set("PagedGeometry", saveGeometry().toBase64());
qDebug() << "Paged dialog geometry saved"; qDebug() << "Paged dialog geometry saved";
QDialog::closeEvent(event); close();
} }
} }

5
launcher/ui/pagedialog/PageDialog.h
View File

@ -25,9 +25,8 @@ class PageDialog : public QDialog {
explicit PageDialog(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0); explicit PageDialog(BasePageProvider* pageProvider, QString defaultId = QString(), QWidget* parent = 0);
virtual ~PageDialog() {} virtual ~PageDialog() {}
private slots:
virtual void closeEvent(QCloseEvent* event);
private: private:
void applyAndClose();
PageContainer* m_container; PageContainer* m_container;
}; };