author | mickeyl <mickeyl> | 2005-05-02 13:11:18 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-02 13:11:18 (UTC) |
commit | 3a86e1464fb00d3d9b9962bcabc1041d8a3d9343 (patch) (unidiff) | |
tree | 1cee100c29a56ab34ea60f98a2711a8da7c025e7 | |
parent | d70e9287e4f7aabaed564e5c9c6cf2c4bb04afec (diff) | |
download | opie-3a86e1464fb00d3d9b9962bcabc1041d8a3d9343.zip opie-3a86e1464fb00d3d9b9962bcabc1041d8a3d9343.tar.gz opie-3a86e1464fb00d3d9b9962bcabc1041d8a3d9343.tar.bz2 |
prepare for inclusion of DevicesInfo
-rw-r--r-- | noncore/settings/sysinfo/devicesinfo.cpp | 74 | ||||
-rw-r--r-- | noncore/settings/sysinfo/devicesinfo.h | 56 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 17 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.pro | 11 |
4 files changed, 141 insertions, 17 deletions
diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp new file mode 100644 index 0000000..38afd54 --- a/dev/null +++ b/noncore/settings/sysinfo/devicesinfo.cpp | |||
@@ -0,0 +1,74 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | =. Copyright (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | ||
4 | .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org> | ||
5 | .>+-= | ||
6 | _;:, .> :=|. This program is free software; you can | ||
7 | .> <`_, > . <= redistribute it and/or modify it under | ||
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
9 | .="- .-=="i, .._ License as published by the Free Software | ||
10 | - . .-<_> .<> Foundation; version 2 of the License. | ||
11 | ._= =} : | ||
12 | .%`+i> _;_. | ||
13 | .i_,=:_. -<s. This program is distributed in the hope that | ||
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
15 | : .. .:, . . . without even the implied warranty of | ||
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
18 | ..}^=.= = ; General Public License for more | ||
19 | ++= -. .` .: details. | ||
20 | : = ...= . :.=- | ||
21 | -. .:....=;==+<; You should have received a copy of the GNU | ||
22 | -_. . . )=. = General Public License along with | ||
23 | -- :-=` this application; see the file LICENSE.GPL. | ||
24 | If not, write to the Free Software Foundation, | ||
25 | Inc., 59 Temple Place - Suite 330, | ||
26 | Boston, MA 02111-1307, USA. | ||
27 | */ | ||
28 | |||
29 | #include "devicesinfo.h" | ||
30 | |||
31 | /* OPIE */ | ||
32 | #include <opie2/olistview.h> | ||
33 | #include <qpe/qpeapplication.h> | ||
34 | |||
35 | /* QT */ | ||
36 | #include <qcombobox.h> | ||
37 | #include <qfile.h> | ||
38 | #include <qlayout.h> | ||
39 | #include <qmessagebox.h> | ||
40 | #include <qpushbutton.h> | ||
41 | #include <qtextview.h> | ||
42 | #include <qtimer.h> | ||
43 | #include <qwhatsthis.h> | ||
44 | |||
45 | using namespace Opie::Ui; | ||
46 | |||
47 | DevicesView::DevicesView( QWidget* parent, const char* name, WFlags fl ) | ||
48 | : OListView( parent, name, fl ) | ||
49 | { | ||
50 | addColumn( tr( "Module" ) ); | ||
51 | setAllColumnsShowFocus( true ); | ||
52 | setRootIsDecorated( true ); | ||
53 | QWhatsThis::add( this, tr( "This is a list of all the devices currently recognized on this device." ) ); | ||
54 | } | ||
55 | |||
56 | DevicesView::~DevicesView() | ||
57 | { | ||
58 | } | ||
59 | |||
60 | DevicesInfo::DevicesInfo( QWidget* parent, const char* name, WFlags fl ) | ||
61 | : QWidget( parent, name, fl ) | ||
62 | { | ||
63 | QGridLayout *layout = new QGridLayout( this ); | ||
64 | layout->setSpacing( 4 ); | ||
65 | layout->setMargin( 4 ); | ||
66 | |||
67 | view = new DevicesView( this ); | ||
68 | |||
69 | layout->addMultiCellWidget( view, 0, 0, 0, 1 ); | ||
70 | } | ||
71 | |||
72 | DevicesInfo::~DevicesInfo() | ||
73 | { | ||
74 | } | ||
diff --git a/noncore/settings/sysinfo/devicesinfo.h b/noncore/settings/sysinfo/devicesinfo.h new file mode 100644 index 0000000..082586b --- a/dev/null +++ b/noncore/settings/sysinfo/devicesinfo.h | |||
@@ -0,0 +1,56 @@ | |||
1 | /* | ||
2 | This file is part of the Opie Project | ||
3 | =. Copyright (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de> | ||
4 | .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org> | ||
5 | .>+-= | ||
6 | _;:, .> :=|. This program is free software; you can | ||
7 | .> <`_, > . <= redistribute it and/or modify it under | ||
8 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | ||
9 | .="- .-=="i, .._ License as published by the Free Software | ||
10 | - . .-<_> .<> Foundation; version 2 of the License. | ||
11 | ._= =} : | ||
12 | .%`+i> _;_. | ||
13 | .i_,=:_. -<s. This program is distributed in the hope that | ||
14 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
15 | : .. .:, . . . without even the implied warranty of | ||
16 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
17 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
18 | ..}^=.= = ; General Public License for more | ||
19 | ++= -. .` .: details. | ||
20 | : = ...= . :.=- | ||
21 | -. .:....=;==+<; You should have received a copy of the GNU | ||
22 | -_. . . )=. = General Public License along with | ||
23 | -- :-=` this application; see the file LICENSE.GPL. | ||
24 | If not, write to the Free Software Foundation, | ||
25 | Inc., 59 Temple Place - Suite 330, | ||
26 | Boston, MA 02111-1307, USA. | ||
27 | */ | ||
28 | |||
29 | #ifndef DEVICESINFO_H | ||
30 | #define DEVICESINFO_H | ||
31 | |||
32 | #include <qwidget.h> | ||
33 | #include <opie2/olistview.h> | ||
34 | using namespace Opie::Ui; | ||
35 | |||
36 | class DevicesView : public OListView | ||
37 | { | ||
38 | Q_OBJECT | ||
39 | public: | ||
40 | DevicesView( QWidget* parent = 0, const char* name = 0, WFlags f = 0 ); | ||
41 | ~DevicesView(); | ||
42 | }; | ||
43 | |||
44 | class DevicesInfo : public QWidget | ||
45 | { | ||
46 | Q_OBJECT | ||
47 | public: | ||
48 | DevicesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | ||
49 | ~DevicesInfo(); | ||
50 | |||
51 | private: | ||
52 | OListView* view; | ||
53 | |||
54 | private slots: | ||
55 | }; | ||
56 | #endif | ||
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 | |||
@@ -22,9 +22,9 @@ | |||
22 | ** | 22 | ** |
23 | **********************************************************************/ | 23 | **********************************************************************/ |
24 | 24 | ||
25 | #include "memory.h" | 25 | #include "memory.h" |
26 | #include "load.h" | 26 | #include "devicesinfo.h" |
27 | #include "storage.h" | 27 | #include "storage.h" |
28 | #include "processinfo.h" | 28 | #include "processinfo.h" |
29 | #include "modulesinfo.h" | 29 | #include "modulesinfo.h" |
30 | #include "benchmarkinfo.h" | 30 | #include "benchmarkinfo.h" |
@@ -46,28 +46,19 @@ SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) | |||
46 | { | 46 | { |
47 | setIcon( Resource::loadPixmap( "system_icon" ) ); | 47 | setIcon( Resource::loadPixmap( "system_icon" ) ); |
48 | setCaption( tr("System Info") ); | 48 | setCaption( tr("System Info") ); |
49 | 49 | ||
50 | resize( 220, 180 ); | ||
51 | |||
52 | Config config( "qpe" ); | ||
53 | config.setGroup( "Appearance" ); | ||
54 | bool advanced = config.readBoolEntry( "Advanced", TRUE ); | ||
55 | |||
56 | QVBoxLayout *lay = new QVBoxLayout( this ); | 50 | QVBoxLayout *lay = new QVBoxLayout( this ); |
57 | OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); | 51 | OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); |
58 | lay->addWidget( tab ); | 52 | lay->addWidget( tab ); |
59 | 53 | ||
60 | tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") ); | 54 | tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") ); |
61 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 55 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
62 | tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") ); | 56 | tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") ); |
63 | #endif | 57 | #endif |
64 | tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon", tr("CPU") ); | 58 | tab->addTab( new DevicesInfo( tab ), "sysinfo/cputabicon", tr("Devices") ); |
65 | if ( advanced ) | 59 | tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr( "Process" ) ); |
66 | { | 60 | tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon", tr( "Modules" ) ); |
67 | tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr( "Process" ) ); | ||
68 | tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon", tr( "Modules" ) ); | ||
69 | } | ||
70 | tab->addTab( new SyslogInfo( tab ), "sysinfo/syslogtabicon", tr( "Syslog" ) ); | 61 | tab->addTab( new SyslogInfo( tab ), "sysinfo/syslogtabicon", tr( "Syslog" ) ); |
71 | tab->addTab( new BenchmarkInfo( tab ), "sysinfo/benchmarktabicon", tr( "Benchmark" ) ); | 62 | tab->addTab( new BenchmarkInfo( tab ), "sysinfo/benchmarktabicon", tr( "Benchmark" ) ); |
72 | tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon", tr("Version") ); | 63 | tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon", tr("Version") ); |
73 | 64 | ||
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro index e1d6449..8b23a57 100644 --- a/noncore/settings/sysinfo/sysinfo.pro +++ b/noncore/settings/sysinfo/sysinfo.pro | |||
@@ -1,9 +1,10 @@ | |||
1 | CONFIG = qt warn_on quick-app | 1 | CONFIG = qt warn_on quick-app |
2 | |||
2 | HEADERS = \ | 3 | HEADERS = \ |
3 | memory.h \ | 4 | memory.h \ |
4 | graph.h \ | 5 | graph.h \ |
5 | load.h \ | 6 | devicesinfo.h \ |
6 | storage.h \ | 7 | storage.h \ |
7 | processinfo.h \ | 8 | processinfo.h \ |
8 | modulesinfo.h \ | 9 | modulesinfo.h \ |
9 | detail.h \ | 10 | detail.h \ |
@@ -11,12 +12,14 @@ HEADERS = \ | |||
11 | benchmarkinfo.h \ | 12 | benchmarkinfo.h \ |
12 | sysloginfo.h \ | 13 | sysloginfo.h \ |
13 | versioninfo.h \ | 14 | versioninfo.h \ |
14 | sysinfo.h | 15 | sysinfo.h |
15 | SOURCES = main.cpp \ | 16 | |
17 | SOURCES = \ | ||
18 | main.cpp \ | ||
16 | memory.cpp \ | 19 | memory.cpp \ |
17 | graph.cpp \ | 20 | graph.cpp \ |
18 | load.cpp \ | 21 | devicesinfo.cpp \ |
19 | storage.cpp \ | 22 | storage.cpp \ |
20 | processinfo.cpp \ | 23 | processinfo.cpp \ |
21 | modulesinfo.cpp \ | 24 | modulesinfo.cpp \ |
22 | detail.cpp \ | 25 | detail.cpp \ |
@@ -30,7 +33,7 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
30 | DEPENDPATH += $(OPIEDIR)/include | 33 | DEPENDPATH += $(OPIEDIR)/include |
31 | LIBS += -lqpe -lopiecore2 -lopieui2 | 34 | LIBS += -lqpe -lopiecore2 -lopieui2 |
32 | DEFINES += UNIX | 35 | DEFINES += UNIX |
33 | TARGET = sysinfo | 36 | TARGET = sysinfo |
34 | VERSION = 1.2.2 | 37 | VERSION = 1.3.0 |
35 | 38 | ||
36 | include( $(OPIEDIR)/include.pro ) | 39 | include( $(OPIEDIR)/include.pro ) |