Author: dmacvicar Date: Fri Dec 7 11:27:41 2007 New Revision: 42778 URL: http://svn.opensuse.org/viewcvs/yast?rev=42778&view=rev Log: YQPkgVersionsView Modified: trunk/qt4/src/pkg/YQPkgList.cc trunk/qt4/src/pkg/YQPkgList.h trunk/qt4/src/pkg/YQPkgPatternList.cc trunk/qt4/src/pkg/YQPkgPatternList.h trunk/qt4/src/pkg/YQPkgVersionsView.cc trunk/qt4/src/pkg/YQPkgVersionsView.h Modified: trunk/qt4/src/pkg/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgList.cc?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgList.cc (original) +++ trunk/qt4/src/pkg/YQPkgList.cc Fri Dec 7 11:27:41 2007 @@ -755,7 +755,7 @@ return YQPkgObjListItem::compare( otherListViewItem, col, ascending ); } - +#if 0 void YQPkgListItem::paintCell( QPainter * painter, const QColorGroup & colorGroup, @@ -808,7 +808,7 @@ } #endif } - +#endif #include "YQPkgList.moc" Modified: trunk/qt4/src/pkg/YQPkgList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgList.h?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgList.h (original) +++ trunk/qt4/src/pkg/YQPkgList.h Fri Dec 7 11:27:41 2007 @@ -314,17 +314,6 @@ **/ void setSourceRpmIcon(); - /** - * Paint method. Reimplemented from @ref QListViewItem so different - * colors can be used. - * - * Reimplemented from QListViewItem. - **/ - virtual void paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ); // Data members Modified: trunk/qt4/src/pkg/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgPatternList.cc?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgPatternList.cc (original) +++ trunk/qt4/src/pkg/YQPkgPatternList.cc Fri Dec 7 11:27:41 2007 @@ -283,10 +283,11 @@ #endif } - - - - +void YQPkgPatternList::drawRow ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const +{ + painter->setFont( YQUI::yqApp()->headingFont() ); + QTreeWidget::drawRow ( painter, option, index ); +} YQPkgPatternListItem::YQPkgPatternListItem( YQPkgPatternList * patternList, ZyppSel selectable, @@ -384,20 +385,6 @@ // NOP } - -void -YQPkgPatternCategoryItem::paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ) -{ - painter->setFont( YQUI::yqApp()->headingFont() ); - //FIXME QY2ListViewItem::paintCell( painter, colorGroup, column, width, alignment ); -} - - - void YQPkgPatternCategoryItem::addPattern( ZyppPattern pattern ) { Modified: trunk/qt4/src/pkg/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgPatternList.h?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgPatternList.h (original) +++ trunk/qt4/src/pkg/YQPkgPatternList.h Fri Dec 7 11:27:41 2007 @@ -54,6 +54,13 @@ **/ virtual ~YQPkgPatternList(); + /** + * Paint method. Reimplemented from @ref QTreeWidget so a different + * font can be used. + * + * Reimplemented from QY2ListViewItem. + **/ + virtual void drawRow ( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; public slots: @@ -131,7 +138,6 @@ **/ void filterFinished(); - protected: /** @@ -199,7 +205,6 @@ int statusCol() const { return _patternList->statusCol(); } int summaryCol() const { return _patternList->summaryCol(); } - protected: /** @@ -283,19 +288,6 @@ * close icons. **/ void setTreeIcon( void ); - - /** - * Paint method. Reimplemented from @ref QListViewItem so a different - * font can be used. - * - * Reimplemented from QY2ListViewItem. - **/ - virtual void paintCell( QPainter * painter, - const QColorGroup & colorGroup, - int column, - int width, - int alignment ); - // // Data members // Modified: trunk/qt4/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgVersionsView.cc?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgVersionsView.cc (original) +++ trunk/qt4/src/pkg/YQPkgVersionsView.cc Fri Dec 7 11:27:41 2007 @@ -123,10 +123,10 @@ return; #if FIXME - QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str(), - Q3CheckListItem::Controller ); + QY2CheckListItem * root = new QY2CheckListItem( this, selectable->theObj()->name().c_str() ); + //FIXME add element Q_CHECK_PTR( root ); - root->setOpen( true ); + root->setExpanded( true ); bool installedIsAvailable = false; @@ -162,15 +162,18 @@ void YQPkgVersionsView::checkForChangedCandidate() { + QTreeWidgetItemIterator iter(this); + QTreeWidgetItem *first = *iter; #if FIXME - if ( ! firstChild() || ! _selectable ) + if ( ! first || ! _selectable ) return; - Q3ListViewItem * item = firstChild()->firstChild(); - - while ( item ) + + QTreeWidgetItemIterator iter_c(first); + + while ( *iter_c ) { - YQPkgVersion * versionItem = dynamic_cast (item); + YQPkgVersion * versionItem = dynamic_cast (*iter_c); if ( versionItem && versionItem->isOn() ) { @@ -226,7 +229,7 @@ } } - item = item->nextSibling(); + ++iter_c; } #endif } Modified: trunk/qt4/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/pkg/YQPkgVersionsView.h?rev=42778&r1=42777&r2=42778&view=diff ============================================================================== --- trunk/qt4/src/pkg/YQPkgVersionsView.h (original) +++ trunk/qt4/src/pkg/YQPkgVersionsView.h Fri Dec 7 11:27:41 2007 @@ -22,7 +22,6 @@ #include "QY2ListView.h" #include "YQZypp.h" -#include <Q3ListViewItem> class QTabWidget; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org