10 files changed, 80 insertions, 59 deletions

diff --git a/noncore/settings/sysinfo/load.cpp b/noncore/settings/sysinfo/load.cpp
index 900b3d3..d9d7a66 100644
--- a/noncore/settings/sysinfo/load.cpp
+++ b/noncore/settings/sysinfo/load.cpp
@@ -125,13 +125,13 @@ Load::Load( QWidget *parent, const char *name, WFlags f )
     timer->start( 2000 );
     gettimeofday( &last, 0 );
     first = TRUE;
     timeout();
 }
 
-void Load::paintEvent( QPaintEvent *ev )
+void Load::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
 
     int h = height() - 5;
 
     int mult = (int)(h / maxLoad);
diff --git a/noncore/settings/sysinfo/memory.cpp b/noncore/settings/sysinfo/memory.cpp
index 30d42d5..4f612d8 100644
--- a/noncore/settings/sysinfo/memory.cpp
+++ b/noncore/settings/sysinfo/memory.cpp
@@ -25,13 +25,13 @@
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include "graph.h"
 #include "memory.h"
 
-MemoryInfo::MemoryInfo( QWidget *parent, const char *name, WFlags f )
+MemoryInfo::MemoryInfo( QWidget *parent, const char *name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     QVBoxLayout *vb = new QVBoxLayout( this, 5 );
 
     totalMem = new QLabel( this );
     vb->addWidget( totalMem );
diff --git a/noncore/settings/sysinfo/modulesdetail.cpp b/noncore/settings/sysinfo/modulesdetail.cpp
index ea5f352..ea9cdfa 100644
--- a/noncore/settings/sysinfo/modulesdetail.cpp
+++ b/noncore/settings/sysinfo/modulesdetail.cpp
@@ -29,13 +29,13 @@
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 #include <qwhatsthis.h>
 
-ModulesDetail::ModulesDetail( QWidget* parent,  const char* name, WFlags fl )
+ModulesDetail::ModulesDetail( QWidget* parent,  const char* name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     modname = "";
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index a0d26c7..c558fad 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -18,105 +18,116 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include <qpe/qpeapplication.h>
 
+#include <qcombobox.h>
 #include <qfile.h>
 #include <qheader.h>
 #include <qlayout.h>
 #include <qlistview.h>
+#include <qmessagebox.h>
+#include <qpushbutton.h>
+#include <qstring.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include "modulesinfo.h"
 
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     : QWidget( parent, name, fl )
 {
-    QVBoxLayout *layout = new QVBoxLayout( this, 5 );
+    QGridLayout *layout = new QGridLayout( this );
+    layout->setSpacing( 4 );
+    layout->setMargin( 4 );
 
-    ModulesView = new QListView( this, "ModulesView" );
+    ModulesView = new QListView( this );
     int colnum = ModulesView->addColumn( tr( "Module" ) );
     colnum = ModulesView->addColumn( tr( "Size" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
     colnum = ModulesView->addColumn( tr( "Use#" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
     colnum = ModulesView->addColumn( tr( "Used By" ) );
     ModulesView->setAllColumnsShowFocus( TRUE );
-    QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
-    connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
-            this, SLOT( viewModules( QListViewItem * ) ) );
-    layout->addWidget( ModulesView );
+    layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 );
     QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
 
+    CommandCB = new QComboBox( FALSE, this );
+    CommandCB->insertItem( "modprobe -r" );
+    CommandCB->insertItem( "rmmod" );
+    // I can't think of other useful commands yet. Anyone?
+    layout->addWidget( CommandCB, 1, 0 );
+    QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command to module selected above." ) );
+
+    QPushButton *btn = new QPushButton( this );
+    btn->setMinimumSize( QSize( 50, 24 ) );
+    btn->setMaximumSize( QSize( 50, 24 ) );
+    btn->setText( tr( "Send" ) );
+    connect( btn, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
+    layout->addWidget( btn, 1, 1 );
+    QWhatsThis::add( btn, tr( "Click here to send the selected command to the module selected above." ) );
+
     QTimer *t = new QTimer( this );
     connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
     t->start( 5000 );
 
     updateData();
-    
-    ModulesDtl = new ModulesDetail( 0, 0, 0 );
-    ModulesDtl->ModulesView->setTextFormat( PlainText );
 }
 
 ModulesInfo::~ModulesInfo()
 {
 }
 
 void ModulesInfo::updateData()
 {
     char modname[64];
     char usage[200];
     int modsize, usecount;
-    
+
     ModulesView->clear();
 
     FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
 
     if ( procfile )
     {
-        while ( true ) {                    
+        while ( true ) {
             int success = fscanf( procfile, "%s%d%d%[^\n]", modname, &modsize, &usecount, usage );
-           
+
             if ( success == EOF )
                 break;
 
             QString qmodname = QString( modname );
             QString qmodsize = QString::number( modsize ).rightJustify( 6, ' ' );
             QString qusecount = QString::number( usecount ).rightJustify( 2, ' ' );
             QString qusage = QString( usage );
-            
+
             ( void ) new QListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage );
         }
-                
+
         fclose( procfile );
     }
 }
 
-void ModulesInfo::viewModules( QListViewItem *modules )
+void ModulesInfo::slotSendClicked()
 {
-    QString modname = modules->text( 0 );   
-    ModulesDtl->setCaption( QString( "Module: " ) + modname );
-    ModulesDtl->modname = modname;
-    QString command = QString( "/sbin/modinfo " ) + modules->text( 0 );
-    
-    FILE* modinfo = popen( command, "r" );
-    
-    if ( modinfo )
+        QString capstr = tr( "You really want to execute\n" );
+        capstr.append( CommandCB->currentText() );
+        capstr.append( "\nfor this module?" );
+
+    if ( QMessageBox::warning( this, caption(), capstr,
+         QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     {
-        char line[200];
-        ModulesDtl->ModulesView->setText( " Details:\n------------\n" );
-        
-        while( true )
-        {        
-            int success = fscanf( modinfo, "%[^\n]\n", line );
-            if ( success == EOF )
-                break;         
-            ModulesDtl->ModulesView->append( line );
-        }
-        
-        pclose( modinfo );
+                QString command = "/sbin/";
+                command.append( CommandCB->currentText() );
+                command.append( " " );
+                command.append( ModulesView->currentItem()->text( 0 ) );
+
+        FILE* stream = popen( command, "r" );
+        if ( stream )
+            pclose( stream );
+        //{
+          //  hide();
+        //}
     }
 
-    ModulesDtl->showMaximized();
 }
diff --git a/noncore/settings/sysinfo/modulesinfo.h b/noncore/settings/sysinfo/modulesinfo.h
index c702f24..ef1f805 100644
--- a/noncore/settings/sysinfo/modulesinfo.h
+++ b/noncore/settings/sysinfo/modulesinfo.h
@@ -20,27 +20,27 @@
 **********************************************************************/
 
 #ifndef MODULESINFO_H
 #define MODULESINFO_H
 
 #include <qwidget.h>
-#include <qlistview.h>
 
-#include "modulesdetail.h"
+class QComboBox;
+class QListView;
 
 class ModulesInfo : public QWidget
 {
     Q_OBJECT
 public:
     ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~ModulesInfo();
 
-private slots:
-    void updateData();
-    void viewModules( QListViewItem * );
-
 private:
     QListView* ModulesView;
-    ModulesDetail *ModulesDtl;
+    QComboBox* CommandCB;
+
+private slots:
+    void updateData();
+    void slotSendClicked();
 };
 
 #endif
diff --git a/noncore/settings/sysinfo/processdetail.cpp b/noncore/settings/sysinfo/processdetail.cpp
index 661e32c..fcb871f 100644
--- a/noncore/settings/sysinfo/processdetail.cpp
+++ b/noncore/settings/sysinfo/processdetail.cpp
@@ -27,13 +27,13 @@
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 #include <qwhatsthis.h>
 
-ProcessDetail::ProcessDetail( QWidget* parent,  const char* name, WFlags fl )
+ProcessDetail::ProcessDetail( QWidget* parent,  const char* name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     pid = 0;
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp
index c33663e..5d6cd1b 100644
--- a/noncore/settings/sysinfo/storage.cpp
+++ b/noncore/settings/sysinfo/storage.cpp
@@ -17,12 +17,13 @@
 ** not clear to you.
 **
 **********************************************************************/
 // additions copyright 2002 by L.J. Potter
 #include <qlabel.h>
 #include <qlayout.h>
+#include <qscrollview.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include "graph.h"
 #include "storage.h"
 
@@ -32,14 +33,22 @@
 #include <mntent.h>
  #endif
 
 StorageInfo::StorageInfo( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
-    vb = 0;
-    disks.setAutoDelete(TRUE);
+        QVBoxLayout *tmpvb = new QVBoxLayout( this );
+        QScrollView *sv = new QScrollView( this );
+        tmpvb->addWidget( sv, 0, 0 );
+        sv->setResizePolicy( QScrollView::AutoOneFit );
+        sv->setFrameStyle( QFrame::NoFrame );
+        container = new QWidget( sv->viewport() );
+        sv->addChild( container );
+    vb = 0x0;
+
+        disks.setAutoDelete(TRUE);
     lines.setAutoDelete(TRUE);
     updateMounts();
     startTimer( 5000 );
 }
 
 void StorageInfo::timerEvent(QTimerEvent*)
@@ -81,16 +90,15 @@ void StorageInfo::updateMounts()
     QStringList fsT;
     bool rebuild = FALSE;
     int n=0;
     if ( mntfp ) {
         while ( (me = getmntent( mntfp )) != 0 ) {
             QString fs = me->mnt_fsname;
-            qDebug(fs+" "+(QString)me->mnt_type);
             if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
                  || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
-                 || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs") {
+                 || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs" || fs.left(5) == "tmpfs" ) {
                 n++;
                 curdisks.append(fs);
                 QString d = me->mnt_dir;
                 curfs.append(d);
                 QString mount =  me->mnt_dir;
                 mountList.append(mount);
@@ -103,29 +111,28 @@ void StorageInfo::updateMounts()
         endmntent( mntfp );
     }
     if ( rebuild || n != (int)disks.count() ) {
         disks.clear();
         lines.clear();
         delete vb;
-        vb = new QVBoxLayout( this, n > 3 ? 1 : 5 );
+        vb = new QVBoxLayout( container/*, n > 3 ? 1 : 5*/ );
         bool frst=TRUE;
         QStringList::ConstIterator it=curdisks.begin();
         QStringList::ConstIterator fsit=curfs.begin();
         QStringList::ConstIterator fsmount=mountList.begin();
         QStringList::ConstIterator fsTit=fsT.begin();
 
     for (; it!=curdisks.end(); ++it, ++fsit) {
             if ( !frst ) {
-                QFrame *f = new QFrame( this );
+                QFrame *f = new QFrame( container );
                 vb->addWidget(f);
                 f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
                 lines.append(f);
                 f->show();
             } frst=FALSE;
             QString humanname=*it;
-//            qDebug(humanname);
             if ( isCF(humanname) )
                 humanname = tr( "CF Card: " );
             else if ( humanname == "/dev/hda1" )
                 humanname = tr( "Hard Disk " );
             else if ( humanname.left(9) == "/dev/mmcd" )
                 humanname = tr( "SD Card " );
@@ -138,19 +145,21 @@ void StorageInfo::updateMounts()
             else if ( humanname.left(14) == "/dev/mtdblock/" )
                 humanname = tr( "Int. Storage /dev/mtdblock/ " );
             else if ( humanname.left(13) == "/dev/mtdblock" )
                 humanname = tr( "Int. Storage /dev/mtdblock " );
             else if ( humanname.left(9) == "/dev/root" )
                 humanname = tr( "Int. Storage " );
+            else if ( humanname.left(5) == "tmpfs" )
+                humanname = tr( "RAM disk" );
               // etc.
             humanname.append( *fsmount );
             humanname.append( " " );
             humanname.append( *fsTit );
             humanname.append( " " );
 
-            MountInfo* mi = new MountInfo( *fsit, humanname, this );
+            MountInfo* mi = new MountInfo( *fsit, humanname, container );
             vb->addWidget(mi);
             disks.insert(*fsit,mi);
             mi->show();
             fsmount++;fsTit++;
             QString tempstr = humanname.left( 2 );
             if ( tempstr == tr( "CF" ) )
@@ -160,12 +169,14 @@ void StorageInfo::updateMounts()
             else if ( tempstr == tr( "SD" ) )
                 QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Secure Digital memory card." ) );
             else if ( tempstr == tr( "SC" ) )
                 QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) );
             else if ( tempstr == tr( "In" ) )
                 QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device." ) );
+            else if ( tempstr == tr( "RA" ) )
+                QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used of the temporary RAM disk." ) );
         }
         vb->addStretch();
     } else {
           // just update them
         for (QDictIterator<MountInfo> i(disks); i.current(); ++i)
             i.current()->updateData();
@@ -174,13 +185,12 @@ void StorageInfo::updateMounts()
 }
 
 
 MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent, const char *name )
     : QWidget( parent, name ), title(ttl)
 {
-    qDebug("new path is "+path);
     fs = new FileSystem( path );
     QVBoxLayout *vb = new QVBoxLayout( this, 3 );
 
     totalSize = new QLabel( this );
     vb->addWidget( totalSize );
 
diff --git a/noncore/settings/sysinfo/storage.h b/noncore/settings/sysinfo/storage.h
index 3fa5b79..7e8b4e0 100644
--- a/noncore/settings/sysinfo/storage.h
+++ b/noncore/settings/sysinfo/storage.h
@@ -26,12 +26,13 @@ class QLabel;
 class GraphData;
 class Graph;
 class GraphLegend;
 class FileSystem;
 class MountInfo;
 class QVBoxLayout;
+class QWidget;
 
 
 class StorageInfo : public QWidget
 {
     Q_OBJECT
 public:
@@ -42,12 +43,13 @@ protected:
 
 private:
     void updateMounts();
     QDict<MountInfo> disks;
     QList<QFrame> lines;
     QVBoxLayout *vb;
+    QWidget *container;
 };
 
 class MountInfo : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index 6d2a64f..872492e 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -34,13 +34,13 @@
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 
-SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f )
+SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     setIcon( Resource::loadPixmap( "system_icon" ) );
     setCaption( tr("System Info") );
 
     resize( 220, 180 );
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index 236fc02..7e66451 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -5,24 +5,22 @@ HEADERS   = memory.h \
       graph.h \
       load.h \
       storage.h \
       processinfo.h \
       processdetail.h \
       modulesinfo.h \
-      modulesdetail.h \
       versioninfo.h \
       sysinfo.h
 SOURCES   = main.cpp \
       memory.cpp \
       graph.cpp \
       load.cpp \
       storage.cpp \
       processinfo.cpp \
       modulesinfo.cpp \
       processdetail.cpp \
-      modulesdetail.cpp \
       versioninfo.cpp \
       sysinfo.cpp
 INTERFACES  = 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie