August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39963 - in /trunk/packager: package/yast2-packager.changes src/modules/PackagesUI.ycp
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 09:44:18 2007 New Revision: 39963 URL: http://svn.opensuse.org/viewcvs/yast?rev=39963&view=rev Log: - Added text into the license-confirmation dialog about where to find the license on the media (FATE #302018). Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/PackagesUI.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Aug 6 09:44:18 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 6 09:39:01 CEST 2007 - locilka(a)suse.cz + +- Added text into the license-confirmation dialog about where to + find the license on the media (FATE #302018). + +------------------------------------------------------------------- Thu Aug 2 21:13:04 CEST 2007 - locilka(a)suse.cz - Support for localized strings in remote repositories Modified: trunk/packager/src/modules/PackagesUI.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackagesUI.… ============================================================================== --- trunk/packager/src/modules/PackagesUI.ycp (original) +++ trunk/packager/src/modules/PackagesUI.ycp Mon Aug 6 09:44:18 2007 @@ -118,6 +118,13 @@ `VBox ( `HSpacing (70), `RichText (help), + // FATE #302018 + + // TRANSLATORS: Licenses to confirm can be found here. + // do not use more than 76 characters per line, keep it as short as possible + `Label (_("If you like to print this license, +check the EULA.txt file on the first media.")), + `VSpacing(1), `HBox ( `HStretch (), // push button -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39962 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_network_setup.ycp
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 09:30:16 2007 New Revision: 39962 URL: http://svn.opensuse.org/viewcvs/yast?rev=39962&view=rev Log: - First stage network setup dialog - changes in dialog alignment (#295043). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_network_setup.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 6 09:30:16 2007 @@ -4,6 +4,8 @@ - Renamed product/default repositories check-box to "Add Internet Repositories Before Installation" (#297580). - Added help for that check-box (#296810). +- First stage network setup dialog - changes in dialog alignment + (#295043). ------------------------------------------------------------------- Thu Aug 2 08:53:56 CEST 2007 - jsrain(a)suse.cz Modified: trunk/installation/src/clients/inst_network_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ne… ============================================================================== --- trunk/installation/src/clients/inst_network_setup.ycp (original) +++ trunk/installation/src/clients/inst_network_setup.ycp Mon Aug 6 09:30:16 2007 @@ -602,10 +602,11 @@ } symbol NetworkSetupDialog () { - Wizard::SetContentsButtons ( - // TRANSLATORS: dialog caption - _("Network Setup"), + // centered & aligned dialog + // see bugzilla #295043 + term netsetup_dialog = `VBox ( + `VStretch(), `Left (`Label (sformat( // TRANSLATORS: dialog label, %1 is replaced with a selected network device name, e.g, eth3 // See *2 @@ -641,26 +642,38 @@ )) )), `VSpacing (2), - `VSquash (`Left ( - `CheckBoxFrame ( - `id ("use_proxy"), - _("&Use Proxy for Accessing the Internet"), - false, - `VBox ( - `Left (`HBox ( - `HSquash (`MinWidth (42, `TextEntry (`id ("proxy_server"), _("&HTTP Proxy Server"), "http://"))), - `HSpacing (0.5), - `HSquash (`MinWidth (6, `ComboBox (`id ("proxy_port"), `opt (`editable), _("&Port"), [ "", "3128", "8080" ]))) - )), - `Left (`HBox ( - `HSquash (`MinWidth (14, `TextEntry (`id ("proxy_user"), _("Us&er (Optional)")))), - `HSpacing (0.5), - `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (Optional)")))) - )) - ) + `VSquash ( + `HBox ( + `HSpacing (4), + `Left (`CheckBoxFrame ( + `id ("use_proxy"), + _("&Use Proxy for Accessing the Internet"), + false, + `VBox ( + `Left (`HBox ( + `HSquash (`MinWidth (42, `TextEntry (`id ("proxy_server"), _("&HTTP Proxy Server"), "http://"))), + `HSpacing (0.5), + `HSquash (`MinWidth (6, `ComboBox (`id ("proxy_port"), `opt (`editable), _("&Port"), [ "", "3128", "8080" ]))) + )), + `Left (`HBox ( + `HSquash (`MinWidth (14, `TextEntry (`id ("proxy_user"), _("Us&er (Optional)")))), + `HSpacing (0.5), + `HSquash (`MinWidth (14, `Password (`id ("proxy_password"), _("Pass&word (Optional)")))) + )) + ) + )) ) - )), + ), `VStretch() + ); + + Wizard::SetContentsButtons ( + // TRANSLATORS: dialog caption + _("Network Setup"), + `HBox ( + `HStretch(), + netsetup_dialog, + `HStretch() ), // TRANSLATORS: dialog help 1/2 _("<big>Network Setup</big> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39961 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_system_analysis.ycp
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 09:02:58 2007 New Revision: 39961 URL: http://svn.opensuse.org/viewcvs/yast?rev=39961&view=rev Log: - Renamed product/default repositories check-box to "Add Internet Repositories Before Installation" (#297580). - Added help for that check-box (#296810). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_system_analysis.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 6 09:02:58 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 6 08:58:02 CEST 2007 - locilka(a)suse.cz + +- Renamed product/default repositories check-box to "Add Internet + Repositories Before Installation" (#297580). +- Added help for that check-box (#296810). + +------------------------------------------------------------------- Thu Aug 2 08:53:56 CEST 2007 - jsrain(a)suse.cz - do not show "Clone" check box in live installation Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Mon Aug 6 09:02:58 2007 @@ -232,6 +232,12 @@ from your existing system whenever possible. ") + + // help text for installation option + _(" +To use suggested remote repositories during installation or update, select +Add Internet Repositories Before Installation. +") + + // help text for installation method _(" To install an add-on product from separate media together with &product;, select @@ -244,6 +250,8 @@ your hard disk. This option can try to fix problems automatically. ") + + + // help text for installation method _("Select Other Options then select Boot Installed System if you have a Linux system on your hard @@ -310,7 +318,7 @@ `Left (`CheckBox ( `id (`productsources), `opt(`notify), // check box - _("Include &Default Repositories"), + _("&Add Internet Repositories Before Installation"), Installation::productsources_selected )), `Left (`CheckBox ( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39960 - in /trunk/packager: package/yast2-packager.changes yast2-packager.spec.in
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 08:49:20 2007 New Revision: 39960 URL: http://svn.opensuse.org/viewcvs/yast?rev=39960&view=rev Log: Adjusted RPM dependencies (yast2-pkg-bindings >= 2.15.38) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/yast2-packager.spec.in Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Mon Aug 6 08:49:20 2007 @@ -7,7 +7,7 @@ ag_xmlrepos. - Added support for downloading from HTTPS servers. - Only repositories with 'installation_repo' tag set are used in - first stage installation (instead of 'official'). + first stage installation (instead of 'official') (#297628). - Reporting when list of repositories is empty, cannot be downloaded or parsed (#294997). - Using new pkg-bindings functionality to provide optional @@ -16,6 +16,7 @@ - Download and use y2update before merging installation.xml when use Add-On product in installation (#295160). - Renamed product repositories to "Community Repositories". +- Adjusted RPM dependencies (yast2-pkg-bindings). ------------------------------------------------------------------- Thu Aug 2 11:08:37 CEST 2007 - lslezak(a)suse.cz Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?… ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Mon Aug 6 08:49:20 2007 @@ -11,8 +11,8 @@ Requires: yast2-country Requires: yast2-installation >= 2.15.12 -# changed ProgressStart callback signature -Requires: yast2-pkg-bindings >= 2.15.35 +# New function: Pkg::SourceProvideDirectory +Requires: yast2-pkg-bindings >= 2.15.38 # Mode::live_installation Requires: yast2 >= 2.15.38 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39959 - /trunk/installation/package/yast2-installation.changes
by locilka＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: locilka Date: Mon Aug 6 08:40:48 2007 New Revision: 39959 URL: http://svn.opensuse.org/viewcvs/yast?rev=39959&view=rev Log: Adding Bugzilla ID 297628 Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Aug 6 08:40:48 2007 @@ -8,6 +8,7 @@ Wed Aug 1 11:00:15 CEST 2007 - locilka(a)suse.cz - Changing remote repositories link to http://download.opensuse.org + (#297628) ------------------------------------------------------------------- Wed Aug 1 10:33:45 CEST 2007 - mvidner(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39958 - /trunk/add-on-creator/package/yast2-add-on-creator.changes
by jsuchome＠svn.opensuse.org 06 Aug '07

06 Aug '07

Author: jsuchome Date: Mon Aug 6 06:41:17 2007 New Revision: 39958 URL: http://svn.opensuse.org/viewcvs/yast?rev=39958&view=rev Log: typos Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug 6 06:41:17 2007 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Fri Aug 3 15:24:36 CEST 2007 - jsuchome(a)suse.cz -- do not require rpm's for acreating AddOn (#297165) +- do not require rpms for creating AddOn (#297165) - password verification entry (#297168) - new PackagesDescr.pm module instead of ag_packages_descr (Perl agent cannot handle large amount of data on input) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39957 - in /trunk/registration: VERSION package/yast2-registration.changes
by jdsn＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: jdsn Date: Fri Aug 3 20:13:49 2007 New Revision: 39957 URL: http://svn.opensuse.org/viewcvs/yast?rev=39957&view=rev Log: new version 2.15.0 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=39957&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Aug 3 20:13:49 2007 @@ -1 +1 @@ -2.14.6 +2.15.0 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Aug 3 20:13:49 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 3 20:13:19 CEST 2007 - jdsn(a)suse.de + +- new version +- 2.15.0 + +------------------------------------------------------------------- Tue Jul 17 20:44:16 CEST 2007 - jdsn(a)suse.de - made multiline texts gettext compatible (#230388) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39956 - /tags/stable-2_15_0/registration/
by jdsn＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: jdsn Date: Fri Aug 3 20:02:22 2007 New Revision: 39956 URL: http://svn.opensuse.org/viewcvs/yast?rev=39956&view=rev Log: Created tag stable-2_15_0 for registration Added: tags/stable-2_15_0/registration/ - copied from r39955, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39955 - in /branches/tmp/mvidner/ui-as-namespace/core/libyui/src: Y2UINamespace.cc Y2UINamespace.h
by mvidner＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: mvidner Date: Fri Aug 3 18:57:25 2007 New Revision: 39955 URL: http://svn.opensuse.org/viewcvs/yast?rev=39955&view=rev Log: Implemented resolution of overloaded functions Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc Fri Aug 3 18:57:25 2007 @@ -646,6 +646,7 @@ constTypePtr Y2UIFunction::wantedParameterType () const { // we do not help them with type conversion + // hey but we could, at least for non-overloaded functions return Type::Any; // FIXME make this the default behavior in parent class } @@ -678,11 +679,15 @@ bool Y2UIFunction::finishParameters () { + // Aha, perl could give us any garbage. + // Hmm, how do we cope with giving garbage to ycp modules? + // - it heeds wantedParameterType + // Funny, why is this function not called? + y2internal ("FIXME finishParameters not implemented"); return true; } - YCPValue Y2UIFunction::evaluateCall () { if ( ! m_comp->ui () ) @@ -741,7 +746,79 @@ string Y2UIFunction::name() const { - return("Y2UI"); + // FIXME. when is this called at all? + return("Y2UI"); +} + +// error reporting helper +static +void no_match (const char * name, constTypePtr type, + vector<SymbolEntryPtr>::iterator b, + vector<SymbolEntryPtr>::iterator e) +{ + y2error ("Function %s called with wrong type %s", + name, type->toString().c_str()); + y2error ("TODO: display the candidates"); // use b and e +} + + +Y2UIOverloadedFunction::Y2UIOverloadedFunction ( + Y2UINamespace* instance, YUIComponent* comp, + unsigned pos_offset, + vector<SymbolEntryPtr>::iterator candidates_b, + vector<SymbolEntryPtr>::iterator candidates_e, + bool play_macro_blocks) : + Y2UIFunction (instance, comp, pos_offset, play_macro_blocks), + m_candidates_b (candidates_b), + m_candidates_e (candidates_e) +{ + // still to do: m_position is just the first candidate +} + +bool Y2UIOverloadedFunction::finishParameters () +{ + FunctionTypePtr real_tp = new FunctionType (Type::Unspec); //return type + if (!m_param1.isNull()) { + real_tp->concat (Type::vt2type (m_param1->valuetype ())); + if (!m_param2.isNull()) { + real_tp->concat (Type::vt2type (m_param2->valuetype ())); + if (!m_param3.isNull()) { + real_tp->concat (Type::vt2type (m_param3->valuetype ())); + if (!m_param4.isNull()) { + real_tp->concat (Type::vt2type (m_param4->valuetype ())); + + if (!m_param5.isNull()) { + real_tp->concat (Type::vt2type (m_param5->valuetype ())); + } + } + } + } + } + y2debug ("Actual type: %s", real_tp->toString().c_str()); + + vector<SymbolEntryPtr>::iterator + b = m_candidates_b, + e = m_candidates_e, + it; + + for (it = b; it != e; ++it) { + SymbolEntryPtr se_p = *it; + constFunctionTypePtr cand_type = se_p->type(); + int m = real_tp->match (cand_type); + y2debug ("Candidate: %s MATCH: %d", + se_p->toString().c_str(), m); + if (m == 0) + break; + } + + if (it == e) { + // any candidate has a good name. report actual used signature. + no_match ((*b)->name(), real_tp, b, e); + return false; + } + // found + m_position += (it - b); + return true; } /** @@ -761,33 +838,63 @@ Y2Function* Y2UINamespace::createFunctionCall (const string name, constFunctionTypePtr type) { - symbols_t::iterator it; - y2debug ("Creating function call for %s", name.c_str ()); + y2debug ("whose type is %s", type? type->toString().c_str() : "unknown"); - for ( it = m_symbols.begin (); it != m_symbols.end (); it++) + // overloading: functions with same name must be adjacent in m_symbols + + symbols_t::iterator + b = m_symbols.begin (), + e = m_symbols.end (), + it = b; + SymbolEntryPtr p; + + // 1: find start of range of overloaded functions + for ( ; it != e; it++) { - SymbolEntryPtr p = (*it); - if ( p->name () == name ) // FIXME overload && p->type () == type ) - { - y2debug ("Found symbol '%s' (%s) %d" - , p->name(), p->type()->toString ().c_str (), p->position ()); + p = (*it); + if ( p->name () == name ) break; - } } - if (it == m_symbols.end ()) + if (it == e) { y2error ("No such function %s", name.c_str ()); return NULL; } bool play_macro_blocks = (name == "UserInput" || name == "TimeoutUserInput" || name == "WaitForEvent"); + + symbols_t::iterator rb = it; + // 2: find end of range of overloaded functions or the exact match + for ( ; it != e; it++) + { + p = (*it); + if ( p->name () != name ) + break; + // type comparison, ugh, use match + if (type && p->type () == type) + { + // found exact match + // BTW, p->position() may change as we go, don't get confused. + // What matters is our own counting. + y2debug ("Found symbol '%s' @%d", p->toString ().c_str (), p->position ()); + return new Y2UIFunction (this, m_comp, it - b, play_macro_blocks); + } + } + symbols_t::iterator re = it; + // [rb, re) have matching name + + if (type) + { + // we have exhausted the candidates without finding a match + y2error ("Incompatible yast2-core?"); + no_match (name.c_str (), type, rb, re); + return NULL; + } - // FIXME: - // here we assume the linear adding of symbols to m_symbols - // this holds so far, but might fall apart easily - return new Y2UIFunction (this, m_comp, it- m_symbols.begin (), play_macro_blocks); + y2debug ("overloaded %s, %u@%u", name.c_str(), re - rb, rb - b); + return new Y2UIOverloadedFunction (this, m_comp, rb - b, rb, re, play_macro_blocks); } void Y2UINamespace::registerFunctions() Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Fri Aug 3 18:57:25 2007 @@ -36,8 +36,13 @@ class Y2UINamespace; +/** + * A call of a UI:: function + */ class Y2UIFunction: public Y2Function { + protected: + unsigned int m_position; Y2UINamespace* m_instance; YUIComponent* m_comp; @@ -61,6 +66,32 @@ string name () const; }; +/** + * A call of a UI:: function where we don't know the signature beforehand + */ +class Y2UIOverloadedFunction: public Y2UIFunction +{ + /** A range of SymbolEntries with a matching name. + * We will eventually find the right one + */ + vector<SymbolEntryPtr>::iterator m_candidates_b; + vector<SymbolEntryPtr>::iterator m_candidates_e; + + public: + Y2UIOverloadedFunction ( + Y2UINamespace* instance, YUIComponent* comp, + unsigned pos_offset, + vector<SymbolEntryPtr>::iterator candidates_b, + vector<SymbolEntryPtr>::iterator candidates_e, + bool play_macro_blocks); + + // attachParameter, appendParameter, reset from parent: fine + // wantedParameterType from parent: kind of fine + + //! the main job + bool finishParameters (); +}; + class Y2UINamespace: public Y2Namespace { private: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39954 - in /branches/tmp/mvidner/ui-as-namespace/core/libyui: doc/namespace src/Y2UINamespace.cc src/Y2UINamespace.h
by mvidner＠svn.opensuse.org 03 Aug '07

03 Aug '07

Author: mvidner Date: Fri Aug 3 17:54:22 2007 New Revision: 39954 URL: http://svn.opensuse.org/viewcvs/yast?rev=39954&view=rev Log: brought back macro block playing Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/doc/namespace Fri Aug 3 17:54:22 2007 @@ -32,7 +32,7 @@ Y2UINamespace: created, copying code from YUI_bindings. - FIXME overloading -- FIXME macro player +- FIXME macro player: should work now, test Removed UI.h that served to register the builtins. (TODO: the docs is still done in builtin style. Take it as inspiration.) Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.cc Fri Aug 3 17:54:22 2007 @@ -615,10 +615,11 @@ // ------------- -Y2UIFunction::Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos) : +Y2UIFunction::Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks) : m_position (pos) , m_instance (instance) , m_comp (comp) +, m_play_macro_blocks (play_macro_blocks) , m_param1 ( YCPNull () ) , m_param2 ( YCPNull () ) , m_param3 ( YCPNull () ) @@ -690,20 +691,13 @@ m_comp->createUI(); } - YCPValue ret = YCPVoid(); - -/* FIXME: - if ( macroPlayer ) + if ( m_play_macro_blocks && m_comp->ui ()->playingMacro () ) { - if ( function == UIUserInput || - function == UITimeoutUserInput || - function == UIWaitForEvent || - function == UIWaitForEventTimeout ) - { - playNextMacroBlock (); - } + m_comp->ui ()->playNextMacroBlock (); } -*/ + + YCPValue ret = YCPVoid(); + if ( m_comp->ui ()-> threads () ) { m_comp->ui ()->_builtinCallData.function = this; @@ -788,10 +782,12 @@ return NULL; } + bool play_macro_blocks = (name == "UserInput" || name == "TimeoutUserInput" || name == "WaitForEvent"); + // FIXME: // here we assume the linear adding of symbols to m_symbols // this holds so far, but might fall apart easily - return new Y2UIFunction (this, m_comp, it- m_symbols.begin ()); + return new Y2UIFunction (this, m_comp, it- m_symbols.begin (), play_macro_blocks); } void Y2UINamespace::registerFunctions() Modified: branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/c… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h (original) +++ branches/tmp/mvidner/ui-as-namespace/core/libyui/src/Y2UINamespace.h Fri Aug 3 17:54:22 2007 @@ -41,6 +41,7 @@ unsigned int m_position; Y2UINamespace* m_instance; YUIComponent* m_comp; + bool m_play_macro_blocks; YCPValue m_param1; YCPValue m_param2; YCPValue m_param3; @@ -48,7 +49,8 @@ YCPValue m_param5; public: - Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos); + Y2UIFunction (Y2UINamespace* instance, YUIComponent* comp, unsigned int pos, bool play_macro_blocks); + bool attachParameter (const YCPValue& arg, const int position); constTypePtr wantedParameterType () const; bool appendParameter (const YCPValue& arg); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0