-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 19 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.pro | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index be7e4b6..fde032a 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | ** BenchmarkInfo | 2 | ** BenchmarkInfo |
3 | ** | 3 | ** |
4 | ** A benchmark for Qt/Embedded | 4 | ** A benchmark widget for Qt/Embedded |
5 | ** | 5 | ** |
6 | ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de> | 6 | ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de> |
@@ -64,7 +64,4 @@ extern "C" | |||
64 | #define TEST_DURATION 3 | 64 | #define TEST_DURATION 3 |
65 | 65 | ||
66 | #define BUFF_SIZE 8192 | ||
67 | #define FILE_SIZE 1024 * 1024 // 1Mb | ||
68 | |||
69 | //=========================================================================== | 66 | //=========================================================================== |
70 | 67 | ||
@@ -143,4 +140,7 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
143 | vb->addWidget( tests, 2 ); | 140 | vb->addWidget( tests, 2 ); |
144 | 141 | ||
142 | QHBoxLayout* hb = new QHBoxLayout( vb ); | ||
143 | hb->addWidget( startButton, 2 ); | ||
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 ) ) |
@@ -159,11 +159,8 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
159 | } | 159 | } |
160 | 160 | ||
161 | QHBoxLayout* hb = new QHBoxLayout( vb ); | 161 | hb->addWidget( new QLabel( tr( "Compare:" ), this ) ); |
162 | hb->addWidget( new QLabel( tr( "Compare To:" ), this ) ); | ||
163 | hb->addWidget( machineCombo, 2 ); | 162 | hb->addWidget( machineCombo, 2 ); |
164 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); | 163 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); |
165 | } | 164 | } |
166 | |||
167 | vb->addWidget( startButton, 2 ); | ||
168 | } | 165 | } |
169 | 166 | ||
@@ -196,5 +193,5 @@ void BenchmarkInfo::machineActivated( int index ) | |||
196 | void BenchmarkInfo::run() | 193 | void BenchmarkInfo::run() |
197 | { | 194 | { |
198 | startButton->setText( "> Don't touch! Running Tests! Don't touch! <" ); | 195 | startButton->setText( "> Don't touch! <" ); |
199 | qApp->processEvents(); | 196 | qApp->processEvents(); |
200 | QTime t; | 197 | QTime t; |
@@ -397,5 +394,5 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item | |||
397 | if ( readSpeed > 1024 ) | 394 | if ( readSpeed > 1024 ) |
398 | { | 395 | { |
399 | readSpeed = readSpeed / 1024.0; | 396 | readSpeed /= 1024.0; |
400 | readUnit = "MB/s"; | 397 | readUnit = "MB/s"; |
401 | } | 398 | } |
@@ -404,5 +401,5 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item | |||
404 | if ( writeSpeed > 1024 ) | 401 | if ( writeSpeed > 1024 ) |
405 | { | 402 | { |
406 | writeSpeed = writeSpeed / 1024.0; | 403 | writeSpeed /= 1024.0; |
407 | writeUnit = "MB/s"; | 404 | writeUnit = "MB/s"; |
408 | } | 405 | } |
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index 58f6eb0..dd35563 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro | |||
@@ -30,5 +30,5 @@ LIBS += -lqpe -lopiecore2 -lopieui2 | |||
30 | DEFINES += UNIX | 30 | DEFINES += UNIX |
31 | TARGET = sysinfo | 31 | TARGET = sysinfo |
32 | VERSION = 1.1.0 | 32 | VERSION = 1.1.1 |
33 | 33 | ||
34 | include ( $(OPIEDIR)/include.pro ) | 34 | include ( $(OPIEDIR)/include.pro ) |