[yast-commit] r44812 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-lvm-dialogs.ycp include/lvm_pv_lib.ycp include/partition_defines.ycp modules/Partitions.ycp

Author: aschnell Date: Thu Feb 21 21:39:25 2008 New Revision: 44812 URL: http://svn.opensuse.org/viewcvs/yast?rev=44812&view=rev Log: - show size of pvs in vg create dialog Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/lvm_pv_lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/partition_defines.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp 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=44812&r1=44811&r2=44812&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 Thu Feb 21 21:39:25 2008 @@ -20,7 +20,8 @@ list<term> candidates_list = maplist(map candidate, candidates, { string device = candidate["device"]:""; - return `item(`id(device), device); + integer size_k = candidate["size_k"]:0; + return `item(`id(device), device + " " + ByteToHumanStringWithZero(size_k*1024)); }); /* @@ -37,7 +38,6 @@ `Heading("Add Volume Group"), `InputField(`id("vgname"), "Volume Group Name:"), `InputField(`id("pesize"), _("&Physical Extent Size:"), "4M"), - `CheckBox(`id("lvm1"), _("Use &Old LVM1 Compatible Metadata Format"), false), DualMultiSelectionBox::Create(candidates_list), `HBox( `PushButton(`id(`help), "Help"), @@ -50,7 +50,6 @@ string vgname = ""; string pesize = ""; - boolean old_metadata = false; list<string> pvs = []; any widget = nil; @@ -64,7 +63,6 @@ { vgname = deletechars((string) UI::QueryWidget(`id("vgname"), `Value), " \t"); pesize = (string) UI::QueryWidget(`id("pesize"), `Value); - old_metadata = (boolean) UI::QueryWidget(`id("lvm1"), `Value); list<term> tmp1 = DualMultiSelectionBox::GetSelectedItems(); list<map> candidates_selected = filter(map candidate, candidates, { @@ -82,7 +80,7 @@ if (widget == `ok) { - if (Storage::CreateLvmVgWithDevs(vgname, pesize_str_to_byte (pesize), !old_metadata, pvs)) + if (Storage::CreateLvmVgWithDevs(vgname, pesize_str_to_byte (pesize), true, pvs)) return vgname; } 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=44812&r1=44811&r2=44812&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 Thu Feb 21 21:39:25 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 define list<map> get_possible_pvs( map targetMap ) ``{ list<map> ret = []; Modified: branches/tmp/aschnell/part-redesign/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/partition_defines.ycp?rev=44812&r1=44811&r2=44812&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/partition_defines.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/partition_defines.ycp Thu Feb 21 21:39:25 2008 @@ -164,22 +164,18 @@ * Return value: string "0" if input == 0 *---------------------------------------------------------------------- */ -define string ByteToHumanStringWithZero ( integer number ) - ``{ - // string or locale - string ret = ByteToHumanString( number ); - - // label text - if( ret == _("unknown") ) - { +string ByteToHumanStringWithZero(integer number) +{ + if (number == 0) + { // label text, short for Megabyte (MB) - return( "0 " + _("MB") ); - } + return "0 " + _("MB"); + } else - { - return( ret ); - } - }; + { + return ByteToHumanString(number); + } +}; /*--------------------------------------------------------------------- Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp?rev=44812&r1=44811&r2=44812&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/Partitions.ycp Thu Feb 21 21:39:25 2008 @@ -782,6 +782,8 @@ * see also ByteToHumanStringWithZero ! * Return value: string "unknown" if input == 0 *---------------------------------------------------------------------- + * + * TODO: also defined in partition_defines.ycp, remove one */ global define string ByteToHumanString ( integer number ) ``{ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org