summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-12-17 01:43:27 (UTC)
committer llornkcor <llornkcor>2002-12-17 01:43:27 (UTC)
commit2c338cc2ed1815c243cc88ed4506d1de184c19e0 (patch) (side-by-side diff)
tree28f58530a213256bd05fca4edeacc9a7e8810db9
parentcf373af175eb2d017acc6114e492452f1b4d2560 (diff)
downloadopie-2c338cc2ed1815c243cc88ed4506d1de184c19e0.zip
opie-2c338cc2ed1815c243cc88ed4506d1de184c19e0.tar.gz
opie-2c338cc2ed1815c243cc88ed4506d1de184c19e0.tar.bz2
fix mtdblock string display
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/storage.cpp44
1 files changed, 23 insertions, 21 deletions
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp
index 5d6cd1b..eb157ef 100644
--- a/noncore/settings/sysinfo/storage.cpp
+++ b/noncore/settings/sysinfo/storage.cpp
@@ -33,22 +33,22 @@
#include <mntent.h>
#endif
StorageInfo::StorageInfo( QWidget *parent, const char *name )
: QWidget( parent, name )
{
- 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 );
+ 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);
+ disks.setAutoDelete(TRUE);
lines.setAutoDelete(TRUE);
updateMounts();
startTimer( 5000 );
}
void StorageInfo::timerEvent(QTimerEvent*)
@@ -92,13 +92,14 @@ void StorageInfo::updateMounts()
int n=0;
if ( mntfp ) {
while ( (me = getmntent( mntfp )) != 0 ) {
QString fs = me->mnt_fsname;
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(5) == "tmpfs" ) {
+ || 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);
@@ -113,16 +114,16 @@ void StorageInfo::updateMounts()
if ( rebuild || n != (int)disks.count() ) {
disks.clear();
lines.clear();
delete vb;
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();
+ 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( container );
vb->addWidget(f);
f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
@@ -131,26 +132,27 @@ void StorageInfo::updateMounts()
} frst=FALSE;
QString humanname=*it;
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 " );
+
else if ( humanname.left(7) == "/dev/hd" )
humanname = tr( "Hard Disk /dev/hd " );
+
else if ( humanname.left(7) == "/dev/sd" )
humanname = tr( "SCSI Hard Disk /dev/sd " );
- else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
- humanname = tr( "Int. Storage " );
- 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 == "/dev/mtdblock1"
+ || humanname.left(13) == "/dev/mtdblock"
+ || 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 );