Author: gs Date: Tue Jul 29 10:27:27 2008 New Revision: 49477 URL: http://svn.opensuse.org/viewcvs/yast?rev=49477&view=rev Log: set correct steps Modified: trunk/auditd/src/Auditd.ycp trunk/auditd/src/wizards.ycp Modified: trunk/auditd/src/Auditd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/Auditd.ycp?rev=49477&r1=49476&r2=49477&view=diff ============================================================================== --- trunk/auditd/src/Auditd.ycp (original) +++ trunk/auditd/src/Auditd.ycp Tue Jul 29 10:27:27 2008 @@ -146,8 +146,8 @@ /* Auditd read dialog caption */ string caption = _("Initializing auditd Configuration"); - // TODO FIXME Set the right number of stages - integer steps = 4; + // Set the right number of stages + integer steps = 3; integer sl = 500; sleep(sl); @@ -156,19 +156,16 @@ // We do not set help text here, because it was set outside Progress::New( caption, " ", steps, [ /* Progress stage 1/3 */ - _("Read the database"), + _("Read the configuration for auditd"), /* Progress stage 2/3 */ - _("Read the previous settings"), + _("Read the rules file") /* Progress stage 3/3 */ - _("Detect the devices") ], [ /* Progress step 1/3 */ - _("Reading the database..."), + _("Reading the configuration..."), /* Progress step 2/3 */ - _("Reading the previous settings..."), + _("Reading the rules file..."), /* Progress step 3/3 */ - _("Detecting the devices..."), - /* Progress finished */ _("Finished") ], "" @@ -195,13 +192,6 @@ if(false) Report::Error(Message::CannotReadCurrentSettings()); sleep(sl); - // detect devices - if(Abort()) return false; - Progress::NextStage(); - /* Error message */ - if(false) Report::Warning(_("Cannot detect devices.")); - sleep(sl); - if(Abort()) return false; /* Progress finished */ Progress::NextStage(); Modified: trunk/auditd/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/auditd/src/wizards.ycp?rev=49477&r1=49476&r2=49477&view=diff ============================================================================== --- trunk/auditd/src/wizards.ycp (original) +++ trunk/auditd/src/wizards.ycp Tue Jul 29 10:27:27 2008 @@ -37,33 +37,6 @@ include "auditd/complex.ycp"; include "auditd/dialogs.ycp"; -/** - * Add a configuration of auditd - * @return sequence result - */ -any AddSequence() { - - /* FIXME: adapt to your needs */ - map aliases = $[ - "config1" : ``(Configure1Dialog()), - "config2" : ``(Configure2Dialog()), - ]; - - /* FIXME: adapt to your needs */ - map sequence = $[ - "ws_start" : "config1", - "config1" : $[ - `abort : `abort, - `next : "config2" - ], - "config2" : $[ - `abort : `abort, - `next : `next - ] - ]; - - return Sequencer::Run(aliases, sequence); -} /** * Main workflow of the auditd configuration @@ -74,10 +47,7 @@ /* FIXME: adapt to your needs */ map aliases = $[ "summary" : ``( SummaryDialog() ), - "overview" : ``( OverviewDialog() ), - "configure" : [ ``( AddSequence() ), true ], - "add" : [ ``( AddSequence() ), true ], - "edit" : [ ``( AddSequence() ), true ] + "overview" : ``( OverviewDialog() ) ]; /* FIXME: adapt to your needs */ @@ -86,27 +56,11 @@ "summary" : $[ `abort : `abort, `next : `next, - `overview : "overview", - `configure : "configure", - `other : "configure", + `overview : "overview" ], "overview" : $[ `abort : `abort, - `next : `next, - `add : "add", - `edit : "edit", - ], - "configure" : $[ - `abort : `abort, - `next : "summary", - ], - "add" : $[ - `abort : `abort, - `next : "overview", - ], - "edit" : $[ - `abort : `abort, - `next : "overview", + `next : `next ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org