From f3f3b5bdacb8d2070a7b372018a1fa14a67af414 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 23 Aug 2016 13:38:27 +0200 Subject: [PATCH 1/5] Move in own file --- src/CMakeLists.txt | 1 + .../filteractionmissingaccountdialog.cpp | 114 ++++++++++++++++++ .../dialog/filteractionmissingaccountdialog.h | 45 +++++++ .../filteractionmissingargumentdialog.cpp | 80 ------------ .../filteractionmissingargumentdialog.h | 16 --- src/filter/mailfilter.cpp | 6 +- 6 files changed, 163 insertions(+), 99 deletions(-) create mode 100644 src/filter/dialog/filteractionmissingaccountdialog.cpp create mode 100644 src/filter/dialog/filteractionmissingaccountdialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5c63c1..993b8dd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -67,6 +67,7 @@ set(libmailcommon_filter_dialog filter/dialog/filteractionmissingargumentdialog.cpp filter/dialog/filteractionmissingsoundurldialog.cpp filter/dialog/filteractionmissingtagdialog.cpp + filter/dialog/filteractionmissingaccountdialog.cpp ) diff --git a/src/filter/dialog/filteractionmissingaccountdialog.cpp b/src/filter/dialog/filteractionmissingaccountdialog.cpp new file mode 100644 index 0000000..5969908 --- /dev/null +++ b/src/filter/dialog/filteractionmissingaccountdialog.cpp @@ -0,0 +1,114 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#include "filteractionmissingaccountdialog.h" +#include "filter/kmfilteraccountlist.h" +#include "kernel/mailkernel.h" +#include "util/mailutil.h" + +#include + +#include +#include +#include +#include + +using namespace MailCommon; + +FilterActionMissingAccountDialog::FilterActionMissingAccountDialog(const QStringList &lstAccount, + const QString &filtername, + QWidget *parent) + : QDialog(parent) +{ + setModal(true); + setWindowTitle(i18n("Select Account")); + QVBoxLayout *mainLayout = new QVBoxLayout(this); + QWidget *mainWidget = new QWidget(this); + mainLayout->addWidget(mainWidget); + + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingAccountDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingAccountDialog::reject); + mainLayout->addWidget(buttonBox); + okButton->setDefault(true); + QVBoxLayout *lay = new QVBoxLayout(mainWidget); + QLabel *label = new QLabel(this); + label->setText(i18n("Filter account is missing. " + "Please select account to use with filter \"%1\"", + filtername)); + label->setWordWrap(true); + lay->addWidget(label); + mAccountList = new MailCommon::KMFilterAccountList(this); + mAccountList->applyOnAccount(lstAccount); + lay->addWidget(mAccountList); + readConfig(); +} + +FilterActionMissingAccountDialog::~FilterActionMissingAccountDialog() +{ + writeConfig(); +} + +void FilterActionMissingAccountDialog::readConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); + + const QSize size = group.readEntry("Size", QSize(500, 300)); + if (size.isValid()) { + resize(size); + } +} + +void FilterActionMissingAccountDialog::writeConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); + group.writeEntry("Size", size()); +} + +QStringList FilterActionMissingAccountDialog::selectedAccount() const +{ + return mAccountList->selectedAccount(); +} + +bool FilterActionMissingAccountDialog::allAccountExist(const QStringList &lst) +{ + const Akonadi::AgentInstance::List lstAgent = MailCommon::Util::agentInstances(); + + const int numberOfAccount(lst.count()); + const int numberOfAgent(lstAgent.count()); + + for (int i = 0; i < numberOfAccount; ++i) { + bool found = false; + const QString accountName(lst.at(i)); + for (int j = 0; j < numberOfAgent; ++j) { + if (lstAgent.at(j).identifier() == accountName) { + found = true; + break; + } + } + if (!found) { + return false; + } + } + return true; +} diff --git a/src/filter/dialog/filteractionmissingaccountdialog.h b/src/filter/dialog/filteractionmissingaccountdialog.h new file mode 100644 index 0000000..a1bcaaf --- /dev/null +++ b/src/filter/dialog/filteractionmissingaccountdialog.h @@ -0,0 +1,45 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#ifndef FILTERACTIONMISSINGACCOUNTDIALOG_H +#define FILTERACTIONMISSINGACCOUNTDIALOG_H + +#include +namespace MailCommon +{ +class KMFilterAccountList; +class FilterActionMissingAccountDialog : public QDialog +{ + Q_OBJECT +public: + explicit FilterActionMissingAccountDialog(const QStringList &lstAccount, + const QString &filtername, + QWidget *parent = Q_NULLPTR); + ~FilterActionMissingAccountDialog(); + QStringList selectedAccount() const; + static bool allAccountExist(const QStringList &lst); + +private: + void readConfig(); + void writeConfig(); + MailCommon::KMFilterAccountList *mAccountList; +}; +} +#endif // FILTERACTIONMISSINGACCOUNTDIALOG_H diff --git a/src/filter/dialog/filteractionmissingargumentdialog.cpp b/src/filter/dialog/filteractionmissingargumentdialog.cpp index 1e711e3..691147c 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.cpp +++ b/src/filter/dialog/filteractionmissingargumentdialog.cpp @@ -377,83 +377,3 @@ QString FilterActionMissingTemplateDialog::selectedTemplate() const } } -FilterActionMissingAccountDialog::FilterActionMissingAccountDialog(const QStringList &lstAccount, - const QString &filtername, - QWidget *parent) - : QDialog(parent) -{ - setModal(true); - setWindowTitle(i18n("Select Account")); - QVBoxLayout *mainLayout = new QVBoxLayout(this); - QWidget *mainWidget = new QWidget(this); - mainLayout->addWidget(mainWidget); - - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setDefault(true); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingAccountDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingAccountDialog::reject); - mainLayout->addWidget(buttonBox); - okButton->setDefault(true); - QVBoxLayout *lay = new QVBoxLayout(mainWidget); - QLabel *label = new QLabel(this); - label->setText(i18n("Filter account is missing. " - "Please select account to use with filter \"%1\"", - filtername)); - label->setWordWrap(true); - lay->addWidget(label); - mAccountList = new MailCommon::KMFilterAccountList(this); - mAccountList->applyOnAccount(lstAccount); - lay->addWidget(mAccountList); - readConfig(); -} - -FilterActionMissingAccountDialog::~FilterActionMissingAccountDialog() -{ - writeConfig(); -} - -void FilterActionMissingAccountDialog::readConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); - - const QSize size = group.readEntry("Size", QSize(500, 300)); - if (size.isValid()) { - resize(size); - } -} - -void FilterActionMissingAccountDialog::writeConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); - group.writeEntry("Size", size()); -} - -QStringList FilterActionMissingAccountDialog::selectedAccount() const -{ - return mAccountList->selectedAccount(); -} - -bool FilterActionMissingAccountDialog::allAccountExist(const QStringList &lst) -{ - const Akonadi::AgentInstance::List lstAgent = MailCommon::Util::agentInstances(); - - const int numberOfAccount(lst.count()); - const int numberOfAgent(lstAgent.count()); - - for (int i = 0; i < numberOfAccount; ++i) { - bool found = false; - const QString accountName(lst.at(i)); - for (int j = 0; j < numberOfAgent; ++j) { - if (lstAgent.at(j).identifier() == accountName) { - found = true; - break; - } - } - if (!found) { - return false; - } - } - return true; -} diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h index 5c3edd4..4cf5b89 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.h +++ b/src/filter/dialog/filteractionmissingargumentdialog.h @@ -132,22 +132,6 @@ private: KComboBox *mComboBoxTemplate; }; -class FilterActionMissingAccountDialog : public QDialog -{ - Q_OBJECT -public: - explicit FilterActionMissingAccountDialog(const QStringList &lstAccount, - const QString &filtername, - QWidget *parent = Q_NULLPTR); - ~FilterActionMissingAccountDialog(); - QStringList selectedAccount() const; - static bool allAccountExist(const QStringList &lst); - -private: - void readConfig(); - void writeConfig(); - MailCommon::KMFilterAccountList *mAccountList; -}; #endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */ diff --git a/src/filter/mailfilter.cpp b/src/filter/mailfilter.cpp index 862ac1d..7dfd944 100644 --- a/src/filter/mailfilter.cpp +++ b/src/filter/mailfilter.cpp @@ -27,7 +27,7 @@ #include "filteractions/filteractiondict.h" #include "filtermanager.h" #include "filterlog.h" -#include "dialog/filteractionmissingargumentdialog.h" +#include "dialog/filteractionmissingaccountdialog.h" using MailCommon::FilterLog; #include "PimCommon/PimUtil" @@ -470,8 +470,8 @@ bool MailFilter::readConfig(const KConfigGroup &config, bool interactive) mAccounts = config.readEntry("accounts-set", QStringList()); if (!mAccounts.isEmpty() && interactive) { - if (!FilterActionMissingAccountDialog::allAccountExist(mAccounts)) { - FilterActionMissingAccountDialog *dlg = new FilterActionMissingAccountDialog(mAccounts, name()); + if (!MailCommon::FilterActionMissingAccountDialog::allAccountExist(mAccounts)) { + MailCommon::FilterActionMissingAccountDialog *dlg = new MailCommon::FilterActionMissingAccountDialog(mAccounts, name()); if (dlg->exec()) { mAccounts = dlg->selectedAccount(); needUpdate = true; From bf19abea21d5f769786974fb7fbfb82c065fc772 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 23 Aug 2016 13:42:59 +0200 Subject: [PATCH 2/5] Split filteractionmissingtemplatedialog --- src/CMakeLists.txt | 1 + src/filter/autotests/CMakeLists.txt | 2 +- .../filteractionmissingargumentdialog.cpp | 61 ------------ .../filteractionmissingargumentdialog.h | 16 ---- .../filteractionmissingtemplatedialog.cpp | 94 +++++++++++++++++++ .../filteractionmissingtemplatedialog.h | 43 +++++++++ .../filteractions/filteractionforward.cpp | 4 +- 7 files changed, 141 insertions(+), 80 deletions(-) create mode 100644 src/filter/dialog/filteractionmissingtemplatedialog.cpp create mode 100644 src/filter/dialog/filteractionmissingtemplatedialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 993b8dd..7c55cbf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,6 +68,7 @@ set(libmailcommon_filter_dialog filter/dialog/filteractionmissingsoundurldialog.cpp filter/dialog/filteractionmissingtagdialog.cpp filter/dialog/filteractionmissingaccountdialog.cpp + filter/dialog/filteractionmissingtemplatedialog.cpp ) diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt index d5a601d..d04e373 100644 --- a/src/filter/autotests/CMakeLists.txt +++ b/src/filter/autotests/CMakeLists.txt @@ -166,7 +166,7 @@ add_mailcommon_filter_test(filteractionforwardtest ../filteractions/filteractionforward.cpp ../filteractions/filteractionwithaddress.cpp ../filteractions/filteractionwithstring.cpp - ../dialog/filteractionmissingargumentdialog.cpp + ../dialog/filteractionmissingtemplatedialog.cpp ../kmfilteraccountlist.cpp ${filter_common_SRCS} ) diff --git a/src/filter/dialog/filteractionmissingargumentdialog.cpp b/src/filter/dialog/filteractionmissingargumentdialog.cpp index 691147c..af743cf 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.cpp +++ b/src/filter/dialog/filteractionmissingargumentdialog.cpp @@ -316,64 +316,3 @@ int FilterActionMissingTransportDialog::selectedTransport() const return mComboBoxTransport->currentTransportId(); } -FilterActionMissingTemplateDialog::FilterActionMissingTemplateDialog( - const QStringList &templateList, const QString &filtername, QWidget *parent) - : QDialog(parent) -{ - setModal(true); - setWindowTitle(i18n("Select Template")); - QVBoxLayout *mainLayout = new QVBoxLayout(this); - QWidget *mainWidget = new QWidget(this); - mainLayout->addWidget(mainWidget); - - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setDefault(true); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingTemplateDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingTemplateDialog::reject); - mainLayout->addWidget(buttonBox); - okButton->setDefault(true); - QVBoxLayout *lay = new QVBoxLayout(mainWidget); - QLabel *label = new QLabel(this); - label->setText(i18n("Filter template is missing. " - "Please select a template to use with filter \"%1\"", - filtername)); - label->setWordWrap(true); - lay->addWidget(label); - mComboBoxTemplate = new KComboBox(this); - mComboBoxTemplate->addItems(templateList); - lay->addWidget(mComboBoxTemplate); - readConfig(); -} - -FilterActionMissingTemplateDialog::~FilterActionMissingTemplateDialog() -{ - writeConfig(); -} - -void FilterActionMissingTemplateDialog::readConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); - - const QSize size = group.readEntry("Size", QSize(500, 300)); - if (size.isValid()) { - resize(size); - } -} - -void FilterActionMissingTemplateDialog::writeConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); - group.writeEntry("Size", size()); -} - -QString FilterActionMissingTemplateDialog::selectedTemplate() const -{ - if (mComboBoxTemplate->currentIndex() == 0) { - return QString(); - } else { - return mComboBoxTemplate->currentText(); - } -} - diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h index 4cf5b89..c40c349 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.h +++ b/src/filter/dialog/filteractionmissingargumentdialog.h @@ -116,22 +116,6 @@ private: MailTransport::TransportComboBox *mComboBoxTransport; }; -class FilterActionMissingTemplateDialog : public QDialog -{ - Q_OBJECT -public: - explicit FilterActionMissingTemplateDialog(const QStringList &templateList, - const QString &filtername, - QWidget *parent = Q_NULLPTR); - ~FilterActionMissingTemplateDialog(); - QString selectedTemplate() const; - -private: - void readConfig(); - void writeConfig(); - KComboBox *mComboBoxTemplate; -}; - #endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */ diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.cpp b/src/filter/dialog/filteractionmissingtemplatedialog.cpp new file mode 100644 index 0000000..e52602e --- /dev/null +++ b/src/filter/dialog/filteractionmissingtemplatedialog.cpp @@ -0,0 +1,94 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "filteractionmissingtemplatedialog.h" +#include "kernel/mailkernel.h" + +#include +#include +#include + +#include +#include +#include +#include + +using namespace MailCommon; + +FilterActionMissingTemplateDialog::FilterActionMissingTemplateDialog( + const QStringList &templateList, const QString &filtername, QWidget *parent) + : QDialog(parent) +{ + setModal(true); + setWindowTitle(i18n("Select Template")); + QVBoxLayout *mainLayout = new QVBoxLayout(this); + QWidget *mainWidget = new QWidget(this); + mainLayout->addWidget(mainWidget); + + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingTemplateDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingTemplateDialog::reject); + mainLayout->addWidget(buttonBox); + okButton->setDefault(true); + QVBoxLayout *lay = new QVBoxLayout(mainWidget); + QLabel *label = new QLabel(this); + label->setText(i18n("Filter template is missing. " + "Please select a template to use with filter \"%1\"", + filtername)); + label->setWordWrap(true); + lay->addWidget(label); + mComboBoxTemplate = new KComboBox(this); + mComboBoxTemplate->addItems(templateList); + lay->addWidget(mComboBoxTemplate); + readConfig(); +} + +FilterActionMissingTemplateDialog::~FilterActionMissingTemplateDialog() +{ + writeConfig(); +} + +void FilterActionMissingTemplateDialog::readConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); + + const QSize size = group.readEntry("Size", QSize(500, 300)); + if (size.isValid()) { + resize(size); + } +} + +void FilterActionMissingTemplateDialog::writeConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); + group.writeEntry("Size", size()); +} + +QString FilterActionMissingTemplateDialog::selectedTemplate() const +{ + if (mComboBoxTemplate->currentIndex() == 0) { + return QString(); + } else { + return mComboBoxTemplate->currentText(); + } +} + diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.h b/src/filter/dialog/filteractionmissingtemplatedialog.h new file mode 100644 index 0000000..a839929 --- /dev/null +++ b/src/filter/dialog/filteractionmissingtemplatedialog.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef FILTERACTIONMISSINGTEMPLATEDIALOG_H +#define FILTERACTIONMISSINGTEMPLATEDIALOG_H + +#include + +class KComboBox; +namespace MailCommon { +class FilterActionMissingTemplateDialog : public QDialog +{ + Q_OBJECT +public: + explicit FilterActionMissingTemplateDialog(const QStringList &templateList, + const QString &filtername, + QWidget *parent = Q_NULLPTR); + ~FilterActionMissingTemplateDialog(); + QString selectedTemplate() const; + +private: + void readConfig(); + void writeConfig(); + KComboBox *mComboBoxTemplate; +}; +} +#endif // FILTERACTIONMISSINGTEMPLATEDIALOG_H diff --git a/src/filter/filteractions/filteractionforward.cpp b/src/filter/filteractions/filteractionforward.cpp index 1888e87..641b356 100644 --- a/src/filter/filteractions/filteractionforward.cpp +++ b/src/filter/filteractions/filteractionforward.cpp @@ -22,7 +22,7 @@ #include "kernel/mailkernel.h" #include "util/mailutil.h" -#include "filter/dialog/filteractionmissingargumentdialog.h" +#include "filter/dialog/filteractionmissingtemplatedialog.h" #include #include @@ -221,7 +221,7 @@ bool FilterActionForward::argsFromStringInteractive(const QString &argsStr, cons currentTemplateList << templateName; } } - QPointer dlg = new FilterActionMissingTemplateDialog(currentTemplateList, filterName); + QPointer dlg = new MailCommon::FilterActionMissingTemplateDialog(currentTemplateList, filterName); if (dlg->exec()) { mTemplate = dlg->selectedTemplate(); needUpdate = true; From 55a238572c3e0cce2d6f1fc325bd3a0c39ce4299 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 23 Aug 2016 13:47:30 +0200 Subject: [PATCH 3/5] Extract filteractionmissingtransportdialog --- src/CMakeLists.txt | 1 + src/filter/autotests/CMakeLists.txt | 2 +- .../filteractionmissingargumentdialog.cpp | 56 ------------ .../filteractionmissingargumentdialog.h | 16 ---- .../filteractionmissingtransportdialog.cpp | 89 +++++++++++++++++++ .../filteractionmissingtransportdialog.h | 47 ++++++++++ .../filteractionsettransport.cpp | 4 +- 7 files changed, 140 insertions(+), 75 deletions(-) create mode 100644 src/filter/dialog/filteractionmissingtransportdialog.cpp create mode 100644 src/filter/dialog/filteractionmissingtransportdialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7c55cbf..28f4fe6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,6 +69,7 @@ set(libmailcommon_filter_dialog filter/dialog/filteractionmissingtagdialog.cpp filter/dialog/filteractionmissingaccountdialog.cpp filter/dialog/filteractionmissingtemplatedialog.cpp + filter/dialog/filteractionmissingtransportdialog.cpp ) diff --git a/src/filter/autotests/CMakeLists.txt b/src/filter/autotests/CMakeLists.txt index d04e373..50b6aaf 100644 --- a/src/filter/autotests/CMakeLists.txt +++ b/src/filter/autotests/CMakeLists.txt @@ -209,7 +209,7 @@ add_mailcommon_filter_test(filteractionsendreceipttest add_mailcommon_filter_test(filteractionsettransporttest filteractionsettransporttest.cpp ../filteractions/filteractionsettransport.cpp - ../dialog/filteractionmissingargumentdialog.cpp + ../dialog/filteractionmissingtransportdialog.cpp ../kmfilteraccountlist.cpp ${filter_common_SRCS} ) diff --git a/src/filter/dialog/filteractionmissingargumentdialog.cpp b/src/filter/dialog/filteractionmissingargumentdialog.cpp index af743cf..b4ad061 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.cpp +++ b/src/filter/dialog/filteractionmissingargumentdialog.cpp @@ -260,59 +260,3 @@ int FilterActionMissingIdentityDialog::selectedIdentity() const return mComboBoxIdentity->currentIdentity(); } -FilterActionMissingTransportDialog::FilterActionMissingTransportDialog(const QString &filtername, - QWidget *parent) - : QDialog(parent) -{ - setModal(true); - setWindowTitle(i18n("Select Transport")); - QVBoxLayout *mainLayout = new QVBoxLayout(this); - QWidget *mainWidget = new QWidget(this); - mainLayout->addWidget(mainWidget); - - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setDefault(true); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingTransportDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingTransportDialog::reject); - mainLayout->addWidget(buttonBox); - okButton->setDefault(true); - QVBoxLayout *lay = new QVBoxLayout(mainWidget); - QLabel *label = new QLabel(this); - label->setText(i18n("Filter transport is missing. " - "Please select a transport to use with filter \"%1\"", - filtername)); - label->setWordWrap(true); - lay->addWidget(label); - mComboBoxTransport = new MailTransport::TransportComboBox(this); - lay->addWidget(mComboBoxTransport); - readConfig(); -} - -FilterActionMissingTransportDialog::~FilterActionMissingTransportDialog() -{ - writeConfig(); -} - -void FilterActionMissingTransportDialog::readConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); - - const QSize size = group.readEntry("Size", QSize(500, 300)); - if (size.isValid()) { - resize(size); - } -} - -void FilterActionMissingTransportDialog::writeConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); - group.writeEntry("Size", size()); -} - -int FilterActionMissingTransportDialog::selectedTransport() const -{ - return mComboBoxTransport->currentTransportId(); -} - diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h index c40c349..ed8e83c 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.h +++ b/src/filter/dialog/filteractionmissingargumentdialog.h @@ -101,21 +101,5 @@ private: KIdentityManagement::IdentityCombo *mComboBoxIdentity; }; -class FilterActionMissingTransportDialog : public QDialog -{ - Q_OBJECT -public: - explicit FilterActionMissingTransportDialog(const QString &filtername, - QWidget *parent = Q_NULLPTR); - ~FilterActionMissingTransportDialog(); - int selectedTransport() const; - -private: - void writeConfig(); - void readConfig(); - MailTransport::TransportComboBox *mComboBoxTransport; -}; - - #endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */ diff --git a/src/filter/dialog/filteractionmissingtransportdialog.cpp b/src/filter/dialog/filteractionmissingtransportdialog.cpp new file mode 100644 index 0000000..7b09fdd --- /dev/null +++ b/src/filter/dialog/filteractionmissingtransportdialog.cpp @@ -0,0 +1,89 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "filteractionmissingtransportdialog.h" +#include "kernel/mailkernel.h" + +#include + +#include +#include +#include +#include + +#include + +using namespace MailCommon; + +FilterActionMissingTransportDialog::FilterActionMissingTransportDialog(const QString &filtername, + QWidget *parent) + : QDialog(parent) +{ + setModal(true); + setWindowTitle(i18n("Select Transport")); + QVBoxLayout *mainLayout = new QVBoxLayout(this); + QWidget *mainWidget = new QWidget(this); + mainLayout->addWidget(mainWidget); + + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingTransportDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingTransportDialog::reject); + mainLayout->addWidget(buttonBox); + okButton->setDefault(true); + QVBoxLayout *lay = new QVBoxLayout(mainWidget); + QLabel *label = new QLabel(this); + label->setText(i18n("Filter transport is missing. " + "Please select a transport to use with filter \"%1\"", + filtername)); + label->setWordWrap(true); + lay->addWidget(label); + mComboBoxTransport = new MailTransport::TransportComboBox(this); + lay->addWidget(mComboBoxTransport); + readConfig(); +} + +FilterActionMissingTransportDialog::~FilterActionMissingTransportDialog() +{ + writeConfig(); +} + +void FilterActionMissingTransportDialog::readConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); + + const QSize size = group.readEntry("Size", QSize(500, 300)); + if (size.isValid()) { + resize(size); + } +} + +void FilterActionMissingTransportDialog::writeConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); + group.writeEntry("Size", size()); +} + +int FilterActionMissingTransportDialog::selectedTransport() const +{ + return mComboBoxTransport->currentTransportId(); +} + diff --git a/src/filter/dialog/filteractionmissingtransportdialog.h b/src/filter/dialog/filteractionmissingtransportdialog.h new file mode 100644 index 0000000..1a74be6 --- /dev/null +++ b/src/filter/dialog/filteractionmissingtransportdialog.h @@ -0,0 +1,47 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef FILTERACTIONMISSINGTRANSPORTDIALOG_H +#define FILTERACTIONMISSINGTRANSPORTDIALOG_H + +#include +namespace MailTransport +{ +class TransportComboBox; +} + +namespace MailCommon +{ +class FilterActionMissingTransportDialog : public QDialog +{ + Q_OBJECT +public: + explicit FilterActionMissingTransportDialog(const QString &filtername, + QWidget *parent = Q_NULLPTR); + ~FilterActionMissingTransportDialog(); + int selectedTransport() const; + +private: + void writeConfig(); + void readConfig(); + MailTransport::TransportComboBox *mComboBoxTransport; +}; +} + +#endif // FILTERACTIONMISSINGTRANSPORTDIALOG_H diff --git a/src/filter/filteractions/filteractionsettransport.cpp b/src/filter/filteractions/filteractionsettransport.cpp index 6a4474b..3260989 100644 --- a/src/filter/filteractions/filteractionsettransport.cpp +++ b/src/filter/filteractions/filteractionsettransport.cpp @@ -19,7 +19,7 @@ #include "filteractionsettransport.h" -#include "filter/dialog/filteractionmissingargumentdialog.h" +#include "filter/dialog/filteractionmissingtransportdialog.h" #include #include @@ -57,7 +57,7 @@ bool FilterActionSetTransport::argsFromStringInteractive(const QString &argsStr, bool needUpdate = false; argsFromString(argsStr); if (!MailTransport::TransportManager::self()->transportById(mParameter, false)) { - QPointer dlg = new FilterActionMissingTransportDialog(filterName); + QPointer dlg = new MailCommon::FilterActionMissingTransportDialog(filterName); if (dlg->exec()) { mParameter = dlg->selectedTransport(); needUpdate = true; From 6e805c29c1b1af740730100a50755c0621f0ecc8 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 23 Aug 2016 13:52:48 +0200 Subject: [PATCH 4/5] Extract filteractionmissingidentitydialog --- src/CMakeLists.txt | 1 + .../filteractionmissingargumentdialog.cpp | 57 ------------ .../filteractionmissingargumentdialog.h | 14 --- .../filteractionmissingidentitydialog.cpp | 93 +++++++++++++++++++ .../filteractionmissingidentitydialog.h | 48 ++++++++++ .../filteractions/filteractionsetidentity.cpp | 4 +- 6 files changed, 144 insertions(+), 73 deletions(-) create mode 100644 src/filter/dialog/filteractionmissingidentitydialog.cpp create mode 100644 src/filter/dialog/filteractionmissingidentitydialog.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 28f4fe6..c3e53a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,6 +70,7 @@ set(libmailcommon_filter_dialog filter/dialog/filteractionmissingaccountdialog.cpp filter/dialog/filteractionmissingtemplatedialog.cpp filter/dialog/filteractionmissingtransportdialog.cpp + filter/dialog/filteractionmissingidentitydialog.cpp ) diff --git a/src/filter/dialog/filteractionmissingargumentdialog.cpp b/src/filter/dialog/filteractionmissingargumentdialog.cpp index b4ad061..e034aa1 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.cpp +++ b/src/filter/dialog/filteractionmissingargumentdialog.cpp @@ -203,60 +203,3 @@ Akonadi::Collection::List FilterActionMissingCollectionDialog::potentialCorrectF return lst; } -FilterActionMissingIdentityDialog::FilterActionMissingIdentityDialog(const QString &filtername, - QWidget *parent) - : QDialog(parent) -{ - setModal(true); - setWindowTitle(i18n("Select Identity")); - QVBoxLayout *mainLayout = new QVBoxLayout(this); - - QWidget *mainWidget = new QWidget(this); - mainLayout->addWidget(mainWidget); - - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); - okButton->setDefault(true); - okButton->setShortcut(Qt::CTRL | Qt::Key_Return); - connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingIdentityDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingIdentityDialog::reject); - mainLayout->addWidget(buttonBox); - okButton->setDefault(true); - QVBoxLayout *lay = new QVBoxLayout(mainWidget); - QLabel *label = new QLabel(this); - label->setText(i18n("Filter identity is missing. " - "Please select an identity to use with filter \"%1\"", - filtername)); - label->setWordWrap(true); - lay->addWidget(label); - mComboBoxIdentity = new KIdentityManagement::IdentityCombo(KernelIf->identityManager(), this); - lay->addWidget(mComboBoxIdentity); - readConfig(); -} - -FilterActionMissingIdentityDialog::~FilterActionMissingIdentityDialog() -{ - writeConfig(); -} - -void FilterActionMissingIdentityDialog::readConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); - - const QSize size = group.readEntry("Size", QSize(500, 300)); - if (size.isValid()) { - resize(size); - } -} - -void FilterActionMissingIdentityDialog::writeConfig() -{ - KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); - group.writeEntry("Size", size()); -} - -int FilterActionMissingIdentityDialog::selectedIdentity() const -{ - return mComboBoxIdentity->currentIdentity(); -} - diff --git a/src/filter/dialog/filteractionmissingargumentdialog.h b/src/filter/dialog/filteractionmissingargumentdialog.h index ed8e83c..5ea28b2 100644 --- a/src/filter/dialog/filteractionmissingargumentdialog.h +++ b/src/filter/dialog/filteractionmissingargumentdialog.h @@ -86,20 +86,6 @@ private: QPushButton *mOkButton; }; -class FilterActionMissingIdentityDialog : public QDialog -{ - Q_OBJECT -public: - explicit FilterActionMissingIdentityDialog(const QString &filtername, - QWidget *parent = Q_NULLPTR); - ~FilterActionMissingIdentityDialog(); - int selectedIdentity() const; - -private: - void writeConfig(); - void readConfig(); - KIdentityManagement::IdentityCombo *mComboBoxIdentity; -}; #endif /* FILTERACTIONMISSINGARGUMENTDIALOG_H */ diff --git a/src/filter/dialog/filteractionmissingidentitydialog.cpp b/src/filter/dialog/filteractionmissingidentitydialog.cpp new file mode 100644 index 0000000..d3abd7f --- /dev/null +++ b/src/filter/dialog/filteractionmissingidentitydialog.cpp @@ -0,0 +1,93 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#include "filteractionmissingidentitydialog.h" +#include "kernel/mailkernel.h" + + +#include +#include + +#include +#include +#include +#include + +#include + +using namespace MailCommon; + +FilterActionMissingIdentityDialog::FilterActionMissingIdentityDialog(const QString &filtername, + QWidget *parent) + : QDialog(parent) +{ + setModal(true); + setWindowTitle(i18n("Select Identity")); + QVBoxLayout *mainLayout = new QVBoxLayout(this); + + QWidget *mainWidget = new QWidget(this); + mainLayout->addWidget(mainWidget); + + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); + QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setDefault(true); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingIdentityDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingIdentityDialog::reject); + mainLayout->addWidget(buttonBox); + okButton->setDefault(true); + QVBoxLayout *lay = new QVBoxLayout(mainWidget); + QLabel *label = new QLabel(this); + label->setText(i18n("Filter identity is missing. " + "Please select an identity to use with filter \"%1\"", + filtername)); + label->setWordWrap(true); + lay->addWidget(label); + mComboBoxIdentity = new KIdentityManagement::IdentityCombo(KernelIf->identityManager(), this); + lay->addWidget(mComboBoxIdentity); + readConfig(); +} + +FilterActionMissingIdentityDialog::~FilterActionMissingIdentityDialog() +{ + writeConfig(); +} + +void FilterActionMissingIdentityDialog::readConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); + + const QSize size = group.readEntry("Size", QSize(500, 300)); + if (size.isValid()) { + resize(size); + } +} + +void FilterActionMissingIdentityDialog::writeConfig() +{ + KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); + group.writeEntry("Size", size()); +} + +int FilterActionMissingIdentityDialog::selectedIdentity() const +{ + return mComboBoxIdentity->currentIdentity(); +} + diff --git a/src/filter/dialog/filteractionmissingidentitydialog.h b/src/filter/dialog/filteractionmissingidentitydialog.h new file mode 100644 index 0000000..9de1110 --- /dev/null +++ b/src/filter/dialog/filteractionmissingidentitydialog.h @@ -0,0 +1,48 @@ +/* + Copyright (C) 2016 Laurent Montel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + + +#ifndef FILTERACTIONMISSINGIDENTITYDIALOG_H +#define FILTERACTIONMISSINGIDENTITYDIALOG_H + +#include + +namespace KIdentityManagement +{ +class IdentityCombo; +} +namespace MailCommon +{ +class FilterActionMissingIdentityDialog : public QDialog +{ + Q_OBJECT +public: + explicit FilterActionMissingIdentityDialog(const QString &filtername, + QWidget *parent = Q_NULLPTR); + ~FilterActionMissingIdentityDialog(); + int selectedIdentity() const; + +private: + void writeConfig(); + void readConfig(); + KIdentityManagement::IdentityCombo *mComboBoxIdentity; +}; +} + +#endif // FILTERACTIONMISSINGIDENTITYDIALOG_H diff --git a/src/filter/filteractions/filteractionsetidentity.cpp b/src/filter/filteractions/filteractionsetidentity.cpp index 6d49e9f..a8453b0 100644 --- a/src/filter/filteractions/filteractionsetidentity.cpp +++ b/src/filter/filteractions/filteractionsetidentity.cpp @@ -21,7 +21,7 @@ #include "MessageCore/StringUtil" #include "kernel/mailkernel.h" -#include "filter/dialog/filteractionmissingargumentdialog.h" +#include "filter/dialog/filteractionmissingidentitydialog.h" #include #include @@ -48,7 +48,7 @@ bool FilterActionSetIdentity::argsFromStringInteractive(const QString &argsStr, bool needUpdate = false; argsFromString(argsStr); if (KernelIf->identityManager()->identityForUoid(mParameter).isNull()) { - QPointer dlg = new FilterActionMissingIdentityDialog(filterName); + QPointer dlg = new MailCommon::FilterActionMissingIdentityDialog(filterName); if (dlg->exec()) { mParameter = dlg->selectedIdentity(); needUpdate = true; From cffc0030d339ca4ac196cb2017427ca8e53be5d4 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Tue, 23 Aug 2016 13:57:51 +0200 Subject: [PATCH 5/5] Remove dependancy against KernelIf when not necessary --- src/filter/dialog/filteractionmissingaccountdialog.cpp | 7 ++++--- src/filter/dialog/filteractionmissingidentitydialog.cpp | 6 +++--- src/filter/dialog/filteractionmissingsoundurldialog.cpp | 6 +++--- src/filter/dialog/filteractionmissingtagdialog.cpp | 6 +++--- src/filter/dialog/filteractionmissingtemplatedialog.cpp | 7 ++++--- src/filter/dialog/filteractionmissingtransportdialog.cpp | 6 +++--- src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp | 6 +++--- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/filter/dialog/filteractionmissingaccountdialog.cpp b/src/filter/dialog/filteractionmissingaccountdialog.cpp index 5969908..918895d 100644 --- a/src/filter/dialog/filteractionmissingaccountdialog.cpp +++ b/src/filter/dialog/filteractionmissingaccountdialog.cpp @@ -20,11 +20,12 @@ #include "filteractionmissingaccountdialog.h" #include "filter/kmfilteraccountlist.h" -#include "kernel/mailkernel.h" #include "util/mailutil.h" #include +#include +#include #include #include #include @@ -71,7 +72,7 @@ FilterActionMissingAccountDialog::~FilterActionMissingAccountDialog() void FilterActionMissingAccountDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -81,7 +82,7 @@ void FilterActionMissingAccountDialog::readConfig() void FilterActionMissingAccountDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingAccountDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingAccountDialog"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/filteractionmissingidentitydialog.cpp b/src/filter/dialog/filteractionmissingidentitydialog.cpp index d3abd7f..678cc6a 100644 --- a/src/filter/dialog/filteractionmissingidentitydialog.cpp +++ b/src/filter/dialog/filteractionmissingidentitydialog.cpp @@ -21,7 +21,7 @@ #include "filteractionmissingidentitydialog.h" #include "kernel/mailkernel.h" - +#include #include #include @@ -72,7 +72,7 @@ FilterActionMissingIdentityDialog::~FilterActionMissingIdentityDialog() void FilterActionMissingIdentityDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -82,7 +82,7 @@ void FilterActionMissingIdentityDialog::readConfig() void FilterActionMissingIdentityDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingMissingIdentity"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingMissingIdentity"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/filteractionmissingsoundurldialog.cpp b/src/filter/dialog/filteractionmissingsoundurldialog.cpp index 29f264e..62c7ccc 100644 --- a/src/filter/dialog/filteractionmissingsoundurldialog.cpp +++ b/src/filter/dialog/filteractionmissingsoundurldialog.cpp @@ -18,11 +18,11 @@ */ #include "filteractionmissingsoundurldialog.h" -#include "kernel/mailkernel.h" #include #include #include +#include #include #include #include @@ -78,7 +78,7 @@ QString FilterActionMissingSoundUrlDialog::soundUrl() const void FilterActionMissingSoundUrlDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -88,7 +88,7 @@ void FilterActionMissingSoundUrlDialog::readConfig() void FilterActionMissingSoundUrlDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingSoundUrlDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingSoundUrlDialog"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/filteractionmissingtagdialog.cpp b/src/filter/dialog/filteractionmissingtagdialog.cpp index ff8ea03..9f7f25a 100644 --- a/src/filter/dialog/filteractionmissingtagdialog.cpp +++ b/src/filter/dialog/filteractionmissingtagdialog.cpp @@ -20,9 +20,9 @@ #include "filteractionmissingtagdialog.h" #include +#include #include "tag/addtagdialog.h" -#include "kernel/mailkernel.h" #include #include @@ -89,7 +89,7 @@ FilterActionMissingTagDialog::~FilterActionMissingTagDialog() void FilterActionMissingTagDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -99,7 +99,7 @@ void FilterActionMissingTagDialog::readConfig() void FilterActionMissingTagDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTagDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTagDialog"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/filteractionmissingtemplatedialog.cpp b/src/filter/dialog/filteractionmissingtemplatedialog.cpp index e52602e..2338c5f 100644 --- a/src/filter/dialog/filteractionmissingtemplatedialog.cpp +++ b/src/filter/dialog/filteractionmissingtemplatedialog.cpp @@ -18,7 +18,8 @@ */ #include "filteractionmissingtemplatedialog.h" -#include "kernel/mailkernel.h" + +#include #include #include @@ -69,7 +70,7 @@ FilterActionMissingTemplateDialog::~FilterActionMissingTemplateDialog() void FilterActionMissingTemplateDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -79,7 +80,7 @@ void FilterActionMissingTemplateDialog::readConfig() void FilterActionMissingTemplateDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTemplateDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTemplateDialog"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/filteractionmissingtransportdialog.cpp b/src/filter/dialog/filteractionmissingtransportdialog.cpp index 7b09fdd..9bc1daa 100644 --- a/src/filter/dialog/filteractionmissingtransportdialog.cpp +++ b/src/filter/dialog/filteractionmissingtransportdialog.cpp @@ -18,8 +18,8 @@ */ #include "filteractionmissingtransportdialog.h" -#include "kernel/mailkernel.h" +#include #include #include @@ -68,7 +68,7 @@ FilterActionMissingTransportDialog::~FilterActionMissingTransportDialog() void FilterActionMissingTransportDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -78,7 +78,7 @@ void FilterActionMissingTransportDialog::readConfig() void FilterActionMissingTransportDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "FilterActionMissingTransportDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingTransportDialog"); group.writeEntry("Size", size()); } diff --git a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp index e3d6703..658e7e0 100644 --- a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp +++ b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp @@ -17,7 +17,7 @@ #include "selectthunderbirdfilterfilesdialog.h" #include "selectthunderbirdfilterfileswidget.h" -#include "kernel/mailkernel.h" +#include #include #include @@ -67,7 +67,7 @@ void SelectThunderbirdFilterFilesDialog::setStartDir(const QUrl &url) void SelectThunderbirdFilterFilesDialog::readConfig() { - KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog"); const QSize size = group.readEntry("Size", QSize(500, 300)); if (size.isValid()) { @@ -77,6 +77,6 @@ void SelectThunderbirdFilterFilesDialog::readConfig() void SelectThunderbirdFilterFilesDialog::writeConfig() { - KConfigGroup group(KernelIf->config(), "SelectThunderbirdFilterFilesDialog"); + KConfigGroup group(KSharedConfig::openConfig(), "SelectThunderbirdFilterFilesDialog"); group.writeEntry("Size", size()); }