summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/memoryapplet/config.in2
-rw-r--r--noncore/applets/memoryapplet/memoryapplet.pro2
-rw-r--r--noncore/applets/memoryapplet/memorystatus.cpp31
-rw-r--r--noncore/applets/memoryapplet/memorystatus.h10
-rw-r--r--noncore/applets/memoryapplet/opie-memoryapplet.control2
5 files changed, 24 insertions, 23 deletions
diff --git a/noncore/applets/memoryapplet/config.in b/noncore/applets/memoryapplet/config.in
index 578aaf9..4fc13ba 100644
--- a/noncore/applets/memoryapplet/config.in
+++ b/noncore/applets/memoryapplet/config.in
@@ -1,6 +1,6 @@
1 config MEMORYAPPLET 1 config MEMORYAPPLET
2 boolean "opie-memoryapplet (view memory status and manage a swap file)" 2 boolean "opie-memoryapplet (view memory status and manage a swap file)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && SYSINFO 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO
5 comment "opie-memoryapplet needs a libqpe, libopie and sysinfo" 5 comment "opie-memoryapplet needs a libqpe, libopie and sysinfo"
6 depends ! ( LIBOPIE && SYSINFO ) 6 depends ! ( LIBOPIE && SYSINFO )
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
index cd3f4a5..6031386 100644
--- a/noncore/applets/memoryapplet/memoryapplet.pro
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -1,24 +1,24 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugin warn_on release 2CONFIG += qt plugin warn_on release
3HEADERS = ../../settings/sysinfo/graph.h \ 3HEADERS = ../../settings/sysinfo/graph.h \
4 ../../settings/sysinfo/load.h \ 4 ../../settings/sysinfo/load.h \
5 ../../settings/sysinfo/memory.h \ 5 ../../settings/sysinfo/memory.h \
6 memoryappletimpl.h \ 6 memoryappletimpl.h \
7 memorymeter.h \ 7 memorymeter.h \
8 memorystatus.h \ 8 memorystatus.h \
9 swapfile.h 9 swapfile.h
10SOURCES = ../../settings/sysinfo/graph.cpp \ 10SOURCES = ../../settings/sysinfo/graph.cpp \
11 ../../settings/sysinfo/load.cpp \ 11 ../../settings/sysinfo/load.cpp \
12 ../../settings/sysinfo/memory.cpp \ 12 ../../settings/sysinfo/memory.cpp \
13 memoryappletimpl.cpp \ 13 memoryappletimpl.cpp \
14 memorymeter.cpp \ 14 memorymeter.cpp \
15 memorystatus.cpp \ 15 memorystatus.cpp \
16 swapfile.cpp 16 swapfile.cpp
17TARGET = memoryapplet 17TARGET = memoryapplet
18DESTDIR = $(OPIEDIR)/plugins/applets 18DESTDIR = $(OPIEDIR)/plugins/applets
19INCLUDEPATH += $(OPIEDIR)/include 19INCLUDEPATH += $(OPIEDIR)/include
20DEPENDPATH += ../$(OPIEDIR)/include 20DEPENDPATH += ../$(OPIEDIR)/include
21VERSION = 1.0.0 21VERSION = 1.0.0
22LIBS += -lqpe -lopie 22LIBS += -lqpe -lopieui2
23 23
24include ( $(OPIEDIR)/include.pro ) 24include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index b738312..c01ba28 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -1,82 +1,81 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "memorystatus.h" 20#include "memorystatus.h"
21#include "../../settings/sysinfo/memory.h" 21#include "../../settings/sysinfo/memory.h"
22#include "swapfile.h" 22#include "swapfile.h"
23 23
24#include <qpainter.h> 24#include <qpainter.h>
25#include <qpushbutton.h> 25#include <qpushbutton.h>
26#include <qdrawutil.h> 26#include <qdrawutil.h>
27#include <qlabel.h> 27#include <qlabel.h>
28 28
29#include <opie/otabwidget.h>
30#include <qlayout.h> 29#include <qlayout.h>
31 30
32MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) 31MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
33 : QFrame(parent, 0, f), mi(0), sf(0) 32 : QFrame(parent, 0, f), mi(0), sf(0)
34{ 33{
35 setCaption( tr("Memory Status") ); 34 setCaption( tr("Memory Status") );
36 //resize( 220, 180 ); 35 //resize( 220, 180 );
37 36
38 QVBoxLayout *lay = new QVBoxLayout( this ); 37 QVBoxLayout *lay = new QVBoxLayout( this );
39 tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); 38 tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
40 lay->addWidget( tab ); 39 lay->addWidget( tab );
41 tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") ); 40 tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") );
42 tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") ); 41 tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") );
43 42
44 QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>" 43 QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>"
45 "Copyright (C) 2003 Anton Maslovsky<br>" 44 "Copyright (C) 2003 Anton Maslovsky<br>"
46 "&lt;<a href=\"mailto:my-zaurus@narod.ru\">my-zaurus@narod.ru</a>&gt;<br>" 45 "&lt;<a href=\"mailto:my-zaurus@narod.ru\">my-zaurus@narod.ru</a>&gt;<br>"
47 "<a href=\"http://my-zaurus.narod.ru\">http://my-zaurus.narod.ru</a><br>" 46 "<a href=\"http://my-zaurus.narod.ru\">http://my-zaurus.narod.ru</a><br>"
48 "Based on source code from:<br> qswap (udoseidel@gmx.de) <br> Battery Applet (trolltech.com) <br> SysInfo (OPIE)<br><br>" 47 "Based on source code from:<br> qswap (udoseidel@gmx.de) <br> Battery Applet (trolltech.com) <br> SysInfo (OPIE)<br><br>"
49 "This program is licensed under GNU GPL.</center>"), tab); 48 "This program is licensed under GNU GPL.</center>"), tab);
50 49
51 tab->addTab( about, "memory/info", tr("About") ); 50 tab->addTab( about, "memory/info", tr("About") );
52 51
53 tab->setCurrentTab( tr( "Memory" ) ); 52 tab->setCurrentTab( tr( "Memory" ) );
54} 53}
55 54
56int MemoryStatus::percent() 55int MemoryStatus::percent()
57{ 56{
58 if (mi == 0) 57 if (mi == 0)
59 return 100; 58 return 100;
60 59
61 int total = mi->total; 60 int total = mi->total;
62 if (mi->swaptotal > 0) 61 if (mi->swaptotal > 0)
63 total += mi->swaptotal; 62 total += mi->swaptotal;
64 63
65 int used = mi->realUsed; 64 int used = mi->realUsed;
66 if (mi->swapused > 0) 65 if (mi->swapused > 0)
67 total += mi->swapused; 66 total += mi->swapused;
68 67
69 return ((total - used) * 100)/total; 68 return ((total - used) * 100)/total;
70} 69}
71 70
72QSize MemoryStatus::sizeHint() const 71QSize MemoryStatus::sizeHint() const
73{ 72{
74 QSize s = tab->size(); 73 QSize s = tab->size();
75 s.setWidth(200); 74 s.setWidth(200);
76 s.setHeight((mi->swaptotal > 0) ? 220 : 200); 75 s.setHeight((mi->swaptotal > 0) ? 220 : 200);
77 return s; 76 return s;
78} 77}
79 78
80MemoryStatus::~MemoryStatus() 79MemoryStatus::~MemoryStatus()
81{ 80{
82} 81}
diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h
index 5c73833..c3926db 100644
--- a/noncore/applets/memoryapplet/memorystatus.h
+++ b/noncore/applets/memoryapplet/memorystatus.h
@@ -1,47 +1,49 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef MEMORY_STATUS_H 20#ifndef MEMORY_STATUS_H
21#define MEMORY_STATUS_H 21#define MEMORY_STATUS_H
22 22
23#include <qframe.h> 23#include <qframe.h>
24 24
25#include <opie2/otabwidget.h>
26
25class MemoryInfo; 27class MemoryInfo;
26class Swapfile; 28class Swapfile;
27class OTabWidget; 29using Opie::OTabWidget;
28 30
29class MemoryStatus : public QFrame 31class MemoryStatus : public QFrame
30{ 32{
31 Q_OBJECT 33 Q_OBJECT
32public: 34public:
33 MemoryStatus(QWidget *parent = 0, WFlags f = 0); 35 MemoryStatus(QWidget *parent = 0, WFlags f = 0);
34 ~MemoryStatus(); 36 ~MemoryStatus();
35 37
36 QSize sizeHint() const; 38 QSize sizeHint() const;
37 MemoryInfo* mi; 39 MemoryInfo* mi;
38 Swapfile* sf; 40 Swapfile* sf;
39 41
40 int percent(); 42 int percent();
41 43
42private: 44private:
43 OTabWidget *tab; 45 OTabWidget *tab;
44}; 46};
45 47
46#endif 48#endif
47 49
diff --git a/noncore/applets/memoryapplet/opie-memoryapplet.control b/noncore/applets/memoryapplet/opie-memoryapplet.control
index 12026a4..c01a93f 100644
--- a/noncore/applets/memoryapplet/opie-memoryapplet.control
+++ b/noncore/applets/memoryapplet/opie-memoryapplet.control
@@ -1,10 +1,10 @@
1Package: opie-memoryapplet 1Package: opie-memoryapplet
2Files: plugins/applets/libmemoryapplet.so* pics/memory 2Files: plugins/applets/libmemoryapplet.so* pics/memory
3Priority: optional 3Priority: optional
4Section: opie/applets 4Section: opie/applets
5Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 5Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopieui2
8Description: Memory Applet 8Description: Memory Applet
9 This applet displays the amount of free memory and manages the swap partition 9 This applet displays the amount of free memory and manages the swap partition
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION