SysInfo:

- add pcmcia device node detail view
- add input device node detail view
- grab preferred fixed font for syslog from qpe.conf
- slightly adjust tree/detail widget space ratio

5 files changed, 81 insertions, 16 deletions

diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 4940286..76c9b79 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -40,12 +40,13 @@ using namespace Opie::Ui;
 /* QT */
 #include <qobjectlist.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qpushbutton.h>
+#include <qstringlist.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 //=================================================================================================
@@ -93,13 +94,13 @@ DevicesInfo::DevicesInfo( QWidget* parent,  const char* name, WFlags fl )
     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, 70 );
+    layout->addWidget( stack, 80 );
 }
 
 
 DevicesInfo::~DevicesInfo()
 {
 }
@@ -183,13 +184,14 @@ void InputCategory::populate()
 {
     odebug << "InputCategory::populate()" << oendl;
     OInputSystem* sys = OInputSystem::instance();
     OInputSystem::DeviceIterator it = sys->iterator();
     while ( it.current() )
     {
-        new InputDevice( this, it.current()->identity() );
+        InputDevice* dev = new InputDevice( this, it.current()->identity() );
+        dev->setInfo( it.current() );
         ++it;
     }
 }
 
 //=================================================================================================
 CardsCategory::CardsCategory( DevicesView* parent )
@@ -205,13 +207,14 @@ void CardsCategory::populate()
 {
     odebug << "CardsCategory::populate()" << oendl;
     OPcmciaSystem* sys = OPcmciaSystem::instance();
     OPcmciaSystem::CardIterator it = sys->iterator();
     while ( it.current() )
     {
-        new CardDevice( this, it.current()->identity() );
+        CardDevice *dev = new CardDevice( this, it.current()->identity() );
+        dev->setInfo( it.current() );
         ++it;
     }
 }
 
 //=================================================================================================
 UsbCategory::UsbCategory( DevicesView* parent )
@@ -323,26 +326,88 @@ void CpuDevice::addInfo( const QString& info )
 }
 
 //=================================================================================================
 CardDevice::CardDevice( Category* parent, const QString& name )
            :Device( parent, name )
 {
-    details = new QPushButton( name, devinfo );
-    details->hide();
+    OListView* w = new OListView( devinfo );
+    details = w;
+    w->addColumn( "Info" );
+    w->addColumn( "Value" );
+    w->hide();
+}
+
+void CardDevice::setInfo( const OPcmciaSocket* card )
+{
+    QStringList vendorlst = card->productIdentityVector();
+    for( QStringList::Iterator it = vendorlst.begin(); it != vendorlst.end(); ++it )
+    {
+        new OListViewItem( (OListView*) details, "VendorID", *it );
+    }
+    new OListViewItem( (OListView*) details, "Manufacturer", card->manufacturerIdentity() );
+    new OListViewItem( (OListView*) details, "Function", card->function() );
+
+    QStringList text;
+    OPcmciaSocket::OPcmciaSocketCardStatus status = card->status();
+    if ( status )
+    {
+        if ( status & OPcmciaSocket::Occupied ) text += "Occupied";
+        if ( status & OPcmciaSocket::OccupiedCardBus ) text += "CardBus";
+        if ( status & OPcmciaSocket::WriteProtected ) text += "WriteProtected";
+        if ( status & OPcmciaSocket::BatteryLow ) text += "BatteryLow";
+        if ( status & OPcmciaSocket::BatteryDead ) text += "BatteryDead";
+        if ( status & OPcmciaSocket::Ready ) text += "Ready";
+        if ( status & OPcmciaSocket::Suspended ) text += "Suspended";
+        if ( status & OPcmciaSocket::Attention ) text += "Attention";
+        if ( status & OPcmciaSocket::InsertionInProgress ) text += "InsertionInProgress";
+        if ( status & OPcmciaSocket::RemovalInProgress ) text += "RemovalInProgress";
+        if ( status & OPcmciaSocket::ThreeVolts  ) text += "3V";
+        if ( status & OPcmciaSocket::SupportsVoltage ) text += "SupportsVoltage";
+    }
+    else
+    {
+        text += "<unknown>";
+    }
+    new OListViewItem( (OListView*) details, "Status", text.join( ", " ) );
 }
 
 CardDevice::~CardDevice()
 {
 }
 
 //=================================================================================================
 InputDevice::InputDevice( Category* parent, const QString& name )
             :Device( parent, name )
 {
-    details = new QPushButton( name, devinfo );
-    details->hide();
+    OListView* w = new OListView( devinfo );
+    details = w;
+    w->addColumn( "Info" );
+    w->addColumn( "Value" );
+    w->hide();
+}
+
+void InputDevice::setInfo( const OInputDevice* dev )
+{
+    new OListViewItem( (OListView*) details, "Identity", dev->identity() );
+    new OListViewItem( (OListView*) details, "Path", dev->path() );
+    new OListViewItem( (OListView*) details, "Unique", dev->uniq() );
+
+    QStringList text;
+    if ( dev->hasFeature( OInputDevice::Synchronous ) ) text += "Synchronous";
+    if ( dev->hasFeature( OInputDevice::Keys ) ) text += "Keys";
+    if ( dev->hasFeature( OInputDevice::Relative ) ) text += "Relative";
+    if ( dev->hasFeature( OInputDevice::Absolute ) ) text += "Absolute";
+    if ( dev->hasFeature( OInputDevice::Miscellaneous ) ) text += "Miscellaneous";
+    if ( dev->hasFeature( OInputDevice::Leds ) ) text += "Leds";
+    if ( dev->hasFeature( OInputDevice::Sound ) ) text += "Sound";
+    if ( dev->hasFeature( OInputDevice::AutoRepeat ) ) text += "AutoRepeat";
+    if ( dev->hasFeature( OInputDevice::ForceFeedback ) ) text += "ForceFeedback";
+    if ( dev->hasFeature( OInputDevice::PowerManagement ) ) text += "PowerManagement";
+    if ( dev->hasFeature( OInputDevice::ForceFeedbackStatus ) ) text += "ForceFeedbackStatus";
+    new OListViewItem( (OListView*) details, "Features", text.join( ", " ) );
+
 }
 
 InputDevice::~InputDevice()
 {
 }
 
diff --git a/noncore/settings/sysinfo/devicesinfo.h b/noncore/settings/sysinfo/devicesinfo.h
index c601a96..c4e3637 100644
--- a/noncore/settings/sysinfo/devicesinfo.h
+++ b/noncore/settings/sysinfo/devicesinfo.h
@@ -34,12 +34,14 @@ _;:,     .>    :=|.         This program is free software; you can
 #include <opie2/olayout.h>
 
 /* QT */
 #include <qwidget.h>
 #include <qwidgetstack.h>
 
+namespace Opie { namespace Core { class OPcmciaSocket; class OInputDevice; }; };
+
 //=================================================================================================
 class DevicesView : public Opie::Ui::OListView
 {
     Q_OBJECT
 public:
     DevicesView( QWidget* parent = 0, const char* name = 0, WFlags f = 0 );
@@ -99,13 +101,12 @@ public:
 //=================================================================================================
 class CardsCategory : public Category
 {
 public:
     CardsCategory( DevicesView* parent );
     virtual ~CardsCategory();
-
     virtual void populate();
 };
 
 //=================================================================================================
 class UsbCategory : public Category
 {
@@ -146,21 +147,24 @@ public:
 class InputDevice : public Device
 {
 public:
     InputDevice( Category* parent, const QString& name );
     ~InputDevice();
 
+    void setInfo( const Opie::Core::OInputDevice* dev );
+
 //     virtual QWidget* detailsWidget();
 };
 
 //=================================================================================================
 class CardDevice : public Device
 {
 public:
     CardDevice( Category* parent, const QString& name );
     ~CardDevice();
+    void setInfo( const Opie::Core::OPcmciaSocket* card );
 
 //     virtual QWidget* detailsWidget();
 };
 
 //=================================================================================================
 class UsbDevice : public Device
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 8b23a57..ed9bc0e 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -31,9 +31,9 @@ SOURCES   = \
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2
 DEFINES     += UNIX
 TARGET    = sysinfo
-VERSION   = 1.3.0
+VERSION   = 1.3.1
 
 include( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/sysloginfo.cpp b/noncore/settings/sysinfo/sysloginfo.cpp
index 21427f4..279c335 100644
--- a/noncore/settings/sysinfo/sysloginfo.cpp
+++ b/noncore/settings/sysinfo/sysloginfo.cpp
@@ -1,14 +1,12 @@
 /**********************************************************************
 ** SyslogInfo
 **
 ** Display Syslog information
 **
-** Copyright (C) 2004, Michael Lauer
-**                    mickey@tm.informatik.uni-frankfurt.de
-**                    http://www.Vanille.de
+** Copyright (C) 2004-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
@@ -66,13 +64,13 @@ SyslogInfo::SyslogInfo( QWidget* parent,  const char* name, WFlags fl )
     layout->setMargin( 0 );
 
     syslogview = new QTextView( this );
     syslogview->setTextFormat( PlainText );
     OConfig cfg( "qpe" );
     cfg.setGroup( "Appearance" );
-    syslogview->setFont( QFont( "Fixed", cfg.readNumEntry( "FontSize", 10 ) ) );
+    syslogview->setFont( QFont( cfg.readEntry( "FixedFontFamily", "Fixed" ), cfg.readNumEntry( "FixedFontSize", 10 ) ) );
     layout->addWidget( syslogview, 0, 0 );
     syslogview->setText( "..." );
 
     memset( buf, 0, bufsize );
     ::klogctl( SYSLOG_READ_ALL, buf, bufsize );
     syslogview->setText( buf );
diff --git a/noncore/settings/sysinfo/sysloginfo.h b/noncore/settings/sysinfo/sysloginfo.h
index 7bf8d17..f9e522a 100644
--- a/noncore/settings/sysinfo/sysloginfo.h
+++ b/noncore/settings/sysinfo/sysloginfo.h
@@ -1,14 +1,12 @@
 /**********************************************************************
 ** SyslogInfo
 **
 ** Display Syslog information
 **
-** Copyright (C) 2004, Michael Lauer
-**                    mickey@tm.informatik.uni-frankfurt.de
-**                    http://www.Vanille.de
+** Copyright (C) 2004-2005, Michael 'Mickey' Lauer <mickey@Vanille.de>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **