wilderjds
/
mailcommon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename class

Browse Source
wilder
Montel Laurent 9 years ago
parent e6ed1b14bb
commit 8b0be47d6b
4 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      src/filter/dialog/filteractionmissingargumentdialog.cpp
  2. 6
      src/filter/dialog/filteractionmissingargumentdialog.h
  3. 4
      src/filter/filteractions/filteractionwithfolder.cpp
  4. 4
      src/util/mailutil.cpp

38
src/filter/dialog/filteractionmissingargumentdialog.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <QDialogButtonBox>
#include <QPushButton>
FilterActionMissingCollectionDialog::FilterActionMissingCollectionDialog(
FilterActionMissingFolderDialog::FilterActionMissingFolderDialog(
const Akonadi::Collection::List &list, const QString &filtername, const QString &argStr, QWidget *parent)
: QDialog(parent)
, mListwidget(nullptr)
@ -60,11 +60,11 @@ FilterActionMissingCollectionDialog::FilterActionMissingCollectionDialog(
for (int i = 0; i < numberOfItems; ++i) {
Akonadi::Collection col = list.at(i);
QListWidgetItem *item = new QListWidgetItem(MailCommon::Util::fullCollectionPath(col));
item->setData(FilterActionMissingCollectionDialog::IdentifyCollection, col.id());
item->setData(FilterActionMissingFolderDialog::IdentifyCollection, col.id());
mListwidget->addItem(item);
}
connect(mListwidget, &QListWidget::currentItemChanged, this, &FilterActionMissingCollectionDialog::slotCurrentItemChanged);
connect(mListwidget, &QListWidget::itemDoubleClicked, this, &FilterActionMissingCollectionDialog::slotDoubleItemClicked);
connect(mListwidget, &QListWidget::currentItemChanged, this, &FilterActionMissingFolderDialog::slotCurrentItemChanged);
connect(mListwidget, &QListWidget::itemDoubleClicked, this, &FilterActionMissingFolderDialog::slotDoubleItemClicked);
}
QLabel *label = new QLabel(this);
@ -80,7 +80,7 @@ FilterActionMissingCollectionDialog::FilterActionMissingCollectionDialog(
mainLayout->addWidget(label);
mFolderRequester = new MailCommon::FolderRequester(this);
mFolderRequester->setObjectName(QStringLiteral("folderrequester"));
connect(mFolderRequester, &MailCommon::FolderRequester::folderChanged, this, &FilterActionMissingCollectionDialog::slotFolderChanged);
connect(mFolderRequester, &MailCommon::FolderRequester::folderChanged, this, &FilterActionMissingFolderDialog::slotFolderChanged);
mainLayout->addWidget(mFolderRequester);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
@ -89,18 +89,18 @@ FilterActionMissingCollectionDialog::FilterActionMissingCollectionDialog(
mOkButton->setDefault(true);
mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
mOkButton->setEnabled(false);
connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingCollectionDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingCollectionDialog::reject);
connect(buttonBox, &QDialogButtonBox::accepted, this, &FilterActionMissingFolderDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &FilterActionMissingFolderDialog::reject);
mainLayout->addWidget(buttonBox);
readConfig();
}
FilterActionMissingCollectionDialog::~FilterActionMissingCollectionDialog()
FilterActionMissingFolderDialog::~FilterActionMissingFolderDialog()
{
writeConfig();
}
void FilterActionMissingCollectionDialog::readConfig()
void FilterActionMissingFolderDialog::readConfig()
{
KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingCollectionDialog");
@ -110,46 +110,46 @@ void FilterActionMissingCollectionDialog::readConfig()
}
}
void FilterActionMissingCollectionDialog::writeConfig()
void FilterActionMissingFolderDialog::writeConfig()
{
KConfigGroup group(KSharedConfig::openConfig(), "FilterActionMissingCollectionDialog");
group.writeEntry("Size", size());
}
void FilterActionMissingCollectionDialog::slotFolderChanged(const Akonadi::Collection &col)
void FilterActionMissingFolderDialog::slotFolderChanged(const Akonadi::Collection &col)
{
mOkButton->setEnabled(col.isValid());
}
void FilterActionMissingCollectionDialog::slotDoubleItemClicked(QListWidgetItem *item)
void FilterActionMissingFolderDialog::slotDoubleItemClicked(QListWidgetItem *item)
{
if (!item) {
return;
}
const Akonadi::Collection::Id id
= item->data(FilterActionMissingCollectionDialog::IdentifyCollection).toLongLong();
= item->data(FilterActionMissingFolderDialog::IdentifyCollection).toLongLong();
mFolderRequester->setCollection(Akonadi::Collection(id));
accept();
}
void FilterActionMissingCollectionDialog::slotCurrentItemChanged()
void FilterActionMissingFolderDialog::slotCurrentItemChanged()
{
QListWidgetItem *currentItem = mListwidget->currentItem();
if (currentItem) {
const Akonadi::Collection::Id id
= currentItem->data(FilterActionMissingCollectionDialog::IdentifyCollection).toLongLong();
= currentItem->data(FilterActionMissingFolderDialog::IdentifyCollection).toLongLong();
mFolderRequester->setCollection(Akonadi::Collection(id));
}
}
Akonadi::Collection FilterActionMissingCollectionDialog::selectedCollection() const
Akonadi::Collection FilterActionMissingFolderDialog::selectedCollection() const
{
return mFolderRequester->collection();
}
void FilterActionMissingCollectionDialog::getPotentialFolders(const QAbstractItemModel *model, const QModelIndex &parentIndex, const QString &lastElement, Akonadi::Collection::List &list)
void FilterActionMissingFolderDialog::getPotentialFolders(const QAbstractItemModel *model, const QModelIndex &parentIndex, const QString &lastElement, Akonadi::Collection::List &list)
{
const int rowCount = model->rowCount(parentIndex);
for (int row = 0; row < rowCount; ++row) {
@ -164,7 +164,7 @@ void FilterActionMissingCollectionDialog::getPotentialFolders(const QAbstractIte
}
}
Akonadi::Collection::List FilterActionMissingCollectionDialog::potentialCorrectFolders(
Akonadi::Collection::List FilterActionMissingFolderDialog::potentialCorrectFolders(
const QString &path, bool &exactPath)
{
Akonadi::Collection::List lst;
@ -182,7 +182,7 @@ Akonadi::Collection::List FilterActionMissingCollectionDialog::potentialCorrectF
lastElement = realPath.right(realPath.length() - lastSlash - 1);
}
FilterActionMissingCollectionDialog::getPotentialFolders(
FilterActionMissingFolderDialog::getPotentialFolders(
KernelIf->collectionModel(), QModelIndex(), lastElement, lst);
const int numberOfItems(lst.count());

6
src/filter/dialog/filteractionmissingargumentdialog.h
Unescape View File

@ -34,12 +34,12 @@ namespace MailCommon {
class FolderRequester;
}
class MAILCOMMON_TESTS_EXPORT FilterActionMissingCollectionDialog : public QDialog
class MAILCOMMON_TESTS_EXPORT FilterActionMissingFolderDialog : public QDialog
{
Q_OBJECT
public:
explicit FilterActionMissingCollectionDialog(const Akonadi::Collection::List &list, const QString &filtername = QString(), const QString &argStr = QString(), QWidget *parent = nullptr);
~FilterActionMissingCollectionDialog();
explicit FilterActionMissingFolderDialog(const Akonadi::Collection::List &list, const QString &filtername = QString(), const QString &argStr = QString(), QWidget *parent = nullptr);
~FilterActionMissingFolderDialog();
Akonadi::Collection selectedCollection() const;
static Akonadi::Collection::List potentialCorrectFolders(const QString &path, bool &exactPath);

4
src/filter/filteractions/filteractionwithfolder.cpp
Unescape View File

@ -71,11 +71,11 @@ bool FilterActionWithFolder::argsFromStringInteractive(const QString &argsStr, c
argsFromString(argsStr);
if (!mFolder.isValid()) {
bool exactPath = false;
const Akonadi::Collection::List lst = FilterActionMissingCollectionDialog::potentialCorrectFolders(argsStr, exactPath);
const Akonadi::Collection::List lst = FilterActionMissingFolderDialog::potentialCorrectFolders(argsStr, exactPath);
if (lst.count() == 1 && exactPath) {
mFolder = lst.at(0);
} else {
QPointer<FilterActionMissingCollectionDialog> dlg = new FilterActionMissingCollectionDialog(lst, name, argsStr);
QPointer<FilterActionMissingFolderDialog> dlg = new FilterActionMissingFolderDialog(lst, name, argsStr);
if (dlg->exec()) {
mFolder = dlg->selectedCollection();
needUpdate = true;

4
src/util/mailutil.cpp
Unescape View File

@ -211,11 +211,11 @@ Akonadi::Collection::Id MailCommon::Util::convertFolderPathToCollectionId(const
{
Akonadi::Collection::Id newFolderId = -1;
bool exactPath = false;
Akonadi::Collection::List lst = FilterActionMissingCollectionDialog::potentialCorrectFolders(folder, exactPath);
Akonadi::Collection::List lst = FilterActionMissingFolderDialog::potentialCorrectFolders(folder, exactPath);
if (lst.count() == 1 && exactPath) {
newFolderId = lst.at(0).id();
} else {
QPointer<FilterActionMissingCollectionDialog> dlg = new FilterActionMissingCollectionDialog(lst, QString(), folder);
QPointer<FilterActionMissingFolderDialog> dlg = new FilterActionMissingFolderDialog(lst, QString(), folder);
if (dlg->exec()) {
newFolderId = dlg->selectedCollection().id();
}

Write Preview
Loading…
Cancel
Save