From 390bda85524345791782317d559fea1d004c5306 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Wed, 03 Dec 2003 15:59:43 +0000 Subject: beautify the sysinfo version tab a bit --- (limited to 'noncore') diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index be24baa..b3462f5 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -50,41 +50,41 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) sv->setFrameStyle( QFrame::NoFrame ); QWidget *container = new QWidget( sv->viewport() ); sv->addChild( container ); - + QVBoxLayout *vb = new QVBoxLayout( container, 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( "Linux Kernel

Version: " ); - kernelVersionString.append( v ); - kernelVersionString.append( "

" ); - t >> v; - kernelVersionString.append( tr( "Compiled by: " ) ); - kernelVersionString.append( v ); - kernelVersionString.append(""); - file.close(); + if ( file.open( IO_ReadOnly ) ) + { + QTextStream t( &file ); + QString v; + t >> v; t >> v; t >> v; + v = v.left( 20 ); + kernelVersionString = "" + tr( "Linux Kernel

Version: " ); + kernelVersionString.append( v ); + kernelVersionString.append( "
" ); + t >> v; + kernelVersionString.append( tr( "Compiled by: " ) ); + kernelVersionString.append( v ); + kernelVersionString.append(""); + file.close(); } - QString palmtopVersionString = tr( "Opie

Version: " ); + QString palmtopVersionString = "" + tr( "Opie

Version: " ); palmtopVersionString.append( QPE_VERSION ); - palmtopVersionString.append( "

" ); + palmtopVersionString.append( "
" ); #ifdef QPE_VENDOR QString builder = QPE_VENDOR; #else QString builder = "Unknown"; #endif - palmtopVersionString.append( ""+ tr( "Compiled by: " ) ); + palmtopVersionString.append( tr( "Compiled by: " ) ); palmtopVersionString.append( builder ); - palmtopVersionString.append( "

" ); + palmtopVersionString.append( "
" ); palmtopVersionString.append( tr( "Built on: " ) ); palmtopVersionString.append( __DATE__ ); palmtopVersionString.append( "" ); - QHBoxLayout *hb1 = new QHBoxLayout( vb ); hb1->setSpacing( 2 ); @@ -124,12 +124,31 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) hb3->setSpacing( 2 ); QLabel *palmtopLogo3 = new QLabel( container ); - QImage logo3 = Resource::loadImage( "sysinfo/pda" ); - logo3 = logo3.smoothScale( 50, 55 ); + + OModel model = ODevice::inst()->model(); + QString modelPixmap = "sysinfo/"; + if ( model == Model_Zaurus_SLC7x0 ) + modelPixmap += "zaurusc700"; + else if ( model >= Model_Zaurus_SLC7x0 && model <= Model_Zaurus_SLC7x0 ) + modelPixmap += "zaurus5500"; + else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx ) + modelPixmap += "ipaq3600"; + else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus ) + modelPixmap += "simpad"; + else + modelPixmap += "pda"; + + QImage logo3 = Resource::loadImage( modelPixmap ); + + int width = logo3.width(); + int height = logo3.height(); + float aspect = float( height ) / width; + logo3 = logo3.smoothScale( 50, 50.0 * aspect ); + QPixmap logo3Pixmap; logo3Pixmap.convertFromImage( logo3 ); palmtopLogo3->setPixmap( logo3Pixmap ); - palmtopLogo3->setFixedSize( 60, 60 ); + palmtopLogo3->setFixedSize( 60, 100 ); hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); QString systemString = ""; @@ -137,9 +156,9 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) systemString.append( "" ); systemString.append( tr( "

Version: " ) ); systemString.append( ODevice::inst()->systemVersionString() ); - systemString.append( tr( "

Model: " ) ); + systemString.append( tr( "
Model: " ) ); systemString.append( ODevice::inst()->modelString() ); - systemString.append( tr( "

Vendor: " ) ); + systemString.append( tr( "
Vendor: " ) ); systemString.append( ODevice::inst()->vendorString() ); systemString.append(""); -- cgit v0.9.0.2