summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgui.py9
-rw-r--r--iw/package.py6
2 files changed, 9 insertions, 6 deletions
diff --git a/gui.py b/gui.py
index db2f0b49f..5c10771e5 100755
--- a/gui.py
+++ b/gui.py
@@ -5,6 +5,7 @@ from iw.language import *
from iw.welcome import *
from iw.progress import *
from iw.package import *
+from iw.network import *
import sys
import GdkImlib
@@ -176,10 +177,12 @@ class InstallInterface:
["Partition", PartitionWindow, (todo,)]
]
- steps = [WelcomeWindow, LanguageWindow, PackageSelectionWindow, InstallProgressWindow]
+ steps = [WelcomeWindow, LanguageWindow, NetworkWindow,
+ PackageSelectionWindow, InstallProgressWindow]
- windows = [WelcomeWindow, LanguageWindow, PackageSelectionWindow,
- IndividualPackageSelectionWindow, InstallProgressWindow]
+ windows = [WelcomeWindow, LanguageWindow, NetworkWindow,
+ PackageSelectionWindow, IndividualPackageSelectionWindow,
+ InstallProgressWindow]
icw = InstallControlWindow (self, steps, windows, todo)
diff --git a/iw/package.py b/iw/package.py
index 80115beba..8ce413873 100644
--- a/iw/package.py
+++ b/iw/package.py
@@ -226,7 +226,7 @@ class IndividualPackageSelectionWindow (InstallWindow):
def getScreen (self):
threads_leave ()
- self.todo.headerList()
+ self.todo.getHeaderList()
threads_enter ()
self.path_mapping = {}
@@ -371,8 +371,8 @@ class PackageSelectionWindow (InstallWindow):
def getScreen (self):
threads_leave ()
- self.todo.headerList ()
- self.todo.compsList()
+ self.todo.getHeaderList ()
+ self.todo.getCompsList()
threads_enter ()
sw = GtkScrolledWindow ()