| -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 @@ -258,2 +258,4 @@ void UsbCategory::populate() int usbcount = 0; + UsbDevice* lastDev = 0; + UsbDevice* dev = 0; while ( !usbinfo.atEnd() ) @@ -266,3 +268,19 @@ void UsbCategory::populate() - 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>" ); } @@ -283,2 +301,8 @@ Device::Device( Category* parent, const QString& name ) +Device::Device( Device* parent, const QString& name ) + :OListViewItem( parent, name ) +{ + devinfo = static_cast<QWidget*>( listView()->parent() ); +} + Device::~Device() @@ -349,2 +373,10 @@ UsbDevice::UsbDevice( Category* parent, const QString& name ) +//================================================================================================= +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 @@ -123,2 +123,3 @@ public: Device( Category* parent, const QString& name ); + Device( Device* parent, const QString& name ); ~Device(); @@ -168,2 +169,3 @@ public: UsbDevice( Category* parent, const QString& name ); + UsbDevice( UsbDevice* parent, const QString& name ); ~UsbDevice(); |