use OAutoBoxLayout for devices info

2 files changed, 23 insertions, 9 deletions

diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index a1c9e0b..4bce65f 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -22,64 +22,74 @@ _;:,     .>    :=|.         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/olayout.h>
 #include <opie2/olistview.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
 /* QT */
+#include <qlistview.h>
 #include <qcombobox.h>
 #include <qfile.h>
-#include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 //=================================================================================================
 DevicesView::DevicesView( QWidget* parent,  const char* name, WFlags fl )
-            :OListView( parent, name, 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;
+}
+
+
 //=================================================================================================
 DevicesInfo::DevicesInfo( QWidget* parent,  const char* name, WFlags fl )
             :QWidget( parent, name, fl )
 {
-    QVBoxLayout *layout = new QVBoxLayout( this );
+    OAutoBoxLayout *layout = new OAutoBoxLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
     view = new DevicesView( this );
     layout->addWidget( view );
 }
 
 DevicesInfo::~DevicesInfo()
 {
 }
 
 
 Category::Category( DevicesView* parent, const QString& name )
diff --git a/noncore/settings/sysinfo/devicesinfo.h b/noncore/settings/sysinfo/devicesinfo.h
index 60ec999..262af31 100644
--- a/noncore/settings/sysinfo/devicesinfo.h
+++ b/noncore/settings/sysinfo/devicesinfo.h
@@ -20,63 +20,67 @@ _;:,     .>    :=|.         This program is free software; you can
 :     =  ...= . :.=-
 -.   .:....=;==+<;          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
 
-#include <qwidget.h>
+/* OPIE */
 #include <opie2/olistview.h>
-using namespace Opie::Ui;
+
+/* QT */
+#include <qwidget.h>
 
 //=================================================================================================
-class DevicesView : public OListView
+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();
 
 private:
-    OListView* view;
+    Opie::Ui::OListView* view;
 
 private slots:
 };
 
 //=================================================================================================
-class Category : public OListViewItem
+class Category : public Opie::Ui::OListViewItem
 {
 public:
     Category( DevicesView* parent, const QString& name );
     virtual ~Category();
 
     virtual void populate() = 0;
 };
 
 //=================================================================================================
-class Device : public OListViewItem
+class Device : public Opie::Ui::OListViewItem
 {
 public:
     Device( Category* parent, const QString& name );
     ~Device();
 };
 
 //=================================================================================================
 class CpuCategory : public Category
 {
 public:
     CpuCategory( DevicesView* parent );
     virtual ~CpuCategory();