summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -108,49 +108,49 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
108 108
109 QLabel *linuxLogo = new QLabel( container ); 109 QLabel *linuxLogo = new QLabel( container );
110 QImage logo2 = Resource::loadImage( "logo/tux-logo" ); 110 QImage logo2 = Resource::loadImage( "logo/tux-logo" );
111 logo2 = logo2.smoothScale( 55, 60 ); 111 logo2 = logo2.smoothScale( 55, 60 );
112 QPixmap logo2Pixmap; 112 QPixmap logo2Pixmap;
113 logo2Pixmap.convertFromImage( logo2 ); 113 logo2Pixmap.convertFromImage( logo2 );
114 linuxLogo->setPixmap( logo2Pixmap ); 114 linuxLogo->setPixmap( logo2Pixmap );
115 linuxLogo->setFixedSize( 60, 60 ); 115 linuxLogo->setFixedSize( 60, 60 );
116 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 116 hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
117 117
118 QLabel *kernelVersion = new QLabel( container ); 118 QLabel *kernelVersion = new QLabel( container );
119 kernelVersion->setText( kernelVersionString ); 119 kernelVersion->setText( kernelVersionString );
120 hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 120 hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
121 121
122 122
123 QHBoxLayout *hb3 = new QHBoxLayout( vb ); 123 QHBoxLayout *hb3 = new QHBoxLayout( vb );
124 hb3->setSpacing( 2 ); 124 hb3->setSpacing( 2 );
125 125
126 QLabel *palmtopLogo3 = new QLabel( container ); 126 QLabel *palmtopLogo3 = new QLabel( container );
127 127
128 OModel model = ODevice::inst()->model(); 128 OModel model = ODevice::inst()->model();
129 QString modelPixmap = "sysinfo/"; 129 QString modelPixmap = "sysinfo/";
130 if ( model == Model_Zaurus_SLC7x0 ) 130 if ( model == Model_Zaurus_SLC7x0 )
131 modelPixmap += "zaurusc700"; 131 modelPixmap += "zaurusc700";
132 else if ( model >= Model_Zaurus_SLC7x0 && model <= Model_Zaurus_SLC7x0 ) 132 else if ( model >= Model_Zaurus_SL5000 && model <= Model_Zaurus_SLB600 )
133 modelPixmap += "zaurus5500"; 133 modelPixmap += "zaurus5500";
134 else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx ) 134 else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx )
135 modelPixmap += "ipaq3600"; 135 modelPixmap += "ipaq3600";
136 else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus ) 136 else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus )
137 modelPixmap += "simpad"; 137 modelPixmap += "simpad";
138 else 138 else
139 modelPixmap += "pda"; 139 modelPixmap += "pda";
140 140
141 QImage logo3 = Resource::loadImage( modelPixmap ); 141 QImage logo3 = Resource::loadImage( modelPixmap );
142 142
143 int width = logo3.width(); 143 int width = logo3.width();
144 int height = logo3.height(); 144 int height = logo3.height();
145 float aspect = float( height ) / width; 145 float aspect = float( height ) / width;
146 logo3 = logo3.smoothScale( 50, 50.0 * aspect ); 146 logo3 = logo3.smoothScale( 50, 50.0 * aspect );
147 147
148 QPixmap logo3Pixmap; 148 QPixmap logo3Pixmap;
149 logo3Pixmap.convertFromImage( logo3 ); 149 logo3Pixmap.convertFromImage( logo3 );
150 palmtopLogo3->setPixmap( logo3Pixmap ); 150 palmtopLogo3->setPixmap( logo3Pixmap );
151 palmtopLogo3->setFixedSize( 60, 100 ); 151 palmtopLogo3->setFixedSize( 60, 100 );
152 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); 152 hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
153 153
154 QString systemString = "<qt><b>"; 154 QString systemString = "<qt><b>";
155 systemString.append( ODevice::inst()->systemString() ); 155 systemString.append( ODevice::inst()->systemString() );
156 systemString.append( "</b>" ); 156 systemString.append( "</b>" );