Author: ug Date: Wed Jan 9 16:40:14 2008 New Revision: 43502 URL: http://svn.opensuse.org/viewcvs/yast?rev=43502&view=rev Log: jumping directly to a module in UI added (fate #5997) Modified: trunk/autoinstallation/src/clients/autoyast.ycp trunk/autoinstallation/src/include/conftree.ycp trunk/autoinstallation/src/modules/AutoinstConfig.ycp Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/autoyast.ycp?rev=43502&r1=43501&r2=43502&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Wed Jan 9 16:40:14 2008 @@ -39,7 +39,7 @@ Pkg::CallbackAcceptFileWithoutChecksum("AutoInstall::callbackTrue"); Pkg::CallbackAcceptUnsignedFile("AutoInstall::callbackTrue"); - void openFile( map options ) { + define boolean openFile( map options ) { if( !Profile::ReadXML( options["filename"]:"" ) ) { Popup::Error(_("Error while parsing the control file. Check the log files for more details or fix the @@ -65,6 +65,14 @@ } }); Popup::ClearFeedback(); + AutoSequence (); + return true; + } + + define boolean runModule( map options ) { + AutoinstConfig::runModule = options["modname"]:""; + AutoSequence (); + return true; } @@ -73,16 +81,22 @@ "help" : _("autoyast"), "guihandler" : AutoSequence, "actions" : $[ - "file" : $[ "handler":openFile, "help":"file operations" ] + "file" : $[ "handler":openFile, "help":"file operations" ], + "module": $[ "handler":runModule, "help":"module specific operations" ] ], "options" : $[ "filename": $[ "type":"string", "help":"filename=XML_PROFILE" - ] + ], + "modname": $[ + "type":"string", + "help":"modname=AYAST_MODULE" + ] ], "mappings" : $[ - "file" : ["filename"] + "file" : ["filename"], + "module" : ["modname"] ] ]; @@ -95,7 +109,9 @@ string exit = ""; list l = []; - CommandLine::Run(cmdline); + any ret = nil; + ret = CommandLine::Run(cmdline); + AddOnProduct::CleanModeConfigSources(); return `exit; Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/conftree.ycp?rev=43502&r1=43501&r2=43502&view=diff ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Wed Jan 9 16:40:14 2008 @@ -343,8 +343,14 @@ while(true) { - map event = UI::WaitForEvent(); - ret = event["ID"]:nil; + if( AutoinstConfig::runModule != "" ) { + ret = `configure; + Wizard::SelectTreeItem( "module@"+AutoinstConfig::runModule ); + } else { + map event = UI::WaitForEvent(); + ret = event["ID"]:nil; + AutoinstConfig::runModule = ""; + } if (ret == `wizardTree) { ret = UI::QueryWidget(`id(`wizardTree), `CurrentItem); @@ -356,6 +362,7 @@ if (ret == `configure) { tree_item = Wizard::QueryTreeItem(); + y2milestone("tree item: %1", tree_item); y2debug("tree item: %1", tree_item); string modulename=moduleName(tree_item); y2debug("configure module: %1", modulename); Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstConfig.ycp?rev=43502&r1=43501&r2=43502&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Wed Jan 9 16:40:14 2008 @@ -19,7 +19,7 @@ - + global string runModule = ""; // Profile Repository global string Repository = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org