Diffstat (limited to 'noncore/applets/memoryapplet/memorymeter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/memoryapplet/memorymeter.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp index 9299f49..9cdeaf4 100644 --- a/noncore/applets/memoryapplet/memorymeter.cpp +++ b/noncore/applets/memoryapplet/memorymeter.cpp | |||
@@ -28,22 +28,23 @@ | |||
28 | #include <qpainter.h> | 28 | #include <qpainter.h> |
29 | #include <qtimer.h> | 29 | #include <qtimer.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | 31 | ||
32 | #include <qtopia/applnk.h> | 32 | #include <qtopia/applnk.h> |
33 | 33 | ||
34 | using namespace Opie::Ui; | ||
34 | MemoryMeter::MemoryMeter( QWidget *parent ) | 35 | MemoryMeter::MemoryMeter( QWidget *parent ) |
35 | : QWidget( parent ), memoryView(0) | 36 | : QWidget( parent ), memoryView(0) |
36 | { | 37 | { |
37 | bvsz = QSize(); | 38 | bvsz = QSize(); |
38 | if ( qApp->desktop()->height() >= 300 ) | 39 | if ( qApp->desktop()->height() >= 300 ) |
39 | { | 40 | { |
40 | memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); | 41 | memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); |
41 | memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); | 42 | memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); |
42 | } | 43 | } |
43 | else | 44 | else |
44 | { | 45 | { |
45 | memoryView = new MemoryStatus( 0 ); | 46 | memoryView = new MemoryStatus( 0 ); |
46 | memoryView->showMaximized(); | 47 | memoryView->showMaximized(); |
47 | } | 48 | } |
48 | 49 | ||
49 | Config config("MemoryPlugin"); | 50 | Config config("MemoryPlugin"); |
@@ -76,17 +77,17 @@ QSize MemoryMeter::sizeHint() const | |||
76 | 77 | ||
77 | bool MemoryMeter::updateMemoryViewGeometry() | 78 | bool MemoryMeter::updateMemoryViewGeometry() |
78 | { | 79 | { |
79 | if (memoryView != 0) | 80 | if (memoryView != 0) |
80 | { | 81 | { |
81 | QSize sz = memoryView->sizeHint(); | 82 | QSize sz = memoryView->sizeHint(); |
82 | if ( sz != bvsz ) | 83 | if ( sz != bvsz ) |
83 | { | 84 | { |
84 | bvsz = sz; | 85 | bvsz = sz; |
85 | QRect r(memoryView->pos(), memoryView->sizeHint()); | 86 | QRect r(memoryView->pos(), memoryView->sizeHint()); |
86 | if ( qApp->desktop()->height() >= 300 ) | 87 | if ( qApp->desktop()->height() >= 300 ) |
87 | { | 88 | { |
88 | QPoint curPos = mapToGlobal( rect().topLeft() ); | 89 | QPoint curPos = mapToGlobal( rect().topLeft() ); |
89 | int lp = qApp->desktop()->width() - memoryView->sizeHint().width(); | 90 | int lp = qApp->desktop()->width() - memoryView->sizeHint().width(); |
90 | r.moveTopLeft( QPoint(lp, curPos.y() - memoryView->sizeHint().height()-1) ); | 91 | r.moveTopLeft( QPoint(lp, curPos.y() - memoryView->sizeHint().height()-1) ); |
91 | } | 92 | } |
92 | memoryView->setGeometry(r); | 93 | memoryView->setGeometry(r); |
@@ -97,17 +98,17 @@ bool MemoryMeter::updateMemoryViewGeometry() | |||
97 | 98 | ||
98 | return FALSE; | 99 | return FALSE; |
99 | } | 100 | } |
100 | 101 | ||
101 | void MemoryMeter::mousePressEvent( QMouseEvent *) | 102 | void MemoryMeter::mousePressEvent( QMouseEvent *) |
102 | { | 103 | { |
103 | if ( memoryView->isVisible() ) | 104 | if ( memoryView->isVisible() ) |
104 | { | 105 | { |
105 | memoryView->hide(); | 106 | memoryView->hide(); |
106 | } | 107 | } |
107 | else | 108 | else |
108 | { | 109 | { |
109 | bvsz = QSize(); | 110 | bvsz = QSize(); |
110 | updateMemoryViewGeometry(); | 111 | updateMemoryViewGeometry(); |
111 | memoryView->raise(); | 112 | memoryView->raise(); |
112 | memoryView->show(); | 113 | memoryView->show(); |
113 | } | 114 | } |
@@ -203,13 +204,13 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
203 | if (used_height < 0) | 204 | if (used_height < 0) |
204 | used_height = 0; | 205 | used_height = 0; |
205 | 206 | ||
206 | // | 207 | // |
207 | // Drained section. | 208 | // Drained section. |
208 | // | 209 | // |
209 | if (used_height != 0) | 210 | if (used_height != 0) |
210 | { | 211 | { |
211 | p.setPen(NoPen); | 212 | p.setPen(NoPen); |
212 | p.setBrush(gray); | 213 | p.setBrush(gray); |
213 | p.drawRect(batt_xoffset, batt_yoffset, band_width, used_height); | 214 | p.drawRect(batt_xoffset, batt_yoffset, band_width, used_height); |
214 | p.drawRect(batt_xoffset + 2 * band_width, batt_yoffset, band_width, used_height); | 215 | p.drawRect(batt_xoffset + 2 * band_width, batt_yoffset, band_width, used_height); |
215 | 216 | ||
@@ -220,13 +221,13 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
220 | p.drawRect(batt_xoffset + 3 * band_width, batt_yoffset, band_width, used_height); | 221 | p.drawRect(batt_xoffset + 3 * band_width, batt_yoffset, band_width, used_height); |
221 | } | 222 | } |
222 | 223 | ||
223 | // | 224 | // |
224 | // Unused section. | 225 | // Unused section. |
225 | // | 226 | // |
226 | if ( batt_height - used_height > 0 ) | 227 | if ( batt_height - used_height > 0 ) |
227 | { | 228 | { |
228 | int unused_offset = used_height + batt_yoffset; | 229 | int unused_offset = used_height + batt_yoffset; |
229 | int unused_height = batt_height - used_height; | 230 | int unused_height = batt_height - used_height; |
230 | p.setPen(NoPen); | 231 | p.setPen(NoPen); |
231 | p.setBrush(c); | 232 | p.setBrush(c); |
232 | p.drawRect(batt_xoffset, unused_offset, band_width, unused_height); | 233 | p.drawRect(batt_xoffset, unused_offset, band_width, unused_height); |
@@ -237,11 +238,8 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
237 | 238 | ||
238 | p.setBrush(darkc); | 239 | p.setBrush(darkc); |
239 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); | 240 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); |
240 | } | 241 | } |
241 | } | 242 | } |
242 | 243 | ||
243 | Q_EXPORT_INTERFACE() | 244 | EXPORT_OPIE_APPLET_v1( MemoryMeter ) |
244 | { | ||
245 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> ); | ||
246 | } | ||
247 | 245 | ||