summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp19
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro2
-rw-r--r--share/sysinfo/results4
3 files changed, 12 insertions, 13 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 @@
** BenchmarkInfo
**
-** A benchmark for Qt/Embedded
+** A benchmark widget for Qt/Embedded
**
** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
@@ -64,7 +64,4 @@ extern "C"
#define TEST_DURATION 3
-#define BUFF_SIZE 8192
-#define FILE_SIZE 1024 * 1024 // 1Mb
-
//===========================================================================
@@ -143,4 +140,7 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
vb->addWidget( tests, 2 );
+ QHBoxLayout* hb = new QHBoxLayout( vb );
+ hb->addWidget( startButton, 2 );
+
QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
if ( f.open( IO_ReadOnly ) )
@@ -159,11 +159,8 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
}
- QHBoxLayout* hb = new QHBoxLayout( vb );
- hb->addWidget( new QLabel( tr( "Compare To:" ), this ) );
+ hb->addWidget( new QLabel( tr( "Compare:" ), this ) );
hb->addWidget( machineCombo, 2 );
connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
}
-
- vb->addWidget( startButton, 2 );
}
@@ -196,5 +193,5 @@ void BenchmarkInfo::machineActivated( int index )
void BenchmarkInfo::run()
{
- startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
+ startButton->setText( "> Don't touch! <" );
qApp->processEvents();
QTime t;
@@ -397,5 +394,5 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item
if ( readSpeed > 1024 )
{
- readSpeed = readSpeed / 1024.0;
+ readSpeed /= 1024.0;
readUnit = "MB/s";
}
@@ -404,5 +401,5 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item
if ( writeSpeed > 1024 )
{
- writeSpeed = writeSpeed / 1024.0;
+ writeSpeed /= 1024.0;
writeUnit = "MB/s";
}
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
DEFINES += UNIX
TARGET = sysinfo
-VERSION = 1.1.0
+VERSION = 1.1.1
include ( $(OPIEDIR)/include.pro )
diff --git a/share/sysinfo/results b/share/sysinfo/results
index b34fc99..b53f1ea 100644
--- a/share/sysinfo/results
+++ b/share/sysinfo/results
@@ -1,3 +1,3 @@
-<Choose a model>
+<Choose model>
n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a,n/a
Sharp SL-5500
@@ -29,2 +29,4 @@ not,yet,contributed,please,mail,to,opie@handhelds.org
SIEMENS SIMpad
not,yet,contributed,please,mail,to,opie@handhelds.org
+MASTERIA Beagle
+not,yet,contributed,please,mail,to,opie@handhelds.org