summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-04 21:05:21 (UTC)
committer mickeyl <mickeyl>2005-05-04 21:05:21 (UTC)
commita19581c15cdb15f17988b6af958e6aa27eb01c7d (patch) (unidiff)
tree387a43f66c252bd4fe5d24bdf90dbb429b74a94d
parentbdc113a8b37e3fa2f65903d043798d33d2f9f907 (diff)
downloadopie-a19581c15cdb15f17988b6af958e6aa27eb01c7d.zip
opie-a19581c15cdb15f17988b6af958e6aa27eb01c7d.tar.gz
opie-a19581c15cdb15f17988b6af958e6aa27eb01c7d.tar.bz2
CPUinfo details now shown
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/config.in3
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp148
-rw-r--r--noncore/settings/sysinfo/devicesinfo.h66
3 files changed, 172 insertions, 45 deletions
diff --git a/noncore/settings/sysinfo/config.in b/noncore/settings/sysinfo/config.in
index 349dbdc..0c558dd 100644
--- a/noncore/settings/sysinfo/config.in
+++ b/noncore/settings/sysinfo/config.in
@@ -3,2 +3,5 @@
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
5 comment "opie-sysinfo needs a libqpe, libopie2core, libopie2ui"
6 depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI )
7
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index f1efb33..6508d3c 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -28,5 +28,4 @@ _;:,     .>    :=|. This program is free software; you can
28 28
29#include "devicesinfo.h" 29#include "devicesinfo.h"
30
31/* OPIE */ 30/* OPIE */
32#include <opie2/odebug.h> 31#include <opie2/odebug.h>
@@ -39,4 +38,5 @@ using namespace Opie::Ui;
39 38
40/* QT */ 39/* QT */
40#include <qobjectlist.h>
41#include <qlistview.h> 41#include <qlistview.h>
42#include <qcombobox.h> 42#include <qcombobox.h>
@@ -74,6 +74,13 @@ void DevicesView::selectionChanged( QListViewItem* item )
74{ 74{
75 odebug << "DevicesView::selectionChanged to '" << item->text( 0 ) << "'" << oendl; 75 odebug << "DevicesView::selectionChanged to '" << item->text( 0 ) << "'" << oendl;
76 QWidget* details = ( static_cast<Device*>( item ) )->detailsWidget(); 76 if ( item->parent() )
77 ( static_cast<DevicesInfo*>( parent() ) )->setDetailsWidget( details ); 77 {
78 QWidget* details = ( static_cast<Device*>( item ) )->detailsWidget();
79 ( static_cast<DevicesInfo*>( parent() ) )->setDetailsWidget( details );
80 }
81 else
82 {
83 odebug << "DevicesView::not a device node." << oendl;
84 }
78} 85}
79 86
@@ -84,8 +91,10 @@ DevicesInfo::DevicesInfo( QWidget* parent, const char* name, WFlags fl )
84{ 91{
85 layout = new OAutoBoxLayout( this ); 92 layout = new OAutoBoxLayout( this );
86 layout->setSpacing( 4 ); 93 layout->setSpacing( 2 );
87 layout->setMargin( 4 ); 94 layout->setMargin( 2 );
88 view = new DevicesView( this ); 95 view = new DevicesView( this );
89 layout->addWidget( view ); 96 layout->addWidget( view, 100 );
97 stack = new QWidgetStack( this );
98 layout->addWidget( stack, 70 );
90} 99}
91 100
@@ -98,7 +107,12 @@ DevicesInfo::~DevicesInfo()
98void DevicesInfo::setDetailsWidget( QWidget* w ) 107void DevicesInfo::setDetailsWidget( QWidget* w )
99{ 108{
100 if ( details ) delete( details ); 109 if ( details )
101 layout->addWidget( w ); 110 {
102 w->show(); 111 qDebug( "hiding widget '%s' ('%s')", details->name(), details->className() );
112 stack->removeWidget( w );
113 }
114
115 stack->addWidget( details = w, 40 );
116 stack->raiseWidget( details );
103} 117}
104 118
@@ -116,20 +130,4 @@ Category::~Category()
116 130
117//================================================================================================= 131//=================================================================================================
118Device::Device( Category* parent, const QString& name )
119 :OListViewItem( parent, name )
120{
121}
122
123Device::~Device()
124{
125}
126
127QWidget* Device::detailsWidget()
128{
129 return new QPushButton( static_cast<QWidget*>( listView()->parent() ), "Press Button to self-destruct" );
130}
131
132
133//=================================================================================================
134CpuCategory::CpuCategory( DevicesView* parent ) 132CpuCategory::CpuCategory( DevicesView* parent )
135 :Category( parent, "1. Central Processing Unit" ) 133 :Category( parent, "1. Central Processing Unit" )
@@ -147,5 +145,5 @@ void CpuCategory::populate()
147 if ( !cpuinfofile.exists() || !cpuinfofile.open( IO_ReadOnly ) ) 145 if ( !cpuinfofile.exists() || !cpuinfofile.open( IO_ReadOnly ) )
148 { 146 {
149 new OListViewItem( this, "ERROR: /proc/cpuinfo not found or unaccessible" ); 147 new CpuDevice( this, "ERROR: /proc/cpuinfo not found or unaccessible" );
150 return; 148 return;
151 } 149 }
@@ -153,4 +151,6 @@ void CpuCategory::populate()
153 151
154 int cpucount = 0; 152 int cpucount = 0;
153 CpuDevice* dev = 0;
154
155 while ( !cpuinfo.atEnd() ) 155 while ( !cpuinfo.atEnd() )
156 { 156 {
@@ -159,9 +159,10 @@ void CpuCategory::populate()
159 if ( line.startsWith( "processor" ) ) 159 if ( line.startsWith( "processor" ) )
160 { 160 {
161 new OListViewItem( this, QString( "CPU #%1" ).arg( cpucount++ ) ); 161 dev = new CpuDevice( this, QString( "CPU #%1" ).arg( cpucount++ ) );
162 dev->addInfo( line );
162 } 163 }
163 else 164 else
164 { 165 {
165 continue; 166 if ( dev ) dev->addInfo( line );
166 } 167 }
167 } 168 }
@@ -186,5 +187,5 @@ void InputCategory::populate()
186 { 187 {
187 OInputDevice* dev = it.current(); 188 OInputDevice* dev = it.current();
188 new OListViewItem( this, dev->identity() ); 189 new InputDevice( this, dev->identity() );
189 ++it; 190 ++it;
190 } 191 }
@@ -211,5 +212,5 @@ void CardsCategory::populate()
211 if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) ) 212 if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
212 { 213 {
213 new OListViewItem( this, "ERROR: pcmcia info file not found or unaccessible" ); 214 new CardDevice( this, "ERROR: pcmcia info file not found or unaccessible" );
214 return; 215 return;
215 } 216 }
@@ -219,7 +220,7 @@ void CardsCategory::populate()
219 QString line = cardinfo.readLine(); 220 QString line = cardinfo.readLine();
220 odebug << "got line '" << line << "'" << oendl; 221 odebug << "got line '" << line << "'" << oendl;
221 if ( line.startsWith("Socket") ) 222 if ( line.startsWith( "Socket" ) )
222 { 223 {
223 new OListViewItem( this, line ); 224 new CardDevice( this, line );
224 } 225 }
225 else 226 else
@@ -246,5 +247,5 @@ void UsbCategory::populate()
246 if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) ) 247 if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) )
247 { 248 {
248 new OListViewItem( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" ); 249 new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
249 return; 250 return;
250 } 251 }
@@ -260,9 +261,9 @@ void UsbCategory::populate()
260 QString line = usbinfo.readLine(); 261 QString line = usbinfo.readLine();
261 odebug << "got line '" << line << "'" << oendl; 262 odebug << "got line '" << line << "'" << oendl;
262 if ( line.startsWith("T:") ) 263 if ( line.startsWith( "T:" ) )
263 { 264 {
264 sscanf(line.local8Bit().data(), "T: Bus=%2d Lev=%2d Prnt=%2d Port=%d Cnt=%2d Dev#=%3d Spd=%3f MxCh=%2d", &_bus, &_level, &_parent, &_port, &_count, &_device, &_speed, &_channels); 265 sscanf(line.local8Bit().data(), "T: Bus=%2d Lev=%2d Prnt=%2d Port=%d Cnt=%2d Dev#=%3d Spd=%3f MxCh=%2d", &_bus, &_level, &_parent, &_port, &_count, &_device, &_speed, &_channels);
265 266
266 new OListViewItem( this, QString( "USB Device #%1" ).arg( usbcount++ ) ); 267 new UsbDevice( this, QString( "USB Device #%1" ).arg( usbcount++ ) );
267 } 268 }
268 else 269 else
@@ -273,2 +274,79 @@ void UsbCategory::populate()
273} 274}
274 275
276
277//=================================================================================================
278Device::Device( Category* parent, const QString& name )
279 :OListViewItem( parent, name )
280{
281 devinfo = static_cast<QWidget*>( listView()->parent() );
282}
283
284Device::~Device()
285{
286}
287
288
289QWidget* Device::detailsWidget()
290{
291 return details;
292}
293
294//=================================================================================================
295CpuDevice::CpuDevice( Category* parent, const QString& name )
296 :Device( parent, name )
297{
298 OListView* w = new OListView( devinfo );
299 details = w;
300 w->addColumn( "Info" );
301 w->addColumn( "Value" );
302 w->hide();
303}
304
305CpuDevice::~CpuDevice()
306{
307}
308
309void CpuDevice::addInfo( const QString& info )
310{
311 int dp = info.find( ':' );
312 if ( dp != -1 )
313 {
314 new OListViewItem( (OListView*) details, info.left( dp ), info.right( info.length()-dp ) );
315 }
316}
317
318//=================================================================================================
319CardDevice::CardDevice( Category* parent, const QString& name )
320 :Device( parent, name )
321{
322 details = new QPushButton( name, devinfo );
323 details->hide();
324}
325
326CardDevice::~CardDevice()
327{
328}
329
330//=================================================================================================
331InputDevice::InputDevice( Category* parent, const QString& name )
332 :Device( parent, name )
333{
334 details = new QPushButton( name, devinfo );
335 details->hide();
336}
337
338InputDevice::~InputDevice()
339{
340}
341
342//=================================================================================================
343UsbDevice::UsbDevice( Category* parent, const QString& name )
344 :Device( parent, name )
345{
346 details = new QPushButton( name, devinfo );
347 details->hide();
348}
349
350UsbDevice::~UsbDevice()
351{
352}
diff --git a/noncore/settings/sysinfo/devicesinfo.h b/noncore/settings/sysinfo/devicesinfo.h
index b065f40..586d204 100644
--- a/noncore/settings/sysinfo/devicesinfo.h
+++ b/noncore/settings/sysinfo/devicesinfo.h
@@ -36,4 +36,5 @@ _;:,     .>    :=|. This program is free software; you can
36/* QT */ 36/* QT */
37#include <qwidget.h> 37#include <qwidget.h>
38#include <qwidgetstack.h>
38 39
39//================================================================================================= 40//=================================================================================================
@@ -62,4 +63,5 @@ private:
62 Opie::Ui::OListView* view; 63 Opie::Ui::OListView* view;
63 QWidget* details; 64 QWidget* details;
65 QWidgetStack* stack;
64private slots: 66private slots:
65}; 67};
@@ -76,14 +78,4 @@ public:
76 78
77//================================================================================================= 79//=================================================================================================
78class Device : public Opie::Ui::OListViewItem
79{
80public:
81 Device( Category* parent, const QString& name );
82 ~Device();
83
84 QWidget* detailsWidget();
85};
86
87//=================================================================================================
88class CpuCategory : public Category 80class CpuCategory : public Category
89{ 81{
@@ -125,4 +117,58 @@ public:
125}; 117};
126 118
119//=================================================================================================
120class Device : public Opie::Ui::OListViewItem
121{
122public:
123 Device( Category* parent, const QString& name );
124 ~Device();
125
126 QWidget* devinfo;
127 QWidget* details;
128
129 virtual QWidget* detailsWidget();
130};
131
132//=================================================================================================
133class CpuDevice : public Device
134{
135public:
136 CpuDevice( Category* parent, const QString& name );
137 ~CpuDevice();
138
139 void addInfo( const QString& line );
140
141// virtual QWidget* detailsWidget();
142};
143
144//=================================================================================================
145class InputDevice : public Device
146{
147public:
148 InputDevice( Category* parent, const QString& name );
149 ~InputDevice();
150
151// virtual QWidget* detailsWidget();
152};
153
154//=================================================================================================
155class CardDevice : public Device
156{
157public:
158 CardDevice( Category* parent, const QString& name );
159 ~CardDevice();
160
161// virtual QWidget* detailsWidget();
162};
163
164//=================================================================================================
165class UsbDevice : public Device
166{
167public:
168 UsbDevice( Category* parent, const QString& name );
169 ~UsbDevice();
170
171// virtual QWidget* detailsWidget();
172};
127 173
128#endif 174#endif