Diffstat (limited to 'noncore/settings/sysinfo/sysinfo.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp index 13f810a..56ac488 100644 --- a/noncore/settings/sysinfo/sysinfo.cpp +++ b/noncore/settings/sysinfo/sysinfo.cpp | |||
@@ -18,40 +18,38 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "memory.h" | 21 | #include "memory.h" |
22 | #include "load.h" | 22 | #include "load.h" |
23 | #include "storage.h" | 23 | #include "storage.h" |
24 | //#include "graphics.h" | ||
25 | #include "processinfo.h" | 24 | #include "processinfo.h" |
26 | #include "modulesinfo.h" | 25 | #include "modulesinfo.h" |
27 | #include "versioninfo.h" | 26 | #include "versioninfo.h" |
28 | #include "sysinfo.h" | 27 | #include "sysinfo.h" |
29 | 28 | ||
29 | #include "otabwidget.h" | ||
30 | 30 | ||
31 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
32 | 32 | ||
33 | #include <qtabwidget.h> | ||
34 | #include <qlayout.h> | 33 | #include <qlayout.h> |
35 | 34 | ||
36 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f ) | 35 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags f ) |
37 | : QWidget( parent, name, f ) | 36 | : QWidget( parent, name, f ) |
38 | { | 37 | { |
39 | setIcon( Resource::loadPixmap( "system_icon" ) ); | 38 | setIcon( Resource::loadPixmap( "system_icon" ) ); |
40 | setCaption( tr("System Info") ); | 39 | setCaption( tr("System Info") ); |
41 | QVBoxLayout *lay = new QVBoxLayout( this ); | 40 | QVBoxLayout *lay = new QVBoxLayout( this ); |
42 | QTabWidget *tab = new QTabWidget( this ); | 41 | OTabWidget *tab = new OTabWidget( this, "tabwidget" ); |
43 | lay->addWidget( tab ); | 42 | lay->addWidget( tab ); |
44 | tab->addTab( new MemoryInfo( tab ), tr("Memory") ); | 43 | tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon.png", tr("Memory") ); |
45 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 44 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
46 | tab->addTab( new StorageInfo( tab ), tr("Storage") ); | 45 | tab->addTab( new StorageInfo( tab ), "sysinfo/storagetabicon.png", tr("Storage") ); |
47 | #endif | 46 | #endif |
48 | tab->addTab( new LoadInfo( tab ), tr("CPU") ); | 47 | tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon.png", tr("CPU") ); |
49 | // tab->addTab( new Graphics( tab ), tr("Graphics") ); | 48 | tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon.png", tr("Process") ); |
50 | tab->addTab( new ProcessInfo( tab ), tr("Process") ); | 49 | tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon.png", tr("Modules") ); |
51 | tab->addTab( new ModulesInfo( tab ), tr("Modules") ); | 50 | tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon.png", tr("Version") ); |
52 | tab->addTab( new VersionInfo( tab ), tr("Version") ); | ||
53 | 51 | ||
54 | resize( 220, 180 ); | 52 | resize( 220, 180 ); |
55 | } | 53 | } |
56 | 54 | ||
57 | 55 | ||