[yast-commit] r63370 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPPropertyHandler.cc src/YCPPropertyHandler.h yast2-ycp-ui-bindings.spec.in

Author: tgoettlicher Date: Tue Feb 8 12:21:32 2011 New Revision: 63370 URL: http://svn.opensuse.org/viewcvs/yast?rev=63370&view=rev Log: - Added support for currentItem to tree widget Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc trunk/ycp-ui-bindings/src/YCPPropertyHandler.h 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=63370&r1=63369&r2=63370&view=diff ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Tue Feb 8 12:21:32 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 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=63370&r1=63369&r2=63370&view=diff ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Tue Feb 8 12:21:32 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 12:17:41 CET 2011 - tgoettlicher@suse.de + +- Added support for currentItem to tree widget +- V 2.20.2 + +------------------------------------------------------------------- Sun Feb 6 10:00:59 UTC 2011 - coolo@novell.com - fix syntax error Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc?rev=63370&r1=63369&r2=63370&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Tue Feb 8 12:21:32 2011 @@ -192,7 +192,7 @@ else if ( propertyName == YUIProperty_CurrentItem ) { val = tryGetSelectionBoxValue ( widget ); if ( ! val.isNull() ) return val; - val = tryGetTreeValue ( widget ); if ( ! val.isNull() ) return val; + val = tryGetTreeCurrentItem ( widget ); if ( ! val.isNull() ) return val; val = tryGetTableValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetDumbTabValue ( widget ); if ( ! val.isNull() ) return val; @@ -1259,6 +1259,31 @@ return YCPTableItemWriter::itemList( table->itemsBegin(), table->itemsEnd() ); } +YCPValue +YCPPropertyHandler::tryGetTreeCurrentItem( YWidget * widget ) +{ + YTree * tree = dynamic_cast (widget); + + if ( ! tree ) + return YCPNull(); + + YItem * currentItem = tree->currentItem(); + + if ( tree ) + { + YCPTreeItem * item = dynamic_cast (currentItem); + + if ( item ) + return item->id(); + else + y2error( "Item is not a YCPItem: \"%s\"", currentItem->label().c_str() ); + } + + return YCPVoid(); + +} + + YCPValue YCPPropertyHandler::tryGetTreeItems( YWidget * widget ) Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyHandler.h?rev=63370&r1=63369&r2=63370&view=diff ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.h (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.h Tue Feb 8 12:21:32 2011 @@ -160,6 +160,8 @@ static YCPValue tryGetSelectionWidgetItems ( YWidget * widget ); static YCPValue tryGetBarGraphValues ( YWidget * widget ); static YCPValue tryGetBarGraphLabels ( YWidget * widget ); + static YCPValue tryGetTreeCurrentItem ( YWidget * widget ); + /** 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=63370&r1=63369&r2=63370&view=diff ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Tue Feb 8 12:21:32 2011 @@ -21,8 +21,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.20.0 -BuildRequires: yast2-libyui-devel >= 2.20.0 +Requires: yast2-libyui >= 2.20.1 +BuildRequires: yast2-libyui-devel >= 2.20.1 # libyui ImplPtr BuildRequires: boost-devel -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org