Author: dmacvicar Date: Tue Apr 15 18:00:38 2008 New Revision: 46686 URL: http://svn.opensuse.org/viewcvs/yast?rev=46686&view=rev Log: - unclutter versions and screen. No Excel look anymore Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.cc trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc trunk/qt-pkg/src/YQPkgObjList.h trunk/qt-pkg/src/YQPkgVersionsView.cc Modified: trunk/qt-pkg/src/YQPkgGenericDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgGenericDetailsView.cc?rev=46686&r1=46685&r2=46686&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgGenericDetailsView.cc (original) +++ trunk/qt-pkg/src/YQPkgGenericDetailsView.cc Tue Apr 15 18:00:38 2008 @@ -47,23 +47,23 @@ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif ;" "font-weight: normal;" "font-size: 11px;" - "color: #fff;" + ";color: #fff;" "width: 100%;" - "background-color: #666;" + "" "border: 1px;" "border-collapse: collapse;" "border-spacing: 4px;}" "" "table.stats td" - "{background-color: #CCC;" - "color: #000;" + "{" + ";color: #000;" "padding: 4px;" "text-align: left;" "border: 1px #fff solid;}" "" "table.stats td.hed" - "{background-color: #666;" - "color: #fff;" + "{" + ";color: #fff;" "padding: 4px;" "text-align: left;" "border-bottom: 2px #fff solid;" Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=46686&r1=46685&r2=46686&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Tue Apr 15 18:00:38 2008 @@ -53,12 +53,13 @@ headers << _( "Package" ); _nameCol = numCol++; headers << _( "Summary" ); _summaryCol = numCol++; - headers << _( "Size" ); _sizeCol = numCol++; if ( haveInstalledPkgs() ) { - headers << _( "Avail. Ver." ); _versionCol = numCol++; - headers << _( "Inst. Ver." ); _instVersionCol = numCol++; + headers << _("Inst (Avail)"); _versionStatusCol = numCol++; + + //headers << _( "Avail. Ver." ); _versionCol = numCol++; + //headers << _( "Inst. Ver." ); _instVersionCol = numCol++; } else { @@ -66,11 +67,10 @@ _instVersionCol = -1; } -#if SOURCE_RPM_DISABLED -#warning Selecting source RPMs disabled! -#else - headers << _( "Source" ); _srpmStatusCol = numCol++; -#endif + //headers << _( "Source" ); _srpmStatusCol = numCol++; + + headers << _( "Size" ); _sizeCol = numCol++; + setHeaderLabels(headers); setSortingEnabled( true ); @@ -572,7 +572,7 @@ _zyppPkg = tryCastToZyppPkg( selectable->theObj() ); setSourceRpmIcon(); - + setTextAlignment( sizeCol(), Qt::AlignRight ); setSizeHint( sizeCol(), QSize( QFontMetrics( pkgList->font() ).width( text( sizeCol() ) ), 10 ) ); } Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=46686&r1=46685&r2=46686&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Tue Apr 15 18:00:38 2008 @@ -74,6 +74,7 @@ _nameCol = -42; _versionCol = -42; _instVersionCol = -42; + _versionStatusCol = -42; _summaryCol = -42; _sizeCol = -42; _brokenIconCol = -42; @@ -944,6 +945,39 @@ setText( sizeCol(), size.asString() ); } + if ( versionStatusCol() >= 0 ) + { + setBackgroundColor( versionStatusCol(), _pkgObjList->palette().color(QPalette::AlternateBase)); + if ( !selectable()->installedEmpty() ) + { + if ( zyppObj() != selectable()->installedObj() && + zyppObj() != selectable()->candidateObj() ) + { + setText( versionStatusCol(), QString().sprintf("%s", zyppObj()->edition().c_str()) ); + } + else if ( selectable()->hasCandidateObj() ) + { + if ( installed->edition() == candidate->edition() ) + { + setText( versionStatusCol(), QString().sprintf("%s", installed->edition().c_str()) ); + + } + else + { + if ( installed->edition() > candidate->edition() ) + setTextColor( versionStatusCol(), Qt::red); + + setText( versionStatusCol(), QString().sprintf("%s (%s)", installed->edition().c_str(), candidate->edition().c_str()) ); + } + + } + } + else + { + setText( versionStatusCol(), QString().sprintf("(%s)", candidate->edition().c_str()) ); + } + } + if ( instVersionCol() >= 0 ) { if ( !selectable()->installedEmpty() ) @@ -965,6 +999,7 @@ } setStatusIcon(); + } Modified: trunk/qt-pkg/src/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.h?rev=46686&r1=46685&r2=46686&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.h (original) +++ trunk/qt-pkg/src/YQPkgObjList.h Tue Apr 15 18:00:38 2008 @@ -75,6 +75,7 @@ int sizeCol() const { return _sizeCol; } int versionCol() const { return _versionCol; } int instVersionCol() const { return _instVersionCol; } + int versionStatusCol() const { return _versionStatusCol; } int brokenIconCol() const { return _brokenIconCol; } int satisfiedIconCol() const { return _satisfiedIconCol; } @@ -344,6 +345,7 @@ int _sizeCol; int _versionCol; int _instVersionCol; + int _versionStatusCol; int _brokenIconCol; int _satisfiedIconCol; bool _editable; @@ -591,6 +593,7 @@ int sizeCol() const { return _pkgObjList->sizeCol(); } int versionCol() const { return _pkgObjList->versionCol(); } int instVersionCol() const { return _pkgObjList->instVersionCol(); } + int versionStatusCol() const { return _pkgObjList->versionStatusCol(); } int brokenIconCol() const { return _pkgObjList->brokenIconCol(); } int satisfiedIconCol() const { return _pkgObjList->satisfiedIconCol(); } Modified: trunk/qt-pkg/src/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgVersionsView.cc?rev=46686&r1=46685&r2=46686&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgVersionsView.cc (original) +++ trunk/qt-pkg/src/YQPkgVersionsView.cc Tue Apr 15 18:00:38 2008 @@ -44,7 +44,7 @@ _picture = new QLabel(this); _text = new QLabel(this); _text->setText(text); - _picture->setPixmap(YQIconPool::pkgKeepInstalled()); + _picture->setPixmap(YQIconPool::pkgSatisfied()); layout->addWidget(_picture); layout->addWidget(_text); layout->addStretch(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org