summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-05-10 13:19:28 (UTC)
committer llornkcor <llornkcor>2002-05-10 13:19:28 (UTC)
commit5d100217dc071b713e3531b9eedd2af6e0a2b4f1 (patch) (side-by-side diff)
treefe0ef2fb657968e32a74db190f30486543f068be
parentd3ae8b4b27cf0eb8b412b7dafc88e48cb3b5fd3d (diff)
downloadopie-5d100217dc071b713e3531b9eedd2af6e0a2b4f1.zip
opie-5d100217dc071b713e3531b9eedd2af6e0a2b4f1.tar.gz
opie-5d100217dc071b713e3531b9eedd2af6e0a2b4f1.tar.bz2
make readout smaller
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
@@ -62,103 +62,105 @@ static bool isCF(const QString& m)
fclose(f);
return TRUE;
}
}
}
fclose(f);
}
return FALSE;
}
void StorageInfo::updateMounts()
{
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
struct mntent *me;
FILE *mntfp = setmntent( "/etc/mtab", "r" );
QStringList curdisks;
QStringList curfs;
QStringList mountList;
QStringList fsT;
bool rebuild = FALSE;
int n=0;
if ( mntfp ) {
while ( (me = getmntent( mntfp )) != 0 ) {
QString fs = me->mnt_fsname;
+ qDebug(fs+" "+(QString)me->mnt_type);
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") {
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;
}
}
endmntent( mntfp );
}
if ( rebuild || n != (int)disks.count() ) {
disks.clear();
lines.clear();
delete vb;
vb = new QVBoxLayout( this, n > 3 ? 1 : 5 );
bool frst=TRUE;
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 ) {
QFrame *f = new QFrame( this );
vb->addWidget(f);
f->setFrameStyle( QFrame::HLine | QFrame::Sunken );
lines.append(f);
f->show();
} frst=FALSE;
QString humanname=*it;
+// qDebug(humanname);
if ( isCF(humanname) )
humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" ");
else if ( humanname == "/dev/hda1" )
humanname = tr("Hard Disk "+*fsmount+" "+*fsTit+" ");
else if ( humanname.left(9) == "/dev/mmcd" )
humanname = tr("SD Card "+*fsmount+" "+*fsTit+" ");
else if ( humanname.left(7) == "/dev/hd" )
humanname = tr("Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname.left(7) == "/dev/sd" )
humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" )
- humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+"\n");
+ humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+"\n");
else if ( humanname.left(14) == "/dev/mtdblock/" )
- humanname = tr("Internal Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" ";
+ humanname = tr("Int. Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname.left(13) == "/dev/mtdblock" )
- humanname = tr("Internal Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" ";
+ humanname = tr("Int. Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" ";
else if ( humanname.left(9) == "/dev/root" )
- humanname = tr("Internal Storage "+*fsmount+" "+*fsTit+" ");
+ humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+" ");
// etc.
MountInfo* mi = new MountInfo( *fsit, humanname, this );
vb->addWidget(mi);
disks.insert(*fsit,mi);
mi->show();
fsmount++;fsTit++;
}
vb->addStretch();
} else {
// just update them
for (QDictIterator<MountInfo> i(disks); i.current(); ++i)
i.current()->updateData();
}
#endif
}
MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent, const char *name )
: QWidget( parent, name ), title(ttl)
{
qDebug("new path is "+path);
fs = new FileSystem( path );
QVBoxLayout *vb = new QVBoxLayout( this, 3 );
@@ -175,49 +177,49 @@ MountInfo::MountInfo( const QString &path, const QString &ttl, QWidget *parent,
legend->setOrientation(Horizontal);
vb->addWidget( legend );
legend->setData( data );
updateData();
}
MountInfo::~MountInfo()
{
delete data;
delete fs;
}
void MountInfo::updateData()
{
fs->update();
long mult = fs->blockSize() / 1024;
long div = 1024 / fs->blockSize();
if ( !mult ) mult = 1;
if ( !div ) div = 1;
long total = fs->totalBlocks() * mult / div;
long avail = fs->availBlocks() * mult / div;
long used = total - avail;
- totalSize->setText( title + tr("Total: %1 kB").arg( total ) );
+ totalSize->setText( title + tr(" : %1 kB").arg( total ) );
data->clear();
data->addItem( tr("Used (%1 kB)").arg(used), used );
data->addItem( tr("Available (%1 kB)").arg(avail), avail );
graph->repaint( FALSE );
legend->update();
graph->show();
legend->show();
}
//---------------------------------------------------------------------------
FileSystem::FileSystem( const QString &p )
: fspath( p ), blkSize(512), totalBlks(0), availBlks(0)
{
update();
}
void FileSystem::update()
{
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
struct statfs fs;
if ( !statfs( fspath.latin1(), &fs ) ) {
if( fspath.left(8) == "/mnt/ram") { //ugly hack openzaurus
blkSize = fs.f_bsize;