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

List:       kde-commits
Subject:    KDE/kdepim/runtime/resources/kolabproxy/wizard
From:       Tom Albers <toma () kde ! org>
Date:       2010-05-16 11:58:46
Message-ID: 20100516120343.C0370AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1127366 by toma:

Adjust the kolab assistant to the new accountwizard. Don't ask name, email or \
password anymore, just the server is left now.


 M  +8 -28     kolabwizard.js  
 M  +6 -62     kolabwizard.ui  


--- trunk/KDE/kdepim/runtime/resources/kolabproxy/wizard/kolabwizard.js \
#1127365:1127366 @@ -21,22 +21,7 @@
 var page = Dialog.addPage( "kolabwizard.ui", "Personal Settings" );
 
 var userChangedServerAddress = false;
-function emailChanged( arg )
-{
-  validateInput();
-  if ( userChangedServerAddress == true ) {
-    return;
-  }
 
-  var pos = arg.indexOf( "@" );
-  if ( pos >= 0 && (pos + 1) < arg.length ) {
-    var server = arg.slice( pos + 1, arg.length );
-    page.kolabWizard.serverAddress.setText( server );
-  }
-
-  userChangedServerAddress = false;
-}
-
 function serverChanged( arg )
 {
   validateInput();
@@ -49,7 +34,7 @@
 
 function validateInput()
 {
-  if ( page.kolabWizard.serverAddress.text == "" || \
page.kolabWizard.emailAddress.text == "" ) { +  if ( \
page.kolabWizard.serverAddress.text == "" ) {  page.setValid( false );
   } else {
     page.setValid( true );
@@ -61,13 +46,13 @@
   SetupManager.createResource( "akonadi_kolabproxy_resource" );
 
   var identity = SetupManager.createIdentity();
-  identity.setEmail( page.kolabWizard.emailAddress.text );
-  identity.setRealName( page.kolabWizard.fullName.text );
+  identity.setEmail( SetupManager.email() );
+  identity.setRealName( SetupManager.name() );
 
   var imapRes = SetupManager.createResource( "akonadi_imap_resource" );
   imapRes.setOption( "ImapServer", page.kolabWizard.serverAddress.text );
-  imapRes.setOption( "UserName", page.kolabWizard.emailAddress.text );
-  imapRes.setOption( "Password", page.kolabWizard.password.text );
+  imapRes.setOption( "UserName", SetupManager.email() );
+  imapRes.setOption( "Password", SetupManager.password() );
   imapRes.setOption( "UseDefaultIdentity", false );
   imapRes.setOption( "AccountIdentity", identity.uoid() );
   imapRes.setOption( "SubscriptionEnabled", true );
@@ -77,11 +62,11 @@
   smtp.setHost( page.kolabWizard.serverAddress.text );
   smtp.setPort( 465 );
   smtp.setEncryption( "SSL" );
-  smtp.setUsername( page.kolabWizard.emailAddress.text );
-  smtp.setPassword( page.kolabWizard.password.text );
+  smtp.setUsername( SetupManager.email() );
+  smtp.setPassword( SetupManager.password() );
 
   var ldap = SetupManager.createLdap();
-  ldap.setUser( page.kolabWizard.emailAddress.text );
+  ldap.setUser( SetupManager.email() );
   ldap.setServer( page.kolabWizard.serverAddress.text );
 
   var korganizer = SetupManager.createConfigFile( "korganizerrc" );
@@ -92,12 +77,7 @@
   SetupManager.execute();
 }
 
-connect( page.kolabWizard.emailAddress, "textChanged(QString)", this, \
"emailChanged(QString)" );  connect( page.kolabWizard.serverAddress, \
"textChanged(QString)", this, "serverChanged(QString)" );  connect( page, \
"pageLeftNext()", this, "setup()" );  
-page.kolabWizard.emailAddress.text = SetupManager.email();
-page.kolabWizard.password.text = SetupManager.password();
-page.kolabWizard.fullName.text = SetupManager.name();
-
 validateInput();
--- trunk/KDE/kdepim/runtime/resources/kolabproxy/wizard/kolabwizard.ui \
#1127365:1127366 @@ -7,24 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>81</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
-   <item row="3" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>&amp;Email Address:</string>
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
      </property>
-     <property name="buddy">
-      <cstring>emailAddress</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="KLineEdit" name="emailAddress"/>
-   </item>
-   <item row="4" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>&amp;Server Address:</string>
@@ -34,27 +24,10 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="1" column="1">
     <widget class="KLineEdit" name="serverAddress"/>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>&amp;Password:</string>
-     </property>
-     <property name="buddy">
-      <cstring>password</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="KLineEdit" name="password">
-     <property name="passwordMode">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
+   <item row="2" column="0">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -67,32 +40,6 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_4">
-     <property name="text">
-      <string>&amp;Full Name:</string>
-     </property>
-     <property name="buddy">
-      <cstring>fullName</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="KLineEdit" name="fullName"/>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -103,10 +50,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>fullName</tabstop>
-  <tabstop>emailAddress</tabstop>
   <tabstop>serverAddress</tabstop>
-  <tabstop>password</tabstop>
  </tabstops>
  <resources/>
  <connections/>


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