Diffstat (limited to 'noncore/settings/sysinfo/versioninfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 79e7fea..658f371 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -34,49 +34,56 @@ #include "versioninfo.h" #include <opie/odevice.h> using namespace Opie; VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) : QWidget( parent, name, f ) { setMinimumSize( 200, 150 ); QVBoxLayout *vb = new QVBoxLayout( this, 4 ); - + QString kernelVersionString; QFile file( "/proc/version" ); if ( file.open( IO_ReadOnly ) ) { QTextStream t( &file ); QString v; t >> v; t >> v; t >> v; v = v.left( 20 ); - kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; + kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ); + kernelVersionString.append( v ); + kernelVersionString.append( "<p>" ); t >> v; - kernelVersionString += tr( "Compiled by: " ) + v; + kernelVersionString.append( tr( "Compiled by: " ) ); + kernelVersionString.append( v ); file.close(); } - QString palmtopVersionString; - palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>"; + QString palmtopVersionString = tr( "<b>Opie</b><p>Version: " ); + palmtopVersionString.append( QPE_VERSION ); + palmtopVersionString.append( "<p>" ); #ifdef QPE_VENDOR QString builder = QPE_VENDOR; #else QString builder = "Unknown"; -#endif - palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; - palmtopVersionString += tr( "Built on: " ) + __DATE__; +#endif + palmtopVersionString.append( tr( "Compiled by: " ) ); + palmtopVersionString.append( builder ); + palmtopVersionString.append( "<p>" ); + palmtopVersionString.append( tr( "Built on: " ) ); + palmtopVersionString.append( __DATE__ ); + - 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 ); @@ -87,47 +94,51 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) 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()->systemVersionString() - +tr("<p>Model: ") + ODevice::inst()->modelString() - +tr("<p>Vendor: ") + ODevice::inst()->vendorString(); + QString systemString = "<b>"; + systemString.append( ODevice::inst()->systemString() ); + systemString.append( "</b>" ); + systemString.append( tr( "<p>Version: " ) ); + systemString.append( ODevice::inst()->systemVersionString() ); + systemString.append( tr( "<p>Model: " ) ); + systemString.append( ODevice::inst()->modelString() ); + systemString.append( tr( "<p>Vendor: " ) ); + systemString.append( ODevice::inst()->vendorString() ); QLabel *systemVersion = new QLabel( this ); systemVersion->setText( systemString ); hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); QWhatsThis::add( this, tr( "This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device." ) ); } VersionInfo::~VersionInfo() { } |