[Uludag-commits] r15082 - in trunk/yali/yali: . gui

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Wed Aug 22 16:26:50 2007
New Revision: 15082

Modified:
   trunk/yali/yali/gui/ScrPartitionAuto.py
   trunk/yali/yali/gui/ScrPartitionManual.py
   trunk/yali/yali/gui/screens.py
   trunk/yali/yali/steps.py
Log:
Cleanup.

Modified: trunk/yali/yali/gui/ScrPartitionAuto.py
=================================================================
--- trunk/yali/yali/gui/ScrPartitionAuto.py	(original)
+++ trunk/yali/yali/gui/ScrPartitionAuto.py	Wed Aug 22 16:26:50 2007
@@ -71,6 +71,7 @@
         for dev in yali.storage.devices:
             if dev.getTotalMB() >= ctx.consts.min_root_size:
                 DeviceItem(self.device_list, dev)
+
         # select the first disk by default
         self.device_list.setSelected(0, True)
 
@@ -97,30 +98,12 @@
 
         if self.accept_auto.isChecked():
             ctx.installData.autoPartDev = self.device
-
-            # show information window...
-            #info_window = InformationWindow(self, _("Please wait while formatting!"))
-
-            # inform user
-            #self.info.setText(_('<font color="#FF6D19">Preparing your disk for installation!</font>'))
-            #ctx.screens.processEvents()
-
-            # remove all other requests (if there are any).
-            #ctx.partrequests.remove_all()
-
-            #ctx.use_autopart = True
-            #autopartDevice()
-            # need to wait for devices to be created
-            #time.sleep(1)
-            #ctx.partrequests.applyAll()
-
             ctx.debugger.log("Automatic Partition selected..")
 
             # skip next screen()
+            # We pass the Manual Partitioning screen
             num = ctx.screens.getCurrentIndex() + 1
             ctx.screens.goToScreen(num)
-            # close window
-            #info_window.close(True)
 
         return True
 

Modified: trunk/yali/yali/gui/ScrPartitionManual.py
=================================================================
--- trunk/yali/yali/gui/ScrPartitionManual.py	(original)
+++ trunk/yali/yali/gui/ScrPartitionManual.py	Wed Aug 22 16:26:50 2007
@@ -101,10 +101,8 @@
 
 
     def shown(self):
-        from os.path import basename
         ctx.debugger.log("%s loaded" % basename(__file__))
         ctx.screens.disableNext()
-
         self.partlist.update()
 
     ##
@@ -114,7 +112,6 @@
         ctx.screens.processEvents()
         return True
 
-
     def slotCreatePart(self, parent, d):
         self.partedit.setState(createState, d)
         self.dialog = Dialog(_("Create Partition"), self.partedit, self)
@@ -135,7 +132,6 @@
         self.dialog = Dialog(_("Resize Partition"), self.partedit, self)
         self.dialog.exec_loop()
 
-
     def slotApplied(self):
         self.dialog.done(0)
         self.partlist.update()

Modified: trunk/yali/yali/gui/screens.py
=================================================================
--- trunk/yali/yali/gui/screens.py	(original)
+++ trunk/yali/yali/gui/screens.py	Wed Aug 22 16:26:50 2007
@@ -12,6 +12,7 @@
 
 from qt import *
 
+import context as ctx
 from yali.steps import Steps
 
 ##
@@ -98,12 +99,9 @@
         # trigger screen
         self.getCurrent().getWidget().shown()
 
-        # FIXME: is it feasible to write the widget object in GUI mode???
-        #yali.logger.log("Changed screen to %s." % self._steps.getCurrent())
+        ctx.debugger.log("Changed screen to %s." % self._current)
 
 
-        
-
 class ScreenData:
     _stage = None
     _widget = None

Modified: trunk/yali/yali/steps.py
=================================================================
--- trunk/yali/yali/steps.py	(original)
+++ trunk/yali/yali/steps.py	Wed Aug 22 16:26:50 2007
@@ -32,11 +32,7 @@
     def addStep(self, index, step):
 
         if self._steps.has_key(index):
-            e = "index %d is present." % index
-            #should find a way to get debug status.
-            #I know optparser is my friend :)
-#            if DEBUG: e += "\nData: %s" % self._steps[index]
-            raise YaliError, e
+            raise YaliError, "index %d is present." % index
 
         self._steps[index] = step