[pim/kdepim-addons] plugins/messageviewerconfigureplugins/expireaccounttrashfolder: don't save when we click on cancel
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit c227d257d68d28326cb029f07c219194ca664236 by Laurent Montel.
Committed on 15/08/2026 at 12:19.
Pushed by mlaurent into branch 'master'.
don't save when we click on cancel
M +7 -2 plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp
M +1 -0 plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h
https://invent.kde.org/pim/kdepim-addons/-/commit/c227d257d68d28326cb029f07c219194ca664236
diff --git a/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp b/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp
index a7543f31a..206735331 100644
--- a/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp
+++ b/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.cpp
@@ -32,17 +32,22 @@ ExpireAccountTrashFolderConfigDialog::ExpireAccountTrashFolderConfigDialog(QWidg
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok, this);
buttonBox->setObjectName(QLatin1StringView("buttonbox"));
connect(buttonBox, &QDialogButtonBox::rejected, this, &ExpireAccountTrashFolderConfigDialog::reject);
- connect(buttonBox, &QDialogButtonBox::accepted, this, &ExpireAccountTrashFolderConfigDialog::accept);
+ connect(buttonBox, &QDialogButtonBox::accepted, this, &ExpireAccountTrashFolderConfigDialog::slotAccepted);
mainLayout->addWidget(buttonBox);
readConfig();
}
ExpireAccountTrashFolderConfigDialog::~ExpireAccountTrashFolderConfigDialog()
{
- mExpireAccountTrashFolderConfig->save();
writeConfig();
}
+void ExpireAccountTrashFolderConfigDialog::slotAccepted()
+{
+ mExpireAccountTrashFolderConfig->save();
+ accept();
+}
+
void ExpireAccountTrashFolderConfigDialog::readConfig()
{
create(); // ensure a window is created
diff --git a/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h b/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h
index 3eccd9bf0..af663ef84 100644
--- a/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h
+++ b/plugins/messageviewerconfigureplugins/expireaccounttrashfolder/expireaccounttrashfolderconfigdialog.h
@@ -19,5 +19,6 @@ public:
private:
LIBEXPIREACCOUNTTRASHFOLDERCONFIG_NO_EXPORT void writeConfig();
LIBEXPIREACCOUNTTRASHFOLDERCONFIG_NO_EXPORT void readConfig();
+ LIBEXPIREACCOUNTTRASHFOLDERCONFIG_NO_EXPORT void slotAccepted();
ExpireAccountTrashFolderConfigWidget *const mExpireAccountTrashFolderConfig;
};