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

List:       kde-commits
Subject:    kdelibs/kio/misc/kwalletd
From:       George Staikos <staikos () kde ! org>
Date:       2003-09-04 23:56:50
[Download RAW message or body]

CVS commit by staikos: 

- bug fix: allow the user to disable kwallet and complete the wizard :)
- tell the user if the lineedit is empty, instead of saying that two empty
passwords match.


  M +14 -5     kwalletwizard.ui.h   1.3


--- kdelibs/kio/misc/kwalletd/kwalletwizard.ui.h  #1.2:1.3
@@ -13,10 +13,8 @@ void KWalletWizard::passwordPageUpdate()
     bool fe = true;
     if (_basic->isChecked()) {
-        fe = !_useWallet->isChecked() || (_pass1->text() == _pass2->text());
-        fe = !_pass1->text().isEmpty() && fe;
+        fe = !_useWallet->isChecked() || ((_pass1->text() == _pass2->text()) && \
!_pass1->text().isEmpty());  setFinishEnabled(page2, fe);
     } else {
-        fe = !_useWallet->isChecked() || (_pass1->text() == _pass2->text());
-        fe = !_pass1->text().isEmpty() && fe;
+        fe = !_useWallet->isChecked() || ((_pass1->text() == _pass2->text()) && \
!_pass1->text().isEmpty());  setFinishEnabled(page3, fe);
     }
@@ -24,5 +22,9 @@ void KWalletWizard::passwordPageUpdate()
     if (_useWallet->isChecked()) {
         if (_pass1->text() == _pass2->text()) {
+            if (_pass1->text().isEmpty()) {
+                _matchLabel->setText(tr("Password is empty."));
+            } else {
             _matchLabel->setText(tr("Passwords match."));
+            }
         } else {
             _matchLabel->setText(tr("Passwords do not match."));
@@ -43,4 +45,5 @@ void KWalletWizard::init()
     setAppropriate(page3, false);
     setAppropriate(page4, false);
+    setFinishEnabled(page2, true);
 }
 
@@ -50,4 +53,7 @@ void KWalletWizard::setAdvanced()
     setAppropriate(page3, true);
     setAppropriate(page4, true);
+    bool fe = !_useWallet->isChecked() || ((_pass1->text() == _pass2->text()) && \
!_pass1->text().isEmpty()); +    setFinishEnabled(page2, false);
+    setFinishEnabled(page3, fe);
 }
 
@@ -57,4 +63,7 @@ void KWalletWizard::setBasic()
     setAppropriate(page3, false);
     setAppropriate(page4, false);
+    bool fe = !_useWallet->isChecked() || ((_pass1->text() == _pass2->text()) && \
!_pass1->text().isEmpty()); +    setFinishEnabled(page3, false);
+    setFinishEnabled(page2, fe);
 }
 


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