summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-23 09:04:41 (UTC)
committer zecke <zecke>2003-08-23 09:04:41 (UTC)
commit3dff9b4751fa9b63ddfd2527ec68add7fafb599d (patch) (side-by-side diff)
treec55f593f50f2949ae8ce6e1e374579a238487f8b
parenta8859fac97c0b3255a261221d2b31ebedb56075c (diff)
downloadopie-3dff9b4751fa9b63ddfd2527ec68add7fafb599d.zip
opie-3dff9b4751fa9b63ddfd2527ec68add7fafb599d.tar.gz
opie-3dff9b4751fa9b63ddfd2527ec68add7fafb599d.tar.bz2
Forward port of the label fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 801af29..be24baa 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -57,35 +57,37 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
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: " );
+ kernelVersionString = "<qt>"+tr( "<b>Linux Kernel</b><p>Version: " );
kernelVersionString.append( v );
kernelVersionString.append( "<p>" );
t >> v;
kernelVersionString.append( tr( "Compiled by: " ) );
kernelVersionString.append( v );
+ kernelVersionString.append("</qt>");
file.close();
}
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.append( tr( "Compiled by: " ) );
+ palmtopVersionString.append( "<qt>"+ tr( "Compiled by: " ) );
palmtopVersionString.append( builder );
palmtopVersionString.append( "<p>" );
palmtopVersionString.append( tr( "Built on: " ) );
- palmtopVersionString.append( __DATE__ );
-
+ palmtopVersionString.append( __DATE__ );
+ palmtopVersionString.append( "</qt>" );
+
QHBoxLayout *hb1 = new QHBoxLayout( vb );
hb1->setSpacing( 2 );
QLabel *palmtopLogo = new QLabel( container );
QImage logo1 = Resource::loadImage( "logo/opielogo" );
@@ -127,21 +129,22 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
QPixmap logo3Pixmap;
logo3Pixmap.convertFromImage( logo3 );
palmtopLogo3->setPixmap( logo3Pixmap );
palmtopLogo3->setFixedSize( 60, 60 );
hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
- QString systemString = "<b>";
+ QString systemString = "<qt><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() );
+ systemString.append("</qt>");
QLabel *systemVersion = new QLabel( container );
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." ) );