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

List:       kde-commits
Subject:    kdepim/wizards
From:       Bram Schoenmakers <bramschoenmakers () kde ! nl>
Date:       2005-01-30 23:03:34
Message-ID: 20050130230334.809491CF9A () office ! kde ! org
[Download RAW message or body]

CVS commit by bram: 

Validate in other wizards as well.


  M +23 -4     groupwisewizard.cpp   1.14
  M +2 -1      groupwisewizard.h   1.6
  M +10 -0     kolabwizard.cpp   1.23
  M +1 -0      kolabwizard.h   1.7
  M +11 -2     sloxwizard.cpp   1.8
  M +1 -0      sloxwizard.h   1.4


--- kdepim/wizards/groupwisewizard.cpp  #1.13:1.14
@@ -30,4 +30,5 @@
 
 #include <libkcal/resourcecalendar.h>
+#include <libemailfunctions/email.h>
 
 #include <klineedit.h>
@@ -349,4 +350,22 @@ GroupwiseWizard::~GroupwiseWizard()
 }
 
+QString GroupwiseWizard::validate()
+{
+  if( mServerEdit->text().isEmpty() ||
+      mPortEdit->text().isEmpty() ||
+      mUserEdit->text().isEmpty() ||
+      mPasswordEdit->text().isEmpty() )
+    return i18n( "Please fill in all fields." );
+
+  if ( mEmailBox->isChecked() ) {
+    if( !KPIM::isValidSimpleEmailAddress( mEmailEdit->text() ) )
+      return i18n("Invalid email address entered.");
+    if( mFullNameEdit->text().isEmpty() )
+      return i18n( "Please fill in all fields." );
+  }
+
+  return QString::null;
+}
+
 void GroupwiseWizard::usrReadConfig()
 {

--- kdepim/wizards/groupwisewizard.h  #1.5:1.6
@@ -36,4 +36,5 @@ class KDE_EXPORT GroupwiseWizard : publi
     ~GroupwiseWizard();
 
+    QString validate();
     void usrReadConfig();
     void usrWriteConfig();

--- kdepim/wizards/kolabwizard.cpp  #1.22:1.23
@@ -304,4 +304,14 @@ KolabWizard::~KolabWizard()
 }
 
+QString KolabWizard::validate()
+{
+  if( mServerEdit->text().isEmpty() ||
+      mUserEdit->text().isEmpty() ||
+      mRealNameEdit->text().isEmpty() ||
+      mPasswordEdit->text().isEmpty() )
+    return i18n( "Please fill in all fields." );
+  return QString::null;
+}
+
 void KolabWizard::usrReadConfig()
 {

--- kdepim/wizards/kolabwizard.h  #1.6:1.7
@@ -36,4 +36,5 @@ class KDE_EXPORT KolabWizard : public KC
     ~KolabWizard();
 
+    QString validate();
     void usrReadConfig();
     void usrWriteConfig();

--- kdepim/wizards/sloxwizard.cpp  #1.7:1.8
@@ -262,4 +262,13 @@ SloxWizard::~SloxWizard()
 }
 
+QString SloxWizard::validate()
+{
+  if( mServerEdit->text().isEmpty() ||
+      mUserEdit->text().isEmpty() ||
+      mPasswordEdit->text().isEmpty() )
+    return i18n( "Please fill in all fields." );
+  return QString::null;
+}
+
 void SloxWizard::usrReadConfig()
 {

--- kdepim/wizards/sloxwizard.h  #1.3:1.4
@@ -33,4 +33,5 @@ class KDE_EXPORT SloxWizard : public KCo
     ~SloxWizard();
 
+    QString validate();
     void usrReadConfig();
     void usrWriteConfig();


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