| -rw-r--r-- | noncore/settings/sysinfo/devicesinfo.cpp | 34 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/devicesinfo.h | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp index 6508d3c..b463e43 100644 --- a/noncore/settings/sysinfo/devicesinfo.cpp +++ b/noncore/settings/sysinfo/devicesinfo.cpp @@ -227,89 +227,113 @@ void CardsCategory::populate() { continue; } } } //================================================================================================= UsbCategory::UsbCategory( DevicesView* parent ) :Category( parent, "4. Universal Serial Bus" ) { } UsbCategory::~UsbCategory() { } void UsbCategory::populate() { odebug << "UsbCategory::populate()" << oendl; QFile usbinfofile( "/proc/bus/usb/devices" ); if ( !usbinfofile.exists() || !usbinfofile.open( IO_ReadOnly ) ) { new UsbDevice( this, "ERROR: /proc/bus/usb/devices not found or unaccessible" ); return; } QTextStream usbinfo( &usbinfofile ); int _bus, _level, _parent, _port, _count, _device, _channels, _power; float _speed; QString _manufacturer, _product, _serial; int usbcount = 0; + UsbDevice* lastDev = 0; + UsbDevice* dev = 0; while ( !usbinfo.atEnd() ) { QString line = usbinfo.readLine(); odebug << "got line '" << line << "'" << oendl; 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 UsbDevice( this, QString( "USB Device #%1" ).arg( usbcount++ ) ); + if ( !_level ) + { + odebug << "adding new bus" << oendl; + dev = new UsbDevice( this, QString( "Generic USB Hub Device" ) ); + lastDev = dev; + } + else + { + odebug << "adding new dev" << oendl; + dev = new UsbDevice( lastDev, QString( "Generic USB Hub Device" ) ); + lastDev = dev; + } + } + else if ( line.startsWith( "S: Product" ) ) + { + int dp = line.find( '=' ); + dev->setText( 0, dp != -1 ? line.right( line.length()-1-dp ) : "<unknown>" ); } else { continue; } } } //================================================================================================= Device::Device( Category* parent, const QString& name ) :OListViewItem( parent, name ) { devinfo = static_cast<QWidget*>( listView()->parent() ); } +Device::Device( Device* 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 ) ); } @@ -318,35 +342,43 @@ void CpuDevice::addInfo( const QString& info ) //================================================================================================= 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( UsbDevice* 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 586d204..c601a96 100644 --- a/noncore/settings/sysinfo/devicesinfo.h +++ b/noncore/settings/sysinfo/devicesinfo.h @@ -92,83 +92,85 @@ class InputCategory : public Category public: InputCategory( DevicesView* parent ); virtual ~InputCategory(); virtual void populate(); }; //================================================================================================= class CardsCategory : public Category { public: CardsCategory( DevicesView* parent ); virtual ~CardsCategory(); virtual void populate(); }; //================================================================================================= class UsbCategory : public Category { public: UsbCategory( DevicesView* parent ); virtual ~UsbCategory(); virtual void populate(); }; //================================================================================================= class Device : public Opie::Ui::OListViewItem { public: Device( Category* parent, const QString& name ); + Device( Device* 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( UsbDevice* parent, const QString& name ); ~UsbDevice(); // virtual QWidget* detailsWidget(); }; #endif |