Author: mzugec Date: Fri Sep 5 09:54:46 2008 New Revision: 50712 URL: http://svn.opensuse.org/viewcvs/yast?rev=50712&view=rev Log: supportconfig references changed to onstar Added: branches/tmp/mzugec/onstar/src/Onstar.ycp (contents, props changed) - copied, changed from r50711, branches/tmp/mzugec/onstar/src/Supportconfig.ycp branches/tmp/mzugec/onstar/src/onstar (props changed) - copied unchanged from r50711, branches/tmp/mzugec/onstar/src/supportconfig branches/tmp/mzugec/onstar/src/onstar.desktop (contents, props changed) - copied, changed from r50711, branches/tmp/mzugec/onstar/src/supportconfig.desktop branches/tmp/mzugec/onstar/src/onstar.ycp (contents, props changed) - copied, changed from r50711, branches/tmp/mzugec/onstar/src/supportconfig.ycp branches/tmp/mzugec/onstar/src/onstar_auto.ycp (contents, props changed) - copied, changed from r50711, branches/tmp/mzugec/onstar/src/supportconfig_auto.ycp branches/tmp/mzugec/onstar/src/onstar_proposal.ycp (contents, props changed) - copied, changed from r50711, branches/tmp/mzugec/onstar/src/supportconfig_proposal.ycp Removed: branches/tmp/mzugec/onstar/src/Supportconfig.ycp branches/tmp/mzugec/onstar/src/supportconfig branches/tmp/mzugec/onstar/src/supportconfig.desktop branches/tmp/mzugec/onstar/src/supportconfig.ycp branches/tmp/mzugec/onstar/src/supportconfig_auto.ycp branches/tmp/mzugec/onstar/src/supportconfig_proposal.ycp Copied: branches/tmp/mzugec/onstar/src/Onstar.ycp (from r50711, branches/tmp/mzugec/onstar/src/Supportconfig.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/onstar/src/Onstar.ycp?p2=branches/tmp/mzugec/onstar/src/Onstar.ycp&p1=branches/tmp/mzugec/onstar/src/Supportconfig.ycp&r1=50711&r2=50712&rev=50712&view=diff ============================================================================== --- branches/tmp/mzugec/onstar/src/Supportconfig.ycp (original) +++ branches/tmp/mzugec/onstar/src/Onstar.ycp Fri Sep 5 09:54:46 2008 @@ -19,21 +19,21 @@ */ /** - * File: modules/Supportconfig.ycp - * Package: Configuration of supportconfig - * Summary: Supportconfig settings, input and output functions + * File: modules/Onstar.ycp + * Package: Configuration of onstar + * Summary: Onstar settings, input and output functions * Authors: Michal Zugec * - * $Id: Supportconfig.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * $Id: Onstar.ycp 41350 2007-10-10 16:59:00Z dfiser $ * - * Representation of the configuration of supportconfig. + * Representation of the configuration of onstar. * Input and output routines. */ { -module "Supportconfig"; -textdomain "supportconfig"; +module "Onstar"; +textdomain "onstar"; import "Progress"; import "Report"; @@ -122,13 +122,13 @@ AbortFunction = function; } -// content of /etc/supportconfig.conf +// content of /etc/onstar.conf map configuration = $[]; // options parsed from configuration map global map options = $[]; -// command line parameters for supportconfig +// command line parameters for onstar global boolean use_defaults=false; global boolean full_listening=false; global boolean exclude_disk_scan=false; @@ -157,7 +157,7 @@ return parameters; } -// Settings: Define all variables needed for configuration of supportconfig +// Settings: Define all variables needed for configuration of onstar // TODO FIXME: Define all the variables necessary to hold // TODO FIXME: the configuration here (with the appropriate // TODO FIXME: description) @@ -173,13 +173,13 @@ // boolean additional_parameter = true; /** - * Read all supportconfig settings + * Read all onstar settings * @return true on success */ global boolean Read() { - /* Supportconfig read dialog caption */ - string caption = _("Initializing supportconfig Configuration"); + /* Onstar read dialog caption */ + string caption = _("Initializing onstar Configuration"); // TODO FIXME Set the right number of stages integer steps = 2; @@ -230,13 +230,13 @@ } /** - * Write all supportconfig settings + * Write all onstar settings * @return true on success */ global boolean Write() { - /* Supportconfig read dialog caption */ - string caption = _("Saving supportconfig Configuration"); + /* Onstar read dialog caption */ + string caption = _("Saving onstar Configuration"); // TODO FIXME And set the right number of stages integer steps = 2; @@ -265,7 +265,7 @@ // write settings if(Abort()) return false; Progress::NextStage(); - string command = sformat("supportconfig %1 -f %2", GetParameterList(), proposed_log_path); + string command = sformat("onstar %1 -f %2", GetParameterList(), proposed_log_path); map output = (map)SCR::Execute(.target.bash_output, command); y2milestone("output %1", output); /* Error message */ @@ -289,7 +289,7 @@ } global boolean WriteConfig(){ - y2milestone("Writing /etc/supportconfig.conf configuration"); + y2milestone("Writing /etc/onstar.conf configuration"); list new_config=[]; list<string>used_options=[]; foreach(map row, configuration["value"]:[], { @@ -316,7 +316,7 @@ } /** - * Get all supportconfig settings from the first parameter + * Get all onstar settings from the first parameter * (For use by autoinstallation.) * @param settings The YCP structure to be imported. * @return boolean True on success @@ -327,7 +327,7 @@ } /** - * Dump the supportconfig settings to a single map + * Dump the onstar settings to a single map * (For use by autoinstallation.) * @return map Dumped settings (later acceptable by Import ()) */ Copied: branches/tmp/mzugec/onstar/src/onstar.desktop (from r50711, branches/tmp/mzugec/onstar/src/supportconfig.desktop) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/onstar/src/onstar.desktop?p2=branches/tmp/mzugec/onstar/src/onstar.desktop&p1=branches/tmp/mzugec/onstar/src/supportconfig.desktop&r1=50711&r2=50712&rev=50712&view=diff ============================================================================== --- branches/tmp/mzugec/onstar/src/supportconfig.desktop (original) +++ branches/tmp/mzugec/onstar/src/onstar.desktop Fri Sep 5 09:54:46 2008 @@ -6,7 +6,7 @@ X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 -X-SuSE-YaST-Call=supportconfig +X-SuSE-YaST-Call=onstar X-SuSE-YaST-Group=Misc X-SuSE-YaST-Argument= @@ -14,12 +14,12 @@ X-SuSE-YaST-AutoInst= X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= -X-SuSE-YaST-AutoInstResource=supportconfig +X-SuSE-YaST-AutoInstResource=onstar -Icon=yast-supportconfig -Exec=/sbin/yast2 supportconfig +Icon=yast-onstar +Exec=/sbin/yast2 onstar -Name=Supportconfig -GenericName=supportconfig +Name=Onstar +GenericName=onstar X-KDE-SubstituteUID=true StartupNotify=true Copied: branches/tmp/mzugec/onstar/src/onstar.ycp (from r50711, branches/tmp/mzugec/onstar/src/supportconfig.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/onstar/src/onstar.ycp?p2=branches/tmp/mzugec/onstar/src/onstar.ycp&p1=branches/tmp/mzugec/onstar/src/supportconfig.ycp&r1=50711&r2=50712&rev=50712&view=diff ============================================================================== --- branches/tmp/mzugec/onstar/src/supportconfig.ycp (original) +++ branches/tmp/mzugec/onstar/src/onstar.ycp Fri Sep 5 09:54:46 2008 @@ -19,42 +19,42 @@ */ /** - * File: clients/supportconfig.ycp - * Package: Configuration of supportconfig + * File: clients/onstar.ycp + * Package: Configuration of onstar * Summary: Main file * Authors: Michal Zugec * - * $Id: supportconfig.ycp 27914 2006-02-13 14:32:08Z locilka $ + * $Id: onstar.ycp 27914 2006-02-13 14:32:08Z locilka $ * - * Main file for supportconfig configuration. Uses all other files. + * Main file for onstar configuration. Uses all other files. */ { /*** - * <h3>Configuration of supportconfig</h3> + * <h3>Configuration of onstar</h3> */ -textdomain "supportconfig"; +textdomain "onstar"; /* The main () */ y2milestone ("----------------------------------------"); -y2milestone ("Supportconfig module started"); +y2milestone ("Onstar module started"); import "Progress"; import "Report"; import "Summary"; import "CommandLine"; -include "supportconfig/wizards.ycp"; +include "onstar/wizards.ycp"; map cmdline_description = $[ - "id" : "supportconfig", - /* Command line help text for the Xsupportconfig module */ - "help" : _("Configuration of supportconfig"), - "guihandler" : SupportconfigSequence, - "initialize" : Supportconfig::Read, - "finish" : Supportconfig::Write, + "id" : "onstar", + /* Command line help text for the Xonstar module */ + "help" : _("Configuration of onstar"), + "guihandler" : OnstarSequence, + "initialize" : Onstar::Read, + "finish" : Onstar::Write, "actions" : $[ // FIXME TODO: fill the functionality description here ], @@ -79,12 +79,12 @@ /* main ui function */ any ret = nil; -if(propose) ret = SupportconfigAutoSequence(); +if(propose) ret = OnstarAutoSequence(); else ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); /* Finish */ -y2milestone("Supportconfig module finished"); +y2milestone("Onstar module finished"); y2milestone("----------------------------------------"); return ret; Copied: branches/tmp/mzugec/onstar/src/onstar_auto.ycp (from r50711, branches/tmp/mzugec/onstar/src/supportconfig_auto.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/onstar/src/onstar_auto.ycp?p2=branches/tmp/mzugec/onstar/src/onstar_auto.ycp&p1=branches/tmp/mzugec/onstar/src/supportconfig_auto.ycp&r1=50711&r2=50712&rev=50712&view=diff ============================================================================== --- branches/tmp/mzugec/onstar/src/supportconfig_auto.ycp (original) +++ branches/tmp/mzugec/onstar/src/onstar_auto.ycp Fri Sep 5 09:54:46 2008 @@ -19,12 +19,12 @@ */ /** - * File: clients/supportconfig_auto.ycp - * Package: Configuration of supportconfig + * File: clients/onstar_auto.ycp + * Package: Configuration of onstar * Summary: Client for autoinstallation * Authors: Michal Zugec * - * $Id: supportconfig_auto.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * $Id: onstar_auto.ycp 41350 2007-10-10 16:59:00Z dfiser $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -33,21 +33,21 @@ /** * @param function to execute - * @param map/list of supportconfig settings + * @param map/list of onstar settings * @return map edited settings, Summary or boolean on success depending on called function * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("supportconfig_auto", [ "Summary", mm ]); + * @example map ret = WFM::CallFunction ("onstar_auto", [ "Summary", mm ]); */ { -textdomain "supportconfig"; +textdomain "onstar"; y2milestone("----------------------------------------"); -y2milestone("Supportconfig auto started"); +y2milestone("Onstar auto started"); -import "Supportconfig"; -include "supportconfig/wizards.ycp"; +import "Onstar"; +include "onstar/wizards.ycp"; any ret = nil; string func = ""; @@ -64,42 +64,42 @@ /* Create a summary*/ if(func == "Summary") { - ret = select(Supportconfig::Summary(), 0, ""); + ret = select(Onstar::Summary(), 0, ""); } /* Reset configuration */ else if (func == "Reset") { - Supportconfig::Import($[]); + Onstar::Import($[]); ret = $[]; } /* Change configuration (run AutoSequence) */ else if (func == "Change") { - ret = SupportconfigAutoSequence(); + ret = OnstarAutoSequence(); } /* Import configuration */ else if (func == "Import") { - ret = Supportconfig::Import(param); + ret = Onstar::Import(param); } /* Return actual state */ else if (func == "Export") { - ret = Supportconfig::Export(); + ret = Onstar::Export(); } /* Return needed packages */ else if (func == "Packages") { - ret = Supportconfig::AutoPackages(); + ret = Onstar::AutoPackages(); } /* Read current state */ else if (func == "Read") { import "Progress"; boolean progress_orig = Progress::set (false); - ret = Supportconfig::Read(); + ret = Onstar::Read(); Progress::set (progress_orig); } /* Write givven settings */ else if (func == "Write") { import "Progress"; boolean progress_orig = Progress::set (false); - Supportconfig::SetWriteOnly (true); - ret = Supportconfig::Write(); + Onstar::SetWriteOnly (true); + ret = Onstar::Write(); Progress::set (progress_orig); } /** @@ -107,14 +107,14 @@ * return boolean */ else if (func == "GetModified") { - ret = Supportconfig::Modified (); + ret = Onstar::Modified (); } /** * set configuration as changed * return boolean */ else if (func == "SetModified") { - Supportconfig::SetModified (true); + Onstar::SetModified (true); ret = true; } @@ -125,7 +125,7 @@ } y2debug("ret=%1", ret); -y2milestone("Supportconfig auto finished"); +y2milestone("Onstar auto finished"); y2milestone("----------------------------------------"); return ret; Copied: branches/tmp/mzugec/onstar/src/onstar_proposal.ycp (from r50711, branches/tmp/mzugec/onstar/src/supportconfig_proposal.ycp) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mzugec/onstar/src/onstar_proposal.ycp?p2=branches/tmp/mzugec/onstar/src/onstar_proposal.ycp&p1=branches/tmp/mzugec/onstar/src/supportconfig_proposal.ycp&r1=50711&r2=50712&rev=50712&view=diff ============================================================================== --- branches/tmp/mzugec/onstar/src/supportconfig_proposal.ycp (original) +++ branches/tmp/mzugec/onstar/src/onstar_proposal.ycp Fri Sep 5 09:54:46 2008 @@ -19,27 +19,27 @@ */ /** - * File: clients/supportconfig_proposal.ycp - * Package: Configuration of supportconfig + * File: clients/onstar_proposal.ycp + * Package: Configuration of onstar * Summary: Proposal function dispatcher. * Authors: Michal Zugec * - * $Id: supportconfig_proposal.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * $Id: onstar_proposal.ycp 41350 2007-10-10 16:59:00Z dfiser $ * - * Proposal function dispatcher for supportconfig configuration. + * Proposal function dispatcher for onstar configuration. * See source/installation/proposal/proposal-API.txt */ { -textdomain "supportconfig"; +textdomain "onstar"; -import "Supportconfig"; +import "Onstar"; import "Progress"; /* The main () */ y2milestone("----------------------------------------"); -y2milestone("Supportconfig proposal started"); +y2milestone("Onstar proposal started"); string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -52,13 +52,13 @@ symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; - if(force_reset || !Supportconfig::ProposalValid()) { - Supportconfig::SetProposalValid (true); + if(force_reset || !Onstar::ProposalValid()) { + Onstar::SetProposalValid (true); boolean progress_orig = Progress::set (false); - Supportconfig::Read(); + Onstar::Read(); Progress::set (progress_orig); } - list sum = Supportconfig::Summary(); + list sum = Onstar::Summary(); proposal = sum[0]:""; ret = $[ @@ -69,9 +69,9 @@ } /* run the module */ else if(func == "AskUser") { - map stored = Supportconfig::Export(); - symbol seq = (symbol) WFM::CallFunction("supportconfig", [.propose]); - if(seq != `next) Supportconfig::Import(stored); + map stored = Onstar::Export(); + symbol seq = (symbol) WFM::CallFunction("onstar", [.propose]); + if(seq != `next) Onstar::Import(stored); y2debug("stored=%1",stored); y2debug("seq=%1",seq); ret = $[ @@ -81,16 +81,16 @@ /* create titles */ else if(func == "Description") { ret = $[ - /* Rich text title for Supportconfig in proposals */ - "rich_text_title" : _("Supportconfig"), - /* Menu title for Supportconfig in proposals */ - "menu_title" : _("&Supportconfig"), - "id" : "supportconfig", + /* Rich text title for Onstar in proposals */ + "rich_text_title" : _("Onstar"), + /* Menu title for Onstar in proposals */ + "menu_title" : _("&Onstar"), + "id" : "onstar", ]; } /* write the proposal */ else if(func == "Write") { - Supportconfig::Write(); + Onstar::Write(); } /* unknown function */ else { @@ -99,7 +99,7 @@ /* Finish */ y2debug("ret=%1",ret); -y2milestone("Supportconfig proposal finished"); +y2milestone("Onstar proposal finished"); y2milestone("----------------------------------------"); return ret; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org