Author: aschnell Date: Fri Mar 6 18:23:45 2009 New Revision: 56000 URL: http://svn.opensuse.org/viewcvs/yast?rev=56000&view=rev Log: - handle cancel event 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=56000&r1=55999&r2=56000&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Fri Mar 6 18:23:45 2009 @@ -230,8 +230,8 @@ boolean ReallyQuit( string label ) { // popup text, %1 will be replaces with button text - string text = sformat(_("You have changed the partitioning or storage settings. These changes -will be lost if you exit the partitioner with %1. + string text = sformat(_("You have changed the partitioning or storage settings. These changes +will be lost if you exit the partitioner with %1. Really exit?"), deletechars(label, "&")); return Popup::YesNo(text); @@ -245,7 +245,7 @@ return helptext; } - + /** * Fullscreen summary of changes @@ -253,7 +253,7 @@ symbol SummaryDialog() { symbol ret = `none; - string summary = Storage::ChangeText() + + string summary = Storage::ChangeText() + ( StorageSettings::GetModified() ? StorageSettings::Summary() : ""); @@ -261,7 +261,7 @@ y2milestone("Summary of changes: %1", summary); Wizard::CreateDialog(); - Wizard::SetContentsButtons(caption + _(": Summary"), + Wizard::SetContentsButtons(caption + _(": Summary"), `VBox(`RichText( `id(`summary), _("Creating summary ..."))), SummaryDialogHelptext(), Label::BackButton(), @@ -355,10 +355,14 @@ repeat { map event = Wizard::WaitForEvent(); - y2milestone("haha %1", event); TreePanel::Handle(event); + widget = Event::IsCancel(event); + + if (widget != nil) + break; + widget = Event::IsWidgetActivated(event); switch (widget) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org