summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-09-15 12:39:17 (UTC)
committer mickeyl <mickeyl>2004-09-15 12:39:17 (UTC)
commit3440a45f736fbdddf787c81664e3dbb74f3e4b8b (patch) (side-by-side diff)
tree6786fa4990a2b9c76cb3a22a68c25dc542db2de6
parentbb7cd69b07a5d6e00a29b23dc8bfebc511d34891 (diff)
downloadopie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.zip
opie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.tar.gz
opie-3440a45f736fbdddf787c81664e3dbb74f3e4b8b.tar.bz2
minor adjustments to button layout. release 1.1.1
Diffstat (more/less context) (ignore 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
@@ -1,10 +1,10 @@
/**********************************************************************
** BenchmarkInfo
**
-** A benchmark for Qt/Embedded
+** A benchmark widget for Qt/Embedded
**
** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
@@ -60,15 +60,12 @@ extern "C"
double dhry_main( int );
}
#define DHRYSTONE_RUNS 20000000
#define TEST_DURATION 3
-#define BUFF_SIZE 8192
-#define FILE_SIZE 1024 * 1024 // 1Mb
-
//===========================================================================
class BenchmarkPaintWidget : public QWidget
{
public:
BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
@@ -139,12 +136,15 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
startButton = new QPushButton( tr( "&Start Tests!" ), this );
QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
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 ) )
{
machineCombo = new QComboBox( this );
QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
@@ -155,19 +155,16 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
odebug << "sysinfo: parsing benchmark results for '" << machline << "'" << oendl;
QString resline = ts.readLine();
machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
machineCombo->insertItem( machline );
}
- 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 );
}
BenchmarkInfo::~BenchmarkInfo()
{}
@@ -192,13 +189,13 @@ void BenchmarkInfo::machineActivated( int index )
#endif
}
void BenchmarkInfo::run()
{
- startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
+ startButton->setText( "> Don't touch! <" );
qApp->processEvents();
QTime t;
if ( test_alu->isOn() )
{
int d = round( dhry_main( DHRYSTONE_RUNS ) );
@@ -393,19 +390,19 @@ void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item
QFile::remove( filename );
double readSpeed = FILE_TEST_COUNT / ( read / 1000.0 );
QString readUnit = "kB/s";
if ( readSpeed > 1024 )
{
- readSpeed = readSpeed / 1024.0;
+ readSpeed /= 1024.0;
readUnit = "MB/s";
}
double writeSpeed = FILE_TEST_COUNT / ( write / 1000.0 );
QString writeUnit = "kb/s";
if ( writeSpeed > 1024 )
{
- writeSpeed = writeSpeed / 1024.0;
+ writeSpeed /= 1024.0;
writeUnit = "MB/s";
}
item->setText( 1, QString().sprintf( "%.2f %s, %.2f %s", readSpeed, readUnit.latin1(), writeSpeed, writeUnit.latin1() ) );
item->setOn( false );
}
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
@@ -26,9 +26,9 @@ SOURCES = main.cpp \
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
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,7 +1,7 @@
-<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
240010 dhrys,41.498 sec,88 char/sec,1786 gops/sec,50.123 kb/sec,41.7329 kb/sec,105.873 kb/sec
Sharp SL-5600
not,yet,contributed,please,mail,to,opie@handhelds.org
Sharp C-700
@@ -25,6 +25,8 @@ not,yet,contributed,please,mail,to,opie@handhelds.org
HP Jornada 5x0
not,yet,contributed,please,mail,to,opie@handhelds.org
M&N Ramses
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