summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
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
@@ -91,86 +91,88 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
91 QLabel *palmtopLogo = new QLabel( container ); 91 QLabel *palmtopLogo = new QLabel( container );
92 QImage logo1 = Resource::loadImage( "logo/opielogo" ); 92 QImage logo1 = Resource::loadImage( "logo/opielogo" );
93 logo1 = logo1.smoothScale( 50, 55 ); 93 logo1 = logo1.smoothScale( 50, 55 );
94 QPixmap logo1Pixmap; 94 QPixmap logo1Pixmap;
95 logo1Pixmap.convertFromImage( logo1 ); 95 logo1Pixmap.convertFromImage( logo1 );
96 palmtopLogo->setPixmap( logo1Pixmap ); 96 palmtopLogo->setPixmap( logo1Pixmap );
97 palmtopLogo->setFixedSize( 60, 60 ); 97 palmtopLogo->setFixedSize( 60, 60 );
98 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); 98 hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
99 99
100 QLabel *palmtopVersion = new QLabel( container ); 100 QLabel *palmtopVersion = new QLabel( container );
101 palmtopVersion->setText( palmtopVersionString ); 101 palmtopVersion->setText( palmtopVersionString );
102 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 102 hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
103 103
104 104
105 QHBoxLayout *hb2 = new QHBoxLayout( vb ); 105 QHBoxLayout *hb2 = new QHBoxLayout( vb );
106 hb1->setSpacing( 2 ); 106 hb1->setSpacing( 2 );
107 107
108 QLabel *linuxLogo = new QLabel( container ); 108 QLabel *linuxLogo = new QLabel( container );
109 QImage logo2 = Resource::loadImage( "logo/tux-logo" ); 109 QImage logo2 = Resource::loadImage( "logo/tux-logo" );
110 logo2 = logo2.smoothScale( 55, 60 ); 110 logo2 = logo2.smoothScale( 55, 60 );
111 QPixmap logo2Pixmap; 111 QPixmap logo2Pixmap;
112 logo2Pixmap.convertFromImage( logo2 ); 112 logo2Pixmap.convertFromImage( logo2 );
113 linuxLogo->setPixmap( logo2Pixmap ); 113 linuxLogo->setPixmap( logo2Pixmap );
114 linuxLogo->setFixedSize( 60, 60 ); 114 linuxLogo->setFixedSize( 60, 60 );
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: " ) );
163 systemString.append( ODevice::inst()->vendorString() ); 165 systemString.append( ODevice::inst()->vendorString() );
164 systemString.append("</qt>"); 166 systemString.append("</qt>");
165 167
166 QLabel *systemVersion = new QLabel( container ); 168 QLabel *systemVersion = new QLabel( container );
167 systemVersion->setText( systemString ); 169 systemVersion->setText( systemString );
168 hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); 170 hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft );
169 171
170 QWhatsThis::add( this, tr( "This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device." ) ); 172 QWhatsThis::add( this, tr( "This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device." ) );
171} 173}
172 174
173VersionInfo::~VersionInfo() 175VersionInfo::~VersionInfo()
174{ 176{
175} 177}
176 178