[Uludag-commits] r15096 - trunk/yali/yali/gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Thu Aug 23 14:33:58 2007
New Revision: 15096

Modified:
   trunk/yali/yali/gui/ScrAdmin.py
Log:
BUG:FIXED:5471

Also check for password length..



Modified: trunk/yali/yali/gui/ScrAdmin.py
=================================================================
--- trunk/yali/yali/gui/ScrAdmin.py	(original)
+++ trunk/yali/yali/gui/ScrAdmin.py	Thu Aug 23 14:33:58 2007
@@ -56,7 +56,7 @@
         apply(RootPassWidget.__init__, (self,) + args)
 
         self.host_valid = True
-        self.pass_valid = True
+        self.pass_valid = False
 
         self.pix.setPixmap(ctx.iconfactory.newPixmap("admin"))
         self.pass_error.setText("")
@@ -77,6 +77,7 @@
     def shown(self):
         from os.path import basename
         ctx.debugger.log("%s loaded" % basename(__file__))
+        self.setNext()
         self.checkCapsLock()
         self.pass1.setFocus()
 
@@ -101,9 +102,14 @@
         p2 = self.pass2.text()
 
         if p1 == p2 and p1:
-            # Sould we also check password length?
-            self.pass_error.setText("")
-            self.pass_valid = True
+            if len(p1)<4:
+                self.pass_error.setText(
+                    _('<font color="#FF6D19">Passwords is too short!</font>'))
+                self.pass_error.setAlignment(QLabel.AlignCenter)
+                self.pass_valid = False
+            else:
+                self.pass_error.setText("")
+                self.pass_valid = True
         else:
             self.pass_valid = False
             if p2:
@@ -124,8 +130,7 @@
         self.host_valid = yali.sysutils.text_is_valid(string.ascii())
 
         if not self.host_valid:
-            self.host_error.setText(
-                _('<font color="#FF6D19">Hostname contains invalid characters!</font>'))
+            self.host_error.setText(_('<font color="#FF6D19">Hostname contains invalid characters!</font>'))
         else:
             self.host_error.setText("")
         self.setNext()