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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/wizards
From:       Till Adam <adam () kde ! org>
Date:       2008-01-25 8:49:40
Message-ID: 1201250980.721066.16104.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 766107 by tilladam:

Merge in scaliz wizard.


 M  +18 -4     Makefile.am  
 M  +42 -5     kmailchanges.cpp  
 M  +14 -2     kmailchanges.h  
 M  +0 -7      kolabwizard.cpp  


--- branches/KDE/3.5/kdepim/wizards/Makefile.am #766106:766107
@@ -5,16 +5,16 @@
            -I$(top_srcdir)/knotes \
            -I$(top_srcdir)/certmanager/lib \
            -I$(top_builddir)/kresources/groupwise \
-	   -I$(top_builddir)/kresources/lib \
+           -I$(top_builddir)/kresources/lib \
            -I$(top_srcdir)/kresources/lib \
            $(all_includes)
 
 bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
-               groupwisewizard exchangewizard
+               groupwisewizard exchangewizard scalixwizard
 
 kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
                          libkolabwizard.la libgroupwisewizard.la \
-                         libexchangewizard.la
+                         libexchangewizard.la libscalixwizard.la
 
 
 groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -91,11 +91,25 @@
 exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 exchangewizard_SOURCES = exchangemain.cpp
 
+# Scalix
+libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
+libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \
+                           $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \
+                           $(top_builddir)/libkcal/libkcal.la \
+                           $(top_builddir)/libkdepim/libkdepim.la \
+                           $(top_builddir)/libkpimidentities/libkpimidentities.la
 
+libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc \
+  scalixkmailchanges.cpp
+
+scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI)
+scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+scalixwizard_SOURCES = scalixmain.cpp
+
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \
                  groupwisewizard.h exchangewizard.h
 
-kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg
+kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot
--- branches/KDE/3.5/kdepim/wizards/kmailchanges.cpp #766106:766107
@@ -44,8 +44,8 @@
 
 CreateImapAccount::CreateImapAccount( const QString &accountName, const QString &title )
   : KConfigPropagator::Change( title ),
-    mAccountName( accountName ), mEnableSieve( false ), mEnableSavePassword( true ),
-    mEncryption( None ), mAuthenticationSend( PLAIN ), mSmtpPort( 25 ),
+    mAccountName( accountName ), mPort( 993 ), mEnableSieve( false ), mEnableSavePassword( true ),
+    mEncryption( None ), mAuthentication( NONE ), mAuthenticationSend( PLAIN ), mSmtpPort( 25 ),
     mExistingAccountId( -1 ), mExistingTransportId( -1 ),
     mCustomWriter( 0 )
 {
@@ -76,6 +76,11 @@
   mRealName = s;
 }
 
+void CreateImapAccount::setPort( int port )
+{
+  mPort = port;
+}
+
 void CreateImapAccount::setEmail( const QString &s )
 {
   mEmail = s;
@@ -102,6 +107,12 @@
   mEncryption = e;
 }
 
+void CreateImapAccount::setAuthentication(
+  CreateImapAccount::Authentication a )
+{
+  mAuthentication = a;
+}
+
 void CreateImapAccount::setDefaultDomain(const QString &d)
 {
   mDefaultDomain = d;
@@ -137,7 +148,7 @@
 
 CreateDisconnectedImapAccount::CreateDisconnectedImapAccount(const QString & accountName) :
     CreateImapAccount( accountName, i18n("Create Disconnected IMAP Account for KMail") ),
-    mLocalSubscription( false )
+    mLocalSubscription( false ), mGroupwareType( GroupwareKolab )
 {
 }
 
@@ -175,11 +186,37 @@
   }
   c.writeEntry( "Id", uid );
   c.writeEntry( "Type", "cachedimap");
-  c.writeEntry( "auth", "*");
+
+  switch ( mAuthentication ) {
+    case NONE:
+      c.writeEntry( "auth", "*" );
+      break;
+    case PLAIN:
+      c.writeEntry( "auth", "PLAIN" );
+      break;
+    case LOGIN:
+      c.writeEntry( "auth", "LOGIN" );
+      break;
+    case NTLM_SPA:
+      c.writeEntry( "auth", "NTLM" );
+      break;
+    case GSSAPI:
+      c.writeEntry( "auth", "GSSAPI" );
+      break;
+    case DIGEST_MD5:
+      c.writeEntry( "auth", "DIGEST-MD5" );
+      break;
+    case CRAM_MD5:
+      c.writeEntry( "auth", "CRAM-MD5" );
+      break;
+  }
+
   c.writeEntry( "Name", mAccountName );
   c.writeEntry( "host", mServer );
-  c.writeEntry( "port", "993" );
+  c.writeEntry( "port", mPort );
 
+  c.writeEntry( "groupwareType", mGroupwareType );
+
   // in case the user wants to get rid of some groupware folders
   c.writeEntry( "locally-subscribed-folders", mLocalSubscription );
 
--- branches/KDE/3.5/kdepim/wizards/kmailchanges.h #766106:766107
@@ -46,6 +46,7 @@
     void setUser( const QString & );
     void setPassword( const QString & );
     void setRealName( const QString & );
+    void setPort( int );
     /**
       Set email. Default is "user@server".
     */
@@ -58,11 +59,11 @@
     void enableSavePassword( bool );
 
     enum Encryption { None, SSL, TLS };
+    enum Authentication { NONE, PLAIN, LOGIN, NTLM_SPA, GSSAPI, DIGEST_MD5, CRAM_MD5 };
 
     void setEncryption( Encryption );
+    void setAuthentication( Authentication );
 
-    enum Authentication { PLAIN, LOGIN };
-
     void setAuthenticationSend( Authentication );
 
     void setSmtpPort( int );
@@ -86,6 +87,7 @@
     QString mUser;
     QString mPassword;
     QString mRealName;
+    int mPort;
     QString mEmail;
     QString mDefaultDomain;
 
@@ -94,6 +96,7 @@
     bool mEnableSavePassword;
 
     Encryption mEncryption;
+    Authentication mAuthentication;
     Authentication mAuthenticationSend;
 
     int mSmtpPort;
@@ -110,13 +113,22 @@
 class CreateDisconnectedImapAccount : public CreateImapAccount
 {
   public:
+    enum GroupwareType
+    {
+      GroupwareNone,
+      GroupwareKolab,
+      GroupwareScalix
+    };
+
     CreateDisconnectedImapAccount( const QString &accountName );
     virtual void apply();
 
     void enableLocalSubscription( bool b ) { mLocalSubscription = b; }
+    void setGroupwareType( GroupwareType type ) { mGroupwareType = type; }
 
   private:
     bool mLocalSubscription;
+    GroupwareType mGroupwareType;
 };
 
 class CreateOnlineImapAccount : public CreateImapAccount
--- branches/KDE/3.5/kdepim/wizards/kolabwizard.cpp #766106:766107
@@ -297,13 +297,6 @@
   mKolab2 = new QRadioButton( i18n ( "Kolab 2" ), bg );
   topLayout->addMultiCellWidget( bg, 6, 6, 0, 1 );
 
-  //DF: I don't see the point in showing the user those pages.
-  //They are very 'internal' and of no use to anyone other than developers.
-  //(This is even more true for the rules page. The changes page is sort of OK)
-
-  setupRulesPage();
-  setupChangesPage();
-
   setInitialSize( QSize( 600, 300 ) );
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]