[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Merge remote-tracking branch 'origin/KDE/4.14'
From:       Montel Laurent <montel () kde ! org>
Date:       2015-05-01 5:58:50
Message-ID: E1Yo3yM-0000QR-DB () scm ! kde ! org
[Download RAW message or body]

Git commit 5f8251ad34d11429af9379f5046c2b8d401d248f by Montel Laurent.
Committed on 01/05/2015 at 05:58.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
	libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
  libkdepim/addressline/completionorder/completionordereditor.cpp
	libkdepim/addressline/recentaddress/recentaddresswidget.cpp
	mailcommon/filter/autotests/mailfiltertest.cpp

M  +2    -5    kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
M  +1    -1    libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
 M  +0    -8    libkdepim/addressline/completionorder/completionordereditor.cpp
M  +0    -2    libkdepim/addressline/recentaddress/recentaddresswidget.cpp
M  +11   -0    mailcommon/filter/autotests/mailfiltertest.cpp

http://commits.kde.org/kdepim/5f8251ad34d11429af9379f5046c2b8d401d248f

diff --cc kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
index 75fd8f3,a7be7c5..d22ff69
--- a/kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
+++ b/kmail/editor/potentialphishingemail/potentialphishingdetaildialog.cpp
@@@ -22,43 -22,22 +22,40 @@@
  #include "potentialphishingdetailwidget.h"
  #include <KSharedConfig>
  #include <KLocalizedString>
- #include <qboxlayout.h>
- #include <QLabel>
- #include <QListWidget>
 -
 +#include <KConfigGroup>
- #include <QDialogButtonBox>
- #include <QPushButton>
 +#include <QVBoxLayout>
++#include <QPushButton>
++#include <QDialogButtonBox>
  
  PotentialPhishingDetailDialog::PotentialPhishingDetailDialog(QWidget *parent)
 -    : KDialog(parent)
 +    : QDialog(parent)
  {
 -    //Add i18n in kf5
 -    setCaption( QLatin1String( "Details" ) );
 -    setButtons( Ok|Cancel );
 -    setDefaultButton( Ok );
 +    setWindowTitle(i18n("Details"));
 +    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::rejected, this, &QDialog::reject);
 +    okButton->setDefault(true);
 +
 +    QVBoxLayout *topLayout = new QVBoxLayout;
 +    setLayout(topLayout);
 +
 +    setModal(true);
 +    mPotentialPhishingDetailWidget = new PotentialPhishingDetailWidget(this);
 +    mPotentialPhishingDetailWidget->setObjectName(QStringLiteral("potentialphising_widget"));
  
 -    setModal( true );
 +    QWidget *mainWidget = new QWidget(this);
 +    QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
      mPotentialPhishingDetailWidget = new PotentialPhishingDetailWidget(this);
 -    mPotentialPhishingDetailWidget->setObjectName(QLatin1String("potentialphising_widget"));
  +    mPotentialPhishingDetailWidget->setObjectName(QStringLiteral("potentialphising_widget"));
  
 -    connect(this, SIGNAL(okClicked()), this, SLOT(slotSave()));
 -    setMainWidget(mPotentialPhishingDetailWidget);
 +    mainLayout->addWidget(mPotentialPhishingDetailWidget);
 +
 +    mainLayout->addWidget(buttonBox);
 +
 +    connect(okButton, &QAbstractButton::clicked, this, \
&PotentialPhishingDetailDialog::slotSave);  +    topLayout->addWidget(mainWidget);
      readConfig();
  }
  
diff --cc libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
 index e525914,8e648b8..7b60e80
--- a/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
                
+++ b/libkdepim/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp
 @@@ -99,12 -108,12 +99,12 @@@ BlackListBalooEmailCompletionWidget::Bl
  
      mExcludeDomainLineEdit = new KLineEdit;
      excludeDomainLayout->addWidget(mExcludeDomainLineEdit);
 -    mExcludeDomainLineEdit->setObjectName(QLatin1String("domain_lineedit"));
 +    mExcludeDomainLineEdit->setObjectName(QStringLiteral("domain_lineedit"));
      mExcludeDomainLineEdit->setClearButtonShown(true);
      mExcludeDomainLineEdit->setTrapReturnKey(true);
-     mExcludeDomainLineEdit->setPlaceholderText(i18n("Separate domain with \',\'"));
 -    //kf5 add i18n
 -    mExcludeDomainLineEdit->setClickMessage(QString::fromLatin1("Separate domain \
                with \'%1\'").arg(QLatin1Char(',')));
 -    connect(mEmailList, SIGNAL(itemSelectionChanged()), this, \
SLOT(slotSelectionChanged())); ++    \
mExcludeDomainLineEdit->setPlaceholderText(i18n("Separate domain with \
\'%1\'",QLatin1Char(',')));  +    connect(mEmailList, \
&QListWidget::itemSelectionChanged, this, \
&BlackListBalooEmailCompletionWidget::slotSelectionChanged);  +    \
slotSelectionChanged();  }
  
  BlackListBalooEmailCompletionWidget::~BlackListBalooEmailCompletionWidget()
diff --cc libkdepim/addressline/completionorder/completionordereditor.cpp
index 300eda6,39724b7..6718bfd
--- a/libkdepim/addressline/completionorder/completionordereditor.cpp
+++ b/libkdepim/addressline/completionorder/completionordereditor.cpp
@@@ -36,26 -36,16 +36,18 @@@
  #include "ldap/ldapclientsearch.h"
  #include "ldap/ldapclientsearchconfig.h"
  
- #include <changerecorder.h>
- #include <collectionfilterproxymodel.h>
- #include <entitytreemodel.h>
- #include <monitor.h>
- 
 -#include <kabc/addressee.h>
 -#include <kabc/contactgroup.h>
 +#include <kcontacts/addressee.h>
 +#include <kcontacts/contactgroup.h>
  #include <kldap/ldapserver.h>
  
 -#include <KDE/KConfigGroup>
 -#include <KDE/KLocale>
 -
 +#include <KConfigGroup>
- #include <QHBoxLayout>
- #include <QIcon>
 +#include <KLocalizedString>
 +#include <QPushButton>
 +#include <QVBoxLayout>
- 
  #include <QtDBus/QDBusConnection>
 -#include <QToolButton>
  #include <QTreeWidget>
 +#include <KSharedConfig>
 +#include <QDialogButtonBox>
  
  using namespace KPIM;
  
diff --cc libkdepim/addressline/recentaddress/recentaddresswidget.cpp
index 51cefa0,173bb16..831d6ff
--- a/libkdepim/addressline/recentaddress/recentaddresswidget.cpp
+++ b/libkdepim/addressline/recentaddress/recentaddresswidget.cpp
@@@ -38,12 -42,10 +38,10 @@@ using namespace KPIM
  RecentAddressWidget::RecentAddressWidget(QWidget *parent)
      : QWidget(parent)
  {
 -    QVBoxLayout *layout = new QVBoxLayout( this );
 +    QVBoxLayout *layout = new QVBoxLayout(this);
-     layout->setSpacing(0);
-     layout->setMargin(0);
  
      mLineEdit = new KLineEdit(this);
 -    mLineEdit->setObjectName(QLatin1String("line_edit"));
 +    mLineEdit->setObjectName(QStringLiteral("line_edit"));
      layout->addWidget(mLineEdit);
  
      mLineEdit->setTrapReturnKey(true);
diff --cc mailcommon/filter/autotests/mailfiltertest.cpp
index f3b9239,6dcbe5c..24e22ef
--- a/mailcommon/filter/autotests/mailfiltertest.cpp
+++ b/mailcommon/filter/autotests/mailfiltertest.cpp
@@@ -48,4 -48,15 +48,15 @@@ void MailFilterTest::shouldHaveDefaultV
  
  }
  
+ void MailFilterTest::shouldApplySettings()
+ {
+     MailCommon::MailFilter mailfilter;
+     bool value = true;
+     mailfilter.setApplyBeforeOutbound(value);
+     QCOMPARE(mailfilter.applyBeforeOutbound(), value);
+     value = false;
+     mailfilter.setApplyBeforeOutbound(value);
+     QCOMPARE(mailfilter.applyBeforeOutbound(), value);
+ }
+ 
 -QTEST_KDEMAIN(MailFilterTest, GUI)
 +QTEST_MAIN(MailFilterTest)


[prev in list] [next in list] [prev in thread] [next in thread]