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
@@ -3,3 +3,3 @@
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"
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
@@ -21,3 +21,3 @@ DEPENDPATH += ../$(OPIEDIR)/include
21VERSION = 1.0.0 21VERSION = 1.0.0
22LIBS += -lqpe -lopie 22LIBS += -lqpe -lopieui2
23 23
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
@@ -28,3 +28,2 @@
28 28
29#include <opie/otabwidget.h>
30#include <qlayout.h> 29#include <qlayout.h>
@@ -43,3 +42,3 @@ MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
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>"
@@ -47,4 +46,4 @@ MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
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
@@ -57,14 +56,14 @@ int 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}
@@ -73,5 +72,5 @@ QSize 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;
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
@@ -24,5 +24,7 @@
24 24
25#include <opie2/otabwidget.h>
26
25class MemoryInfo; 27class MemoryInfo;
26class Swapfile; 28class Swapfile;
27class OTabWidget; 29using Opie::OTabWidget;
28 30
@@ -37,8 +39,8 @@ public:
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};
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
@@ -6,3 +6,3 @@ Maintainer: 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