Author: dmacvicar Date: Mon May 19 19:55:15 2008 New Revision: 47687 URL: http://svn.opensuse.org/viewcvs/yast?rev=47687&view=rev Log: deprecate special selection icons (bnc#392067) Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQIconPool.cc trunk/qt-pkg/src/YQIconPool.h trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=47687&r1=47686&r2=47687&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Mon May 19 19:55:15 2008 @@ -9,7 +9,7 @@ - feedback for search (bnc#391406) - reenable cancel (bnc#350988) - fix search begins with string (bnc#388601) - +- deprecate special selection icons (bnc#392067) ------------------------------------------------------------------- Mon May 19 11:50:51 CEST 2008 - dmacvicar@suse.de Modified: trunk/qt-pkg/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.cc?rev=47687&r1=47686&r2=47687&view=diff ============================================================================== --- trunk/qt-pkg/src/YQIconPool.cc (original) +++ trunk/qt-pkg/src/YQIconPool.cc Mon May 19 19:55:15 2008 @@ -38,12 +38,6 @@ #include "icons/noinst_disabled.xpm" #include "icons/protected.xpm" #include "icons/protected_disabled.xpm" -#include "icons/sel_autodel.xpm" -#include "icons/sel_autodel_disabled.xpm" -#include "icons/sel_autoinstall.xpm" -#include "icons/sel_autoinstall_disabled.xpm" -#include "icons/sel_autoupdate.xpm" -#include "icons/sel_autoupdate_disabled.xpm" #include "icons/taboo.xpm" #include "icons/taboo_disabled.xpm" #include "icons/update.xpm" @@ -77,9 +71,6 @@ QPixmap YQIconPool::pkgAutoInstall() { return iconPool()->cachedIcon( autoinstall_xpm ); } QPixmap YQIconPool::pkgAutoUpdate() { return iconPool()->cachedIcon( autoupdate_xpm ); } QPixmap YQIconPool::pkgAutoDel() { return iconPool()->cachedIcon( autodel_xpm ); } -QPixmap YQIconPool::pkgSelAutoInstall() { return iconPool()->cachedIcon( sel_autoinstall_xpm ); } -QPixmap YQIconPool::pkgSelAutoUpdate() { return iconPool()->cachedIcon( sel_autoupdate_xpm ); } -QPixmap YQIconPool::pkgSelAutoDel() { return iconPool()->cachedIcon( sel_autodel_xpm ); } QPixmap YQIconPool::pkgKeepInstalled() { return iconPool()->cachedIcon( keepinstalled_xpm ); } QPixmap YQIconPool::pkgNoInst() { return iconPool()->cachedIcon( noinst_xpm ); } QPixmap YQIconPool::pkgProtected() { return iconPool()->cachedIcon( protected_xpm ); } @@ -91,9 +82,6 @@ QPixmap YQIconPool::disabledPkgAutoInstall() { return iconPool()->cachedIcon( autoinstall_disabled_xpm ); } QPixmap YQIconPool::disabledPkgAutoUpdate() { return iconPool()->cachedIcon( autoupdate_disabled_xpm ); } QPixmap YQIconPool::disabledPkgAutoDel() { return iconPool()->cachedIcon( autodel_disabled_xpm ); } -QPixmap YQIconPool::disabledPkgSelAutoInstall() { return iconPool()->cachedIcon( sel_autoinstall_disabled_xpm );} -QPixmap YQIconPool::disabledPkgSelAutoUpdate() { return iconPool()->cachedIcon( sel_autoupdate_disabled_xpm ); } -QPixmap YQIconPool::disabledPkgSelAutoDel() { return iconPool()->cachedIcon( sel_autodel_disabled_xpm ); } QPixmap YQIconPool::disabledPkgKeepInstalled() { return iconPool()->cachedIcon( keepinstalled_disabled_xpm ); } QPixmap YQIconPool::disabledPkgNoInst() { return iconPool()->cachedIcon( noinst_disabled_xpm ); } QPixmap YQIconPool::disabledPkgProtected() { return iconPool()->cachedIcon( protected_disabled_xpm ); } Modified: trunk/qt-pkg/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.h?rev=47687&r1=47686&r2=47687&view=diff ============================================================================== --- trunk/qt-pkg/src/YQIconPool.h (original) +++ trunk/qt-pkg/src/YQIconPool.h Mon May 19 19:55:15 2008 @@ -35,9 +35,6 @@ static QPixmap pkgKeepInstalled(); static QPixmap pkgNoInst(); static QPixmap pkgProtected(); - static QPixmap pkgSelAutoDel(); - static QPixmap pkgSelAutoInstall(); - static QPixmap pkgSelAutoUpdate(); static QPixmap pkgTaboo(); static QPixmap pkgUpdate(); @@ -49,10 +46,7 @@ static QPixmap disabledPkgKeepInstalled(); static QPixmap disabledPkgNoInst(); static QPixmap disabledPkgProtected(); - static QPixmap disabledPkgSelAutoDel(); - static QPixmap disabledPkgSelAutoInstall(); - static QPixmap disabledPkgSelAutoUpdate(); - static QPixmap disabledPkgTaboo(); + static QPixmap disabledPkgTaboo(); static QPixmap disabledPkgUpdate(); static QPixmap checkMarkOn(); Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=47687&r1=47686&r2=47687&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Mon May 19 19:55:15 2008 @@ -216,18 +216,11 @@ case S_Taboo: icon = YQIconPool::pkgTaboo(); break; case S_Update: icon = YQIconPool::pkgUpdate(); break; - case S_AutoDel: icon = bySelection ? - YQIconPool::pkgSelAutoDel() : - YQIconPool::pkgAutoDel(); break; - - case S_AutoInstall: icon = bySelection ? - YQIconPool::pkgSelAutoInstall() : - YQIconPool::pkgAutoInstall(); break; - - case S_AutoUpdate: icon = bySelection ? - YQIconPool::pkgSelAutoUpdate() : - YQIconPool::pkgAutoUpdate(); break; + case S_AutoDel: icon = YQIconPool::pkgAutoDel(); break; + case S_AutoInstall: icon = YQIconPool::pkgAutoInstall(); break; + + case S_AutoUpdate: icon = YQIconPool::pkgAutoUpdate(); break; // Intentionally omitting 'default' branch so the compiler can // catch unhandled enum states @@ -245,17 +238,11 @@ case S_Taboo: icon = YQIconPool::disabledPkgTaboo(); break; case S_Update: icon = YQIconPool::disabledPkgUpdate(); break; - case S_AutoDel: icon = bySelection ? - YQIconPool::disabledPkgSelAutoDel() : - YQIconPool::disabledPkgAutoDel(); break; - - case S_AutoInstall: icon = bySelection ? - YQIconPool::disabledPkgSelAutoInstall() : - YQIconPool::disabledPkgAutoInstall(); break; - - case S_AutoUpdate: icon = bySelection ? - YQIconPool::disabledPkgSelAutoUpdate() : - YQIconPool::disabledPkgAutoUpdate(); break; + case S_AutoDel: icon = YQIconPool::disabledPkgAutoDel(); break; + + case S_AutoInstall: icon = YQIconPool::disabledPkgAutoInstall(); break; + + case S_AutoUpdate: icon = YQIconPool::disabledPkgAutoUpdate(); break; // Intentionally omitting 'default' branch so the compiler can // catch unhandled enum states -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org