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

Author: tgoettlicher Date: Tue Apr 19 12:21:00 2011 New Revision: 63824 URL: http://svn.opensuse.org/viewcvs/yast?rev=63824&view=rev Log: +- Enable busy cursor for tree widget during time consuming + operations +- V 2.21.1 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63824&r1=63823&r2=63824&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Apr 19 12:21:00 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "20") -SET(VERSION_PATCH "8") +SET(VERSION_MINOR "21") +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=63824&r1=63823&r2=63824&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Apr 19 12:21:00 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Apr 18 16:16:59 CEST 2011 - tgoettlicher@suse.de + +- Enable busy cursor for tree widget during time consuming + operations +- V 2.21.1 + +------------------------------------------------------------------- Fri Apr 15 16:20:11 CEST 2011 - tgoettlicher@suse.de - Added support for recursive selection in tree widgets Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63824&r1=63823&r2=63824&view=diff ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Tue Apr 19 12:21:00 2011 @@ -281,33 +281,46 @@ void YQTree::selectItem(QTreeWidgetItem * item, bool selected, bool recursive) { - YQTreeItem * treeItem = dynamic_cast (item); - if ( ! treeItem ) - return; + YQTreeItem * treeItem = dynamic_cast (item); - YSelectionWidget::selectItem( treeItem->origItem(), selected ); + if ( ! treeItem ) + return; - if ( recursive ) - { - for (int i; i < item->childCount(); ++i) - { - QTreeWidgetItem* child = item->child(i); - child->setCheckState(0, ( selected )? Qt::Checked : Qt::Unchecked ); - selectItem( child, selected, recursive ); - } + YSelectionWidget::selectItem( treeItem->origItem(), selected ); + + if ( recursive ) + { + for (int i=0; i < item->childCount(); ++i) + { + QTreeWidgetItem* child = item->child(i); + child->setCheckState(0, ( selected )? Qt::Checked : Qt::Unchecked ); + YQTree::selectItem( child, selected, recursive ); } + } + } void YQTree::slotItemChanged( QTreeWidgetItem * item ) { + + YQSignalBlocker sigBlocker( _qt_treeWidget ); + if ( hasMultiSelection() ) { + if ( recursiveSelection() ) + YQUI::ui()->busyCursor(); + if ( item->checkState(0) == Qt::Checked ) - selectItem( item, true, recursiveSelection() ); + YQTree::selectItem( item, true, recursiveSelection() ); else - selectItem( item, false, recursiveSelection() ); + YQTree::selectItem( item, false, recursiveSelection() ); + + + if ( recursiveSelection() ) + YQUI::ui()->normalCursor(); + } else { Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=63824&r1=63823&r2=63824&view=diff ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Apr 19 12:21:00 2011 @@ -20,8 +20,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.20.3 -Requires: yast2-libyui >= 2.20.3 +BuildRequires: yast2-libyui-devel >= 2.21.1 +Requires: yast2-libyui >= 2.21.1 Requires: yast2_theme >= 2.16.1 Requires: yast2-branding Provides: yast2_ui -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org