Author: aschnell Date: Tue Jun 24 15:11:08 2008 New Revision: 48505 URL: http://svn.opensuse.org/viewcvs/yast?rev=48505&view=rev Log: - work on dialog titles Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-dialogs.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp?rev=48505&r1=48504&r2=48505&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd-dialogs.ycp Tue Jun 24 15:11:08 2008 @@ -116,7 +116,9 @@ data["device"] = r["device"]:""; } - symbol widget = MiniWorkflow::Run(_("Add Partition"), hd_part_icon, aliases, sequence, start); + string title = sformat(_("Add Partition on %1"), data["disk_device"]:"error"); + + symbol widget = MiniWorkflow::Run(title, hd_part_icon, aliases, sequence, start); return widget == `finish; } 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=48505&r1=48504&r2=48505&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 Tue Jun 24 15:11:08 2008 @@ -185,9 +185,9 @@ } - boolean DlgResizeVolumeGroup(string vgname) + boolean DlgResizeVolumeGroup(string device) { - map data = $[ "vgname" : vgname ]; + map data = $[ "vgname" : substring(device, 5) ]; map aliases = $[ "TheOne" : ``(MiniWorkflowStepResizeVg(data)) @@ -197,7 +197,7 @@ "TheOne" : $[ `finish : `finish ] ]; - string title = sformat(_("Resize Volume Group %1"), vgname); + string title = sformat(_("Resize Volume Group %1"), device); symbol widget = MiniWorkflow::Run(title, lvm_icon, aliases, sequence, "TheOne"); @@ -246,16 +246,15 @@ } - boolean DlgCreateLogicalVolume(string vg_name) + boolean DlgCreateLogicalVolume(string device) { map target_map = Storage::GetTargetMap(); map data = $[]; data["flavour"] = `lv; - data["vg_name"] = vg_name; - data["max_size"] = target_map["/dev/" + vg_name, "pe_free"]:0 * - target_map["/dev/" + vg_name, "pesize"]:0; + data["vg_name"] = substring(device, 5); + data["max_size"] = target_map[device, "pe_free"]:0 * target_map[device, "pesize"]:0; map aliases = $[ "Name" : ``(MiniWorkflowStepLvName(data)), @@ -273,11 +272,13 @@ "Password" : $[ `finish : `finish ] ]; - symbol ret = MiniWorkflow::Run(_("Add Logical Volume"), lvm_lv_icon, aliases, sequence, "Name"); + string title = sformat(_("Add Logical Volume on %1"), device); + + symbol ret = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "Name"); if (ret == `finish) { - addLogicalVolume(data, vg_name); + addLogicalVolume(data, substring(device, 5)); UpdateNavigationTree(nil); TreePanel::Create(); } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp?rev=48505&r1=48504&r2=48505&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm-lib.ycp Tue Jun 24 15:11:08 2008 @@ -8,6 +8,16 @@ textdomain "storage"; + void EpCreateLogicalVolume(string device) + { + if (DlgCreateLogicalVolume(device)) + { + UpdateNavigationTree(nil); + TreePanel::Create(); + } + } + + void EpResizeVolumeGroup(string device) { if (DlgResizeVolumeGroup(device)) Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp?rev=48505&r1=48504&r2=48505&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Tue Jun 24 15:11:08 2008 @@ -89,7 +89,7 @@ { case `resize: { - DlgResizeVolumeGroup(vgname); + DlgResizeVolumeGroup(device); break; } @@ -148,7 +148,7 @@ switch (widget) { case `add: - DlgCreateLogicalVolume(substring(vg_device, 5)); + EpCreateLogicalVolume(vg_device); break; case `edit: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org