Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 43ccce2..fb140fe 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -105,13 +105,14 @@ void CardMonitor::popUp( QString message, QString icon ) { | |||
105 | void CardMonitor::popupTimeout() { | 105 | void CardMonitor::popupTimeout() { |
106 | popupMenu->hide(); | 106 | popupMenu->hide(); |
107 | } | 107 | } |
108 | 108 | ||
109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { |
110 | QPopupMenu * menu = new QPopupMenu( this ); | 110 | QPopupMenu * menu = new QPopupMenu( this ); |
111 | QString cmd; | 111 | QStringList cmd; |
112 | bool execute = true; | ||
112 | 113 | ||
113 | if ( cardInSd ) { | 114 | if ( cardInSd ) { |
114 | menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), | 115 | menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), |
115 | tr( "Eject SD/MMC card" ), 0 ); | 116 | tr( "Eject SD/MMC card" ), 0 ); |
116 | } | 117 | } |
117 | 118 | ||
@@ -132,21 +133,26 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
132 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); | 133 | QPoint p = mapToGlobal( QPoint( 0, 0 ) ); |
133 | QSize s = menu->sizeHint(); | 134 | QSize s = menu->sizeHint(); |
134 | int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), | 135 | int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), |
135 | p.y() - s.height() ), 0 ); | 136 | p.y() - s.height() ), 0 ); |
136 | 137 | ||
137 | if ( opt == 1 ) { | 138 | if ( opt == 1 ) { |
138 | m_commandOrig = 1; | 139 | m_commandOrig = PCMCIA_Socket1; |
139 | execCommand("/sbin/cardctl eject 0"); | 140 | cmd << "/sbin/cardctl" << "eject" << "0"; |
140 | } else if ( opt == 0 ) { | 141 | } else if ( opt == 0 ) { |
141 | m_commandOrig = 2; | 142 | m_commandOrig = MMC_Socket; |
142 | execCommand( QString("umount %1").arg(cardSdName)); | 143 | cmd << "umount" << cardSdName; |
143 | } else if ( opt == 2 ) { | 144 | } else if ( opt == 2 ) { |
144 | m_commandOrig = 3; | 145 | m_commandOrig = PCMCIA_Socket2; |
145 | execCommand( "/sbin/cardctl eject 1" ); | 146 | cmd << "/sbin/cardctl" << "eject" << "1"; |
146 | } | 147 | }else |
148 | execute = false; | ||
149 | |||
150 | if ( execute ) | ||
151 | execCommand( cmd ); | ||
152 | |||
147 | delete menu; | 153 | delete menu; |
148 | } | 154 | } |
149 | 155 | ||
150 | 156 | ||
151 | void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { | 157 | void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { |
152 | if ( msg == "stabChanged()" ) { | 158 | if ( msg == "stabChanged()" ) { |
@@ -330,21 +336,21 @@ void CardMonitor::paintEvent( QPaintEvent * ) { | |||
330 | } | 336 | } |
331 | 337 | ||
332 | int CardMonitor::position() { | 338 | int CardMonitor::position() { |
333 | return 7; | 339 | return 7; |
334 | } | 340 | } |
335 | 341 | ||
336 | void CardMonitor::execCommand( const QString &command ) { | 342 | void CardMonitor::execCommand( const QStringList &strList ) { |
337 | delete m_process; | 343 | delete m_process; |
338 | m_process = 0; | 344 | m_process = 0; |
339 | 345 | ||
340 | if ( m_process == 0 ) { | 346 | if ( m_process == 0 ) { |
341 | m_process = new OProcess(); | 347 | m_process = new OProcess(); |
342 | QStringList strList = QStringList::split( " ", command ); | ||
343 | 348 | ||
344 | for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { | 349 | |
350 | for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { | ||
345 | *m_process << *it; | 351 | *m_process << *it; |
346 | } | 352 | } |
347 | 353 | ||
348 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), | 354 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
349 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); | 355 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
350 | 356 | ||
@@ -357,18 +363,17 @@ void CardMonitor::execCommand( const QString &command ) { | |||
357 | 363 | ||
358 | void CardMonitor::slotExited( OProcess* ) { | 364 | void CardMonitor::slotExited( OProcess* ) { |
359 | 365 | ||
360 | if( m_process->normalExit() ) { | 366 | if( m_process->normalExit() ) { |
361 | int ret = m_process->exitStatus(); | 367 | int ret = m_process->exitStatus(); |
362 | if( ret != 0 ) { | 368 | if( ret != 0 ) { |
363 | if ( m_commandOrig == 1 ) { | 369 | if ( m_commandOrig == PCMCIA_Socket1 || |
370 | m_commandOrig == PCMCIA_Socket2 ) { | ||
364 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 371 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
365 | } else if ( m_commandOrig == 2 ) { | 372 | } else if ( m_commandOrig == MMC_Socket ) { |
366 | popUp( tr( "SD/MMC card eject failed!" ) ); | 373 | popUp( tr( "SD/MMC card eject failed!" ) ); |
367 | } else if ( m_commandOrig == 3 ) { | ||
368 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | ||
369 | } | 374 | } |
370 | } | 375 | } |
371 | } | 376 | } |
372 | } | 377 | } |
373 | 378 | ||
374 | EXPORT_OPIE_APPLET_v1( CardMonitor ) | 379 | EXPORT_OPIE_APPLET_v1( CardMonitor ) |