| -rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 1f5739a..e92b36c 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -18,40 +18,44 @@ ** **********************************************************************/ #include <qpe/resource.h> #include <qpe/version.h> + #include <qlabel.h> #include <qpixmap.h> #include <qpainter.h> #include <qimage.h> #include <qtimer.h> #include <qfile.h> #include <qtextstream.h> #include <qlayout.h> #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>"; - t >> v; - kernelVersionString += tr( "Compiled by: " ) + v; - file.close(); + 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>"; + t >> v; + kernelVersionString += tr( "Compiled by: " ) + v; + file.close(); } QString palmtopVersionString; palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>"; #ifdef QPE_VENDOR QString builder = QPE_VENDOR; @@ -91,12 +95,35 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) 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 ); + + systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->modelString() + +tr("<p>Version: " ) + ODevice::inst()->vendorString() + +tr("<p>Model: ") + ODevice::inst()->systemString() + +tr("<p>Vendor: ") + ODevice::inst()->systemVersionString(); + + QLabel *systemVersion = new QLabel( this ); + systemVersion->setText( systemString ); + hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); + } VersionInfo::~VersionInfo() { } |