Author: aschnell Date: Fri Feb 29 11:05:27 2008 New Revision: 45117 URL: http://svn.opensuse.org/viewcvs/yast?rev=45117&view=rev Log: - tiny adjustments Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp?rev=45117&r1=45116&r2=45117&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-dialogs.ycp Fri Feb 29 11:05:27 2008 @@ -72,10 +72,10 @@ } - // TODO: symbols here and resulting content should be identical to the once + // TODO: symbols here and resulting content should be identical to the once // used in MakePartitionList // - // TODO: we could use RichText formatting capabilities (but table is only + // TODO: we could use RichText formatting capabilities (but table is only // supported by qt) term MakeInfo(map data, list<symbol> rows) { @@ -94,9 +94,17 @@ ret = ret + "Bus: " + data["bus"]:"" + "\n"; else if (row == `udev_path) ret = ret + "Path: " + data["udev_path"]:"" + "\n"; - else if (row == `udev_id) - ret = ret + "ID: " + mergestring(data["udev_id"]:[], " ") + "\n"; - else if (row == `mount_point) + else if (row == `udev_id) { + if (false) { + ret = ret + "ID: " + mergestring(data["udev_id"]:[], " ") + "\n"; + } else { + integer i = 1; + foreach(string id, data["udev_id"]:[], { + ret = ret + "ID " + i + ": " + id + "\n"; + i = i + 1; + }); + } + } else if (row == `mount_point) ret = ret + "Mount Point: " + data["mount"]:"" + "\n"; else if (row == `size) ret = ret + "Size: " + ByteToHumanStringWithZero(data["size_k"]:0*1024) + "\n"; @@ -116,6 +124,8 @@ ret = ret + "File System: " + FileSystems::GetName(data["used_fs"]:`unknown, "unknown") + "\n"; else if (row == `uuid) ret = ret + "UUID: " + data["uuid"]:"" + "\n"; + else if (row == `label) + ret = ret + "Label: " + data["label"]:"" + "\n"; }); return `Left(`RichText(`opt(`plainText), ret)); Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp?rev=45117&r1=45116&r2=45117&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp Fri Feb 29 11:05:27 2008 @@ -28,7 +28,10 @@ foreach(string t, ["/dev/hda1", "/dev/hda2", "/dev/hda3", "/dev/hda4", "/dev/hda5", "/dev/hdb1", "/dev/hdb2", "/dev/hdb3", "/dev/hdb4", "/dev/hdb5", "/dev/hdb6", "/dev/hdb7", "/dev/hdb8", "/dev/hdb9", "/dev/hdb10" ], { - candidates_list = add(candidates_list, `item(`id(t), t)); + if (substring(t, 5, 3) == "hda") + candidates_list = add(candidates_list, `item(`id(t), t + " 10.0 GB")); + else + candidates_list = add(candidates_list, `item(`id(t), t + " 100.0 GB")); }); */ Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp?rev=45117&r1=45116&r2=45117&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Fri Feb 29 11:05:27 2008 @@ -105,7 +105,7 @@ /** * Sorted call of disk_cb for every disk. */ - void GoOverTargetMap(map targets, void(map, map) disk_cb) + void IterateTargetMap(map targets, void(map, map) disk_cb) { // order should be md, then loop, then LVM, then EVMS map disk_order = $[ `CT_DMRAID : 0, `CT_DISK : 1, `CT_MD : 2, `CT_LOOP : 3, @@ -372,7 +372,7 @@ } } - GoOverTargetMap(targets, disk_cb); + IterateTargetMap(targets, disk_cb); return table_input; } @@ -457,7 +457,7 @@ map tg = Storage::GetTargetMap(); - GoOverTargetMap(tg, disk_cb); + IterateTargetMap(tg, disk_cb); list<term> tree = [ `item(`id(`all), "pandora", [ `item(`id(`hd), "Hard Disks", subtree[`hd]:[]), Modified: branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp?rev=45117&r1=45116&r2=45117&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp Fri Feb 29 11:05:27 2008 @@ -161,7 +161,7 @@ ///////////////////////////////////////////////////////////////// // Get all partitions, we can probably use as physical volumes // Add needed information: disksize -// TODO: make sure ordering is same as with GoOverTargetMap +// TODO: make sure ordering is same as with IterateTargetMap define list<map> get_possible_pvs( map targetMap ) ``{ list<map> ret = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org