author | harlekin <harlekin> | 2003-03-23 13:37:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-03-23 13:37:22 (UTC) |
commit | b827dc4fa5b3e1758e627b40de25b68b25e912de (patch) (unidiff) | |
tree | 466e937219baf4be67aa84045ae204d1bab85916 | |
parent | 56192a3d601e5364e9b8f4c331d892befb19cbc1 (diff) | |
download | opie-b827dc4fa5b3e1758e627b40de25b68b25e912de.zip opie-b827dc4fa5b3e1758e627b40de25b68b25e912de.tar.gz opie-b827dc4fa5b3e1758e627b40de25b68b25e912de.tar.bz2 |
hide cardmon applet if no medium is inserted
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 25bb137..f3f9044 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -270,18 +270,20 @@ bool CardMonitor::getStatusPcmcia(int showPopUp) | |||
270 | QSound::play(Resource::findSound("cardmon/card" + what)); | 270 | QSound::play(Resource::findSound("cardmon/card" + what)); |
271 | } | 271 | } |
272 | } else { | 272 | } else { |
273 | // no file found | 273 | // no file found |
274 | qDebug("no file found"); | 274 | qDebug("no file found"); |
275 | cardInPcmcia0 = FALSE; | 275 | cardInPcmcia0 = FALSE; |
276 | cardInPcmcia1 = FALSE; | 276 | cardInPcmcia1 = FALSE; |
277 | } | 277 | } |
278 | repaint( FALSE ); | ||
278 | return ((cardWas0 == cardInPcmcia0 | 279 | return ((cardWas0 == cardInPcmcia0 |
279 | && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); | 280 | && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); |
281 | |||
280 | } | 282 | } |
281 | 283 | ||
282 | 284 | ||
283 | bool CardMonitor::getStatusSd(int showPopUp) | 285 | bool CardMonitor::getStatusSd(int showPopUp) |
284 | { | 286 | { |
285 | 287 | ||
286 | bool cardWas = cardInSd;// remember last state | 288 | bool cardWas = cardInSd;// remember last state |
287 | cardInSd = FALSE; | 289 | cardInSd = FALSE; |
@@ -318,24 +320,25 @@ bool CardMonitor::getStatusSd(int showPopUp) | |||
318 | } | 320 | } |
319 | //qDebug("TEXT: " + text ); | 321 | //qDebug("TEXT: " + text ); |
320 | QSound::play(Resource::findSound("cardmon/card" + what)); | 322 | QSound::play(Resource::findSound("cardmon/card" + what)); |
321 | popUp(text, "cardmon/ide");// XX add SD pic | 323 | popUp(text, "cardmon/ide");// XX add SD pic |
322 | } | 324 | } |
323 | #else | 325 | #else |
324 | #error "Not on Linux" | 326 | #error "Not on Linux" |
325 | #endif | 327 | #endif |
328 | repaint( FALSE ); | ||
326 | return ((cardWas == cardInSd) ? FALSE : TRUE); | 329 | return ((cardWas == cardInSd) ? FALSE : TRUE); |
327 | } | 330 | } |
328 | 331 | ||
329 | void CardMonitor::paintEvent(QPaintEvent *) | 332 | void CardMonitor::paintEvent(QPaintEvent *) |
330 | { | 333 | { |
331 | 334 | ||
332 | QPainter p(this); | 335 | QPainter p(this); |
333 | 336 | ||
334 | if (cardInPcmcia0 || cardInPcmcia1 || cardInSd) { | 337 | if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { |
335 | p.drawPixmap(0, 0, pm); | 338 | p.drawPixmap(0, 0, pm); |
336 | show(); | 339 | show(); |
337 | } else { | 340 | } else { |
338 | p.eraseRect(rect()); | 341 | //p.eraseRect(rect()); |
339 | hide(); | 342 | hide(); |
340 | } | 343 | } |
341 | } | 344 | } |