Author: rhafer Date: Fri Jun 27 15:56:42 2008 New Revision: 48590 URL: http://svn.opensuse.org/viewcvs/yast?rev=48590&view=rev Log: Update Proposal Sequence Modified: trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=4... ============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Fri Jun 27 15:56:42 2008 @@ -25,19 +25,11 @@ /* FIXME: adapt to your needs */ map aliases = $[ - "enable" : ``( EnableServiceDialog() ), "tree" : ``( TreeDialog() ) ]; map sequence = $[ - "ws_start" : "enable", - "enable" : $[ - `abort : `abort, - `back : `abort, - `cancel : `abort, - `next : `next, - `config : "tree" - ], + "ws_start" : "tree", "tree" : $[ `abort : `abort, `back : `abort, @@ -47,11 +39,12 @@ ]; any ret = Sequencer::Run(aliases, sequence); + UI::CloseDialog(); return ret; } any ProposalSequence() { - + /* Initialization dialog caption */ string caption = _("LDAP Server Configuration"); /* Initialization dialog contents */ @@ -60,19 +53,41 @@ Wizard::CreateDialog(); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - + map aliases = $[ - "propose" : ``( ProposalDialog() ) + "startup" : ``( EnableServiceDialog() ), + "database" : ``( ProposalDialog() ), + "summary" : ``(SummaryDialog() ), + "advanced" : ``(MainSequence() ), + "write" : ``( WriteDialog() ) ]; map sequence = $[ - "ws_start" : "propose", - "propose" : $[ - `next : `next, + "ws_start" : "startup", + "startup" : $[ + `next : "database" + ], + "database" : $[ + `next : "summary", `back : `back, `abort : `back, `cancel : `back - ] + ], + "summary" : $[ + `next : "write", + `back : `back, + `abort : `back, + `cancel : `back, + `advanced : "advanced" + ], + "advanced" : $[ + `abort : `abort, + `next : `next + ], + "write" : $[ + `abort : `abort, + `next : `next + ] ]; y2milestone( "--> starting ProposalSequence" ); @@ -80,7 +95,7 @@ any ret = Sequencer::Run(aliases, sequence); y2milestone( "--> ProposalSequence finished " ); - + UI::CloseDialog(); return ret; @@ -93,17 +108,21 @@ any LdapServerSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : ``( ReadDialog() ), + "main" : ``( MainSequence() ), + "write" : ``( WriteDialog() ) ]; map sequence = $[ "ws_start" : "read", "read" : $[ `abort : `abort, + `initial : "proposal", `next : "main" ], + "proposal" : $[ + `next : "write" + ], "main" : $[ `abort : `abort, `next : "write" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org