summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/memoryapplet/memorystatus.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp
index 95ae06b..9993894 100644
--- a/noncore/applets/memoryapplet/memorystatus.cpp
+++ b/noncore/applets/memoryapplet/memorystatus.cpp
@@ -1,69 +1,69 @@
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 "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 <qlayout.h> 29#include <qlayout.h>
30 30
31using namespace Opie::Ui; 31using namespace Opie::Ui;
32MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) 32MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
33 : QFrame(parent, 0, f), mi(0), sf(0) 33 : QFrame(parent, 0, f), mi(0), sf(0)
34{ 34{
35 setCaption( tr("Memory Status") ); 35 setCaption( tr("Memory Status") );
36 //resize( 220, 180 ); 36 //resize( 220, 180 );
37 37
38 QVBoxLayout *lay = new QVBoxLayout( this ); 38 QVBoxLayout *lay = new QVBoxLayout( this );
39 tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); 39 tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
40 lay->addWidget( tab ); 40 lay->addWidget( tab );
41 tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") ); 41 tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") );
42 tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") ); 42 tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") );
43 43
44 QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>" 44 QLabel* about = new QLabel(tr("<center><b>Memory Monitor Plugin</b><br>"
45 "Copyright (C) 2003 Anton Maslovsky<br>" 45 "Copyright (C) 2003 Anton Maslovsky<br>"
46 "&lt;<a href=\"mailto:my-zaurus@narod.ru\">my-zaurus@narod.ru</a>&gt;<br>" 46 "&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>" 47 "<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>" 48 "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); 49 "This program is licensed under GNU GPL.</center>"), tab);
50 50
51 tab->addTab( about, "memory/info", tr("About") ); 51 tab->addTab( about, "memory/info", tr("About") );
52 52
53 tab->setCurrentTab( tr( "Memory" ) ); 53 tab->setCurrentTab( tr( "Memory" ) );
54} 54}
55 55
56int MemoryStatus::percent() 56int MemoryStatus::percent()
57{ 57{
58 if (mi == 0) 58 if (mi == 0)
59 return 100; 59 return 100;
60 60
61 int total = mi->total; 61 int total = mi->total;
62 if (mi->swaptotal > 0) 62 if (mi->swaptotal > 0)
63 total += mi->swaptotal; 63 total += mi->swaptotal;
64 64
65 int used = mi->realUsed; 65 int used = mi->realUsed;
66 if (mi->swapused > 0) 66 if (mi->swapused > 0)
67 total += mi->swapused; 67 total += mi->swapused;
68 68
69 return ((total - used) * 100)/total; 69 return ((total - used) * 100)/total;