Author: dmacvicar Date: Sat Dec 15 01:18:15 2007 New Revision: 43101 URL: http://svn.opensuse.org/viewcvs/yast?rev=43101&view=rev Log: clicking packages work! so the package selector is now at least usable, except for conflict solving Modified: trunk/qt/src/QY2ListView.cc trunk/qt/src/QY2ListView.h trunk/qt/src/pkg/YQPkgConflictList.cc trunk/qt/src/pkg/YQPkgLangList.cc trunk/qt/src/pkg/YQPkgObjList.cc trunk/qt/src/pkg/YQPkgPatternList.cc trunk/qt/src/pkg/YQPkgPatternList.h Modified: trunk/qt/src/QY2ListView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2ListView.cc?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/QY2ListView.cc (original) +++ trunk/qt/src/QY2ListView.cc Sat Dec 15 01:18:15 2007 @@ -24,6 +24,8 @@ #include <QMouseEvent> #include "QY2ListView.h" +#define y2log_component "qt-pkg" +#include QY2ListView::QY2ListView( QWidget * parent ) : QTreeWidget( parent ) @@ -183,15 +185,16 @@ void -QY2ListView::contentsMousePressEvent( QMouseEvent * ev ) +QY2ListView::mousePressEvent( QMouseEvent * ev ) { - //FIXME may be convert to global - QTreeWidgetItem * item = itemAt( mapToGlobal( ev->pos() ) ); + //y2internal("POS is %d %d", ev->pos().x(), ev->pos().y() ); + QTreeWidgetItem * item = itemAt( ev->pos() ); + if ( item && ( item->flags() & Qt::ItemIsEnabled ) ) { _mousePressedItem = item; -//FIXME _mousePressedCol = header()->sectionAt( ev->pos().x() ); + _mousePressedCol = header()->logicalIndexAt( ev->pos().x() ); _mousePressedButton = ev->button(); } else // invalidate last click data @@ -202,19 +205,20 @@ } // Call base class method - //FIXME QTreeWidget::contentsMousePressEvent( ev ); + QTreeWidget::mousePressEvent( ev ); } void -QY2ListView::contentsMouseReleaseEvent( QMouseEvent * ev ) +QY2ListView::mouseReleaseEvent( QMouseEvent * ev ) { - QTreeWidgetItem * item = itemAt( mapToGlobal( ev->pos() ) ); + //y2internal("REPOS is %d %d", ev->pos().x(), ev->pos().y() ); + QTreeWidgetItem * item = itemAt( ev->pos() ); if ( item && ( item->flags() & Qt::ItemIsEnabled ) && item == _mousePressedItem ) { int col = header()->logicalIndexAt( ev->pos().x() ); - + //y2internal("COL %d", col); if ( item == _mousePressedItem && col == _mousePressedCol && ev->button() == _mousePressedButton ) @@ -231,12 +235,12 @@ _mousePressedButton = Qt::NoButton; // Call base class method - //FIXME QTreeWidget::contentsMouseReleaseEvent( ev ); + QTreeWidget::mouseReleaseEvent( ev ); } void -QY2ListView::contentsMouseDoubleClickEvent( QMouseEvent * ev ) +QY2ListView::mouseDoubleClickEvent( QMouseEvent * ev ) { QTreeWidgetItem * item = itemAt( mapToGlobal( ev->pos() ) ); @@ -252,8 +256,8 @@ _mousePressedCol = -1; _mousePressedButton = Qt::NoButton; -// // Call base class method -// QTreeWidget::contentsMouseDoubleClickEvent( ev ); + // Call base class method + QTreeWidget::mouseDoubleClickEvent( ev ); } Modified: trunk/qt/src/QY2ListView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2ListView.h?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/QY2ListView.h (original) +++ trunk/qt/src/QY2ListView.h Sat Dec 15 01:18:15 2007 @@ -175,19 +175,19 @@ * Handle mouse clicks. * Reimplemented from QScrollView. **/ - virtual void contentsMousePressEvent( QMouseEvent * e ); + virtual void mousePressEvent( QMouseEvent * e ); /** * Handle mouse clicks. * Reimplemented from QScrollView. **/ - virtual void contentsMouseReleaseEvent( QMouseEvent * ); + virtual void mouseReleaseEvent( QMouseEvent * ); /** * Handle mouse clicks. * Reimplemented from QScrollView. **/ - virtual void contentsMouseDoubleClickEvent( QMouseEvent * ); + virtual void mouseDoubleClickEvent( QMouseEvent * ); // Modified: trunk/qt/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgConflictList.cc?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgConflictList.cc (original) +++ trunk/qt/src/pkg/YQPkgConflictList.cc Sat Dec 15 01:18:15 2007 @@ -308,9 +308,7 @@ , _resolutionsHeader( 0 ) { setBackgroundColor( LIGHT_BLUE ); -#if FIXME setExpanded( true ); -#endif formatHeading(); YQPkgConflictList::dumpList( this, fromUTF8( _problem->details() ) ); @@ -326,9 +324,7 @@ QPixmap icon = YQIconPool::normalPkgConflict(); setTextColor( BRIGHT_RED ); -#if FIXME - setText( 0, Qt::DisplayRole, fromUTF8( problem()->description() ) ); -#endif + setData( 0, Qt::DisplayRole, fromUTF8( problem()->description() ) ); setData( 0, Qt::DecorationRole, icon ); } Modified: trunk/qt/src/pkg/YQPkgLangList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgLangList.cc?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgLangList.cc (original) +++ trunk/qt/src/pkg/YQPkgLangList.cc Sat Dec 15 01:18:15 2007 @@ -174,16 +174,12 @@ YQPkgLangListItem * YQPkgLangList::selection() const { -#if FIXME - Q3ListViewItem * item = selectedItem(); + QTreeWidgetItem * item = currentItem(); if ( ! item ) return 0; return dynamic_cast (item); -#else - return 0; -#endif } Modified: trunk/qt/src/pkg/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgObjList.cc?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgObjList.cc (original) +++ trunk/qt/src/pkg/YQPkgObjList.cc Sat Dec 15 01:18:15 2007 @@ -145,6 +145,7 @@ if ( item ) { + //y2internal("CLICKED: %s", item->zyppObj()->name().c_str()); if ( button == Qt::LeftButton ) { if ( col == statusCol() ) Modified: trunk/qt/src/pkg/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatternList.cc?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatternList.cc (original) +++ trunk/qt/src/pkg/YQPkgPatternList.cc Sat Dec 15 01:18:15 2007 @@ -215,16 +215,12 @@ YQPkgPatternListItem * YQPkgPatternList::selection() const { -#if FIXME QTreeWidgetItem * item = currentItem(); if ( ! item ) return 0; return dynamic_cast (item); -#else - return 0; -#endif } @@ -234,7 +230,6 @@ int col, const QPoint & pos ) { -#if FIXME YQPkgPatternCategoryItem * categoryItem = dynamic_cast (listViewItem); @@ -244,7 +239,7 @@ { if ( col == statusCol() ) { - categoryItem->setOpen( ! categoryItem->isExpanded() ); + categoryItem->setExpanded( ! categoryItem->isExpanded() ); } } } @@ -252,7 +247,6 @@ { YQPkgObjList::pkgObjClicked( button, listViewItem, col, pos ); } -#endif } @@ -360,7 +354,7 @@ { setText( _patternList->summaryCol(), category ); setBackgroundColor( CATEGORY_BACKGROUND ); - setOpen( true ); + setExpanded( true ); setTreeIcon(); } @@ -386,9 +380,9 @@ void -YQPkgPatternCategoryItem::setOpen( bool open ) +YQPkgPatternCategoryItem::setExpanded( bool open ) { - //FIXME QTreeWidgetItem::setOpen( open ); + QTreeWidgetItem::setExpanded( open ); setTreeIcon(); } @@ -396,12 +390,11 @@ void YQPkgPatternCategoryItem::setTreeIcon() { -#if FIXME - setPixmap( _patternList->statusCol(), - isOpen() ? + setData( _patternList->statusCol(), Qt::DecorationRole, + isExpanded() ? YQIconPool::treeMinus() : YQIconPool::treePlus() ); -#endif + } Modified: trunk/qt/src/pkg/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatternList.h?rev=43101&r1=43100&r2=43101&view=diff ============================================================================== --- trunk/qt/src/pkg/YQPkgPatternList.h (original) +++ trunk/qt/src/pkg/YQPkgPatternList.h Sat Dec 15 01:18:15 2007 @@ -255,7 +255,7 @@ * * Reimplemented from QListViewItem to force categories open at all times **/ - virtual void setOpen( bool open ); + virtual void setExpanded( bool open ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org