Author: aschnell Date: Fri Aug 8 16:11:47 2008 New Revision: 49875 URL: http://svn.opensuse.org/viewcvs/yast?rev=49875&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-main.ycp?rev=49875&r1=49874&r2=49875&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Fri Aug 8 16:11:47 2008 @@ -211,11 +211,10 @@ } else if (ret1 == `apply || ret1 == `finish) { - StorageSettings::Save(); - Wizard::CreateDialog(); Wizard::SetDesktopIcon("disk"); symbol ret2 = (symbol) WFM::CallFunction("inst_prepdisk", [true, true]); + StorageSettings::Save(); Wizard::CloseDialog(); Storage::CreateTargetBackup("expert-partitioner"); @@ -247,12 +246,11 @@ term contents = `MarginBox(0.5, 0.5, `HBox( `HWeight(30, - `VBox( - `Tree(`id(`tree), `opt(`notify), _("System View"), tree) - ) + `Tree(`id(`tree), `opt(`notify), _("System View"), tree) ), `HWeight(70, - `ReplacePoint(`id(`tree_panel), TreePanel::empty_panel)) + `ReplacePoint(`id(`tree_panel), TreePanel::empty_panel) + ) ) ); @@ -275,13 +273,13 @@ case `abort: { if (!Storage::EqualBackupStates("expert-partitioner", "", true)) { - // popup text %1 will be replaces with button text - string txt = sformat(_("You have changed the partitioning. + // popup text, %1 will be replaces with button text + string text = sformat(_("You have changed the partitioning. These changes are lost if you exit the main dialog with %1. Really quit the main dialog? -"), deletechars(back_label, "&")); // TODO +"), deletechars(back_label, "&")); - if (!Popup::YesNo(txt)) + if (!Popup::YesNo(text)) { widget = `again; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org