Author: sh-sh-sh Date: Thu Jan 22 20:13:25 2009 New Revision: 54926 URL: http://svn.opensuse.org/viewcvs/yast?rev=54926&view=rev Log: use icon Added: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.cc branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.h branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.cc?rev=54926&r1=54925&r2=54926&view=diff ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.cc Thu Jan 22 20:13:25 2009 @@ -16,12 +16,13 @@ /-*/ +#include + #define YUILogComponent "qt-ui" #include "YUILog.h" #include "YQIconPool.h" - #include "icons/autodel.xpm" #include "icons/autodel_disabled.xpm" #include "icons/autoinstall.xpm" @@ -58,8 +59,9 @@ #include "icons/step_current.xpm" #include "icons/step_todo.xpm" #include "icons/step_done.xpm" -//Added by qt3to4: -#include + +#include "icons/tab_remove.xpm" + YQIconPool * YQIconPool::_iconPool = 0; @@ -106,6 +108,8 @@ QPixmap YQIconPool::stepToDo() { return iconPool()->cachedIcon( step_todo_xpm ); } QPixmap YQIconPool::stepDone() { return iconPool()->cachedIcon( step_done_xpm ); } +QPixmap YQIconPool::tabRemove() { return iconPool()->cachedIcon( tab_remove_xpm ); } + YQIconPool * YQIconPool::iconPool() { Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.h?rev=54926&r1=54925&r2=54926&view=diff ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.h (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQIconPool.h Thu Jan 22 20:13:25 2009 @@ -69,6 +69,7 @@ static QPixmap stepToDo(); static QPixmap stepDone(); + static QPixmap tabRemove(); protected: Modified: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc?rev=54926&r1=54925&r2=54926&view=diff ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc (original) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc Thu Jan 22 20:13:25 2009 @@ -28,6 +28,7 @@ #include <QSplitter> #include <QStackedWidget> #include <QTabBar> +#include <QToolButton> #define YUILogComponent "qt-pkg" #include "YUILog.h" @@ -36,6 +37,7 @@ #include "YQPkgFilterTab.h" #include "YQPkgDiskUsageList.h" #include "YQSignalBlocker.h" +#include "YQIconPool.h" #include "YQi18n.h" #include "utf8.h" @@ -71,7 +73,7 @@ YQPkgDiskUsageList * diskUsageList; QWidget * rightPane; QPushButton * viewButton; - QPushButton * closeButton; + QToolButton * closeButton; YQPkgFilterPageVector pages; }; @@ -149,10 +151,12 @@ connect( menu, SIGNAL( triggered( QAction * ) ), this, SLOT ( showPage ( QAction * ) ) ); - // Button to close the current package filter view page - priv->closeButton = new QPushButton( _( "&Close" ), buttonBox ); + + priv->closeButton = new QToolButton( buttonBox ); YUI_CHECK_NEW( priv->closeButton ); buttonBoxLayout->addWidget( priv->closeButton ); + priv->closeButton->setIcon( YQIconPool::tabRemove() ); + priv->closeButton->setToolTip( _( "Close the current page" ) ); connect( priv->closeButton, SIGNAL( clicked() ), this, SLOT ( closeCurrentPage() ) ); Added: branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm?rev=54926&view=auto ============================================================================== --- branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm (added) +++ branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm Thu Jan 22 20:13:25 2009 @@ -0,0 +1,71 @@ +/* XPM */ +static const char * tab_remove_xpm[] = { +"16 16 52 1", +" c None", +". c #FFE9E2", +"+ c #FFDBCF", +"@ c #EDBFBB", +"# c #EE988D", +"$ c #FFC1AD", +"% c #FFAC92", +"& c #FDC4B5", +"* c #F1D3D1", +"= c #FC664C", +"- c #FE472B", +"; c #FEDFD5", +"> c #FFA085", +", c #FF8363", +"' c #FB8D76", +") c #FD664A", +"! c #FE472C", +"~ c #F3897F", +"{ c #FACEC3", +"] c #FE7656", +"^ c #FF5737", +"/ c #FF4325", +"( c #F6877B", +"_ c #F8D0C9", +": c #FE6042", +"< c #FF4225", +"[ c #FF2E15", +"} c #F77069", +"| c #F9C8C0", +"1 c #FE6B51", +"2 c #FF482D", +"3 c #FC6654", +"4 c #FD2F20", +"5 c #FE0C08", +"6 c #F76366", +"7 c #FD7860", +"8 c #FA8B7E", +"9 c #F6A0A0", +"0 c #FF0707", +"a c #FE0909", +"b c #F9BCB5", +"c c #FA9A8F", +"d c #595959", +"e c #F3969A", +"f c #F66B6E", +"g c #FFFFFF", +"h c #F3F3F3", +"i c #AAAAAA", +"j c #D1D1D1", +"k c #E8E8E8", +"l c #DDDDDD", +"m c #9F9F9F", +" .+ @# ", +" $%& *=- ", +" ;>,')!~ ", +" {]^/( ", +" _:<[} ", +" |123456 ", +" 7/8 90a ", +" bcdddef ddddd ", +" dghhhid dghhhid", +" dggggjd dggggjd", +"dghhhhhidghhhhhi", +"dgkkkkkjdddddddd", +"glllllllllllllll", +"jmmmmmmmmmmmmmmm", +"jmgggggggggggggg", +"jmgggggggggggggg"}; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org