Diffstat (limited to 'noncore/settings/sysinfo/versioninfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index d8fd7fa..5736faa 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp | |||
@@ -115,48 +115,50 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
115 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); | 115 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); |
116 | 116 | ||
117 | QLabel *kernelVersion = new QLabel( container ); | 117 | QLabel *kernelVersion = new QLabel( container ); |
118 | kernelVersion->setText( kernelVersionString ); | 118 | kernelVersion->setText( kernelVersionString ); |
119 | hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); | 119 | hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft ); |
120 | 120 | ||
121 | 121 | ||
122 | QHBoxLayout *hb3 = new QHBoxLayout( vb ); | 122 | QHBoxLayout *hb3 = new QHBoxLayout( vb ); |
123 | hb3->setSpacing( 2 ); | 123 | hb3->setSpacing( 2 ); |
124 | 124 | ||
125 | QLabel *palmtopLogo3 = new QLabel( container ); | 125 | QLabel *palmtopLogo3 = new QLabel( container ); |
126 | 126 | ||
127 | OModel model = ODevice::inst()->model(); | 127 | OModel model = ODevice::inst()->model(); |
128 | QString modelPixmap = "sysinfo/"; | 128 | QString modelPixmap = "sysinfo/"; |
129 | if ( model == Model_Zaurus_SLC7x0 ) | 129 | if ( model == Model_Zaurus_SLC7x0 ) |
130 | modelPixmap += "zaurusc700"; | 130 | modelPixmap += "zaurusc700"; |
131 | else if ( model >= Model_Zaurus_SL5000 && model <= Model_Zaurus_SLB600 ) | 131 | else if ( model >= Model_Zaurus_SL5000 && model <= Model_Zaurus_SLB600 ) |
132 | modelPixmap += "zaurus5500"; | 132 | modelPixmap += "zaurus5500"; |
133 | else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx ) | 133 | else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx ) |
134 | modelPixmap += "ipaq3600"; | 134 | modelPixmap += "ipaq3600"; |
135 | else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus ) | 135 | else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus ) |
136 | modelPixmap += "simpad"; | 136 | modelPixmap += "simpad"; |
137 | else if ( model == Model_Jornada_56x ) | 137 | else if ( model == Model_Jornada_56x ) |
138 | modelPixmap += "jornada56x"; | 138 | modelPixmap += "jornada56x"; |
139 | else if ( model == Model_Jornada_720 ) | ||
140 | modelPixmap += "jornada720"; | ||
139 | else | 141 | else |
140 | modelPixmap += "pda"; | 142 | modelPixmap += "pda"; |
141 | 143 | ||
142 | QImage logo3 = Resource::loadImage( modelPixmap ); | 144 | QImage logo3 = Resource::loadImage( modelPixmap ); |
143 | 145 | ||
144 | int width = logo3.width(); | 146 | int width = logo3.width(); |
145 | int height = logo3.height(); | 147 | int height = logo3.height(); |
146 | float aspect = float( height ) / width; | 148 | float aspect = float( height ) / width; |
147 | logo3 = logo3.smoothScale( 50, 50.0 * aspect ); | 149 | logo3 = logo3.smoothScale( 50, 50.0 * aspect ); |
148 | 150 | ||
149 | QPixmap logo3Pixmap; | 151 | QPixmap logo3Pixmap; |
150 | logo3Pixmap.convertFromImage( logo3 ); | 152 | logo3Pixmap.convertFromImage( logo3 ); |
151 | palmtopLogo3->setPixmap( logo3Pixmap ); | 153 | palmtopLogo3->setPixmap( logo3Pixmap ); |
152 | palmtopLogo3->setFixedSize( 60, 100 ); | 154 | palmtopLogo3->setFixedSize( 60, 100 ); |
153 | hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); | 155 | hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft ); |
154 | 156 | ||
155 | QString systemString = "<qt><b>"; | 157 | QString systemString = "<qt><b>"; |
156 | systemString.append( ODevice::inst()->systemString() ); | 158 | systemString.append( ODevice::inst()->systemString() ); |
157 | systemString.append( "</b>" ); | 159 | systemString.append( "</b>" ); |
158 | systemString.append( tr( "<p>Version: " ) ); | 160 | systemString.append( tr( "<p>Version: " ) ); |
159 | systemString.append( ODevice::inst()->systemVersionString() ); | 161 | systemString.append( ODevice::inst()->systemVersionString() ); |
160 | systemString.append( tr( "<br>Model: " ) ); | 162 | systemString.append( tr( "<br>Model: " ) ); |
161 | systemString.append( ODevice::inst()->modelString() ); | 163 | systemString.append( ODevice::inst()->modelString() ); |
162 | systemString.append( tr( "<br>Vendor: " ) ); | 164 | systemString.append( tr( "<br>Vendor: " ) ); |