author | llornkcor <llornkcor> | 2002-11-10 01:03:50 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-10 01:03:50 (UTC) |
commit | 12aa2d36cdd22cbde571716db4da302159c718fd (patch) (unidiff) | |
tree | eda27fb33bf0ca3491e8194cd56153ac74957314 | |
parent | dc4e5e557d8a506eb1461ff97e1fdcc7a9a91264 (diff) | |
download | opie-12aa2d36cdd22cbde571716db4da302159c718fd.zip opie-12aa2d36cdd22cbde571716db4da302159c718fd.tar.gz opie-12aa2d36cdd22cbde571716db4da302159c718fd.tar.bz2 |
added system,system version,model,and vendor strings
-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 | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpe/version.h> | 22 | #include <qpe/version.h> |
23 | 23 | ||
24 | |||
24 | #include <qlabel.h> | 25 | #include <qlabel.h> |
25 | #include <qpixmap.h> | 26 | #include <qpixmap.h> |
26 | #include <qpainter.h> | 27 | #include <qpainter.h> |
@@ -31,6 +32,9 @@ | |||
31 | #include <qlayout.h> | 32 | #include <qlayout.h> |
32 | #include "versioninfo.h" | 33 | #include "versioninfo.h" |
33 | 34 | ||
35 | #include <opie/odevice.h> | ||
36 | using namespace Opie; | ||
37 | |||
34 | VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | 38 | VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) |
35 | : QWidget( parent, name, f ) | 39 | : QWidget( parent, name, f ) |
36 | { | 40 | { |
@@ -41,14 +45,14 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
41 | QString kernelVersionString; | 45 | QString kernelVersionString; |
42 | QFile file( "/proc/version" ); | 46 | QFile file( "/proc/version" ); |
43 | if ( file.open( IO_ReadOnly ) ) { | 47 | if ( file.open( IO_ReadOnly ) ) { |
44 | QTextStream t( &file ); | 48 | QTextStream t( &file ); |
45 | QString v; | 49 | QString v; |
46 | t >> v; t >> v; t >> v; | 50 | t >> v; t >> v; t >> v; |
47 | v = v.left( 20 ); | 51 | v = v.left( 20 ); |
48 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; | 52 | kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; |
49 | t >> v; | 53 | t >> v; |
50 | kernelVersionString += tr( "Compiled by: " ) + v; | 54 | kernelVersionString += tr( "Compiled by: " ) + v; |
51 | file.close(); | 55 | file.close(); |
52 | } | 56 | } |
53 | 57 | ||
54 | QString palmtopVersionString; | 58 | QString palmtopVersionString; |
@@ -94,6 +98,29 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
94 | QLabel *kernelVersion = new QLabel( this ); | 98 | QLabel *kernelVersion = new QLabel( this ); |
95 | kernelVersion->setText( kernelVersionString ); | 99 | kernelVersion->setText( kernelVersionString ); |
96 | hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); | 100 | hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); |
101 | |||
102 | |||
103 | QHBoxLayout *hb3 = new QHBoxLayout( vb ); | ||
104 | hb3->setSpacing( 2 ); | ||
105 | |||
106 | QLabel *palmtopLogo3 = new QLabel( this ); | ||
107 | QImage logo3 = Resource::loadImage( "SystemInfo" ); | ||
108 | logo3 = logo3.smoothScale( 50, 55 ); | ||
109 | QPixmap logo3Pixmap; | ||
110 | logo3Pixmap.convertFromImage( logo3 ); | ||
111 | palmtopLogo3->setPixmap( logo3Pixmap ); | ||
112 | palmtopLogo3->setFixedSize( 60, 60 ); | ||
113 | hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); | ||
114 | |||
115 | systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->modelString() | ||
116 | +tr("<p>Version: " ) + ODevice::inst()->vendorString() | ||
117 | +tr("<p>Model: ") + ODevice::inst()->systemString() | ||
118 | +tr("<p>Vendor: ") + ODevice::inst()->systemVersionString(); | ||
119 | |||
120 | QLabel *systemVersion = new QLabel( this ); | ||
121 | systemVersion->setText( systemString ); | ||
122 | hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); | ||
123 | |||
97 | } | 124 | } |
98 | 125 | ||
99 | VersionInfo::~VersionInfo() | 126 | VersionInfo::~VersionInfo() |