summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-11-04 14:13:05 (UTC)
committer mickeyl <mickeyl>2004-11-04 14:13:05 (UTC)
commit18684ddb43d4d79304dee6b20ab62513ee50b883 (patch) (unidiff)
tree20c765170a62da7e10eb57a47dd5f68db41b7cc2
parent34abbfc57a28dc2d08f71e8e29562659aa3942ac (diff)
downloadopie-18684ddb43d4d79304dee6b20ab62513ee50b883.zip
opie-18684ddb43d4d79304dee6b20ab62513ee50b883.tar.gz
opie-18684ddb43d4d79304dee6b20ab62513ee50b883.tar.bz2
tiny layout tweak
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp2
-rw-r--r--share/sysinfo/results2
2 files changed, 1 insertions, 3 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 060185a..2a269b8 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -128,66 +128,64 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
128 test_fpu->setText( 2, "n/a" ); 128 test_fpu->setText( 2, "n/a" );
129 test_txt->setText( 2, "n/a" ); 129 test_txt->setText( 2, "n/a" );
130 test_gfx->setText( 2, "n/a" ); 130 test_gfx->setText( 2, "n/a" );
131 test_ram->setText( 2, "n/a" ); 131 test_ram->setText( 2, "n/a" );
132#ifndef QT_QWS_RAMSES 132#ifndef QT_QWS_RAMSES
133 test_sd->setText( 2, "n/a" ); 133 test_sd->setText( 2, "n/a" );
134 test_cf->setText( 2, "n/a" ); 134 test_cf->setText( 2, "n/a" );
135#endif 135#endif
136 136
137 startButton = new QPushButton( tr( "&Start Tests!" ), this ); 137 startButton = new QPushButton( tr( "&Start Tests!" ), this );
138 QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) ); 138 QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
139 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); 139 connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
140 vb->addWidget( tests, 2 ); 140 vb->addWidget( tests, 2 );
141 141
142 QHBoxLayout* hb = new QHBoxLayout( vb ); 142 QHBoxLayout* hb = new QHBoxLayout( vb );
143 hb->addWidget( startButton, 2 ); 143 hb->addWidget( startButton, 2 );
144 144
145 QFile f( QPEApplication::qpeDir() + "share/sysinfo/results" ); 145 QFile f( QPEApplication::qpeDir() + "share/sysinfo/results" );
146 if ( f.open( IO_ReadOnly ) ) 146 if ( f.open( IO_ReadOnly ) )
147 { 147 {
148 machineCombo = new QComboBox( this ); 148 machineCombo = new QComboBox( this );
149 QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) ); 149 QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
150 150
151 QTextStream ts( &f ); 151 QTextStream ts( &f );
152 while( !ts.eof() ) 152 while( !ts.eof() )
153 { 153 {
154 QString machline = ts.readLine(); 154 QString machline = ts.readLine();
155 odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl; 155 odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl;
156 QString resline = ts.readLine(); 156 QString resline = ts.readLine();
157 machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) ); 157 machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
158 machineCombo->insertItem( machline ); 158 machineCombo->insertItem( machline );
159 } 159 }
160
161 hb->addWidget( new QLabel( tr( "Compare:" ), this ) );
162 hb->addWidget( machineCombo, 2 ); 160 hb->addWidget( machineCombo, 2 );
163 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); 161 connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
164 } 162 }
165} 163}
166 164
167 165
168BenchmarkInfo::~BenchmarkInfo() 166BenchmarkInfo::~BenchmarkInfo()
169{} 167{}
170 168
171 169
172void BenchmarkInfo::machineActivated( int index ) 170void BenchmarkInfo::machineActivated( int index )
173{ 171{
174 QStringList* results = machines[ machineCombo->text( index ) ]; 172 QStringList* results = machines[ machineCombo->text( index ) ];
175 if ( !results ) 173 if ( !results )
176 { 174 {
177 odebug << "sysinfo: no results available." << oendl; 175 odebug << "sysinfo: no results available." << oendl;
178 return; 176 return;
179 } 177 }
180 QStringList::Iterator it = results->begin(); 178 QStringList::Iterator it = results->begin();
181 test_alu->setText( 2, *(it++) ); 179 test_alu->setText( 2, *(it++) );
182 test_fpu->setText( 2, *(it++) ); 180 test_fpu->setText( 2, *(it++) );
183 test_txt->setText( 2, *(it++) ); 181 test_txt->setText( 2, *(it++) );
184 test_gfx->setText( 2, *(it++) ); 182 test_gfx->setText( 2, *(it++) );
185 test_ram->setText( 2, *(it++) ); 183 test_ram->setText( 2, *(it++) );
186#ifndef QT_QWS_RAMSES 184#ifndef QT_QWS_RAMSES
187 test_sd->setText( 2, *(it++) ); 185 test_sd->setText( 2, *(it++) );
188 test_cf->setText( 2, *(it++) ); 186 test_cf->setText( 2, *(it++) );
189#endif 187#endif
190} 188}
191 189
192 190
193void BenchmarkInfo::run() 191void BenchmarkInfo::run()
diff --git a/share/sysinfo/results b/share/sysinfo/results
index d1fc6a8..7b7a587 100644
--- a/share/sysinfo/results
+++ b/share/sysinfo/results
@@ -1,32 +1,32 @@
1<Choose model> 1<Compare to>
2n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a 2n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a
3Sharp SL-5500 3Sharp SL-5500
4240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec 4240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec
5Sharp SL-5600 5Sharp SL-5600
6not,yet,contributed,please,mail,to,opie@handhelds.org 6not,yet,contributed,please,mail,to,opie@handhelds.org
7Sharp C-700 7Sharp C-700
8not,yet,contributed,please,mail,to,opie@handhelds.org 8not,yet,contributed,please,mail,to,opie@handhelds.org
9Sharp C-750 9Sharp C-750
10490677 dhrys,2.452 sec,437 char/sec,1396 gops/sec,132.061 kb/sec,129.752 kb/sec,n/a 10490677 dhrys,2.452 sec,437 char/sec,1396 gops/sec,132.061 kb/sec,129.752 kb/sec,n/a
11Sharp C-760 11Sharp C-760
12not,yet,contributed,please,mail,to,opie@handhelds.org 12not,yet,contributed,please,mail,to,opie@handhelds.org
13Sharp C-860 13Sharp C-860
14not,yet,contributed,please,mail,to,opie@handhelds.org 14not,yet,contributed,please,mail,to,opie@handhelds.org
15HP iPAQ 36xx 15HP iPAQ 36xx
16not,yet,contributed,please,mail,to,opie@handhelds.org 16not,yet,contributed,please,mail,to,opie@handhelds.org
17HP iPAQ 37xx 17HP iPAQ 37xx
18not,yet,contributed,please,mail,to,opie@handhelds.org 18not,yet,contributed,please,mail,to,opie@handhelds.org
19HP iPAQ 38xx 19HP iPAQ 38xx
20234880 dhrys,42.37 sec,418 char/sec,1788 gops/sec,51.6911 kb/sec,31.1029 kb/sec,untested 20234880 dhrys,42.37 sec,418 char/sec,1788 gops/sec,51.6911 kb/sec,31.1029 kb/sec,untested
21HP iPAQ 54xx 21HP iPAQ 54xx
22not,yet,contributed,please,mail,to,opie@handhelds.org 22not,yet,contributed,please,mail,to,opie@handhelds.org
23HP iPAQ 55xx 23HP iPAQ 55xx
24not,yet,contributed,please,mail,to,opie@handhelds.org 24not,yet,contributed,please,mail,to,opie@handhelds.org
25HP Jornada 5x0 25HP Jornada 5x0
26not,yet,contributed,please,mail,to,opie@handhelds.org 26not,yet,contributed,please,mail,to,opie@handhelds.org
27M&N MNCI 27M&N MNCI
28323677 dhrys,23.65 secs,183 char/sec,2142 gops/sec,50.40 MB/sec;19.24 MB/sec,n/a,n/a 28323677 dhrys,23.65 secs,183 char/sec,2142 gops/sec,50.40 MB/sec;19.24 MB/sec,n/a,n/a
29SIEMENS SIMpad 29SIEMENS SIMpad
30not,yet,contributed,please,mail,to,opie@handhelds.org 30not,yet,contributed,please,mail,to,opie@handhelds.org
31MASTERIA Beagle 31MASTERIA Beagle
32not,yet,contributed,please,mail,to,opie@handhelds.org 32not,yet,contributed,please,mail,to,opie@handhelds.org