Fix to keep current selection for modules & processes. Would lose selection when lists were updated.

2 files changed, 30 insertions, 2 deletions

diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 7abad69..3d127a8 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -87,43 +87,57 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
 }
 
 ModulesInfo::~ModulesInfo()
 {
 }
 
 void ModulesInfo::updateData()
 {
     char modname[64];
     char usage[200];
     int modsize, usecount;
 
+    QString selectedmod;
+    QListViewItem *curritem = ModulesView->currentItem();
+    if ( curritem )
+    {
+        selectedmod = curritem->text( 0 );
+    }
+    
     ModulesView->clear();
 
     FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
 
     if ( procfile )
     {
+        QListViewItem *newitem;
+        QListViewItem *selecteditem = 0x0;
         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 );
+            newitem = new QListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage );
+            if ( qmodname == selectedmod )
+            {
+                selecteditem = newitem;
+            }
         }
+        ModulesView->setCurrentItem( selecteditem );
 
         fclose( procfile );
     }
 }
 
 void ModulesInfo::slotSendClicked()
 {
         if ( !ModulesView->currentItem() )
         {
                 return;
         }
         
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 769410f..2232771 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -92,26 +92,35 @@ ProcessInfo::~ProcessInfo()
 {
 }
 
 void ProcessInfo::updateData()
 {
     int pid, ppid, pgrp, session, tty, tpgid, utime, stime, cutime, cstime, counter, priority, starttime,
        signal, blocked, sigignore, sigcatch;
     uint flags, minflt, cminflt, majflt, cmajflt, timeout, itrealvalue, vsize, rss, rlim, startcode,
          endcode, startstack, kstkesp, kstkeip, wchan;
     char state;
     char comm[64];
 
+    QString selectedpid;
+    QListViewItem *curritem = ProcessView->currentItem();
+    if ( curritem )
+    {
+        selectedpid = curritem->text( 0 );
+    }
+    
     ProcessView->clear();
 
+    QListViewItem *newitem;
+    QListViewItem *selecteditem = 0x0;
     QDir *procdir = new QDir("/proc", 0, QDir::Name, QDir::Dirs);
     QFileInfoList *proclist = new QFileInfoList(*(procdir->entryInfoList()));
     if ( proclist )
     {
         QFileInfoListIterator it(*proclist);
         QFileInfo *f;
         while ( ( f = it.current() ) != 0 )
         {
             ++it;
             QString processnum = f->fileName();
             if ( processnum >= "1" && processnum <= "99999" )
             {
@@ -123,28 +132,33 @@ void ProcessInfo::updateData()
                            "%d %s %c %d %d %d %d %d %u %u %u %u %u %d %d %d %d %d %d %u %u %d %u %u %u %u %u %u %u %u %d %d %d %d %u",
                            &pid, comm, &state, &ppid, &pgrp, &session,&tty, &tpgid, &flags, &minflt, &cminflt,
                            &majflt, &cmajflt, &utime, &stime, &cutime, &cstime, &counter, &priority, &timeout,
                            &itrealvalue, &starttime, &vsize, &rss, &rlim, &startcode, &endcode, &startstack,
                            &kstkesp, &kstkeip, &signal, &blocked, &sigignore, &sigcatch, &wchan );
                     processnum = processnum.rightJustify( 5, ' ' );
                     QString processcmd = QString( comm ).replace( QRegExp( "[()]" ), "" );
                     QString processstatus = QChar(state);
                     QString processtime = QString::number( ( utime + stime ) / 100 );
                     processtime = processtime.rightJustify( 9, ' ' );
                     fclose( procfile );
 
-                    ( void ) new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
+                    newitem = new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
+                    if ( processnum == selectedpid )
+                    {
+                        selecteditem = newitem;
+                    }
                 }
             }
         }
+        ProcessView->setCurrentItem( selecteditem );
     }
 
     delete proclist;
     delete procdir;
 }
 
 void ProcessInfo::slotSendClicked()
 {
         QListViewItem *currprocess = ProcessView->currentItem();
         if ( !currprocess )
         {
                 return;