From 363f9e7b53e1829dd7d55577215ef80ff595d22d Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 10 Jun 2021 17:52:18 +0300 Subject: [PATCH] actionsdialog:connect with preferences handler --- app/settings/actionsdialog/actionsdialog.cpp | 11 +++++++++-- app/settings/actionsdialog/actionsdialog.h | 12 +++++++++++- .../settingsdialog/tabpreferenceshandler.cpp | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/settings/actionsdialog/actionsdialog.cpp b/app/settings/actionsdialog/actionsdialog.cpp index d7dab504e..f5e210d12 100644 --- a/app/settings/actionsdialog/actionsdialog.cpp +++ b/app/settings/actionsdialog/actionsdialog.cpp @@ -7,6 +7,7 @@ // local #include "ui_actionsdialog.h" +#include "../settingsdialog/tabpreferenceshandler.h" // Qt #include @@ -15,9 +16,10 @@ namespace Latte { namespace Settings { namespace Dialog { -ActionsDialog::ActionsDialog(QDialog *parent) +ActionsDialog::ActionsDialog(QDialog *parent, Handler::TabPreferences *handler) : GenericDialog(parent), - m_ui(new Ui::ActionsDialog)/*this is necessary, in order to create the ui*/ + m_ui(new Ui::ActionsDialog), /*this is necessary, in order to create the ui*/ + m_preferencesHandler(handler) { setAttribute(Qt::WA_DeleteOnClose, true); init(); @@ -32,6 +34,11 @@ Ui::ActionsDialog *ActionsDialog::ui() const return m_ui; } +Handler::TabPreferences *ActionsDialog::preferencesHandler() const +{ + return m_preferencesHandler; +} + void ActionsDialog::init() { m_ui->setupUi(this); diff --git a/app/settings/actionsdialog/actionsdialog.h b/app/settings/actionsdialog/actionsdialog.h index 84c711085..b570637b5 100644 --- a/app/settings/actionsdialog/actionsdialog.h +++ b/app/settings/actionsdialog/actionsdialog.h @@ -16,6 +16,13 @@ namespace Ui { class ActionsDialog; } +namespace Latte { +namespace Settings { +namespace Handler { +class TabPreferences; +} +} +} namespace Latte { namespace Settings { @@ -26,10 +33,11 @@ class ActionsDialog : public GenericDialog Q_OBJECT public: - ActionsDialog(QDialog *parent); + ActionsDialog(QDialog *parent, Handler::TabPreferences *handler); ~ActionsDialog(); Ui::ActionsDialog *ui() const; + Handler::TabPreferences *preferencesHandler() const; protected: void accept() override; @@ -44,6 +52,8 @@ private: private: Ui::ActionsDialog *m_ui; + + Handler::TabPreferences *m_preferencesHandler{nullptr}; }; } diff --git a/app/settings/settingsdialog/tabpreferenceshandler.cpp b/app/settings/settingsdialog/tabpreferenceshandler.cpp index b1e52c25a..c25a870d8 100644 --- a/app/settings/settingsdialog/tabpreferenceshandler.cpp +++ b/app/settings/settingsdialog/tabpreferenceshandler.cpp @@ -144,7 +144,7 @@ bool TabPreferences::inDefaultValues() const void TabPreferences::onActionsBtnPressed() { - auto viewsDlg = new Settings::Dialog::ActionsDialog(m_parentDialog); + auto viewsDlg = new Settings::Dialog::ActionsDialog(m_parentDialog, this); viewsDlg->exec(); }