| -rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 43 |
1 files changed, 31 insertions, 12 deletions
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 @@ -57,3 +57,4 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QFile file( "/proc/version" ); - if ( file.open( IO_ReadOnly ) ) { + if ( file.open( IO_ReadOnly ) ) + { QTextStream t( &file ); @@ -64,3 +65,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) kernelVersionString.append( v ); - kernelVersionString.append( "<p>" ); + kernelVersionString.append( "<br>" ); t >> v; @@ -72,5 +73,5 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) - QString palmtopVersionString = tr( "<b>Opie</b><p>Version: " ); + QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " ); palmtopVersionString.append( QPE_VERSION ); - palmtopVersionString.append( "<p>" ); + palmtopVersionString.append( "<br>" ); #ifdef QPE_VENDOR @@ -80,5 +81,5 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) #endif - palmtopVersionString.append( "<qt>"+ tr( "Compiled by: " ) ); + palmtopVersionString.append( tr( "Compiled by: " ) ); palmtopVersionString.append( builder ); - palmtopVersionString.append( "<p>" ); + palmtopVersionString.append( "<br>" ); palmtopVersionString.append( tr( "Built on: " ) ); @@ -87,3 +88,2 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) - QHBoxLayout *hb1 = new QHBoxLayout( vb ); @@ -126,4 +126,23 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) 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; @@ -131,3 +150,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) palmtopLogo3->setPixmap( logo3Pixmap ); - palmtopLogo3->setFixedSize( 60, 60 ); + palmtopLogo3->setFixedSize( 60, 100 ); hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); @@ -139,5 +158,5 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) systemString.append( ODevice::inst()->systemVersionString() ); - systemString.append( tr( "<p>Model: " ) ); + systemString.append( tr( "<br>Model: " ) ); systemString.append( ODevice::inst()->modelString() ); - systemString.append( tr( "<p>Vendor: " ) ); + systemString.append( tr( "<br>Vendor: " ) ); systemString.append( ODevice::inst()->vendorString() ); |