summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-31 10:47:03 (UTC)
committer mickeyl <mickeyl>2005-08-31 10:47:03 (UTC)
commit465eb3107bb32ad7ab2d726d8a510538fca56764 (patch) (side-by-side diff)
tree8ab94dd3a9530edc08116207493b674660fc8788
parentcde931654d1966be6989e6c8f3cfacb23e6822a2 (diff)
downloadopie-465eb3107bb32ad7ab2d726d8a510538fca56764.zip
opie-465eb3107bb32ad7ab2d726d8a510538fca56764.tar.gz
opie-465eb3107bb32ad7ab2d726d8a510538fca56764.tar.bz2
diminish error message
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/devicesinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 176d178..164d608 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -53,279 +53,279 @@ using namespace Opie::Ui;
DevicesView::DevicesView( QWidget* parent, const char* name, WFlags fl )
:Opie::Ui::OListView( parent, name, fl )
{
addColumn( tr( "My Computer" ) );
setAllColumnsShowFocus( true );
setRootIsDecorated( true );
QWhatsThis::add( this, tr( "This is a list of all the devices currently recognized on this device." ) );
DevicesView* root = this;
( new CpuCategory( root ) )->populate();
( new InputCategory( root ) )->populate();
( new CardsCategory( root ) )->populate();
( new UsbCategory( root ) )->populate();
connect( this, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(selectionChanged(QListViewItem*)) );
}
DevicesView::~DevicesView()
{
}
void DevicesView::selectionChanged( QListViewItem* item )
{
odebug << "DevicesView::selectionChanged to '" << item->text( 0 ) << "'" << oendl;
if ( item->parent() )
{
QWidget* details = ( static_cast<Device*>( item ) )->detailsWidget();
( static_cast<DevicesInfo*>( parent() ) )->setDetailsWidget( details );
}
else
{
odebug << "DevicesView::not a device node." << oendl;
}
}
//=================================================================================================
DevicesInfo::DevicesInfo( QWidget* parent, const char* name, WFlags fl )
:QWidget( parent, name, fl ), details( 0 )
{
layout = new OAutoBoxLayout( this );
layout->setSpacing( 2 );
layout->setMargin( 2 );
view = new DevicesView( this );
layout->addWidget( view, 100 );
stack = new QWidgetStack( this );
layout->addWidget( stack, 80 );
}
DevicesInfo::~DevicesInfo()
{
}
void DevicesInfo::setDetailsWidget( QWidget* w )
{
if ( details )
{
qDebug( "hiding widget '%s' ('%s')", details->name(), details->className() );
stack->removeWidget( w );
}
stack->addWidget( details = w, 40 );
stack->raiseWidget( details );
}
//=================================================================================================
Category::Category( DevicesView* parent, const QString& name )
:OListViewItem( parent, name )
{
odebug << "Category '" << name << "' inserted. Scanning for devices..." << oendl;
}
Category::~Category()
{
}
//=================================================================================================
CpuCategory::CpuCategory( DevicesView* parent )
:Category( parent, "1. Central Processing Unit" )
{
}
CpuCategory::~CpuCategory()
{
}
void CpuCategory::populate()
{
odebug << "CpuCategory::populate()" << oendl;
QFile cpuinfofile( "/proc/cpuinfo" );
if ( !cpuinfofile.exists() || !cpuinfofile.open( IO_ReadOnly ) )
{
- new CpuDevice( this, "ERROR: /proc/cpuinfo not found or unaccessible" );
+ new CpuDevice( this, "(no cpu found)" );
return;
}
QTextStream cpuinfo( &cpuinfofile );
int cpucount = 0;
CpuDevice* dev = 0;
while ( !cpuinfo.atEnd() )
{
QString line = cpuinfo.readLine();
odebug << "got line '" << line << "'" << oendl;
if ( line.lower().startsWith( "processor" ) )
{
dev = new CpuDevice( this, QString( "CPU #%1" ).arg( cpucount++ ) );
dev->addInfo( line );
}
else
{
if ( dev ) dev->addInfo( line );
}
}
}
//=================================================================================================
InputCategory::InputCategory( DevicesView* parent )
:Category( parent, "2. Input Subsystem" )
{
}
InputCategory::~InputCategory()
{
}
void InputCategory::populate()
{
odebug << "InputCategory::populate()" << oendl;
OInputSystem* sys = OInputSystem::instance();
OInputSystem::DeviceIterator it = sys->iterator();
while ( it.current() )
{
InputDevice* dev = new InputDevice( this, it.current()->identity() );
dev->setInfo( it.current() );
++it;
}
}
//=================================================================================================
CardsCategory::CardsCategory( DevicesView* parent )
:Category( parent, "3. Removable Cards" )
{
}
CardsCategory::~CardsCategory()
{
}
void CardsCategory::populate()
{
odebug << "CardsCategory::populate()" << oendl;
OPcmciaSystem* sys = OPcmciaSystem::instance();
OPcmciaSystem::CardIterator it = sys->iterator();
while ( it.current() )
{
CardDevice *dev = new CardDevice( this, it.current()->identity() );
dev->setInfo( it.current() );
++it;
}
}
//=================================================================================================
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" );
+ new UsbDevice( this, "(no USB found)" );
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);
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 ) );
}
}
//=================================================================================================
CardDevice::CardDevice( Category* parent, const QString& name )
:Device( parent, name )
{