-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 | |||
@@ -14,13 +14,13 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | // additions copyright 2002 by L.J. Potter | |
21 | #include <qlabel.h> | 21 | #include <qlabel.h> |
22 | #include <qlayout.h> | 22 | #include <qlayout.h> |
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include "graph.h" | 25 | #include "graph.h" |
26 | #include "storage.h" | 26 | #include "storage.h" |
@@ -54,14 +54,13 @@ static bool isCF(const QString& m) | |||
54 | if ( f ) { | 54 | if ( f ) { |
55 | char line[1024]; | 55 | char line[1024]; |
56 | char devtype[80]; | 56 | char devtype[80]; |
57 | char devname[80]; | 57 | char devname[80]; |
58 | while ( fgets( line, 1024, f ) ) { | 58 | while ( fgets( line, 1024, f ) ) { |
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 ) { |
63 | fclose(f); | 62 | fclose(f); |
64 | return TRUE; | 63 | return TRUE; |
65 | } | 64 | } |
66 | } | 65 | } |
67 | } | 66 | } |
@@ -74,24 +73,30 @@ void StorageInfo::updateMounts() | |||
74 | { | 73 | { |
75 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 74 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
76 | struct mntent *me; | 75 | struct mntent *me; |
77 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | 76 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); |
78 | QStringList curdisks; | 77 | QStringList curdisks; |
79 | QStringList curfs; | 78 | QStringList curfs; |
79 | QStringList mountList; | ||
80 | QStringList fsT; | ||
80 | bool rebuild = FALSE; | 81 | bool rebuild = FALSE; |
81 | int n=0; | 82 | int n=0; |
82 | if ( mntfp ) { | 83 | if ( mntfp ) { |
83 | while ( (me = getmntent( mntfp )) != 0 ) { | 84 | while ( (me = getmntent( mntfp )) != 0 ) { |
84 | QString fs = me->mnt_fsname; | 85 | QString fs = me->mnt_fsname; |
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++; |
89 | curdisks.append(fs); | 90 | curdisks.append(fs); |
90 | QString d = me->mnt_dir; | 91 | QString d = me->mnt_dir; |
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) ) |
93 | rebuild = TRUE; | 98 | rebuild = TRUE; |
94 | } | 99 | } |
95 | } | 100 | } |
96 | endmntent( mntfp ); | 101 | endmntent( mntfp ); |
97 | } | 102 | } |
@@ -100,42 +105,48 @@ void StorageInfo::updateMounts() | |||
100 | lines.clear(); | 105 | lines.clear(); |
101 | delete vb; | 106 | delete vb; |
102 | vb = new QVBoxLayout( this, n > 3 ? 1 : 5 ); | 107 | vb = new QVBoxLayout( this, n > 3 ? 1 : 5 ); |
103 | bool frst=TRUE; | 108 | bool frst=TRUE; |
104 | QStringList::ConstIterator it=curdisks.begin(); | 109 | QStringList::ConstIterator it=curdisks.begin(); |
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) { |
107 | if ( !frst ) { | 115 | if ( !frst ) { |
108 | QFrame *f = new QFrame( this ); | 116 | QFrame *f = new QFrame( this ); |
109 | vb->addWidget(f); | 117 | vb->addWidget(f); |
110 | f->setFrameStyle( QFrame::HLine | QFrame::Sunken ); | 118 | f->setFrameStyle( QFrame::HLine | QFrame::Sunken ); |
111 | lines.append(f); | 119 | lines.append(f); |
112 | f->show(); | 120 | f->show(); |
113 | } frst=FALSE; | 121 | } frst=FALSE; |
114 | QString humanname=*it; | 122 | QString humanname=*it; |
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. |
132 | MountInfo* mi = new MountInfo( *fsit, humanname, this ); | 142 | MountInfo* mi = new MountInfo( *fsit, humanname, this ); |
133 | vb->addWidget(mi); | 143 | vb->addWidget(mi); |
134 | disks.insert(*fsit,mi); | 144 | disks.insert(*fsit,mi); |
135 | mi->show(); | 145 | mi->show(); |
146 | fsmount++;fsTit++; | ||
136 | } | 147 | } |
137 | vb->addStretch(); | 148 | vb->addStretch(); |
138 | } else { | 149 | } else { |
139 | // just update them | 150 | // just update them |
140 | for (QDictIterator<MountInfo> i(disks); i.current(); ++i) | 151 | for (QDictIterator<MountInfo> i(disks); i.current(); ++i) |
141 | i.current()->updateData(); | 152 | i.current()->updateData(); |
@@ -144,12 +155,13 @@ void StorageInfo::updateMounts() | |||
144 | } | 155 | } |
145 | 156 | ||
146 | 157 | ||
147 | MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent, const char *name ) | 158 | MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent, const char *name ) |
148 | : QWidget( parent, name ), title(ttl) | 159 | : QWidget( parent, name ), title(ttl) |
149 | { | 160 | { |
161 | qDebug("new path is "+path); | ||
150 | fs = new FileSystem( path ); | 162 | fs = new FileSystem( path ); |
151 | QVBoxLayout *vb = new QVBoxLayout( this, 3 ); | 163 | QVBoxLayout *vb = new QVBoxLayout( this, 3 ); |
152 | 164 | ||
153 | totalSize = new QLabel( this ); | 165 | totalSize = new QLabel( this ); |
154 | vb->addWidget( totalSize ); | 166 | vb->addWidget( totalSize ); |
155 | 167 | ||
@@ -181,13 +193,13 @@ void MountInfo::updateData() | |||
181 | long div = 1024 / fs->blockSize(); | 193 | long div = 1024 / fs->blockSize(); |
182 | if ( !mult ) mult = 1; | 194 | if ( !mult ) mult = 1; |
183 | if ( !div ) div = 1; | 195 | if ( !div ) div = 1; |
184 | long total = fs->totalBlocks() * mult / div; | 196 | long total = fs->totalBlocks() * mult / div; |
185 | long avail = fs->availBlocks() * mult / div; | 197 | long avail = fs->availBlocks() * mult / div; |
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(); |
189 | data->addItem( tr("Used (%1 kB)").arg(used), used ); | 201 | data->addItem( tr("Used (%1 kB)").arg(used), used ); |
190 | data->addItem( tr("Available (%1 kB)").arg(avail), avail ); | 202 | data->addItem( tr("Available (%1 kB)").arg(avail), avail ); |
191 | graph->repaint( FALSE ); | 203 | graph->repaint( FALSE ); |
192 | legend->update(); | 204 | legend->update(); |
193 | graph->show(); | 205 | graph->show(); |
@@ -204,15 +216,21 @@ FileSystem::FileSystem( const QString &p ) | |||
204 | 216 | ||
205 | void FileSystem::update() | 217 | void FileSystem::update() |
206 | { | 218 | { |
207 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 219 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
208 | struct statfs fs; | 220 | struct statfs fs; |
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; |
211 | totalBlks = fs.f_blocks; | 228 | totalBlks = fs.f_blocks; |
212 | availBlks = fs.f_bavail; | 229 | availBlks = fs.f_bavail; |
230 | } | ||
213 | } else { | 231 | } else { |
214 | blkSize = 0; | 232 | blkSize = 0; |
215 | totalBlks = 0; | 233 | totalBlks = 0; |
216 | availBlks = 0; | 234 | availBlks = 0; |
217 | } | 235 | } |
218 | #endif | 236 | #endif |