Author: jsrain Date: Thu Sep 29 14:39:44 2011 New Revision: 66177 URL: http://svn.opensuse.org/viewcvs/yast?rev=66177&view=rev Log: run the dialog to select application for profiling without pop-up (bnc#531512) Modified: trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/clients/GenProf.ycp Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.changes?rev=66177&r1=66176&r2=66177&view=diff ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Thu Sep 29 14:39:44 2011 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Sep 29 09:17:21 UTC 2011 - jsrain@site +Thu Sep 29 12:42:55 UTC 2011 - jsrain@site - fixed enabling/disabling apparmor - fixed setting notifications (and enabling aaeventsd as part of @@ -7,6 +7,8 @@ - prevent profile generator from failing immediately - prevent window from disappearing when starting a module - don't close the module after running a report (bnc#531512) +- run the dialog to select application for profiling without + pop-up (bnc#531512) ------------------------------------------------------------------- Thu Sep 22 12:42:09 UTC 2011 - jreidinger@suse.com Modified: trunk/apparmor/src/clients/GenProf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/GenProf.ycp?rev=66177&r1=66176&r2=66177&view=diff ============================================================================== --- trunk/apparmor/src/clients/GenProf.ycp (original) +++ trunk/apparmor/src/clients/GenProf.ycp Thu Sep 29 14:39:44 2011 @@ -287,37 +287,32 @@ `VSpacing(`opt(`vstretch), 0.25) ) ), - `HBox( `HCenter(`PushButton(`id(`browse), _("&Browse")))), - `HBox( - `HSpacing(`opt(`hstretch), 0.1), - `HCenter(`PushButton(`id(`okay), `opt(`default), okay_label)), - `HCenter(`PushButton(`id(`cancel), cancel_label)), - `HSpacing(`opt(`hstretch), 0.1), - `VSpacing(1) - ) + `HBox( `HCenter(`PushButton(`id(`browse), _("&Browse")))) ); - UI::OpenDialog(dialog); + string helptext = _("<p><h1>Application to Profile</h1> +Select the application which you want to profile. Afterwards, when you run the application, AppArmor will collect +information about system resources it accesses.</p>");; + Wizard::SetContentsButtons(_("Application to Profile"), dialog, helptext, Label::BackButton(), Label::NextButton()); map<string,string> answers = $[ ]; - any poo = false; + any ret = false; repeat { UI::SetFocus(`id(`filename)); - poo = UI::UserInput(); - if(poo == `okay) { + ret = UI::UserInput(); + y2internal ("Poo: %1", ret); + if(ret == `next) { answers["answer"] = "okay"; answers["filename"] = (string) UI::QueryWidget(`id(`filename), `Value); - } else if(poo == `cancel) { + } else if(ret == `cancel || ret == `abort || ret == `back) { answers["answer"] = "cancel"; - } else if ( poo == `browse ) { + } else if ( ret == `browse ) { string selectfilename = UI::AskForExistingFile( "/", "", browse_desc); UI::ChangeWidget(`id(`filename), `Value, selectfilename); } - } until ((poo == `okay) || (poo == `cancel)); - - UI::CloseDialog(); + } until ((ret == `next) || (ret == `cancel)|| ret == `abort || ret == `back); // tell the backend what they picked boolean written = SCR::Write(.genprof, answers); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org