Author: sh-sh-sh Date: Tue Apr 29 16:48:11 2008 New Revision: 47165 URL: http://svn.opensuse.org/viewcvs/yast?rev=47165&view=rev Log: Fixed bnc #144694: Too low resolution for control center app icon Removed: trunk/control-center/src/suseicon.xpm Modified: trunk/control-center/VERSION trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/Makefile.am trunk/control-center/src/main.cpp trunk/control-center/src/y2controlcenter.cpp trunk/control-center/src/y2controlcenter.h Modified: trunk/control-center/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/VERSION (original) +++ trunk/control-center/VERSION Tue Apr 29 16:48:11 2008 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-control-center.changes?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Tue Apr 29 16:48:11 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 29 16:44:03 CEST 2008 - sh@suse.de + +- Fixed bnc #144694: Too low resolution for control center app icon +- V 2.16.1 + +------------------------------------------------------------------- Tue Nov 27 13:39:45 CET 2007 - tgoettlicher@suse.de - V 2.16.0 Modified: trunk/control-center/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/Makefile.am?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/src/Makefile.am (original) +++ trunk/control-center/src/Makefile.am Tue Apr 29 16:48:11 2008 @@ -45,8 +45,7 @@ y2controlcenter.h \ y2controlcenterview.h \ yastmodules.h \ - y2savelogs.h \ - suseicon.xpm + y2savelogs.h y2controlcenter_METASOURCES = \ process.moc.cpp \ Modified: trunk/control-center/src/main.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main.cpp?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/src/main.cpp (original) +++ trunk/control-center/src/main.cpp Tue Apr 29 16:48:11 2008 @@ -35,7 +35,7 @@ #include "myintl.h" #include "y2controlcenter.h" #include "y2cc_config.h" -#include "suseicon.xpm" + //global class with config options Config config; @@ -114,7 +114,6 @@ } } y2cc.setCaption( title ); - y2cc.setIcon(QPixmap((const char **)suseicon_xpm)); y2cc.show(); QTimer::singleShot( 0, &y2cc, SLOT( configure() ) ); @@ -122,4 +121,3 @@ return app.exec(); } -// vim: sw=4 Modified: trunk/control-center/src/y2controlcenter.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/y2controlcenter.cpp?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/src/y2controlcenter.cpp (original) +++ trunk/control-center/src/y2controlcenter.cpp Tue Apr 29 16:48:11 2008 @@ -18,6 +18,7 @@ Y2ControlCenter::Y2ControlCenter( WFlags wflags ) : QMainWindow( 0, 0, wflags ) // parent, name, wflags { + setAppIcon(); initStatusBar(); _view = new Y2ControlCenterView( this ); @@ -30,12 +31,30 @@ connect(y2LogSaver, SIGNAL(statusMsg(const QString&)), this, SLOT(slotStatusHelpMsg(const QString&))); } + Y2ControlCenter::~Y2ControlCenter() { delete y2LogSaver; } +void Y2ControlCenter::setAppIcon() +{ + QString iconName( ICON_DIR "/yast.png" ); + QPixmap appIcon( iconName ); + + if ( ! appIcon.isNull() ) + { + // fprintf( stderr, "y2controlcenter: Using icon %s\n", iconName.ascii() ); + topLevelWidget()->setIcon( appIcon ); + } + else + { + fprintf( stderr, "y2controlcenter: No icon %s\n", iconName.ascii() ); + } +} + + void Y2ControlCenter::configure() { statusBar()->message(_("Reading module list...")); Modified: trunk/control-center/src/y2controlcenter.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/y2controlcenter.h?rev=47165&r1=47164&r2=47165&view=diff ============================================================================== --- trunk/control-center/src/y2controlcenter.h (original) +++ trunk/control-center/src/y2controlcenter.h Tue Apr 29 16:48:11 2008 @@ -63,6 +63,7 @@ protected: + void setAppIcon(); void initMenuBar(); void initStatusBar(); bool eventFilter( QObject *obj, QEvent *ev ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org