-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 1663af2..9293c6f 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -53,73 +53,73 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), | |||
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 | ||
69 | CardMonitor::~CardMonitor() { | 69 | CardMonitor::~CardMonitor() { |
70 | if( popupMenu ) { | 70 | if( popupMenu ) { |
71 | delete popupMenu; | 71 | delete popupMenu; |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | void CardMonitor::popUp( QString message, QString icon ) { | 75 | void CardMonitor::popUp( QString message, QString icon ) { |
76 | if ( ! popupMenu ) { | 76 | if ( ! popupMenu ) { |
77 | popupMenu = new QPopupMenu(); | 77 | popupMenu = new QPopupMenu(this); |
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 | ||
96 | void CardMonitor::popupTimeout() { | 96 | void CardMonitor::popupTimeout() { |
97 | popupMenu->hide(); | 97 | popupMenu->hide(); |
98 | } | 98 | } |
99 | 99 | ||
100 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 100 | void CardMonitor::mousePressEvent( QMouseEvent * ) { |
101 | QPopupMenu *menu = new QPopupMenu(); | 101 | QPopupMenu *menu = new QPopupMenu(this); |
102 | QString cmd; | 102 | QString cmd; |
103 | int err=0; | 103 | int err=0; |
104 | 104 | ||
105 | if ( cardInSd ) { | 105 | if ( cardInSd ) { |
106 | menu->insertItem( tr("Eject SD/MMC card"), 0 ); | 106 | menu->insertItem( tr("Eject SD/MMC card"), 0 ); |
107 | } | 107 | } |
108 | 108 | ||
109 | if ( cardInPcmcia0 ) { | 109 | if ( cardInPcmcia0 ) { |
110 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), | 110 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type ) ), |
111 | tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); | 111 | tr( "Eject card 0: %1" ).arg(cardInPcmcia0Name ), 1 ); |
112 | } | 112 | } |
113 | 113 | ||
114 | if ( cardInPcmcia1 ) { | 114 | if ( cardInPcmcia1 ) { |
115 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), | 115 | menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ), |
116 | tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); | 116 | tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); |
117 | } | 117 | } |
118 | 118 | ||
119 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); | 119 | QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); |
120 | QSize s = menu->sizeHint (); | 120 | QSize s = menu->sizeHint (); |
121 | int opt = menu->exec( QPoint ( | 121 | int opt = menu->exec( QPoint ( |
122 | p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), | 122 | p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), |
123 | p. y ( ) - s. height ( ) ), 0); | 123 | p. y ( ) - s. height ( ) ), 0); |
124 | 124 | ||
125 | if ( opt == 1 ) { | 125 | if ( opt == 1 ) { |