summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-06 03:03:59 (UTC)
committer mickeyl <mickeyl>2003-12-06 03:03:59 (UTC)
commit65ae9068fd4e489ecd7ac4d44d312951894f240a (patch) (side-by-side diff)
tree334a0e44168a307c2926586a4a0ca281a51869ce
parent650d6e3ec023759f1c6566d7562857d8dd0e8028 (diff)
downloadopie-65ae9068fd4e489ecd7ac4d44d312951894f240a.zip
opie-65ae9068fd4e489ecd7ac4d44d312951894f240a.tar.gz
opie-65ae9068fd4e489ecd7ac4d44d312951894f240a.tar.bz2
fix 5x00 detection *yawn*
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index b3462f5..abb8d7f 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -84,92 +84,92 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
palmtopVersionString.append( "<br>" );
palmtopVersionString.append( tr( "Built on: " ) );
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" );
logo1 = logo1.smoothScale( 50, 55 );
QPixmap logo1Pixmap;
logo1Pixmap.convertFromImage( logo1 );
palmtopLogo->setPixmap( logo1Pixmap );
palmtopLogo->setFixedSize( 60, 60 );
hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
QLabel *palmtopVersion = new QLabel( container );
palmtopVersion->setText( palmtopVersionString );
hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
QHBoxLayout *hb2 = new QHBoxLayout( vb );
hb1->setSpacing( 2 );
QLabel *linuxLogo = new QLabel( container );
QImage logo2 = Resource::loadImage( "logo/tux-logo" );
logo2 = logo2.smoothScale( 55, 60 );
QPixmap logo2Pixmap;
logo2Pixmap.convertFromImage( logo2 );
linuxLogo->setPixmap( logo2Pixmap );
linuxLogo->setFixedSize( 60, 60 );
hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
QLabel *kernelVersion = new QLabel( container );
kernelVersion->setText( kernelVersionString );
hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
QHBoxLayout *hb3 = new QHBoxLayout( vb );
hb3->setSpacing( 2 );
QLabel *palmtopLogo3 = new QLabel( container );
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 )
+ else if ( model >= Model_Zaurus_SL5000 && model <= Model_Zaurus_SLB600 )
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, 100 );
hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
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( "<br>Model: " ) );
systemString.append( ODevice::inst()->modelString() );
systemString.append( tr( "<br>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." ) );
}
VersionInfo::~VersionInfo()
{
}