This simplifies the edit partition dialog and adds resizing support
---
iw/lvm_dialog_gui.py | 18 ++-----
iw/partition_dialog_gui.py | 43 ++++------------
iw/partition_ui_helpers_gui.py | 111 +++++++++++++++++++++-------------------
iw/raid_dialog_gui.py | 22 ++------
4 files changed, 78 insertions(+), 116 deletions(-)
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 5d81064..472bcf1 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -479,25 +479,15 @@ class VolumeGroupEditor:
format = 1
migrate = 0
else:
- if self.fsoptionsDict.has_key("formatrb"):
- formatrb = self.fsoptionsDict["formatrb"]
- else:
- formatrb = None
-
- if formatrb:
- format = formatrb.get_active()
+ if self.fsoptionsDict.has_key("formatcb"):
+ format = self.fsoptionsDict["formatcb"].get_active()
if format:
fsystem = self.fsoptionsDict["fstypeCombo"].get_active_value()
else:
format = 0
- if self.fsoptionsDict.has_key("migraterb"):
- migraterb = self.fsoptionsDict["migraterb"]
- else:
- migraterb = None
-
- if migraterb:
- migrate = migraterb.get_active()
+ if self.fsoptionsDict.has_key("migratecb"):
+ migrate = self.fsoptionsDict["migratecb"].get_active()
if migrate:
fsystem = self.fsoptionsDict["migfstypeCombo"].get_active_value()
else:
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
index 7c757ae..fa7a6fd 100644
--- a/iw/partition_dialog_gui.py
+++ b/iw/partition_dialog_gui.py
@@ -206,30 +206,26 @@ class PartitionEditor:
# preexisting partition, just set mount point and format flag
request = copy.copy(self.origrequest)
- if self.fsoptionsDict.has_key("formatrb"):
- formatrb = self.fsoptionsDict["formatrb"]
- else:
- formatrb = None
-
- if formatrb:
- request.format = formatrb.get_active()
+ if self.fsoptionsDict.has_key("formatcb"):
+ request.format = self.fsoptionsDict["formatcb"].get_active()
if request.format:
request.fstype = self.fsoptionsDict["fstypeCombo"].get_active_value()
else:
request.format = 0
- if self.fsoptionsDict.has_key("migraterb"):
- migraterb = self.fsoptionsDict["migraterb"]
- else:
- migraterb = None
-
- if migraterb:
- request.migrate = migraterb.get_active()
+ if self.fsoptionsDict.has_key("migratecb"):
+ request.migrate = self.fsoptionsDict["migratecb"].get_active()
if request.migrate:
request.fstype =self.fsoptionsDict["migfstypeCombo"].get_active_value()
else:
request.migrate = 0
+ if self.fsoptionsDict.has_key("resizecb") and self.fsoptionsDict["resizecb"].get_active():
+ request.targetSize = self.fsoptionsDict["resizesb"].get_value_as_int()
+ else:
+ request.targetSize = None
+ print "the target size for %s is %s" %(request.mountpoint, request.targetSize)
+
# set back if we are not formatting or migrating
origfstype = self.origrequest.origfstype
if not request.format and not request.migrate:
@@ -337,21 +333,6 @@ class PartitionEditor:
lbl.set_mnemonic_widget(self.newfstypeCombo)
maintable.attach(self.newfstypeCombo, 1, 2, row, row + 1)
else:
- maintable.attach(createAlignedLabel(_("Original File System "
- "Type:")),
- 0, 1, row, row + 1)
-
- if self.origrequest.origfstype:
- typestr = self.origrequest.origfstype.getName()
- if self.origrequest.origfstype.getName() == "foreign":
- part = get_partition_by_name(self.diskset.disks,
- self.origrequest.device)
- typestr = map_foreign_to_fsname(part.native_type)
- else:
- typestr = _("Unknown")
-
- fstypelabel = gtk.Label(typestr)
- maintable.attach(fstypelabel, 1, 2, row, row + 1)
self.newfstypeCombo = None
+def istruefalse(val):
+ if val is None or not val:
+ return False
+ return True
+
class WideCheckList(checklist.CheckList):
def toggled_item(self, data, row):
@@ -206,6 +211,9 @@ def mountptchangeCB(widget, fstypecombo):
if rhpl.getArch() == "ia64" and widget.get_children()[0].get_text() == "/boot/efi":
fstypecombo.set_active_text("vfat")
Returns the value of row after packing into the maintable,
and a dictionary consistenting of:
- noformatrb - radiobutton for 'leave fs unchanged'
- formatrb - radiobutton for 'format as new fs'
+ noformatcb - checkbutton for 'format as new fs'
fstype - part of format fstype menu
fstypeMenu - part of format fstype menu
- migraterb - radiobutton for migrate fs
- migfstype - menu for migrate fs types
+ 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,
ignorefs=[]):
+ rc = {}
ofstype = origrequest.fstype
- if not formatrb.get_active() and not origrequest.migrate:
+ if not formatcb.get_active() and not origrequest.migrate:
mountCombo.set_data("prevmountable", ofstype.isMountable())
# this gets added to the table a bit later on
lukscb = gtk.CheckButton(_("Encrypt Partition"))
Implement resizing UI for graphical mode.
