summaryrefslogtreecommitdiff
authorzecke <zecke>2004-04-04 23:31:29 (UTC)
committer zecke <zecke>2004-04-04 23:31:29 (UTC)
commitfb8ce053c0f08769d359fe4153785e3de72f83ea (patch) (unidiff)
tree2f0081cf8739c6daba81c791ec77bde37cbbba1a
parentf2da7b706fd5e0512222e11ce0d94d2750074fd1 (diff)
downloadopie-fb8ce053c0f08769d359fe4153785e3de72f83ea.zip
opie-fb8ce053c0f08769d359fe4153785e3de72f83ea.tar.gz
opie-fb8ce053c0f08769d359fe4153785e3de72f83ea.tar.bz2
Comitting a fix is probably a good idea
use EXPORT_OPIE_APPLET_v1 instead of OTaskBarAppletWrapper directly
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index ed4bfc7..1ad8b55 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -375,53 +375,50 @@ bool CardMonitor::getStatusSd( int showPopUp )
375 { 375 {
376 QString text = QString::null; 376 QString text = QString::null;
377 QString what = QString::null; 377 QString what = QString::null;
378 if ( cardInSd ) 378 if ( cardInSd )
379 { 379 {
380 text += "New card: SD/MMC"; 380 text += "New card: SD/MMC";
381 what = "on"; 381 what = "on";
382 } 382 }
383 else 383 else
384 { 384 {
385 text += "Ejected: SD/MMC"; 385 text += "Ejected: SD/MMC";
386 what = "off"; 386 what = "off";
387 } 387 }
388 //qDebug("TEXT: " + text ); 388 //qDebug("TEXT: " + text );
389#ifndef QT_NO_SOUND 389#ifndef QT_NO_SOUND
390 QSound::play( Resource::findSound( "cardmon/card" + what ) ); 390 QSound::play( Resource::findSound( "cardmon/card" + what ) );
391#endif 391#endif
392 popUp( text, "cardmon/ide" );// XX add SD pic 392 popUp( text, "cardmon/ide" );// XX add SD pic
393 } 393 }
394#else 394#else
395#error "Not on Linux" 395#error "Not on Linux"
396#endif 396#endif
397 repaint( FALSE ); 397 repaint( FALSE );
398 return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); 398 return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
399} 399}
400 400
401void CardMonitor::paintEvent( QPaintEvent * ) 401void CardMonitor::paintEvent( QPaintEvent * )
402{ 402{
403 403
404 QPainter p( this ); 404 QPainter p( this );
405 405
406 if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) 406 if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
407 { 407 {
408 p.drawPixmap( 0, 0, pm ); 408 p.drawPixmap( 0, 0, pm );
409 show(); 409 show();
410 } 410 }
411 else 411 else
412 { 412 {
413 //p.eraseRect(rect()); 413 //p.eraseRect(rect());
414 hide(); 414 hide();
415 } 415 }
416} 416}
417 417
418int CardMonitor::position() 418int CardMonitor::position()
419{ 419{
420 return 7; 420 return 7;
421} 421}
422 422
423Q_EXPORT_INTERFACE() 423EXPORT_OPIE_APPLET_v1( CardMonitor )
424{
425 Q_CREATE_INSTANCE( Opie::Ui::Private::OTaskbarAppletWrapper<CardMonitor> );
426}
427 424