From caba40bd944b001121f82a92d2945e7ad877cf2b Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Mon, 9 Mar 2020 23:44:56 +0100 Subject: [PATCH] Only hide the dialog --- app/SysTray-X/preferencesdialog.cpp | 19 +++++++++++++++++-- app/SysTray-X/preferencesdialog.h | 21 +++++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/SysTray-X/preferencesdialog.cpp b/app/SysTray-X/preferencesdialog.cpp index 1e37d84..62ded0f 100644 --- a/app/SysTray-X/preferencesdialog.cpp +++ b/app/SysTray-X/preferencesdialog.cpp @@ -46,6 +46,7 @@ PreferencesDialog::PreferencesDialog( SysTrayXLink *link, Preferences *pref, QWi */ connect( m_ui->chooseCustomButton, &QPushButton::clicked, this, &PreferencesDialog::slotFileSelect ); connect( m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PreferencesDialog::slotAccept ); + connect( m_ui->buttonBox, &QDialogButtonBox::rejected, this, &PreferencesDialog::slotReject ); } @@ -148,9 +149,23 @@ void PreferencesDialog::slotAccept() m_pref->setAppPrefChanged( false ); /* - * Tell the base + * Close it */ - QDialog::accept(); +// QDialog::accept(); + hide(); +} + + +/* + * Handle the accept signal + */ +void PreferencesDialog::slotReject() +{ + /* + * Close it + */ +// QDialog::reject(); + hide(); } diff --git a/app/SysTray-X/preferencesdialog.h b/app/SysTray-X/preferencesdialog.h index 1ab515b..e3be69d 100644 --- a/app/SysTray-X/preferencesdialog.h +++ b/app/SysTray-X/preferencesdialog.h @@ -87,46 +87,51 @@ class PreferencesDialog : public QDialog /** * @brief signalUpdateSysTray. Signal to update the system tray icon. */ - void signalUpdateSysTrayIcon(); + void signalUpdateSysTrayIcon(); public slots: /** * @brief slotDebugChange. Slot for handling debug change signals. */ - void slotDebugChange(); + void slotDebugChange(); /** * @brief slotHideOnMinimizeChange. Slot for handling hide on minimize change signals. */ - void slotHideOnMinimizeChange(); + void slotHideOnMinimizeChange(); /** * @brief slotStartMinimizedChange. Slot for handling start minimized change signals. */ - void slotStartMinimizedChange(); + void slotStartMinimizedChange(); /** * @brief slotIconTypeChange. Slot for handling icon type change signals. */ - void slotIconTypeChange(); + void slotIconTypeChange(); /** * @brief slotIconDataChange. Slot for handling icon data change signals. */ - void slotIconDataChange(); + void slotIconDataChange(); private slots: /** * @brief slotAccept. Store the preferences on the accept signal. */ - void slotAccept(); + void slotAccept(); + + /** + * @brief slotReject. Store the preferences on the accept signal. + */ + void slotReject(); /** * @brief slotFileSelect. Handle the choose custom button click. */ - void slotFileSelect(); + void slotFileSelect(); private: