[yast-commit] r63368 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTree.cc src/YQTree.h yast2-qt.spec.in

Author: tgoettlicher Date: Tue Feb 8 12:18:40 2011 New Revision: 63368 URL: http://svn.opensuse.org/viewcvs/yast?rev=63368&view=rev Log: - Added support for currentItem to tree widget Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/src/YQTree.h trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63368&r1=63367&r2=63368&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Feb 8 12:18:40 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=63368&r1=63367&r2=63368&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Feb 8 12:18:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 12:20:04 CET 2011 - tgoettlicher@suse.de + +- Added support for currentItem to tree widget +- V 2.20.1 + +------------------------------------------------------------------- Thu Feb 3 17:09:08 CET 2011 - tgoettlicher@suse.de - Added ValueChanged event to TreeWidget Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63368&r1=63367&r2=63368&view=diff ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Tue Feb 8 12:18:40 2011 @@ -98,6 +98,9 @@ connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ), this, SLOT ( slotSelectionChanged () ) ); + connect( _qt_treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem *, int ) ), + this, SLOT ( slotItemClicked ( QTreeWidgetItem *, int ) ) ); + connect( _qt_treeWidget, SIGNAL( itemChanged ( QTreeWidgetItem *, int ) ), this, SLOT ( slotItemChanged () ) ); @@ -193,7 +196,7 @@ item->setSelected( true ); if ( hasMultiSelection() ) - item->setCheckState( 0, Qt::Checked ); + item->setCheckState( 0, Qt::Checked ); if ( item->parent() ) openBranch( (YQTreeItem *) item->parent() ); @@ -259,9 +262,20 @@ { if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + } +void YQTree::slotItemClicked( QTreeWidgetItem * item, int column ) +{ + _qt_treeWidget->setCurrentItem( item ); + + if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) + YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); +} + + + void YQTree::slotSelectionChanged( ) { @@ -279,7 +293,7 @@ else treeItem->origItem()->setSelected( false ); } - ++it; + ++it; } } else @@ -358,6 +372,26 @@ YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ContextMenuActivated ) ); } + +YTreeItem * +YQTree::currentItem() +{ + + QTreeWidgetItem * currentQItem = _qt_treeWidget->currentItem(); + + if ( currentQItem ) + { + YQTreeItem * item = dynamic_cast (currentQItem); + + if ( item ) + return item->origItem(); + } + + return 0; +} + + + /*============================================================================*/ Modified: trunk/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.h?rev=63368&r1=63367&r2=63368&view=diff ============================================================================== --- trunk/qt/src/YQTree.h (original) +++ trunk/qt/src/YQTree.h Tue Feb 8 12:18:40 2011 @@ -105,6 +105,7 @@ **/ virtual void deleteAllItems(); + /** * Set enabled/disbled state. * @@ -139,6 +140,16 @@ virtual bool setKeyboardFocus(); + /** + * Return the the item that currently has the keyboard focus + * or 0 if no item currently has the keyboard focus. + * + * Reimplemented from YMultiSelectionBox. + **/ + virtual YTreeItem * currentItem(); + + + protected slots: @@ -156,6 +167,10 @@ * This will trigger a 'ValueChanged' event if 'notify' is set. **/ void slotItemChanged(); + void slotItemClicked( QTreeWidgetItem * item, int column ); + + + /** * Propagate a double click or pressing the space key on a tree item. Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=63368&r1=63367&r2=63368&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Feb 8 12:18:40 2011 @@ -20,8 +20,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: yast2-libyui >= 2.20.0 +BuildRequires: yast2-libyui-devel >= 2.20.1 +Requires: yast2-libyui >= 2.20.1 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org