author | llornkcor <llornkcor> | 2002-11-10 01:32:42 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-10 01:32:42 (UTC) |
commit | ea13a08c3f27b007b24743d8de066fbe52961534 (patch) (side-by-side diff) | |
tree | f29da7a007e1dc8090d45a36e60bae0a7c14aafd | |
parent | da41e6ab08fa453bff64d108a7d542f9af1e7ada (diff) | |
download | opie-ea13a08c3f27b007b24743d8de066fbe52961534.zip opie-ea13a08c3f27b007b24743d8de066fbe52961534.tar.gz opie-ea13a08c3f27b007b24743d8de066fbe52961534.tar.bz2 |
gak.. too much coffee.. wrong stuff in wrong places fix
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 863532e..a8db207 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -67,63 +67,64 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QHBoxLayout *hb1 = new QHBoxLayout( vb ); hb1->setSpacing( 2 ); QLabel *palmtopLogo = new QLabel( this ); QImage logo1 = Resource::loadImage( "logo/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 ); QImage logo2 = Resource::loadImage( "logo/tux-logo" ); 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 ); QHBoxLayout *hb3 = new QHBoxLayout( vb ); hb3->setSpacing( 2 ); QLabel *palmtopLogo3 = new QLabel( this ); QImage logo3 = Resource::loadImage( "SystemInfo" ); logo3 = logo3.smoothScale( 50, 55 ); QPixmap logo3Pixmap; logo3Pixmap.convertFromImage( logo3 ); palmtopLogo3->setPixmap( logo3Pixmap ); palmtopLogo3->setFixedSize( 60, 60 ); hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); +// QString systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->systemString() QString systemString = "<b>" + ODevice::inst()->systemString() + "</b>" - +tr("<p>Version: " ) + ODevice::inst()->vendorString() + +tr("<p>Version: " ) + ODevice::inst()->systemVersionString() +tr("<p>Model: ") + ODevice::inst()->modelString() - +tr("<p>Vendor: ") + ODevice::inst()->systemVersionString(); + +tr("<p>Vendor: ") + ODevice::inst()->vendorString(); QLabel *systemVersion = new QLabel( this ); systemVersion->setText( systemString ); hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); } VersionInfo::~VersionInfo() { } |