Author: tgoettlicher Date: Fri Apr 15 16:19:17 2011 New Revision: 63788 URL: http://svn.opensuse.org/viewcvs/yast?rev=63788&view=rev Log: Added support for recursive selection in tree widgets Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPDialogParser.cc trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=63788&r1=63787&r2=63788&view=diff ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Fri Apr 15 16:19:17 2011 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes?rev=63788&r1=63787&r2=63788&view=diff ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Fri Apr 15 16:19:17 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 15 16:18:41 CEST 2011 - tgoettlicher@suse.de + +- Added support for recursive selection in tree widgets +- V 2.20.4 + +------------------------------------------------------------------- Fri Feb 11 16:00:40 CET 2011 - tgoettlicher@suse.de - fixed segfault when calling currentItem() Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogParser.cc?rev=63788&r1=63787&r2=63788&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Fri Apr 15 16:19:17 2011 @@ -2173,7 +2173,7 @@ { int numArgs = term->size() - argnr; - if ( numArgs < 1 || numArgs > 2 + if ( numArgs < 1 || numArgs > 3 || ! term->value( argnr )->isString() || ( numArgs >= 2 && ! term->value( argnr+1 )->isList() ) ) { @@ -2182,17 +2182,19 @@ bool immediate = false; bool multiSelection = false; + bool recursiveSelection = false; for ( int o=0; o < optList->size(); o++ ) { - if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate ) immediate = true; - else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_multiSelection ) multiSelection = true; + if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate ) immediate = true; + else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_multiSelection ) multiSelection = true; + else if ( optList->value(o)->isSymbol() && optList->value(o)->asSymbol()->symbol() == YUIOpt_recursiveSelection ) recursiveSelection = true; else logUnknownOption( term, optList->value(o) ); } string label = term->value ( argnr )->asString()->value(); - YTree * tree = YUI::widgetFactory()->createTree( parent, label, multiSelection ); + YTree * tree = YUI::widgetFactory()->createTree( parent, label, multiSelection, recursiveSelection ); if ( numArgs > 1 ) { Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in?rev=63788&r1=63787&r2=63788&view=diff ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Fri Apr 15 16:19:17 2011 @@ -21,8 +21,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.20.1 -BuildRequires: yast2-libyui-devel >= 2.20.1 +Requires: yast2-libyui >= 2.20.3 +BuildRequires: yast2-libyui-devel >= 2.20.3 # libyui ImplPtr BuildRequires: boost-devel -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org