auto partitioning

2 files changed, 37 insertions, 3 deletions

diff --git a/text.py b/text.py
index b14bd057e..102510c5f 100644
--- a/text.py
+++ b/text.py
@@ -34,8 +34,7 @@ stepToClasses = {
     "welcome" : ("welcome_text", "WelcomeWindow" ),
     "reconfigwelcome" : ("welcome_text", "ReconfigWelcomeWindow" ),
     "installtype" : ("installpath_text", "InstallPathWindow" ),
-    "autopartition" : ("partitioning_text", ( "AutoPartitionWindow",
-                                              "PartitionMethod" ) ),
+    "autopartition" : ("partition_text", "AutoPartitionWindow"),
     "custom-upgrade" : ("upgrade_text", "UpgradeExamineWindow" ),
     "addswap" : ("upgrade_text", "UpgradeSwapWindow" ),
     "fdisk" : ("partitioning_text", "ManualPartitionWindow" ),
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 1076b60ea..f8343b65f 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -21,7 +21,7 @@ import copy
 import parted
 from partitioning import *
 from fsset import *
-from autopart import doPartitioning
+from autopart import *
 from snack import *
 from constants_text import *
 from translate import _
@@ -790,3 +790,38 @@ class PartitionWindow:
                 screen.popWindow()                
                 return INSTALL_OK
         
+
+
+class AutoPartitionWindow:
+    def __call__(self, screen, type, cleardrives, diskset, intf):
+        self.screen = screen
+        self.type = type
+        self.cleardrives = cleardrives
+        self.diskset = diskset
+        self.intf = intf
+
+        if type == CLEARPART_TYPE_LINUX:
+            clearstring = "all Linux partitions"
+        elif type == CLEARPART_TYPE_ALL:
+            clearstring = "all partitions"
+        else:
+            clearstring = "no partitions"
+
+        if not cleardrives or len(cleardrives) < 1:
+            cleardrivestring = "on all drives"
+        else:
+            cleardrivestring = "on these drives: "
+            for drive in cleardrives:
+                cleardrivestring = cleardrivestring + drive + " "
+
+        rc = ButtonChoiceWindow(self.screen, _("Autopartitioning"),
+              _("Autopartitioning will remove %s %s" %
+                (clearstring, cleardrivestring)),
+                                buttons = [ TEXT_OK_BUTTON, TEXT_BACK_BUTTON ])
+
+        if rc == TEXT_BACK_CHECK:
+            self.screen.popWindow()
+            return INSTALL_BACK
+
+        return INSTALL_OK
+