| -rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 18 |
1 files changed, 10 insertions, 8 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 @@ -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); @@ -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" ) + + 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 ); |