Diffstat (limited to 'noncore/settings/sysinfo/sysinfo.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp index 7000175..03db22a 100644 --- a/noncore/settings/sysinfo/sysinfo.cpp +++ b/noncore/settings/sysinfo/sysinfo.cpp @@ -20,13 +20,13 @@ ** ** Enhancements by: Dan Williams, <williamsdr@acm.org> ** **********************************************************************/ #include "memory.h" -#include "load.h" +#include "devicesinfo.h" #include "storage.h" #include "processinfo.h" #include "modulesinfo.h" #include "benchmarkinfo.h" #include "sysloginfo.h" #include "versioninfo.h" @@ -44,32 +44,23 @@ using namespace Opie::Ui; SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) : QWidget( parent, name, WStyle_ContextHelp ) { setIcon( Resource::loadPixmap( "system_icon" ) ); setCaption( tr("System Info") ); - resize( 220, 180 ); - - Config config( "qpe" ); - config.setGroup( "Appearance" ); - bool advanced = config.readBoolEntry( "Advanced", TRUE ); - QVBoxLayout *lay = new QVBoxLayout( this ); OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); lay->addWidget( tab ); tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") ); #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") ); #endif - tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon", tr("CPU") ); - if ( advanced ) - { + tab->addTab( new DevicesInfo( tab ), "sysinfo/cputabicon", tr("Devices") ); tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr( "Process" ) ); tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon", tr( "Modules" ) ); - } tab->addTab( new SyslogInfo( tab ), "sysinfo/syslogtabicon", tr( "Syslog" ) ); tab->addTab( new BenchmarkInfo( tab ), "sysinfo/benchmarktabicon", tr( "Benchmark" ) ); tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon", tr("Version") ); tab->setCurrentTab( tr( "Memory" ) ); } |