diff options
-rw-r--r-- | iw/netconfig_dialog.py | 1 | ||||
-rw-r--r-- | iw/partition_gui.py | 10 | ||||
-rw-r--r-- | iw/partition_ui_helpers_gui.py | 28 |
3 files changed, 15 insertions, 24 deletions
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py index c87da21d5..3941d3a99 100644 --- a/iw/netconfig_dialog.py +++ b/iw/netconfig_dialog.py @@ -27,7 +27,6 @@ from constants import * import gettext _ = lambda x: gettext.ldgettext("anaconda", x) -import gui import network import isys diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 3f7aa95db..24559ee59 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -129,13 +129,6 @@ class DiskStripeSlice: return "cornsilk2" return "cornsilk1" - def hideOrShowText(self): - return - if self.box.get_bounds()[2] < self.text.get_bounds()[2]: - self.text.hide() - else: - self.text.show() - def sliceText(self): if self.partition.type & parted.PARTITION_EXTENDED: return "" @@ -178,7 +171,6 @@ class DiskStripeSlice: fill_color='black', anchor=gtk.ANCHOR_NW, clip=True, clip_width=xlength-1, clip_height=yheight-1) - self.hideOrShowText() def __init__(self, parent, partition, treeView, editCB): self.text = None @@ -483,8 +475,8 @@ class DiskTreeModel(gtk.TreeStore): # not found the partition raise RuntimeError, "could not find partition" - """ Return the device representing the current selection """ def getCurrentDevice(self): + """ Return the device representing the current selection """ selection = self.view.get_selection() model, iter = selection.get_selected() if not iter: diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index ede020066..0ad18034c 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -280,22 +280,22 @@ def formatMigrateOptionCB(widget, data): setMntPtComboStateFromType(ofstype, mntptcombo) -""" createPreExistFSOptionSection: given inputs for a preexisting partition, - create a section that will provide format and migrate options - - Returns the value of row after packing into the maintable, - and a dictionary consistenting of: - formatcb - checkbutton for 'format as new fs' - fstype - part of format fstype menu - fstypeMenu - part of format fstype menu - migratecb - checkbutton for migrate fs - migfstypeMenu - menu for migrate fs types - lukscb - checkbutton for 'encrypt using LUKS/dm-crypt' - resizecb - checkbutton for 'resize fs' - resizesb - spinbutton with resize target -""" def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo, partitions, ignorefs=[], luksdev=None): + """ createPreExistFSOptionSection: given inputs for a preexisting partition, + create a section that will provide format and migrate options + + Returns the value of row after packing into the maintable, + and a dictionary consistenting of: + formatcb - checkbutton for 'format as new fs' + fstype - part of format fstype menu + fstypeMenu - part of format fstype menu + migratecb - checkbutton for migrate fs + migfstypeMenu - menu for migrate fs types + lukscb - checkbutton for 'encrypt using LUKS/dm-crypt' + resizecb - checkbutton for 'resize fs' + resizesb - spinbutton with resize target + """ rc = {} if luksdev: |