Fix Tux logo

2 files changed, 3 insertions, 10 deletions

diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 517029b..3a37086 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -70,40 +70,33 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
     logo1 = logo1.smoothScale( 50, 55 );
     QPixmap logo1Pixmap;
     logo1Pixmap.convertFromImage( logo1 );
     palmtopLogo->setPixmap( logo1Pixmap );
     palmtopLogo->setFixedSize( 60, 60 );
     hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
     
     QLabel *palmtopVersion = new QLabel( this );
     palmtopVersion->setText( palmtopVersionString  );
     hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
     
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
     
     QLabel *linuxLogo = new QLabel( this );
-
-    // Need to do this extra qpainter code with this image becuase for some
-    // reason it doesn't alpha belnd if directly converted to a pixmap
-    QPixmap logo2Pixmap( 60, 60 );
-    QColor bgColor = colorGroup().background();
-    QPainter painter( &logo2Pixmap );
-    painter.fillRect( QRect( 0, 0, 60, 60 ), QBrush( bgColor ) );
     QImage logo2 = Resource::loadImage( "tux-logo" );
-    logo2 = logo2.smoothScale( 40, 47 );
-    painter.drawImage( 0, 0, logo2 );
-    painter.end();
+    logo2 = logo2.smoothScale( 55, 60 );
+    QPixmap logo2Pixmap;
+    logo2Pixmap.convertFromImage( logo2 );
     linuxLogo->setPixmap( logo2Pixmap );
     linuxLogo->setFixedSize( 60, 60 );
     hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
     
     QLabel *kernelVersion = new QLabel( this );
     kernelVersion->setText( kernelVersionString );
     hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 }
 
 VersionInfo::~VersionInfo()
 {
 }
 
diff --git a/pics/tux-logo.png b/pics/tux-logo.png
index ad7c579..f405025 100644
--- a/pics/tux-logo.png
+++ b/pics/tux-logo.png