summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp19
-rw-r--r--pics/tux-logo.pngbin2272 -> 30257 bytes
2 files changed, 6 insertions, 13 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
@@ -52,58 +52,51 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
}
QString palmtopVersionString;
palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>";
#ifdef QPE_VENDOR
QString builder = QPE_VENDOR;
#else
QString builder = "Unknown";
#endif
palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>";
palmtopVersionString += tr( "Built on: " ) + __DATE__;
QHBoxLayout *hb1 = new QHBoxLayout( vb );
hb1->setSpacing( 2 );
QLabel *palmtopLogo = new QLabel( this );
QImage logo1 = Resource::loadImage( "launcher/opielogo" );
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 ) );
+ QLabel *linuxLogo = new QLabel( this );
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
Binary files differ