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

List:       kde-commits
Subject:    [kdepim] kmail/identity: Allow to restore default domain name
From:       Montel Laurent <montel () kde ! org>
Date:       2014-03-28 17:12:27
Message-ID: E1WTaKR-0001NJ-Mh () scm ! kde ! org
[Download RAW message or body]

Git commit ca2fe4567ba357a0ec2bae7d7118804880b12aec by Montel Laurent.
Committed on 28/03/2014 at 17:11.
Pushed by mlaurent into branch 'master'.

Allow to restore default domain name

M  +15   -1    kmail/identity/identitydialog.cpp
M  +1    -1    kmail/identity/identitydialog.h

http://commits.kde.org/kdepim/ca2fe4567ba357a0ec2bae7d7118804880b12aec

diff --git a/kmail/identity/identitydialog.cpp b/kmail/identity/identitydialog.cpp
index 3a1a91c..bad8b64 100644
--- a/kmail/identity/identitydialog.cpp
+++ b/kmail/identity/identitydialog.cpp
@@ -86,6 +86,7 @@ using MailTransport::TransportManager;
 #include <kcombobox.h>
 #include <ktabwidget.h>
 #include <KStandardDirs>
+#include <KIcon>
 #include <sonnet/dictionarycombobox.h>
 
 // Qt headers:
@@ -95,6 +96,7 @@ using MailTransport::TransportManager;
 #include <QGridLayout>
 #include <QFile>
 #include <QHostInfo>
+#include <QToolButton>
 
 // other headers:
 #include <gpgme++/key.h>
@@ -499,8 +501,15 @@ IdentityDialog::IdentityDialog( QWidget * parent )
 
     // "default domain" input field:
     ++row;
+    QHBoxLayout *hbox = new QHBoxLayout;
     mDefaultDomainEdit = new KLineEdit( tab );
-    glay->addWidget( mDefaultDomainEdit, row, 1 );
+    hbox->addWidget(mDefaultDomainEdit);
+    QToolButton *restoreDefaultDomainName = new QToolButton;
+    restoreDefaultDomainName->setIcon(KIcon(QLatin1String("view-refresh")));
+    restoreDefaultDomainName->setToolTip(i18n("Restore default domain name"));
+    hbox->addWidget(restoreDefaultDomainName);
+    connect(restoreDefaultDomainName, SIGNAL(clicked()), this, SLOT(slotRefreshDefaultDomainName()));
+    glay->addLayout(hbox, row, 1 );
     label = new QLabel( i18n("Defaul&t domain:"), tab );
     label->setBuddy( mDefaultDomainEdit );
     glay->addWidget( label, row, 0 );
@@ -652,6 +661,11 @@ QString DoesntMatchEMailAddress::extractEmail( const char * e ) {
 }
 }
 
+void IdentityDialog::slotRefreshDefaultDomainName()
+{
+    mDefaultDomainEdit->setText(QHostInfo::localHostName());
+}
+
 void IdentityDialog::slotButtonClicked( int button )
 {
     if ( button != KDialog::Ok ) {
diff --git a/kmail/identity/identitydialog.h b/kmail/identity/identitydialog.h
index c0af159..3e4d92d 100644
--- a/kmail/identity/identitydialog.h
+++ b/kmail/identity/identitydialog.h
@@ -102,7 +102,7 @@ protected slots:
 private slots:
     void slotDelayedButtonClicked( KJob* );
     void slotEditVcard();
-
+    void slotRefreshDefaultDomainName();
 private:
     bool checkFolderExists( const QString & folder, const QString & msg );
     bool validateAddresses( const QString & addresses );
[prev in list] [next in list] [prev in thread] [next in thread]