summaryrefslogtreecommitdiff
path: root/noncore/settings/sysinfo/versioninfo.cpp
Unidiff
Diffstat (limited to 'noncore/settings/sysinfo/versioninfo.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp33
1 files changed, 22 insertions, 11 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
@@ -51,21 +51,28 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
51 QString v; 51 QString v;
52 t >> v; t >> v; t >> v; 52 t >> v; t >> v; t >> v;
53 v = v.left( 20 ); 53 v = v.left( 20 );
54 kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " ) + v + "<p>"; 54 kernelVersionString = tr( "<b>Linux Kernel</b><p>Version: " );
55 kernelVersionString.append( v );
56 kernelVersionString.append( "<p>" );
55 t >> v; 57 t >> v;
56 kernelVersionString += tr( "Compiled by: " ) + v; 58 kernelVersionString.append( tr( "Compiled by: " ) );
59 kernelVersionString.append( v );
57 file.close(); 60 file.close();
58 } 61 }
59 62
60 QString palmtopVersionString; 63 QString palmtopVersionString = tr( "<b>Opie</b><p>Version: " );
61 palmtopVersionString = tr( "<b>Opie</b><p>Version: " ) + QPE_VERSION + "<p>"; 64 palmtopVersionString.append( QPE_VERSION );
65 palmtopVersionString.append( "<p>" );
62#ifdef QPE_VENDOR 66#ifdef QPE_VENDOR
63 QString builder = QPE_VENDOR; 67 QString builder = QPE_VENDOR;
64#else 68#else
65 QString builder = "Unknown"; 69 QString builder = "Unknown";
66#endif 70#endif
67 palmtopVersionString += tr( "Compiled by: " ) + builder + "<p>"; 71 palmtopVersionString.append( tr( "Compiled by: " ) );
68 palmtopVersionString += tr( "Built on: " ) + __DATE__; 72 palmtopVersionString.append( builder );
73 palmtopVersionString.append( "<p>" );
74 palmtopVersionString.append( tr( "Built on: " ) );
75 palmtopVersionString.append( __DATE__ );
69 76
70 77
71 QHBoxLayout *hb1 = new QHBoxLayout( vb ); 78 QHBoxLayout *hb1 = new QHBoxLayout( vb );
@@ -114,11 +121,15 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
114 palmtopLogo3->setFixedSize( 60, 60 ); 121 palmtopLogo3->setFixedSize( 60, 60 );
115 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); 122 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
116 123
117// QString systemString = tr( "<b>System</b><p>System: ") + ODevice::inst()->systemString() 124 QString systemString = "<b>";
118 QString systemString = "<b>"+ ODevice::inst()->systemString()+"</b>" 125 systemString.append( ODevice::inst()->systemString() );
119 +tr("<p>Version: " ) + ODevice::inst()->systemVersionString() 126 systemString.append( "</b>" );
120 +tr("<p>Model: ") + ODevice::inst()->modelString() 127 systemString.append( tr( "<p>Version: " ) );
121 +tr("<p>Vendor: ") + ODevice::inst()->vendorString(); 128 systemString.append( ODevice::inst()->systemVersionString() );
129 systemString.append( tr( "<p>Model: " ) );
130 systemString.append( ODevice::inst()->modelString() );
131 systemString.append( tr( "<p>Vendor: " ) );
132 systemString.append( ODevice::inst()->vendorString() );
122 133
123 QLabel *systemVersion = new QLabel( this ); 134 QLabel *systemVersion = new QLabel( this );
124 systemVersion->setText( systemString ); 135 systemVersion->setText( systemString );