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

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Tue Oct  2 12:48:36 2007
New Revision: 15589

Modified:
   trunk/yali/yali/gui/ScrKickerCheck.py
   trunk/yali/yali/gui/ScrWelcome.py
   trunk/yali/yali/gui/runner.py
Log:
birtakim fixler

Modified: trunk/yali/yali/gui/ScrKickerCheck.py
=================================================================
--- trunk/yali/yali/gui/ScrKickerCheck.py	(original)
+++ trunk/yali/yali/gui/ScrKickerCheck.py	Tue Oct  2 12:48:36 2007
@@ -62,8 +62,7 @@
         num = ctx.screens.getCurrentIndex() + 1
         ctx.screens.goToScreen(num)
 
-    def shown(self):
-        ctx.kickerReady = False
+    def execute(self):
         if not kickstartExists():
             ctx.debugger.log("There is no kickstart jumps to the next screen.")
             self.jumpToNext()
@@ -114,10 +113,7 @@
                     ctx.installData.users.append(user)
                     yali.users.pending_users.append(user)
                     ctx.debugger.log("USER    : %s " % user.username)
-
-                ctx.screens.processEvents()
-                ctx.kickerReady = True
-                ctx.screens.next()
+                ctx.screens.goToScreen(9)
             else:
                 ctx.debugger.log("This kickstart file is not correct !!")
                 wrongData = yaliKick.getValues()

Modified: trunk/yali/yali/gui/ScrWelcome.py
=================================================================
--- trunk/yali/yali/gui/ScrWelcome.py	(original)
+++ trunk/yali/yali/gui/ScrWelcome.py	Tue Oct  2 12:48:36 2007
@@ -98,9 +98,6 @@
         yali.sysutils.fastreboot()
 
     def shown(self):
-        if ctx.kickerReady and ctx.autoInstall:
-            ctx.screens.goToScreen(9)
-
         ctx.screens.disablePrev()
         if self.accept.isChecked():
             ctx.screens.enableNext()

Modified: trunk/yali/yali/gui/runner.py
=================================================================
--- trunk/yali/yali/gui/runner.py	(original)
+++ trunk/yali/yali/gui/runner.py	Tue Oct  2 12:48:36 2007
@@ -123,6 +123,7 @@
         # set the current screen and stage to 1 at startup...
         ctx.stages.setCurrent(1)
         ctx.screens.setCurrent(1)
+        ctx.screens.next()
 
     ##
     # Fire up the interface.