[Uludag-commits] r16921 - branches/yali4-md/yali4/gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Fri Feb  1 23:38:10 2008
New Revision: 16921

Modified:
   branches/yali4-md/yali4/gui/ScrBootloader.py
Log:
* sync with release version

Modified: branches/yali4-md/yali4/gui/ScrBootloader.py
=================================================================
--- branches/yali4-md/yali4/gui/ScrBootloader.py	(original)
+++ branches/yali4-md/yali4/gui/ScrBootloader.py	Fri Feb  1 23:38:10 2008
@@ -19,6 +19,7 @@
 from PyQt4.QtCore import *
 
 import time
+import thread
 from os.path import basename
 
 import yali4.storage
@@ -72,7 +73,6 @@
         if not yali4.storage.init_devices():
             raise GUIException, _("Can't find a storage device!")
 
-
         if len(yali4.storage.devices) > 1:
             self.device_list_state = True
             # fill device list
@@ -98,15 +98,10 @@
         self.connect(self.ui.device_list, SIGNAL("clicked()"),
                      self.slotSelect)
 
-    def shown(self):
-        if ctx.autoInstall:
-            ctx.mainScreen.next()
-
     def backCheck(self):
         # we need to go partition auto screen, not manual ;)
-        num = ctx.mainScreen.mainStack.getCurrentIndex() - 2
-        ctx.mainScreen.stackMove(num)
-        return False
+        ctx.mainScreen.moveInc = 2
+        return True
 
     def slotSelect(self):
         self.ui.installMBR.setChecked(True)
@@ -182,7 +177,6 @@
                 ctx.mainScreen.enableBack()
                 return False
 
-        #info_window = InformationWindow(self, _("Please wait while formatting!"))
         ctx.mainScreen.processEvents()
 
         # We should do partitioning operations in here.
@@ -191,20 +185,23 @@
         if ctx.installData.autoPartDev:
             ctx.partrequests.remove_all()
             ctx.use_autopart = True
-            self.autopartDevice()
+            # self.autopartDevice()
             time.sleep(1)
-            ctx.partrequests.applyAll()
+            #ctx.partrequests.applyAll()
 
         # Manual Partitioning
         else:
+            ctx.debugger.log("Format Operation Started")
             for dev in yali4.storage.devices:
+                ctx.mainScreen.processEvents()
                 dev.commit()
             # wait for udev to create device nodes
             time.sleep(2)
-            self.checkSwap()
+            ctx.mainScreen.processEvents()
             ctx.partrequests.applyAll()
-
-        #info_window.close()
+            ctx.debugger.log("Format Operation Finished")
+            ctx.mainScreen.processEvents()
+            self.checkSwap()
 
         root_part_req = ctx.partrequests.searchPartTypeAndReqType(parttype.root,
                                                                   request.mountRequestType)