summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp53
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.h22
-rw-r--r--noncore/settings/sysinfo/detail.cpp4
-rw-r--r--noncore/settings/sysinfo/detail.h6
-rw-r--r--noncore/settings/sysinfo/modulesinfo.cpp22
-rw-r--r--noncore/settings/sysinfo/modulesinfo.h8
-rw-r--r--noncore/settings/sysinfo/processinfo.cpp24
-rw-r--r--noncore/settings/sysinfo/processinfo.h11
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp9
9 files changed, 84 insertions, 75 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
@@ -18,4 +18,7 @@
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>
@@ -39,2 +42,3 @@
39#include <qtimer.h> 42#include <qtimer.h>
43#include <qwhatsthis.h>
40 44
@@ -49,5 +53,2 @@ extern double round(double);
49 53
50
51#include "benchmarkinfo.h"
52
53extern "C" 54extern "C"
@@ -97,3 +98,6 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
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 );
@@ -104,12 +108,12 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
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" );
@@ -118,6 +122,6 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
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" );
@@ -126,9 +130,9 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
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" );
@@ -137,3 +141,4 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
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 );
@@ -147,3 +152,3 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
147 } 152 }
148 153
149 QHBoxLayout* hb = new QHBoxLayout( vb ); 154 QHBoxLayout* hb = new QHBoxLayout( vb );
@@ -153,3 +158,3 @@ BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
153 } 158 }
154 159
155 vb->addWidget( startButton, 2 ); 160 vb->addWidget( startButton, 2 );
@@ -334,3 +339,3 @@ int BenchmarkInfo::gfxRendering( int seconds )
334 339
335void BenchmarkInfo::performFileTest( const QString& fname, QCheckListItem* item ) 340void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
336{ 341{
diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h
index d143602..c3d44ec 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.h
+++ b/noncore/settings/sysinfo/benchmarkinfo.h
@@ -25,5 +25,5 @@ class QClipboard;
25class QComboBox; 25class QComboBox;
26class QCheckListItem; 26class OCheckListItem;
27class QPushButton; 27class QPushButton;
28class QListView; 28class OListView;
29 29
@@ -37,9 +37,9 @@ public:
37 37
38 QCheckListItem* test_alu; 38 OCheckListItem* test_alu;
39 QCheckListItem* test_fpu; 39 OCheckListItem* test_fpu;
40 QCheckListItem* test_txt; 40 OCheckListItem* test_txt;
41 QCheckListItem* test_gfx; 41 OCheckListItem* test_gfx;
42 QCheckListItem* test_ram; 42 OCheckListItem* test_ram;
43 QCheckListItem* test_sd; 43 OCheckListItem* test_sd;
44 QCheckListItem* test_cf; 44 OCheckListItem* test_cf;
45 45
@@ -54,3 +54,3 @@ public:
54 QComboBox* machineCombo; 54 QComboBox* machineCombo;
55 QListView* tests; 55 OListView* tests;
56 QPushButton* startButton; 56 QPushButton* startButton;
@@ -60,3 +60,3 @@ public:
60 int gfxRendering( int ); 60 int gfxRendering( int );
61 void performFileTest( const QString& fname, QCheckListItem* item ); 61 void performFileTest( const QString& fname, OCheckListItem* item );
62 62
diff --git a/noncore/settings/sysinfo/detail.cpp b/noncore/settings/sysinfo/detail.cpp
index 79daa2b..6645fdd 100644
--- a/noncore/settings/sysinfo/detail.cpp
+++ b/noncore/settings/sysinfo/detail.cpp
@@ -23,5 +23,3 @@
23 23
24#include <sys/types.h> 24#include <qtextview.h>
25#include <stdio.h>
26
27#include <qlayout.h> 25#include <qlayout.h>
diff --git a/noncore/settings/sysinfo/detail.h b/noncore/settings/sysinfo/detail.h
index 7ca9d45..71d3e3a 100644
--- a/noncore/settings/sysinfo/detail.h
+++ b/noncore/settings/sysinfo/detail.h
@@ -25,6 +25,4 @@
25#include <qwidget.h> 25#include <qwidget.h>
26#include <qcombo.h> 26
27#include <qtextview.h> 27class QTextView;
28#include <qpushbutton.h>
29#include <qlistview.h>
30 28
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index e688a29..dfe48e1 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -25,2 +25,3 @@
25/* OPIE */ 25/* OPIE */
26#include <opie2/olistview.h>
26#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
@@ -28,2 +29,3 @@
28/* QT */ 29/* QT */
30#include <qcombobox.h>
29#include <qfile.h> 31#include <qfile.h>
@@ -31,2 +33,4 @@
31#include <qmessagebox.h> 33#include <qmessagebox.h>
34#include <qpushbutton.h>
35#include <qtextview.h>
32#include <qtimer.h> 36#include <qtimer.h>
@@ -41,3 +45,3 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
41 45
42 ModulesView = new QListView( this ); 46 ModulesView = new OListView( this );
43 int colnum = ModulesView->addColumn( tr( "Module" ) ); 47 int colnum = ModulesView->addColumn( tr( "Module" ) );
@@ -56,4 +60,4 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
56 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold ); 60 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
57 connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), 61 connect( ModulesView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
58 this, SLOT( viewModules(QListViewItem*) ) ); 62 this, SLOT( viewModules(OListViewItem*) ) );
59 } 63 }
@@ -95,3 +99,3 @@ void ModulesInfo::updateData()
95 QString selectedmod; 99 QString selectedmod;
96 QListViewItem *curritem = ModulesView->currentItem(); 100 OListViewItem *curritem = static_cast<OListViewItem*>( ModulesView->currentItem() );
97 if ( curritem ) 101 if ( curritem )
@@ -107,4 +111,4 @@ void ModulesInfo::updateData()
107 { 111 {
108 QListViewItem *newitem; 112 OListViewItem *newitem;
109 QListViewItem *selecteditem = 0x0; 113 OListViewItem *selecteditem = 0x0;
110 while ( true ) 114 while ( true )
@@ -123,3 +127,3 @@ void ModulesInfo::updateData()
123 127
124 newitem = new QListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage ); 128 newitem = new OListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage );
125 if ( qmodname == selectedmod ) 129 if ( qmodname == selectedmod )
@@ -142,3 +146,3 @@ void ModulesInfo::slotSendClicked()
142 146
143 QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() ); 147 QString capstr = tr( "You really want to execute\n%1 for this module?" ).arg( CommandCB->currentText() );
144 148
@@ -161,3 +165,3 @@ void ModulesInfo::slotSendClicked()
161 165
162void ModulesInfo::viewModules( QListViewItem *modules ) 166void ModulesInfo::viewModules( OListViewItem *modules )
163{ 167{
diff --git a/noncore/settings/sysinfo/modulesinfo.h b/noncore/settings/sysinfo/modulesinfo.h
index e974610..78dce73 100644
--- a/noncore/settings/sysinfo/modulesinfo.h
+++ b/noncore/settings/sysinfo/modulesinfo.h
@@ -28,4 +28,4 @@ class Detail;
28class QComboBox; 28class QComboBox;
29class QListView; 29class OListView;
30class QListViewItem; 30class OListViewItem;
31 31
@@ -39,3 +39,3 @@ public:
39private: 39private:
40 QListView* ModulesView; 40 OListView* ModulesView;
41 QComboBox* CommandCB; 41 QComboBox* CommandCB;
@@ -47,3 +47,3 @@ private slots:
47 void slotSendClicked(); 47 void slotSendClicked();
48 void viewModules( QListViewItem * ); 48 void viewModules( OListViewItem * );
49}; 49};
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 69b4ab5..dd9a05d 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -23,2 +23,3 @@
23/* OPIE */ 23/* OPIE */
24#include <opie2/olistview.h>
24#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
@@ -26,2 +27,3 @@
26/* QT */ 27/* QT */
28#include <qcombobox.h>
27#include <qdir.h> 29#include <qdir.h>
@@ -29,2 +31,4 @@
29#include <qmessagebox.h> 31#include <qmessagebox.h>
32#include <qpushbutton.h>
33#include <qtextview.h>
30#include <qtimer.h> 34#include <qtimer.h>
@@ -44,3 +48,3 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
44 48
45 ProcessView = new QListView( this, "ProcessView" ); 49 ProcessView = new OListView( this, "ProcessView" );
46 int colnum = ProcessView->addColumn( tr( "PID" ) ); 50 int colnum = ProcessView->addColumn( tr( "PID" ) );
@@ -53,4 +57,4 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
53 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold ); 57 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
54 connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), 58 connect( ProcessView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
55 this, SLOT( viewProcess(QListViewItem*) ) ); 59 this, SLOT( viewProcess(OListViewItem*) ) );
56 layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); 60 layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 );
@@ -103,3 +107,3 @@ void ProcessInfo::updateData()
103 QString selectedpid; 107 QString selectedpid;
104 QListViewItem *curritem = ProcessView->currentItem(); 108 OListViewItem *curritem = static_cast<OListViewItem*>( ProcessView->currentItem() );
105 if ( curritem ) 109 if ( curritem )
@@ -111,4 +115,4 @@ void ProcessInfo::updateData()
111 115
112 QListViewItem *newitem; 116 OListViewItem *newitem;
113 QListViewItem *selecteditem = 0x0; 117 OListViewItem *selecteditem = 0x0;
114 QDir *procdir = new QDir("/proc", 0, QDir::Name, QDir::Dirs); 118 QDir *procdir = new QDir("/proc", 0, QDir::Name, QDir::Dirs);
@@ -142,3 +146,3 @@ void ProcessInfo::updateData()
142 146
143 newitem = new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime ); 147 newitem = new OListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
144 if ( processnum == selectedpid ) 148 if ( processnum == selectedpid )
@@ -159,3 +163,3 @@ void ProcessInfo::slotSendClicked()
159{ 163{
160 QListViewItem *currprocess = ProcessView->currentItem(); 164 OListViewItem *currprocess = static_cast<OListViewItem*>( ProcessView->currentItem() );
161 if ( !currprocess ) 165 if ( !currprocess )
@@ -171,3 +175,3 @@ void ProcessInfo::slotSendClicked()
171 { 175 {
172 currprocess = ProcessView->currentItem(); 176 currprocess = static_cast<OListViewItem*>( ProcessView->currentItem() );
173 if ( currprocess ) 177 if ( currprocess )
@@ -183,3 +187,3 @@ void ProcessInfo::slotSendClicked()
183 187
184void ProcessInfo::viewProcess( QListViewItem *process ) 188void ProcessInfo::viewProcess( OListViewItem *process )
185{ 189{
diff --git a/noncore/settings/sysinfo/processinfo.h b/noncore/settings/sysinfo/processinfo.h
index 687e080..6e7acd5 100644
--- a/noncore/settings/sysinfo/processinfo.h
+++ b/noncore/settings/sysinfo/processinfo.h
@@ -23,3 +23,2 @@
23#include <qwidget.h> 23#include <qwidget.h>
24#include <qlistview.h>
25 24
@@ -27,4 +26,4 @@ class Detail;
27class QComboBox; 26class QComboBox;
28class QListView; 27class OListView;
29class QListViewItem; 28class OListViewItem;
30 29
@@ -38,6 +37,6 @@ public:
38private: 37private:
39 QListView* ProcessView; 38 OListView* ProcessView;
40 QComboBox* SignalCB; 39 QComboBox* SignalCB;
41 QPushButton* SendButton; 40 QPushButton* SendButton;
42 41
43 Detail *ProcessDtl; 42 Detail *ProcessDtl;
@@ -47,3 +46,3 @@ private slots:
47 void slotSendClicked(); 46 void slotSendClicked();
48 void viewProcess( QListViewItem * ); 47 void viewProcess( OListViewItem * );
49}; 48};
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 0ebcebe..4bebd06 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -20,2 +20,6 @@
20 20
21#include "versioninfo.h"
22
23/* OPIE */
24#include <opie2/odevice.h>
21#include <qpe/resource.h> 25#include <qpe/resource.h>
@@ -23,2 +27,3 @@
23 27
28/* QT */
24#include <qfile.h> 29#include <qfile.h>
@@ -30,6 +35,2 @@
30 35
31#include "versioninfo.h"
32
33#include <opie2/odevice.h>
34
35using namespace Opie; 36using namespace Opie;