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

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2010-06-29 18:50:10
Message-ID: 20100629185010.13586AC8E0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1144366 by tmcguire:

Remove email support in the groupwise wizard.

It didn't work anyway, is it modified the old KMail config file.

 M  +1 -2      CMakeLists.txt  
 M  +1 -97     groupwisewizard.cpp  
 M  +0 -9      groupwisewizard.h  
 D             kmailchanges.cpp  
 D             kmailchanges.h  


--- trunk/KDE/kdepim/wizards/CMakeLists.txt #1144365:1144366
@@ -24,7 +24,6 @@
 
   set(groupwarewizard_SRCS ${libknotesresources_SRCS} groupwarewizard.cpp \
groupwaremain.cpp overviewpage.cpp  groupwisewizard.cpp
-      kmailchanges.cpp
   )
 
   kde4_add_kcfg_files(groupwarewizard_SRCS groupwiseconfig.kcfgc)
@@ -53,7 +52,7 @@
 
   ########### next target ###############
 
-  set(groupwisewizard_SRCS groupwisewizard.cpp groupwisemain.cpp kmailchanges.cpp)
+  set(groupwisewizard_SRCS groupwisewizard.cpp groupwisemain.cpp)
 
   kde4_add_kcfg_files(groupwisewizard_SRCS groupwiseconfig.kcfgc)
 
--- trunk/KDE/kdepim/wizards/groupwisewizard.cpp #1144365:1144366
@@ -21,7 +21,7 @@
 #include "groupwisewizard.h"
 
 #include "groupwiseconfig.h"
-#include "kmailchanges.h"
+#include "kconfigpropagator.h"
 
 #include "kresources/groupwise/kabc_groupwiseprefs.h"
 #include "kresources/groupwise/kabc_resourcegroupwise.h"
@@ -180,16 +180,6 @@
     }
 
   protected:
-    class Writer : public CreateDisconnectedImapAccount::CustomWriter
-    {
-      public:
-	void writeFolder( KConfig &, int ) {}
-	void writeIds( int accountId, int transportId )
-	{
-          GroupwiseConfig::setKMailAccountId( accountId );
-	  GroupwiseConfig::setKMailTransportId( transportId );
-	}
-    };
 
     void addCustomChanges( Change::List &changes )
     {
@@ -240,32 +230,7 @@
           }
         }
       }
-
-      if ( GroupwiseConfig::createEmailAccount() ) {
-        CreateDisconnectedImapAccount *ca =
-          new CreateDisconnectedImapAccount( i18n("GroupWise") );
-
-        ca->setServer( GroupwiseConfig::host() );
-        ca->setUser( GroupwiseConfig::user() );
-        ca->setPassword( GroupwiseConfig::password() );
-        ca->setRealName( GroupwiseConfig::fullName() );
-        QString email = GroupwiseConfig::email();
-        if ( !email.isEmpty() ) ca->setEmail( email );
-        ca->enableSavePassword( true );
-        ca->enableSieve( false );
-        ca->setEncryption( CreateDisconnectedImapAccount::SSL );
-        ca->setAuthentication( CreateDisconnectedImapAccount::PLAIN );
-        ca->setAuthenticationSend( CreateDisconnectedImapAccount::PLAIN );
-        ca->setSmtpPort( 25 );
-
-        ca->setExistingAccountId( GroupwiseConfig::kMailAccountId() );
-        ca->setExistingTransportId( GroupwiseConfig::kMailTransportId() );
-
-        ca->setCustomWriter( new Writer );
-
-        changes.append( ca );
       }
-    }
 };
 
 GroupwiseWizard::GroupwiseWizard() : KConfigWizard( new GroupwisePropagator )
@@ -311,40 +276,6 @@
 
   topLayout->setRowStretch( 6, 1 );
 
-
-  mEmailPage = createWizardPage( i18n("Mail") );
-
-  topLayout = new QGridLayout;
-  topLayout->setSpacing( spacingHint() );
-  mEmailPage->setLayout(topLayout);
-
-  mEmailBox = new QGroupBox( i18n("Create Mail Account"));
-  mEmailBox->setCheckable( true );
-  topLayout->addWidget( mEmailBox, 0, 0 );
-
-  QGridLayout *accountLayout= new QGridLayout;
-  accountLayout->setSpacing( spacingHint() );
-
-  label = new QLabel( i18n("Email address:"));
-  accountLayout->addWidget( label, 0, 0 );
-
-  mEmailEdit = new KLineEdit;
-  accountLayout->addWidget( mEmailEdit, 0, 1 );
-
-  label = new QLabel( i18n("Full name:"));
-  accountLayout->addWidget( label, 1, 0 );
-
-  mFullNameEdit = new KLineEdit;
-  accountLayout->addWidget( mFullNameEdit, 1, 1 );
-
-  accountLayout->setRowStretch( 2, 1 );
-
-  mEmailBox->setLayout(accountLayout);
-
-  connect( this, SIGNAL( currentPageChanged( KPageWidgetItem *, KPageWidgetItem * ) \
                ),
-    SLOT( slotAboutToShowPage( KPageWidgetItem *, KPageWidgetItem * ) ) );
-
-
   setupRulesPage();
   setupChangesPage();
 
@@ -364,13 +295,6 @@
       mPasswordEdit->text().isEmpty() )
     return i18n( "Please fill in all fields." );
 
-  if ( mEmailBox->isChecked() ) {
-    if( !KPIMUtils::isValidSimpleAddress( mEmailEdit->text() ) )
-      return i18n("Invalid email address entered.");
-    if( mFullNameEdit->text().isEmpty() )
-      return i18n( "Please fill in all fields." );
-  }
-
   return QString();
 }
 
@@ -383,9 +307,6 @@
   mPasswordEdit->setText( GroupwiseConfig::self()->password() );
   mSavePasswordCheck->setChecked( GroupwiseConfig::self()->savePassword() );
   mSecureCheck->setChecked( GroupwiseConfig::self()->useHttps() );
-  mEmailEdit->setText( GroupwiseConfig::self()->email() );
-  mFullNameEdit->setText( GroupwiseConfig::fullName() );
-  mEmailBox->setChecked( GroupwiseConfig::createEmailAccount() );
 }
 
 void GroupwiseWizard::usrWriteConfig()
@@ -397,23 +318,6 @@
   GroupwiseConfig::self()->setPassword( mPasswordEdit->text() );
   GroupwiseConfig::self()->setSavePassword( mSavePasswordCheck->isChecked() );
   GroupwiseConfig::self()->setUseHttps( mSecureCheck->isChecked() );
-  GroupwiseConfig::setEmail( mEmailEdit->text() );
-  GroupwiseConfig::setFullName( mFullNameEdit->text() );
-  GroupwiseConfig::setCreateEmailAccount( mEmailBox->isChecked() );
 }
 
-void GroupwiseWizard::slotAboutToShowPage( KPageWidgetItem * page, KPageWidgetItem * \
                )
-{
-  if ( page->widget() == mEmailPage ) {
-    if ( mEmailEdit->text().isEmpty() ) {
-      QString host = mServerEdit->text();
-      int pos = host.lastIndexOf( "." );
-      if ( pos > 0 ) pos = host.lastIndexOf( ".", pos - 1 );
-      if ( pos > 0 ) host = host.mid( pos + 1 );
-      QString email = mUserEdit->text() + '@' + host;
-      mEmailEdit->setText( email );
-    }
-  }
-}
-
 #include "groupwisewizard.moc"
--- trunk/KDE/kdepim/wizards/groupwisewizard.h #1144365:1144366
@@ -38,9 +38,6 @@
     void usrReadConfig();
     void usrWriteConfig();
 
-  protected slots:
-    void slotAboutToShowPage( KPageWidgetItem *, KPageWidgetItem * );
-
   private:
     KLineEdit *mServerEdit;
     KLineEdit *mPathEdit;
@@ -49,12 +46,6 @@
     KLineEdit *mPasswordEdit;
     QCheckBox *mSavePasswordCheck;
     QCheckBox *mSecureCheck;
-
-    QWidget *mEmailPage;
-    QGroupBox *mEmailBox;
-    QWidget *mEmailWidget;
-    KLineEdit *mEmailEdit;
-    KLineEdit *mFullNameEdit;
 };
 
 #endif


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