[yast-commit] r45278 - in /trunk/qt: package/yast2-qt.changes src/YQTree.cc src/YQTree.h

Author: sh-sh-sh Date: Fri Mar 7 12:15:21 2008 New Revision: 45278 URL: http://svn.opensuse.org/viewcvs/yast?rev=45278&view=rev Log: Fixed bnc #357607: OpenItems property of Tree widget is broken Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/src/YQTree.h Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=45278&r1=45277&r2=45278&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Mar 7 12:15:21 2008 @@ -1,8 +1,13 @@ ------------------------------------------------------------------- +Fri Mar 7 12:14:08 CET 2008 - sh@suse.de + +- Fixed bnc #357607: OpenItems property of Tree widget is broken +- V 2.16.33 + +------------------------------------------------------------------- Thu Mar 6 14:47:04 CET 2008 - sh@suse.de - Fixed bnc #357620: Setting current item broken for tree and table -- V 2.16.33 ------------------------------------------------------------------- Tue Mar 4 17:53:00 CET 2008 - sh@suse.de Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=45278&r1=45277&r2=45278&view=diff ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Fri Mar 7 12:15:21 2008 @@ -74,11 +74,17 @@ connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ), this, SLOT ( slotSelectionChanged () ) ); - connect( _qt_treeWidget, SIGNAL( itemActivated ( QTreeWidgetItem * , int ) ), - this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); + connect( _qt_treeWidget, SIGNAL( itemActivated ( QTreeWidgetItem *, int ) ), + this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); connect( _qt_treeWidget, SIGNAL( itemDoubleClicked( QTreeWidgetItem *, int ) ), - this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); + this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) ); + + connect( _qt_treeWidget, SIGNAL( itemExpanded ( QTreeWidgetItem * ) ), + this, SLOT ( slotItemExpanded ( QTreeWidgetItem * ) ) ); + + connect( _qt_treeWidget, SIGNAL( itemCollapsed ( QTreeWidgetItem * ) ), + this, SLOT ( slotItemCollapsed( QTreeWidgetItem * ) ) ); } @@ -164,15 +170,32 @@ } -void YQTree::openBranch( QTreeWidgetItem * item ) +void YQTree::openBranch( YQTreeItem * item ) { while ( item ) { - item->setExpanded( true ); // Takes care of origItem()->setOpen() - item = item->parent(); + item->setOpen( true ); // Takes care of origItem()->setOpen() + item = (YQTreeItem *) item->parent(); } } +void YQTree::slotItemExpanded( QTreeWidgetItem * qItem ) +{ + YQTreeItem * item = dynamic_cast (qItem); + + if ( item ) + item->setOpen( true ); +} + + +void YQTree::slotItemCollapsed( QTreeWidgetItem * qItem ) +{ + YQTreeItem * item = dynamic_cast (qItem); + + if ( item ) + item->setOpen( false ); +} + void YQTree::deselectAllItems() { Modified: trunk/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.h?rev=45278&r1=45277&r2=45278&view=diff ============================================================================== --- trunk/qt/src/YQTree.h (original) +++ trunk/qt/src/YQTree.h Fri Mar 7 12:15:21 2008 @@ -125,7 +125,7 @@ * * This will trigger a 'SelectionChanged' event if 'notify' is set. **/ - void slotSelectionChanged ( ); + void slotSelectionChanged(); /** * Propagate a double click or pressing the space key on a tree item. @@ -134,6 +134,16 @@ **/ void slotActivated( QTreeWidgetItem * item); + /** + * Propagate an "item expanded" event to the underlying YTreeItem. + **/ + void slotItemExpanded( QTreeWidgetItem * item ); + + /** + * Propagate an "item collapsed" event to the underlying YTreeItem. + **/ + void slotItemCollapsed( QTreeWidgetItem * item ); + protected: @@ -145,7 +155,7 @@ /** * Open the branch of 'item' recursively to its toplevel item. **/ - void openBranch( QTreeWidgetItem * item ); + void openBranch( YQTreeItem * item ); /** * Build a tree of items that will be displayed (YQTreeItems) from the -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org