summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/storage.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp
index 0a07a3b..f76fbdb 100644
--- a/noncore/settings/sysinfo/storage.cpp
+++ b/noncore/settings/sysinfo/storage.cpp
@@ -83,6 +83,7 @@ void StorageInfo::updateMounts()
83 if ( mntfp ) { 83 if ( mntfp ) {
84 while ( (me = getmntent( mntfp )) != 0 ) { 84 while ( (me = getmntent( mntfp )) != 0 ) {
85 QString fs = me->mnt_fsname; 85 QString fs = me->mnt_fsname;
86 qDebug(fs+" "+(QString)me->mnt_type);
86 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" 87 if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd"
87 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" 88 || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
88 || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs") { 89 || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs") {
@@ -120,6 +121,7 @@ void StorageInfo::updateMounts()
120 f->show(); 121 f->show();
121 } frst=FALSE; 122 } frst=FALSE;
122 QString humanname=*it; 123 QString humanname=*it;
124// qDebug(humanname);
123 if ( isCF(humanname) ) 125 if ( isCF(humanname) )
124 humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" "); 126 humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" ");
125 else if ( humanname == "/dev/hda1" ) 127 else if ( humanname == "/dev/hda1" )
@@ -131,13 +133,13 @@ void StorageInfo::updateMounts()
131 else if ( humanname.left(7) == "/dev/sd" ) 133 else if ( humanname.left(7) == "/dev/sd" )
132 humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" "; 134 humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" ";
133 else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) 135 else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
134 humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+"\n"); 136 humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+"\n");
135 else if ( humanname.left(14) == "/dev/mtdblock/" ) 137 else if ( humanname.left(14) == "/dev/mtdblock/" )
136 humanname = tr("Internal Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" "; 138 humanname = tr("Int. Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" ";
137 else if ( humanname.left(13) == "/dev/mtdblock" ) 139 else if ( humanname.left(13) == "/dev/mtdblock" )
138 humanname = tr("Internal Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" "; 140 humanname = tr("Int. Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" ";
139 else if ( humanname.left(9) == "/dev/root" ) 141 else if ( humanname.left(9) == "/dev/root" )
140 humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+" "); 142 humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+" ");
141 // etc. 143 // etc.
142 MountInfo* mi = new MountInfo( *fsit, humanname, this ); 144 MountInfo* mi = new MountInfo( *fsit, humanname, this );
143 vb->addWidget(mi); 145 vb->addWidget(mi);
@@ -196,7 +198,7 @@ void MountInfo::updateData()
196 long total = fs->totalBlocks() * mult / div; 198 long total = fs->totalBlocks() * mult / div;
197 long avail = fs->availBlocks() * mult / div; 199 long avail = fs->availBlocks() * mult / div;
198 long used = total - avail; 200 long used = total - avail;
199 totalSize->setText( title + tr("Total: %1 kB").arg( total ) ); 201 totalSize->setText( title + tr(" : %1 kB").arg( total ) );
200 data->clear(); 202 data->clear();
201 data->addItem( tr("Used (%1 kB)").arg(used), used ); 203 data->addItem( tr("Used (%1 kB)").arg(used), used );
202 data->addItem( tr("Available (%1 kB)").arg(avail), avail ); 204 data->addItem( tr("Available (%1 kB)").arg(avail), avail );