Author: kmachalkova Date: Fri Jan 16 13:55:43 2009 New Revision: 54700 URL: http://svn.opensuse.org/viewcvs/yast?rev=54700&view=rev Log: Display LV name in dialog captions in adding LV workflow (#432952) Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp trunk/storage/storage/src/modules/MiniWorkflow.ycp Modified: trunk/storage/storage/src/include/ep-lvm-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lvm-dialogs.ycp?rev=54700&r1=54699&r2=54700&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-dialogs.ycp Fri Jan 16 13:55:43 2009 @@ -363,6 +363,7 @@ integer size_k = data["size_k"]:max_size_k; symbol what = (size_k == max_size_k) ? `max_size : `manual_size; + string name = data["name"]:""; integer stripes = data["stripes"]:1; integer stripe_size = data["stripesize"]:64*1024; @@ -405,6 +406,8 @@ term contents = `HVSquash(frames); + //A dialog title - %1 is a logical volume name, %2 is a volume group. + MiniWorkflow::SetTitle(sformat(_("Add Logical volume %1 on %2"), name, "/dev/" + data["vg_name"]:"error")); MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLvSizeHelptext()); MiniWorkflow::SetLastStep(false); @@ -589,7 +592,7 @@ "Commit" : $[ `finish : `finish ] ]; - // dialog title + // dialog title, %1 is a volume group string title = sformat(_("Add Logical Volume on %1"), "/dev/" + data["vg_name"]:"error"); symbol widget = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "Name"); @@ -613,8 +616,8 @@ "Password" : $[ `finish : `finish ] ]; - // dialog title - string title = sformat(_("Edit Logical Volume %1"), device); + // dialog title - %1 is a logical volume name, %2 is a volume group + string title = sformat(_("Edit Logical Volume %1 on %2"), data["name"]:"", regexpsub( device, "^(.*)/[^/]*$", "\\1" ) ); symbol widget = MiniWorkflow::Run(title, lvm_lv_icon, aliases, sequence, "FormatMount"); Modified: trunk/storage/storage/src/modules/MiniWorkflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/MiniWorkflow.ycp?rev=54700&r1=54699&r2=54700&view=diff ============================================================================== --- trunk/storage/storage/src/modules/MiniWorkflow.ycp (original) +++ trunk/storage/storage/src/modules/MiniWorkflow.ycp Fri Jan 16 13:55:43 2009 @@ -17,6 +17,10 @@ string title = ""; + global void SetTitle(string newtitle) + { + title = newtitle; //a je to! + } global void SetContents(term contents, string help_text) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org