summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/sysinfo/storage.cpp46
1 files changed, 32 insertions, 14 deletions
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp
index 4e81170..0a07a3b 100644
--- a/noncore/settings/sysinfo/storage.cpp
+++ b/noncore/settings/sysinfo/storage.cpp
@@ -18,5 +18,5 @@
**
**********************************************************************/
-
+// additions copyright 2002 by L.J. Potter
#include <qlabel.h>
#include <qlayout.h>
@@ -58,6 +58,5 @@ static bool isCF(const QString& m)
while ( fgets( line, 1024, f ) ) {
// 0 ide ide-cs 0 hda 3 0
- if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 )
- {
+ if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) {
if ( QString(devtype) == "ide" && m.find(devname)>0 ) {
fclose(f);
@@ -78,4 +77,6 @@ void StorageInfo::updateMounts()
QStringList curdisks;
QStringList curfs;
+ QStringList mountList;
+ QStringList fsT;
bool rebuild = FALSE;
int n=0;
@@ -84,10 +85,14 @@ void StorageInfo::updateMounts()
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(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd"
+ || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs") {
n++;
curdisks.append(fs);
QString d = me->mnt_dir;
curfs.append(d);
+ QString mount = me->mnt_dir;
+ mountList.append(mount);
+ QString t = me->mnt_type;
+ fsT.append(t);
if ( !disks.find(d) )
rebuild = TRUE;
@@ -104,4 +109,7 @@ void StorageInfo::updateMounts()
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 ) {
@@ -114,19 +122,21 @@ void StorageInfo::updateMounts()
QString humanname=*it;
if ( isCF(humanname) )
- humanname = tr("CF Card");
+ humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" ");
else if ( humanname == "/dev/hda1" )
- humanname = tr("Hard Disk");
+ humanname = tr("Hard Disk "+*fsmount+" "+*fsTit+" ");
else if ( humanname.left(9) == "/dev/mmcd" )
- humanname = tr("SD Card");
+ humanname = tr("SD Card "+*fsmount+" "+*fsTit+" ");
else if ( humanname.left(7) == "/dev/hd" )
- humanname = tr("Hard Disk") + " " + humanname.mid(7);
+ humanname = tr("Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname.left(7) == "/dev/sd" )
- humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7);
+ humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
- humanname = tr("Internal Storage");
+ humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+"\n");
else if ( humanname.left(14) == "/dev/mtdblock/" )
- humanname = tr("Internal Storage") + " " + humanname.mid(14);
+ humanname = tr("Internal Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname.left(13) == "/dev/mtdblock" )
- humanname = tr("Internal Storage") + " " + humanname.mid(13);
+ humanname = tr("Internal Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" ";
+ else if ( humanname.left(9) == "/dev/root" )
+ humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+" ");
// etc.
MountInfo* mi = new MountInfo( *fsit, humanname, this );
@@ -134,4 +144,5 @@ void StorageInfo::updateMounts()
disks.insert(*fsit,mi);
mi->show();
+ fsmount++;fsTit++;
}
vb->addStretch();
@@ -148,4 +159,5 @@ MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent,
: QWidget( parent, name ), title(ttl)
{
+ qDebug("new path is "+path);
fs = new FileSystem( path );
QVBoxLayout *vb = new QVBoxLayout( this, 3 );
@@ -185,5 +197,5 @@ void MountInfo::updateData()
long avail = fs->availBlocks() * mult / div;
long used = total - avail;
- totalSize->setText( title + tr(" total: %1 kB").arg( total ) );
+ totalSize->setText( title + tr("Total: %1 kB").arg( total ) );
data->clear();
data->addItem( tr("Used (%1 kB)").arg(used), used );
@@ -208,7 +220,13 @@ void FileSystem::update()
struct statfs fs;
if ( !statfs( fspath.latin1(), &fs ) ) {
+ if( fspath.left(8) == "/mnt/ram") { //ugly hack openzaurus
+ blkSize = fs.f_bsize;
+ totalBlks = fs.f_blocks;
+ availBlks = fs.f_ffree;
+ } else {
blkSize = fs.f_bsize;
totalBlks = fs.f_blocks;
availBlks = fs.f_bavail;
+ }
} else {
blkSize = 0;