author | drw <drw> | 2003-02-06 02:15:59 (UTC) |
---|---|---|
committer | drw <drw> | 2003-02-06 02:15:59 (UTC) |
commit | 51f39143a14b10b971670ad3a204af35be2564bb (patch) (side-by-side diff) | |
tree | 72b9e104f25449f014d877f467f34fd3dba12443 /noncore/settings | |
parent | 79588befde53765db0a92977c6890a4d226096e7 (diff) | |
download | opie-51f39143a14b10b971670ad3a204af35be2564bb.zip opie-51f39143a14b10b971670ad3a204af35be2564bb.tar.gz opie-51f39143a14b10b971670ad3a204af35be2564bb.tar.bz2 |
Fix to keep current selection for modules & processes. Would lose selection when lists were updated.
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.cpp | 16 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.cpp | 16 |
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 @@ -93,31 +93,45 @@ 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() 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 @@ -98,14 +98,23 @@ void ProcessInfo::updateData() 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; @@ -129,16 +138,21 @@ void ProcessInfo::updateData() 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; } |