-rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 46 |
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 | |||
@@ -19,3 +19,3 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | // additions copyright 2002 by L.J. Potter | |
21 | #include <qlabel.h> | 21 | #include <qlabel.h> |
@@ -59,4 +59,3 @@ static bool isCF(const QString& m) | |||
59 | // 0 ide ide-cs 0 hda 3 0 | 59 | // 0 ide ide-cs 0 hda 3 0 |
60 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) | 60 | if ( sscanf(line,"%*d %s %*s %*s %s", devtype, devname )==2 ) { |
61 | { | ||
62 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { | 61 | if ( QString(devtype) == "ide" && m.find(devname)>0 ) { |
@@ -79,2 +78,4 @@ void StorageInfo::updateMounts() | |||
79 | QStringList curfs; | 78 | QStringList curfs; |
79 | QStringList mountList; | ||
80 | QStringList fsT; | ||
80 | bool rebuild = FALSE; | 81 | bool rebuild = FALSE; |
@@ -85,4 +86,4 @@ void StorageInfo::updateMounts() | |||
85 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" | 86 | if ( fs.left(7)=="/dev/hd" || fs.left(7)=="/dev/sd" |
86 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" ) | 87 | || fs.left(8)=="/dev/mtd" || fs.left(9) == "/dev/mmcd" |
87 | { | 88 | || fs.left(9) == "/dev/root" || fs.left(5) == "/ramfs") { |
88 | n++; | 89 | n++; |
@@ -91,2 +92,6 @@ void StorageInfo::updateMounts() | |||
91 | curfs.append(d); | 92 | curfs.append(d); |
93 | QString mount = me->mnt_dir; | ||
94 | mountList.append(mount); | ||
95 | QString t = me->mnt_type; | ||
96 | fsT.append(t); | ||
92 | if ( !disks.find(d) ) | 97 | if ( !disks.find(d) ) |
@@ -105,2 +110,5 @@ void StorageInfo::updateMounts() | |||
105 | QStringList::ConstIterator fsit=curfs.begin(); | 110 | QStringList::ConstIterator fsit=curfs.begin(); |
111 | QStringList::ConstIterator fsmount=mountList.begin(); | ||
112 | QStringList::ConstIterator fsTit=fsT.begin(); | ||
113 | |||
106 | for (; it!=curdisks.end(); ++it, ++fsit) { | 114 | for (; it!=curdisks.end(); ++it, ++fsit) { |
@@ -115,17 +123,19 @@ void StorageInfo::updateMounts() | |||
115 | if ( isCF(humanname) ) | 123 | if ( isCF(humanname) ) |
116 | humanname = tr("CF Card"); | 124 | humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" "); |
117 | else if ( humanname == "/dev/hda1" ) | 125 | else if ( humanname == "/dev/hda1" ) |
118 | humanname = tr("Hard Disk"); | 126 | humanname = tr("Hard Disk "+*fsmount+" "+*fsTit+" "); |
119 | else if ( humanname.left(9) == "/dev/mmcd" ) | 127 | else if ( humanname.left(9) == "/dev/mmcd" ) |
120 | humanname = tr("SD Card"); | 128 | humanname = tr("SD Card "+*fsmount+" "+*fsTit+" "); |
121 | else if ( humanname.left(7) == "/dev/hd" ) | 129 | else if ( humanname.left(7) == "/dev/hd" ) |
122 | humanname = tr("Hard Disk") + " " + humanname.mid(7); | 130 | humanname = tr("Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" "; |
123 | else if ( humanname.left(7) == "/dev/sd" ) | 131 | else if ( humanname.left(7) == "/dev/sd" ) |
124 | humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7); | 132 | humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" "; |
125 | else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) | 133 | else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) |
126 | humanname = tr("Internal Storage"); | 134 | humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+"\n"); |
127 | else if ( humanname.left(14) == "/dev/mtdblock/" ) | 135 | else if ( humanname.left(14) == "/dev/mtdblock/" ) |
128 | humanname = tr("Internal Storage") + " " + humanname.mid(14); | 136 | humanname = tr("Internal Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" "; |
129 | else if ( humanname.left(13) == "/dev/mtdblock" ) | 137 | else if ( humanname.left(13) == "/dev/mtdblock" ) |
130 | humanname = tr("Internal Storage") + " " + humanname.mid(13); | 138 | humanname = tr("Internal Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" "; |
139 | else if ( humanname.left(9) == "/dev/root" ) | ||
140 | humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+" "); | ||
131 | // etc. | 141 | // etc. |
@@ -135,2 +145,3 @@ void StorageInfo::updateMounts() | |||
135 | mi->show(); | 145 | mi->show(); |
146 | fsmount++;fsTit++; | ||
136 | } | 147 | } |
@@ -149,2 +160,3 @@ MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent, | |||
149 | { | 160 | { |
161 | qDebug("new path is "+path); | ||
150 | fs = new FileSystem( path ); | 162 | fs = new FileSystem( path ); |
@@ -186,3 +198,3 @@ void MountInfo::updateData() | |||
186 | long used = total - avail; | 198 | long used = total - avail; |
187 | totalSize->setText( title + tr(" total: %1 kB").arg( total ) ); | 199 | totalSize->setText( title + tr("Total: %1 kB").arg( total ) ); |
188 | data->clear(); | 200 | data->clear(); |
@@ -209,2 +221,7 @@ void FileSystem::update() | |||
209 | if ( !statfs( fspath.latin1(), &fs ) ) { | 221 | if ( !statfs( fspath.latin1(), &fs ) ) { |
222 | if( fspath.left(8) == "/mnt/ram") { //ugly hack openzaurus | ||
223 | blkSize = fs.f_bsize; | ||
224 | totalBlks = fs.f_blocks; | ||
225 | availBlks = fs.f_ffree; | ||
226 | } else { | ||
210 | blkSize = fs.f_bsize; | 227 | blkSize = fs.f_bsize; |
@@ -212,2 +229,3 @@ void FileSystem::update() | |||
212 | availBlks = fs.f_bavail; | 229 | availBlks = fs.f_bavail; |
230 | } | ||
213 | } else { | 231 | } else { |