diff options
| author | Matt Wilson <msw@redhat.com> | 1999-08-30 22:47:26 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-08-30 22:47:26 +0000 |
| commit | 334a1240c90a758297d3f27fd65853954f8d2348 (patch) | |
| tree | 79c295c26115f4ac80740985f864d0e5a3ba48e2 /iw | |
| parent | f98c50a82bab65528fb96bab51b23393896d56cc (diff) | |
| download | anaconda-334a1240c90a758297d3f27fd65853954f8d2348.tar.gz anaconda-334a1240c90a758297d3f27fd65853954f8d2348.tar.xz anaconda-334a1240c90a758297d3f27fd65853954f8d2348.zip | |
move bits around, don't double import xpms
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/package.py | 13 | ||||
| -rw-r--r-- | iw/rootpartition.py | 18 |
2 files changed, 15 insertions, 16 deletions
diff --git a/iw/package.py b/iw/package.py index d92bcad36..9381144cc 100644 --- a/iw/package.py +++ b/iw/package.py @@ -2,7 +2,6 @@ from gtk import * from gnome.ui import * from iw import * from string import * -from xpms import * from thread import * from examine import * import rpm @@ -29,10 +28,10 @@ class IndividualPackageSelectionWindow (InstallWindow): self.updatingIcons = FALSE - self.idirImage = GdkImlib.create_image_from_xpm (I_DIRECTORY_XPM) - self.idirUpImage = GdkImlib.create_image_from_xpm (I_DIRECTORY_UP_XPM) - self.packageImage = GdkImlib.create_image_from_xpm (PACKAGE_XPM) - self.packageSelectedImage = GdkImlib.create_image_from_xpm (PACKAGE_SELECTED_XPM) + self.idirImage = GdkImlib.create_image_from_xpm (xpms.I_DIRECTORY_XPM) + self.idirUpImage = GdkImlib.create_image_from_xpm (xpms.I_DIRECTORY_UP_XPM) + self.packageImage = GdkImlib.create_image_from_xpm (xpms.PACKAGE_XPM) + self.packageSelectedImage = GdkImlib.create_image_from_xpm (xpms.PACKAGE_SELECTED_XPM) def getPrev (self): for x in self.ics.getICW ().stateList: @@ -253,9 +252,9 @@ class IndividualPackageSelectionWindow (InstallWindow): if (not self.__dict__.has_key ("open_p")): self.open_p, self.open_b = create_pixmap_from_xpm_d (self.ctree, - None, DIRECTORY_OPEN_XPM) + None, xpms.DIRECTORY_OPEN_XPM) self.closed_p, self.closed_b = create_pixmap_from_xpm_d (self.ctree, - None, DIRECTORY_CLOSE_XPM) + None, xpms.DIRECTORY_CLOSE_XPM) groups = {} diff --git a/iw/rootpartition.py b/iw/rootpartition.py index 8d3526bae..72ccc9589 100644 --- a/iw/rootpartition.py +++ b/iw/rootpartition.py @@ -29,15 +29,6 @@ class PartitionWindow (InstallWindow): ics.setHTML ("<HTML><BODY>Select a root partition" "</BODY></HTML>") ics.setNextEnabled (TRUE) - from gnomepyfsedit import fsedit - - if not self.todo.ddruid: - drives = self.todo.drives.available ().keys () - drives.sort () - self.todo.ddruid = \ - fsedit(1, drives, []) - self.todo.ddruid.setCallback (self.enableCallback, self) - def getNext (self): print "calling self.ddruid.next ()" @@ -63,6 +54,15 @@ class PartitionWindow (InstallWindow): self.ics.setNextEnabled (value) def getScreen (self): + from gnomepyfsedit import fsedit + + if not self.todo.ddruid: + drives = self.todo.drives.available ().keys () + drives.sort () + self.todo.ddruid = \ + fsedit(1, drives, []) + self.todo.ddruid.setCallback (self.enableCallback, self) + self.bin = GtkFrame (None, _obj = self.todo.ddruid.getWindow ()) self.bin.set_shadow_type (SHADOW_NONE) self.todo.ddruid.edit () |