summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
config MEMORYAPPLET
boolean "opie-memoryapplet (view memory status and manage a swap file)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && SYSINFO
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && SYSINFO
comment "opie-memoryapplet needs a libqpe, libopie and sysinfo"
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
@@ -14,11 +14,11 @@ SOURCES = ../../settings/sysinfo/graph.cpp \
memorymeter.cpp \
memorystatus.cpp \
swapfile.cpp
TARGET = memoryapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
VERSION = 1.0.0
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopieui2
include ( $(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
@@ -21,62 +21,61 @@
#include "../../settings/sysinfo/memory.h"
#include "swapfile.h"
#include <qpainter.h>
#include <qpushbutton.h>
#include <qdrawutil.h>
#include <qlabel.h>
-#include <opie/otabwidget.h>
#include <qlayout.h>
MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
: QFrame(parent, 0, f), mi(0), sf(0)
{
setCaption( tr("Memory Status") );
//resize( 220, 180 );
QVBoxLayout *lay = new QVBoxLayout( this );
tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
lay->addWidget( tab );
tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") );
tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") );
- QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>"
+ QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>"
"Copyright (C) 2003 Anton Maslovsky<br>"
"&lt;<a href=\"mailto:my-zaurus@narod.ru\">my-zaurus@narod.ru</a>&gt;<br>"
"<a href=\"http://my-zaurus.narod.ru\">http://my-zaurus.narod.ru</a><br>"
- "Based on source code from:<br> qswap (udoseidel@gmx.de) <br> Battery Applet (trolltech.com) <br> SysInfo (OPIE)<br><br>"
- "This program is licensed under GNU GPL.</center>"), tab);
+ "Based on source code from:<br> qswap (udoseidel@gmx.de) <br> Battery Applet (trolltech.com) <br> SysInfo (OPIE)<br><br>"
+ "This program is licensed under GNU GPL.</center>"), tab);
tab->addTab( about, "memory/info", tr("About") );
tab->setCurrentTab( tr( "Memory" ) );
}
int MemoryStatus::percent()
{
- if (mi == 0)
- return 100;
+ if (mi == 0)
+ return 100;
- int total = mi->total;
- if (mi->swaptotal > 0)
- total += mi->swaptotal;
+ int total = mi->total;
+ if (mi->swaptotal > 0)
+ total += mi->swaptotal;
- int used = mi->realUsed;
- if (mi->swapused > 0)
- total += mi->swapused;
+ int used = mi->realUsed;
+ if (mi->swapused > 0)
+ total += mi->swapused;
- return ((total - used) * 100)/total;
+ return ((total - used) * 100)/total;
}
QSize MemoryStatus::sizeHint() const
{
- QSize s = tab->size();
- s.setWidth(200);
- s.setHeight((mi->swaptotal > 0) ? 220 : 200);
+ QSize s = tab->size();
+ s.setWidth(200);
+ s.setHeight((mi->swaptotal > 0) ? 220 : 200);
return s;
}
MemoryStatus::~MemoryStatus()
{
}
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
@@ -17,31 +17,33 @@
** not clear to you.
**
**********************************************************************/
#ifndef MEMORY_STATUS_H
#define MEMORY_STATUS_H
#include <qframe.h>
+#include <opie2/otabwidget.h>
+
class MemoryInfo;
class Swapfile;
-class OTabWidget;
+using Opie::OTabWidget;
class MemoryStatus : public QFrame
{
Q_OBJECT
public:
MemoryStatus(QWidget *parent = 0, WFlags f = 0);
~MemoryStatus();
QSize sizeHint() const;
MemoryInfo* mi;
- Swapfile* sf;
+ Swapfile* sf;
- int percent();
+ int percent();
private:
- OTabWidget *tab;
+ OTabWidget *tab;
};
#endif
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 @@
Package: opie-memoryapplet
Files: plugins/applets/libmemoryapplet.so* pics/memory
Priority: optional
Section: opie/applets
Maintainer: Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopieui2
Description: Memory Applet
This applet displays the amount of free memory and manages the swap partition
Version: $QPE_VERSION$EXTRAVERSION