author | drw <drw> | 2002-11-17 02:14:03 (UTC) |
---|---|---|
committer | drw <drw> | 2002-11-17 02:14:03 (UTC) |
commit | 9ed0a6022d4c3bcd8428096cdf28cad1e0355ab2 (patch) (side-by-side diff) | |
tree | f84b36548fa91496c0c100c96a3fa1512ec8b108 /noncore/settings | |
parent | 5a1f5ba99dfb754f1be4500dd55dca42b36413b8 (diff) | |
download | opie-9ed0a6022d4c3bcd8428096cdf28cad1e0355ab2.zip opie-9ed0a6022d4c3bcd8428096cdf28cad1e0355ab2.tar.gz opie-9ed0a6022d4c3bcd8428096cdf28cad1e0355ab2.tar.bz2 |
Start of What's This for Sysinfo, plus some code tweaks
-rw-r--r-- | noncore/settings/sysinfo/load.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/sysinfo/memory.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sysinfo/opie-sysinfo.control | 2 | ||||
-rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 39 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 15 |
6 files changed, 53 insertions, 24 deletions
diff --git a/noncore/settings/sysinfo/load.cpp b/noncore/settings/sysinfo/load.cpp index 0fcfa6b..900b3d3 100644 --- a/noncore/settings/sysinfo/load.cpp +++ b/noncore/settings/sysinfo/load.cpp @@ -19,13 +19,16 @@ **********************************************************************/ #include <stdio.h> + +#include <qfile.h> #include <qlayout.h> #include <qlabel.h> #include <qpainter.h> #include <qpixmap.h> -#include <qtimer.h> -#include <qfile.h> #include <qtextstream.h> +#include <qtimer.h> +#include <qwhatsthis.h> + #include "load.h" LoadInfo::LoadInfo( QWidget *parent, const char *name, WFlags f ) @@ -44,6 +47,8 @@ LoadInfo::LoadInfo( QWidget *parent, const char *name, WFlags f ) l->setPixmap( makeLabel( green, tr("System CPU usage (%)") ) ); vb->addWidget( l, 1 ); vb->addStretch(50); + + QWhatsThis::add( this, tr( "This page shows how much this device's processor is being used." ) ); } QPixmap LoadInfo::makeLabel( const QColor &col, const QString &text ) diff --git a/noncore/settings/sysinfo/memory.cpp b/noncore/settings/sysinfo/memory.cpp index 781f0df..30d42d5 100644 --- a/noncore/settings/sysinfo/memory.cpp +++ b/noncore/settings/sysinfo/memory.cpp @@ -19,15 +19,17 @@ **********************************************************************/ #include <qlabel.h> -#include <qtimer.h> #include <qfile.h> -#include <qtextstream.h> #include <qlayout.h> +#include <qtextstream.h> +#include <qtimer.h> +#include <qwhatsthis.h> + #include "graph.h" #include "memory.h" MemoryInfo::MemoryInfo( QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ) + : QWidget( parent, name, WStyle_ContextHelp ) { QVBoxLayout *vb = new QVBoxLayout( this, 5 ); @@ -51,6 +53,8 @@ MemoryInfo::MemoryInfo( QWidget *parent, const char *name, WFlags f ) QTimer *t = new QTimer( this ); connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) ); t->start( 5000 ); + + QWhatsThis::add( this, tr( "This page shows how memory (i.e. RAM) is being allocated on your handheld device.\nMemory is categorized as follows:\n\n1. Used - memory used to by Opie and any running applications.\n2. Buffers - temporary storage used to improve performance\n3. Cached - information that has recently been used, but has not been freed yet.\n4. Free - memory not currently used by Opie or any running applications." ) ); } MemoryInfo::~MemoryInfo() diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control index 796f734..4a6855d 100644 --- a/noncore/settings/sysinfo/opie-sysinfo.control +++ b/noncore/settings/sysinfo/opie-sysinfo.control @@ -1,7 +1,7 @@ Files: bin/sysinfo apps/Applications/sysinfo.desktop pics/sysinfo Priority: optional Section: opie/applications -Maintainer: Dan Williams <wiliamsdr@acm.org> +Maintainer: Dan Williams <williamsdr@acm.org> Architecture: arm Version: $QPE_VERSION-$SUB_VERSION Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp index b369ff1..c33663e 100644 --- a/noncore/settings/sysinfo/storage.cpp +++ b/noncore/settings/sysinfo/storage.cpp @@ -21,7 +21,8 @@ #include <qlabel.h> #include <qlayout.h> #include <qtimer.h> -#include <qlayout.h> +#include <qwhatsthis.h> + #include "graph.h" #include "storage.h" @@ -123,29 +124,45 @@ void StorageInfo::updateMounts() QString humanname=*it; // qDebug(humanname); if ( isCF(humanname) ) - humanname = tr("CF Card: "+*fsmount+" "+*fsTit+" "); + humanname = tr( "CF Card: " ); else if ( humanname == "/dev/hda1" ) - humanname = tr("Hard Disk "+*fsmount+" "+*fsTit+" "); + humanname = tr( "Hard Disk " ); else if ( humanname.left(9) == "/dev/mmcd" ) - humanname = tr("SD Card "+*fsmount+" "+*fsTit+" "); + humanname = tr( "SD Card " ); else if ( humanname.left(7) == "/dev/hd" ) - humanname = tr("Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" "; + humanname = tr( "Hard Disk /dev/hd " ); else if ( humanname.left(7) == "/dev/sd" ) - humanname = tr("SCSI Hard Disk") + " " + humanname.mid(7)+" "+*fsmount+" "+*fsTit+" "; + humanname = tr( "SCSI Hard Disk /dev/sd " ); else if ( humanname == "/dev/mtdblock1" || humanname == "/dev/mtdblock/1" ) - humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+"\n"); + humanname = tr( "Int. Storage " ); else if ( humanname.left(14) == "/dev/mtdblock/" ) - humanname = tr("Int. Storage") + " " + humanname.mid(14)+" "+*fsmount+" "+*fsTit+" "; + humanname = tr( "Int. Storage /dev/mtdblock/ " ); else if ( humanname.left(13) == "/dev/mtdblock" ) - humanname = tr("Int. Storage") + " " + humanname.mid(13)+" "+*fsmount+" "+*fsTit+" "; - else if ( humanname.left(9) == "/dev/root" ) - humanname = tr("Int. Storage "+*fsmount+" "+*fsTit+" "); + humanname = tr( "Int. Storage /dev/mtdblock " ); + else if ( humanname.left(9) == "/dev/root" ) + humanname = tr( "Int. Storage " ); // etc. + humanname.append( *fsmount ); + humanname.append( " " ); + humanname.append( *fsTit ); + humanname.append( " " ); + MountInfo* mi = new MountInfo( *fsit, humanname, this ); vb->addWidget(mi); disks.insert(*fsit,mi); mi->show(); fsmount++;fsTit++; + QString tempstr = humanname.left( 2 ); + if ( tempstr == tr( "CF" ) ) + QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Compact Flash memory card." ) ); + else if ( tempstr == tr( "Ha" ) ) + QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); + else if ( tempstr == tr( "SD" ) ) + QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Secure Digital memory card." ) ); + else if ( tempstr == tr( "SC" ) ) + QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); + else if ( tempstr == tr( "In" ) ) + QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device." ) ); } vb->addStretch(); } else { diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp index f727443..6d2a64f 100644 --- a/noncore/settings/sysinfo/sysinfo.cpp +++ b/noncore/settings/sysinfo/sysinfo.cpp @@ -38,7 +38,7 @@ #include <qlayout.h> SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f ) - : QWidget( parent, name, f ) + : QWidget( parent, name, WStyle_ContextHelp ) { setIcon( Resource::loadPixmap( "system_icon" ) ); setCaption( tr("System Info") ); diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index a8db207..79e7fea 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp @@ -21,18 +21,20 @@ #include <qpe/resource.h> #include <qpe/version.h> - +#include <qfile.h> +#include <qimage.h> #include <qlabel.h> +#include <qlayout.h> #include <qpixmap.h> #include <qpainter.h> -#include <qimage.h> -#include <qtimer.h> -#include <qfile.h> #include <qtextstream.h> -#include <qlayout.h> +#include <qtimer.h> +#include <qwhatsthis.h> + #include "versioninfo.h" #include <opie/odevice.h> + using namespace Opie; VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) @@ -121,7 +123,8 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QLabel *systemVersion = new QLabel( this ); systemVersion->setText( systemString ); hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft ); - + + QWhatsThis::add( this, tr( "This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device." ) ); } VersionInfo::~VersionInfo() |