summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 4199273..1663af2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -45,87 +45,85 @@
45using namespace Opie; 45using namespace Opie;
46 46
47CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), 47CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
48 pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) { 48 pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) {
49 49
50 QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this ); 50 QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this );
51 connect( pcmciaChannel, SIGNAL( received( const QCString &, const QByteArray &) ), 51 connect( pcmciaChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
52 this, SLOT( cardMessage( const QCString &, const QByteArray &) ) ); 52 this, SLOT( cardMessage( const QCString &, const QByteArray &) ) );
53 53
54 QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this ); 54 QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this );
55 connect( sdChannel, SIGNAL( received( const QCString &, const QByteArray &) ), 55 connect( sdChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
56 this, SLOT( cardMessage( const QCString &, const QByteArray &) ) ); 56 this, SLOT( cardMessage( const QCString &, const QByteArray &) ) );
57 57
58 cardInPcmcia0 = FALSE; 58 cardInPcmcia0 = FALSE;
59 cardInPcmcia1 = FALSE; 59 cardInPcmcia1 = FALSE;
60 cardInSd = FALSE; 60 cardInSd = FALSE;
61 61
62 setFixedSize( pm.size() ); 62 setFixedSize( pm.size() );
63 getStatusPcmcia( TRUE ); 63 getStatusPcmcia( TRUE );
64 getStatusSd( TRUE ); 64 getStatusSd( TRUE );
65 repaint( FALSE ); 65 repaint( FALSE );
66 popupMenu = 0; 66 popupMenu = 0;
67} 67}
68 68
69CardMonitor::~CardMonitor() { 69CardMonitor::~CardMonitor() {
70 if( popupMenu ) { 70 if( popupMenu ) {
71 delete popupMenu; 71 delete popupMenu;
72 } 72 }
73} 73}
74 74
75void CardMonitor::popUp( QString message, QString icon ) { 75void CardMonitor::popUp( QString message, QString icon ) {
76 if ( ! popupMenu ) { 76 if ( ! popupMenu ) {
77 popupMenu = new QPopupMenu(0); 77 popupMenu = new QPopupMenu();
78 } 78 }
79 79
80 popupMenu->clear(); 80 popupMenu->clear();
81 if( icon.isEmpty() ) { 81 if( icon.isEmpty() ) {
82 popupMenu->insertItem( message, 0 ); 82 popupMenu->insertItem( message, 0 );
83 } else { 83 } else {
84 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); 84 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 );
85 } 85 }
86 86
87 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); 87 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
88 QSize s = popupMenu->sizeHint (); 88 QSize s = popupMenu->sizeHint ();
89 popupMenu->popup( QPoint ( 89 popupMenu->popup( QPoint (
90 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), 90 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
91 p. y ( ) - s. height ( ) ), 0); 91 p. y ( ) - s. height ( ) ), 0);
92 92
93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); 93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
94} 94}
95 95
96void CardMonitor::popupTimeout() { 96void CardMonitor::popupTimeout() {
97 popupMenu->hide(); 97 popupMenu->hide();
98 popupMenu=0;
99 if(popupMenu) delete popupMenu;
100} 98}
101 99
102void CardMonitor::mousePressEvent( QMouseEvent * ) { 100void CardMonitor::mousePressEvent( QMouseEvent * ) {
103 QPopupMenu *menu = new QPopupMenu(); 101 QPopupMenu *menu = new QPopupMenu();
104 QString cmd; 102 QString cmd;
105 int err=0; 103 int err=0;
106 104
107 if ( cardInSd ) { 105 if ( cardInSd ) {
108 menu->insertItem( tr("Eject SD/MMC card"), 0 ); 106 menu->insertItem( tr("Eject SD/MMC card"), 0 );
109 } 107 }
110 108
111 if ( cardInPcmcia0 ) { 109 if ( cardInPcmcia0 ) {
112 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), 110 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ),
113 tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); 111 tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 );
114 } 112 }
115 113
116 if ( cardInPcmcia1 ) { 114 if ( cardInPcmcia1 ) {
117 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), 115 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
118 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); 116 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
119 } 117 }
120 118
121 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); 119 QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
122 QSize s = menu->sizeHint (); 120 QSize s = menu->sizeHint ();
123 int opt = menu->exec( QPoint ( 121 int opt = menu->exec( QPoint (
124 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), 122 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
125 p. y ( ) - s. height ( ) ), 0); 123 p. y ( ) - s. height ( ) ), 0);
126 124
127 if ( opt == 1 ) { 125 if ( opt == 1 ) {
128 cmd = "/sbin/cardctl eject 0"; 126 cmd = "/sbin/cardctl eject 0";
129 err = system( ( const char * ) cmd ); 127 err = system( ( const char * ) cmd );
130 if ( ( err == 127 ) || ( err < 0 ) ) { 128 if ( ( err == 127 ) || ( err < 0 ) ) {
131 qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err ); 129 qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );