author | mark <mark> | 2002-01-29 20:31:41 (UTC) |
---|---|---|
committer | mark <mark> | 2002-01-29 20:31:41 (UTC) |
commit | b153ae0894438d4871a18443b7eed8e6f9a9cfae (patch) (side-by-side diff) | |
tree | e987c8208f3caf6b1d19dc866ea557d351aae742 | |
parent | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (diff) | |
download | opie-b153ae0894438d4871a18443b7eed8e6f9a9cfae.zip opie-b153ae0894438d4871a18443b7eed8e6f9a9cfae.tar.gz opie-b153ae0894438d4871a18443b7eed8e6f9a9cfae.tar.bz2 |
Change Qtopia logo to Opie one
-rw-r--r-- | noncore/settings/sysinfo/qpe-sysinfo.control | 2 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/sysinfo/qpe-sysinfo.control b/noncore/settings/sysinfo/qpe-sysinfo.control index e5ed583..7a2d85d 100644 --- a/noncore/settings/sysinfo/qpe-sysinfo.control +++ b/noncore/settings/sysinfo/qpe-sysinfo.control @@ -1,9 +1,9 @@ -Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/qpe-logo.png pics/tux-logo.png +Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/opielogo.png pics/tux-logo.png Priority: optional Section: qpe/applications Maintainer: Warwick Allison <warwick@trolltech.com> Architecture: arm Version: $QPE_VERSION-3 Depends: qpe-base ($QPE_VERSION) Description: System Information dialog For the Qtopia environment. diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index d60a445..130a65c 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -45,49 +45,49 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QString v; t >> v; t >> v; t >> v; v = v.left( 20 ); kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; t >> v; kernelVersionString += tr( "Compiled by: " ) + v; file.close(); } QString palmtopVersionString; palmtopVersionString = tr( "<b>Qtopia</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( "qpe-logo" ); + QImage logo1 = Resource::loadImage( "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 ) ); QImage logo2 = Resource::loadImage( "tux-logo" ); |