summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-04 21:05:21 (UTC)
committer mickeyl <mickeyl>2005-05-04 21:05:21 (UTC)
commita19581c15cdb15f17988b6af958e6aa27eb01c7d (patch) (side-by-side diff)
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 @@
default "y"
depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
+ comment "opie-sysinfo needs a libqpe, libopie2core, libopie2ui"
+ depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI )
+
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
#include "devicesinfo.h"
-
/* OPIE */
#include <opie2/odebug.h>
@@ -39,4 +38,5 @@ using namespace Opie::Ui;
/* QT */
+#include <qobjectlist.h>
#include <qlistview.h>
#include <qcombobox.h>
@@ -74,6 +74,13 @@ void DevicesView::selectionChanged( QListViewItem* item )
{
odebug << "DevicesView::selectionChanged to '" << item->text( 0 ) << "'" << oendl;
- QWidget* details = ( static_cast<Device*>( item ) )->detailsWidget();
- ( static_cast<DevicesInfo*>( parent() ) )->setDetailsWidget( details );
+ if ( item->parent() )
+ {
+ QWidget* details = ( static_cast<Device*>( item ) )->detailsWidget();
+ ( static_cast<DevicesInfo*>( parent() ) )->setDetailsWidget( details );
+ }
+ else
+ {
+ odebug << "DevicesView::not a device node." << oendl;
+ }
}
@@ -84,8 +91,10 @@ DevicesInfo::DevicesInfo( QWidget* parent, const char* name, WFlags fl )
{
layout = new OAutoBoxLayout( this );
- layout->setSpacing( 4 );
- layout->setMargin( 4 );
+ layout->setSpacing( 2 );
+ layout->setMargin( 2 );
view = new DevicesView( this );
- layout->addWidget( view );
+ layout->addWidget( view, 100 );
+ stack = new QWidgetStack( this );
+ layout->addWidget( stack, 70 );
}
@@ -98,7 +107,12 @@ DevicesInfo::~DevicesInfo()
void DevicesInfo::setDetailsWidget( QWidget* w )
{
- if ( details ) delete( details );
- layout->addWidget( w );
- w->show();
+ if ( details )
+ {
+ qDebug( "hiding widget '%s' ('%s')", details->name(), details->className() );
+ stack->removeWidget( w );
+ }
+
+ stack->addWidget( details = w, 40 );
+ stack->raiseWidget( details );
}
@@ -116,20 +130,4 @@ Category::~Category()
//=================================================================================================
-Device::Device( Category* parent, const QString& name )
- :OListViewItem( parent, name )
-{
-}
-
-Device::~Device()
-{
-}
-
-QWidget* Device::detailsWidget()
-{
- return new QPushButton( static_cast<QWidget*>( listView()->parent() ), "Press Button to self-destruct" );
-}
-
-
-//=================================================================================================
CpuCategory::CpuCategory( DevicesView* parent )
:Category( parent, "1. Central Processing Unit" )
@@ -147,5 +145,5 @@ void CpuCategory::populate()
if ( !cpuinfofile.exists() || !cpuinfofile.open( IO_ReadOnly ) )
{
- new OListViewItem( this, "ERROR: /proc/cpuinfo not found or unaccessible" );
+ new CpuDevice( this, "ERROR: /proc/cpuinfo not found or unaccessible" );
return;
}
@@ -153,4 +151,6 @@ void CpuCategory::populate()
int cpucount = 0;
+ CpuDevice* dev = 0;
+
while ( !cpuinfo.atEnd() )
{
@@ -159,9 +159,10 @@ void CpuCategory::populate()
if ( line.startsWith( "processor" ) )
{
- new OListViewItem( this, QString( "CPU #%1" ).arg( cpucount++ ) );
+ dev = new CpuDevice( this, QString( "CPU #%1" ).arg( cpucount++ ) );
+ dev->addInfo( line );
}
else
{
- continue;
+ if ( dev ) dev->addInfo( line );
}
}
@@ -186,5 +187,5 @@ void InputCategory::populate()
{
OInputDevice* dev = it.current();
- new OListViewItem( this, dev->identity() );
+ new InputDevice( this, dev->identity() );
++it;
}
@@ -211,5 +212,5 @@ void CardsCategory::populate()
if ( !cardinfofile.exists() || !cardinfofile.open( IO_ReadOnly ) )
{
- new OListViewItem( this, "ERROR: pcmcia info file not found or unaccessible" );
+ new CardDevice( this, "ERROR: pcmcia info file not found or unaccessible" );
return;
}
@@ -219,7 +220,7 @@ void CardsCategory::populate()
QString line = cardinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
- if ( line.startsWith("Socket") )
+ if ( line.startsWith( "Socket" ) )
{
- new OListViewItem( this, line );
+ new CardDevice( this, line );
}
else
@@ -246,5 +247,5 @@ void UsbCategory::populate()
if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) )
{
- new OListViewItem( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
+ new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" );
return;
}
@@ -260,9 +261,9 @@ void UsbCategory::populate()
QString line = usbinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
- if ( line.startsWith("T:") )
+ if ( line.startsWith( "T:" ) )
{
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);
- new OListViewItem( this, QString( "USB Device #%1" ).arg( usbcount++ ) );
+ new UsbDevice( this, QString( "USB Device #%1" ).arg( usbcount++ ) );
}
else
@@ -273,2 +274,79 @@ void UsbCategory::populate()
}
+
+//=================================================================================================
+Device::Device( Category* parent, const QString& name )
+ :OListViewItem( parent, name )
+{
+ devinfo = static_cast<QWidget*>( listView()->parent() );
+}
+
+Device::~Device()
+{
+}
+
+
+QWidget* Device::detailsWidget()
+{
+ return details;
+}
+
+//=================================================================================================
+CpuDevice::CpuDevice( Category* parent, const QString& name )
+ :Device( parent, name )
+{
+ OListView* w = new OListView( devinfo );
+ details = w;
+ w->addColumn( "Info" );
+ w->addColumn( "Value" );
+ w->hide();
+}
+
+CpuDevice::~CpuDevice()
+{
+}
+
+void CpuDevice::addInfo( const QString& info )
+{
+ int dp = info.find( ':' );
+ if ( dp != -1 )
+ {
+ new OListViewItem( (OListView*) details, info.left( dp ), info.right( info.length()-dp ) );
+ }
+}
+
+//=================================================================================================
+CardDevice::CardDevice( Category* parent, const QString& name )
+ :Device( parent, name )
+{
+ details = new QPushButton( name, devinfo );
+ details->hide();
+}
+
+CardDevice::~CardDevice()
+{
+}
+
+//=================================================================================================
+InputDevice::InputDevice( Category* parent, const QString& name )
+ :Device( parent, name )
+{
+ details = new QPushButton( name, devinfo );
+ details->hide();
+}
+
+InputDevice::~InputDevice()
+{
+}
+
+//=================================================================================================
+UsbDevice::UsbDevice( Category* parent, const QString& name )
+ :Device( parent, name )
+{
+ details = new QPushButton( name, devinfo );
+ details->hide();
+}
+
+UsbDevice::~UsbDevice()
+{
+}
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
/* QT */
#include <qwidget.h>
+#include <qwidgetstack.h>
//=================================================================================================
@@ -62,4 +63,5 @@ private:
Opie::Ui::OListView* view;
QWidget* details;
+ QWidgetStack* stack;
private slots:
};
@@ -76,14 +78,4 @@ public:
//=================================================================================================
-class Device : public Opie::Ui::OListViewItem
-{
-public:
- Device( Category* parent, const QString& name );
- ~Device();
-
- QWidget* detailsWidget();
-};
-
-//=================================================================================================
class CpuCategory : public Category
{
@@ -125,4 +117,58 @@ public:
};
+//=================================================================================================
+class Device : public Opie::Ui::OListViewItem
+{
+public:
+ Device( Category* parent, const QString& name );
+ ~Device();
+
+ QWidget* devinfo;
+ QWidget* details;
+
+ virtual QWidget* detailsWidget();
+};
+
+//=================================================================================================
+class CpuDevice : public Device
+{
+public:
+ CpuDevice( Category* parent, const QString& name );
+ ~CpuDevice();
+
+ void addInfo( const QString& line );
+
+// virtual QWidget* detailsWidget();
+};
+
+//=================================================================================================
+class InputDevice : public Device
+{
+public:
+ InputDevice( Category* parent, const QString& name );
+ ~InputDevice();
+
+// virtual QWidget* detailsWidget();
+};
+
+//=================================================================================================
+class CardDevice : public Device
+{
+public:
+ CardDevice( Category* parent, const QString& name );
+ ~CardDevice();
+
+// virtual QWidget* detailsWidget();
+};
+
+//=================================================================================================
+class UsbDevice : public Device
+{
+public:
+ UsbDevice( Category* parent, const QString& name );
+ ~UsbDevice();
+
+// virtual QWidget* detailsWidget();
+};
#endif