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
@@ -22,48 +22,49 @@ _;:,     .>    :=|.         This program is free software; you can
  -_. . .   )=.  =           General Public License along with
    --        :-=`           this application; see the file LICENSE.GPL.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 
 #include "devicesinfo.h"
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/oinputsystem.h>
 #include <opie2/opcmciasystem.h>
 #include <opie2/olayout.h>
 #include <opie2/olistview.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 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>
 
 //=================================================================================================
 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()
@@ -75,49 +76,49 @@ 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, 70 );
+    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 )
@@ -165,71 +166,73 @@ void CpuCategory::populate()
         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() )
     {
-        new InputDevice( this, it.current()->identity() );
+        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() )
     {
-        new CardDevice( this, it.current()->identity() );
+        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" );
         return;
     }
     QTextStream usbinfo( &usbinfofile );
@@ -305,62 +308,124 @@ CpuDevice::CpuDevice( Category* parent, const QString& 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();
+    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()
 {
 }
 
 //=================================================================================================
 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 c601a96..c4e3637 100644
--- a/noncore/settings/sysinfo/devicesinfo.h
+++ b/noncore/settings/sysinfo/devicesinfo.h
@@ -16,48 +16,50 @@ _;:,     .>    :=|.         This program is free software; you can
    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;     General Public License for more
 ++=   -.     .`     .:      details.
 :     =  ...= . :.=-
 -.   .:....=;==+<;          You should have received a copy of the GNU
  -_. . .   )=.  =           General Public License along with
    --        :-=`           this application; see the file LICENSE.GPL.
                             If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 
 #ifndef DEVICESINFO_H
 #define DEVICESINFO_H
 
 /* OPIE */
 #include <opie2/olistview.h>
 #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 );
     ~DevicesView();
 public slots:
     void selectionChanged( QListViewItem* item );
 };
 
 //=================================================================================================
 class DevicesInfo : public QWidget
 {
     Q_OBJECT
 public:
     DevicesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~DevicesInfo();
 
     void setDetailsWidget( QWidget* w = 0 );
 
 private:
     Opie::Ui::OAutoBoxLayout* layout;
     Opie::Ui::OListView* view;
@@ -81,96 +83,98 @@ class CpuCategory : public Category
 {
 public:
     CpuCategory( DevicesView* parent );
     virtual ~CpuCategory();
 
     virtual void populate();
 };
 
 //=================================================================================================
 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();
 
+    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
 {
 public:
     UsbDevice( Category* parent, const QString& name );
     UsbDevice( UsbDevice* parent, const QString& name );
     ~UsbDevice();
 
 //     virtual QWidget* detailsWidget();
 };
 
 #endif
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
@@ -13,27 +13,27 @@ HEADERS   = \
       sysloginfo.h \
       versioninfo.h \
       sysinfo.h
 
 SOURCES   = \
       main.cpp \
       memory.cpp \
       graph.cpp \
       devicesinfo.cpp \
       storage.cpp \
       processinfo.cpp \
       modulesinfo.cpp \
       detail.cpp \
       contrib/dhry.c contrib/fft.c \
       benchmarkinfo.cpp \
       sysloginfo.cpp \
       versioninfo.cpp \
       sysinfo.cpp
 
 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,32 +1,30 @@
 /**********************************************************************
 ** 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.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "sysloginfo.h"
 #include "detail.h"
 
 /* OPIE */
 #include <opie2/olistview.h>
 #include <opie2/oconfig.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlayout.h>
@@ -48,49 +46,49 @@ using namespace Opie::Ui;
 #include <string.h>
 #include <errno.h>
 
 #define SYSLOG_READ 2
 #define SYSLOG_READ_ALL 3
 #define SYSLOG_READ_ALL_CLEAR 4
 #define SYSLOG_UNREAD 9
 
 #undef APPEND
 
 const unsigned int bufsize = 16384;
 char buf[bufsize];
 
 SyslogInfo::SyslogInfo( QWidget* parent,  const char* name, WFlags fl )
         : QWidget( parent, name, fl )
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2 );
     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 );
 
 #ifdef APPEND
     fd = ::open( "/proc/kmsg", O_RDONLY|O_SYNC );
     if ( fd == -1 )
     {
         syslogview->setText( "Couldn't open /proc/kmsg: " + QString( strerror( errno ) ) );
         return;
     }
     QSocketNotifier *sn = new QSocketNotifier( fd, QSocketNotifier::Read, this );
     QObject::connect( sn, SIGNAL(activated(int)), this, SLOT(updateData()) );
 #else
     QPushButton* pb = new QPushButton( "&Refresh", this );
     layout->addWidget( pb, 1, 0 );
     QObject::connect( pb, SIGNAL(clicked()), this, SLOT(updateData()) );
 #endif
 }
 
 SyslogInfo::~SyslogInfo()
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,32 +1,30 @@
 /**********************************************************************
 ** 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.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #ifndef SYSLOGINFO_H
 #define SYSLOGINFO_H
 
 #include <qwidget.h>
 
 class QTextView;
 
 class SyslogInfo : public QWidget
 {
     Q_OBJECT
 public:
     SyslogInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~SyslogInfo();