author | mickeyl <mickeyl> | 2005-01-29 12:24:37 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-01-29 12:24:37 (UTC) |
commit | 0db5704f66f0d08f9928f749774ee0f37bb0250d (patch) (side-by-side diff) | |
tree | 73eea13320ec916b397dd94dc47ce8e5fdebd2b8 | |
parent | d4cf8c6020c46e5dc97b75f3a9781ddc15416b3a (diff) | |
download | opie-0db5704f66f0d08f9928f749774ee0f37bb0250d.zip opie-0db5704f66f0d08f9928f749774ee0f37bb0250d.tar.gz opie-0db5704f66f0d08f9928f749774ee0f37bb0250d.tar.bz2 |
fix
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 2 |
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 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qtopia Environment. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "memorystatus.h" -#include "../../settings/sysinfo/memory.h" +#include "memory.h" #include "swapfile.h" #include <qpainter.h> #include <qpushbutton.h> #include <qdrawutil.h> #include <qlabel.h> #include <qlayout.h> using namespace Opie::Ui; 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>" "Copyright (C) 2003 Anton Maslovsky<br>" "<<a href=\"mailto:my-zaurus@narod.ru\">my-zaurus@narod.ru</a>><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); tab->addTab( about, "memory/info", tr("About") ); tab->setCurrentTab( tr( "Memory" ) ); } int MemoryStatus::percent() { if (mi == 0) return 100; int total = mi->total; if (mi->swaptotal > 0) total += mi->swaptotal; int used = mi->realUsed; if (mi->swapused > 0) total += mi->swapused; return ((total - used) * 100)/total; |