author | mickeyl <mickeyl> | 2004-03-05 21:37:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-05 21:37:50 (UTC) |
commit | 8851dc992ab535bde6cb417cafc44658953f495d (patch) (unidiff) | |
tree | 0a70bd4a768880e61c5af1ab142508c2bb81ecd0 /noncore/settings/sysinfo/benchmarkinfo.cpp | |
parent | b9d58b616102970872129b5bc2f55569910f5c03 (diff) | |
download | opie-8851dc992ab535bde6cb417cafc44658953f495d.zip opie-8851dc992ab535bde6cb417cafc44658953f495d.tar.gz opie-8851dc992ab535bde6cb417cafc44658953f495d.tar.bz2 |
use listview stuff from libopie2
miscellaneous cleanups
Diffstat (limited to 'noncore/settings/sysinfo/benchmarkinfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 2c68fd5..3c2c15f 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp | |||
@@ -17,6 +17,9 @@ | |||
17 | **********************************************************************/ | 17 | **********************************************************************/ |
18 | 18 | ||
19 | #include "benchmarkinfo.h" | ||
20 | |||
19 | /* OPIE */ | 21 | /* OPIE */ |
20 | #include <opie2/ostorageinfo.h> | 22 | #include <opie2/ostorageinfo.h> |
23 | #include <opie2/olistview.h> | ||
21 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
22 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
@@ -38,4 +41,5 @@ | |||
38 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
39 | #include <qtimer.h> | 42 | #include <qtimer.h> |
43 | #include <qwhatsthis.h> | ||
40 | 44 | ||
41 | /* STD */ | 45 | /* STD */ |
@@ -48,7 +52,4 @@ extern double round(double); | |||
48 | #endif | 52 | #endif |
49 | 53 | ||
50 | |||
51 | #include "benchmarkinfo.h" | ||
52 | |||
53 | extern "C" | 54 | extern "C" |
54 | { | 55 | { |
@@ -96,5 +97,8 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
96 | vb->setMargin( 4 ); | 97 | vb->setMargin( 4 ); |
97 | 98 | ||
98 | tests = new QListView( this ); | 99 | tests = new OListView( this ); |
100 | QWhatsThis::add( tests->viewport(), tr( "This area shows the available tests, the results for which the tests " | ||
101 | "have been performed, and comparison values for one selected device. " | ||
102 | "Use the checkboxes to define which tests you want to perform." ) ); | ||
99 | tests->setMargin( 0 ); | 103 | tests->setMargin( 0 ); |
100 | tests->addColumn( tr( "Tests" ) ); | 104 | tests->addColumn( tr( "Tests" ) ); |
@@ -103,38 +107,39 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
103 | tests->setShowSortIndicator( true ); | 107 | tests->setShowSortIndicator( true ); |
104 | 108 | ||
105 | test_alu = new QCheckListItem( tests, tr( "1. Integer Arithmetic " ), QCheckListItem::CheckBox ); | 109 | test_alu = new OCheckListItem( tests, tr( "1. Integer Arithmetic " ), OCheckListItem::CheckBox ); |
106 | test_fpu = new QCheckListItem( tests, tr( "2. Floating Point Unit " ), QCheckListItem::CheckBox ); | 110 | test_fpu = new OCheckListItem( tests, tr( "2. Floating Point Unit " ), OCheckListItem::CheckBox ); |
107 | test_txt = new QCheckListItem( tests, tr( "3. Text Rendering " ), QCheckListItem::CheckBox ); | 111 | test_txt = new OCheckListItem( tests, tr( "3. Text Rendering " ), OCheckListItem::CheckBox ); |
108 | test_gfx = new QCheckListItem( tests, tr( "4. Gfx Rendering " ), QCheckListItem::CheckBox ); | 112 | test_gfx = new OCheckListItem( tests, tr( "4. Gfx Rendering " ), OCheckListItem::CheckBox ); |
109 | test_ram = new QCheckListItem( tests, tr( "5. RAM Performance " ), QCheckListItem::CheckBox ); | 113 | test_ram = new OCheckListItem( tests, tr( "5. RAM Performance " ), OCheckListItem::CheckBox ); |
110 | test_sd = new QCheckListItem( tests, tr( "6. SD Card Performance " ), QCheckListItem::CheckBox ); | 114 | test_sd = new OCheckListItem( tests, tr( "6. SD Card Performance " ), OCheckListItem::CheckBox ); |
111 | test_cf = new QCheckListItem( tests, tr( "7. CF Card Performance " ), QCheckListItem::CheckBox ); | 115 | test_cf = new OCheckListItem( tests, tr( "7. CF Card Performance " ), OCheckListItem::CheckBox ); |
112 | 116 | ||
113 | test_alu->setText( 1, "n/a" ); | 117 | test_alu->setText( 1, "n/a" ); |
114 | test_fpu->setText( 1, "n/a" ); | 118 | test_fpu->setText( 1, "n/a" ); |
115 | test_txt->setText( 1, "n/a" ); | 119 | test_txt->setText( 1, "n/a" ); |
116 | test_gfx->setText( 1, "n/a" ); | 120 | test_gfx->setText( 1, "n/a" ); |
117 | test_ram->setText( 1, "n/a" ); | 121 | test_ram->setText( 1, "n/a" ); |
118 | test_sd->setText( 1, "n/a" ); | 122 | test_sd->setText( 1, "n/a" ); |
119 | test_cf->setText( 1, "n/a" ); | 123 | test_cf->setText( 1, "n/a" ); |
120 | 124 | ||
121 | test_alu->setText( 2, "n/a" ); | 125 | test_alu->setText( 2, "n/a" ); |
122 | test_fpu->setText( 2, "n/a" ); | 126 | test_fpu->setText( 2, "n/a" ); |
123 | test_txt->setText( 2, "n/a" ); | 127 | test_txt->setText( 2, "n/a" ); |
124 | test_gfx->setText( 2, "n/a" ); | 128 | test_gfx->setText( 2, "n/a" ); |
125 | test_ram->setText( 2, "n/a" ); | 129 | test_ram->setText( 2, "n/a" ); |
126 | test_sd->setText( 2, "n/a" ); | 130 | test_sd->setText( 2, "n/a" ); |
127 | test_cf->setText( 2, "n/a" ); | 131 | test_cf->setText( 2, "n/a" ); |
128 | 132 | ||
129 | startButton = new QPushButton( tr( "&Start Tests!" ), this ); | 133 | startButton = new QPushButton( tr( "&Start Tests!" ), this ); |
134 | QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) ); | ||
130 | connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); | 135 | connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) ); |
131 | |||
132 | vb->addWidget( tests, 2 ); | 136 | vb->addWidget( tests, 2 ); |
133 | 137 | ||
134 | QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" ); | 138 | QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" ); |
135 | if ( f.open( IO_ReadOnly ) ) | 139 | if ( f.open( IO_ReadOnly ) ) |
136 | { | 140 | { |
137 | machineCombo = new QComboBox( this ); | 141 | machineCombo = new QComboBox( this ); |
138 | 142 | QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) ); | |
143 | |||
139 | QTextStream ts( &f ); | 144 | QTextStream ts( &f ); |
140 | while( !ts.eof() ) | 145 | while( !ts.eof() ) |
@@ -146,5 +151,5 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
146 | machineCombo->insertItem( machline ); | 151 | machineCombo->insertItem( machline ); |
147 | } | 152 | } |
148 | 153 | ||
149 | QHBoxLayout* hb = new QHBoxLayout( vb ); | 154 | QHBoxLayout* hb = new QHBoxLayout( vb ); |
150 | hb->addWidget( new QLabel( tr( "Compare To:" ), this ) ); | 155 | hb->addWidget( new QLabel( tr( "Compare To:" ), this ) ); |
@@ -152,5 +157,5 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags ) | |||
152 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); | 157 | connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) ); |
153 | } | 158 | } |
154 | 159 | ||
155 | vb->addWidget( startButton, 2 ); | 160 | vb->addWidget( startButton, 2 ); |
156 | } | 161 | } |
@@ -333,5 +338,5 @@ int BenchmarkInfo::gfxRendering( int seconds ) | |||
333 | } | 338 | } |
334 | 339 | ||
335 | void BenchmarkInfo::performFileTest( const QString& fname, QCheckListItem* item ) | 340 | void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item ) |
336 | { | 341 | { |
337 | QTime time; | 342 | QTime time; |