-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 fb140fe..d6ac616 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -257,100 +257,100 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { | |||
257 | QSound::play( Resource::findSound( "cardmon/card" + what ) ); | 257 | QSound::play( Resource::findSound( "cardmon/card" + what ) ); |
258 | #endif | 258 | #endif |
259 | 259 | ||
260 | } | 260 | } |
261 | } else { | 261 | } else { |
262 | // no file found | 262 | // no file found |
263 | odebug << "no file found" << oendl; | 263 | odebug << "no file found" << oendl; |
264 | cardInPcmcia0 = FALSE; | 264 | cardInPcmcia0 = FALSE; |
265 | cardInPcmcia1 = FALSE; | 265 | cardInPcmcia1 = FALSE; |
266 | } | 266 | } |
267 | repaint( FALSE ); | 267 | repaint( FALSE ); |
268 | return ( ( cardWas0 == cardInPcmcia0 | 268 | return ( ( cardWas0 == cardInPcmcia0 |
269 | && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); | 269 | && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE ); |
270 | 270 | ||
271 | } | 271 | } |
272 | 272 | ||
273 | 273 | ||
274 | bool CardMonitor::getStatusSd( int showPopUp ) { | 274 | bool CardMonitor::getStatusSd( int showPopUp ) { |
275 | 275 | ||
276 | bool cardWas = cardInSd; // remember last state | 276 | bool cardWas = cardInSd; // remember last state |
277 | cardInSd = FALSE; | 277 | cardInSd = FALSE; |
278 | 278 | ||
279 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 279 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
280 | 280 | ||
281 | struct mntent *me; | 281 | struct mntent *me; |
282 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); | 282 | FILE *mntfp = setmntent( "/etc/mtab", "r" ); |
283 | 283 | ||
284 | if ( mntfp ) { | 284 | if ( mntfp ) { |
285 | while ( ( me = getmntent( mntfp ) ) != 0 ) { | 285 | while ( ( me = getmntent( mntfp ) ) != 0 ) { |
286 | QString fs = QFile::decodeName( me->mnt_fsname ); | 286 | QString fs = QFile::decodeName( me->mnt_fsname ); |
287 | //odebug << fs << oendl; | 287 | //odebug << fs << oendl; |
288 | if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" | 288 | if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" |
289 | || fs.left( 9 ) == "/dev/mmcd" ) { | 289 | || fs.left( 9 ) == "/dev/mmcd" ) { |
290 | cardInSd = TRUE; | 290 | cardInSd = TRUE; |
291 | cardSdName = fs; | 291 | cardSdName = fs; |
292 | show(); | 292 | show(); |
293 | } | 293 | } |
294 | // else { | 294 | // else { |
295 | // cardInSd = FALSE; | 295 | // cardInSd = FALSE; |
296 | // } | 296 | // } |
297 | } | 297 | } |
298 | endmntent( mntfp ); | 298 | endmntent( mntfp ); |
299 | } | 299 | } |
300 | 300 | ||
301 | if ( !showPopUp && cardWas != cardInSd ) { | 301 | if ( !showPopUp && cardWas != cardInSd ) { |
302 | QString text = QString::null; | 302 | QString text = QString::null; |
303 | QString what = QString::null; | 303 | QString what = QString::null; |
304 | if ( cardInSd ) { | 304 | if ( cardInSd ) { |
305 | text += "New card: SD/MMC"; | 305 | text += tr("New card: SD/MMC"); |
306 | what = "on"; | 306 | what = "on"; |
307 | } else { | 307 | } else { |
308 | text += "Ejected: SD/MMC"; | 308 | text += tr("Ejected: SD/MMC"); |
309 | what = "off"; | 309 | what = "off"; |
310 | } | 310 | } |
311 | //odebug << "TEXT: " + text << oendl; | 311 | //odebug << "TEXT: " + text << oendl; |
312 | #ifndef QT_NO_SOUND | 312 | #ifndef QT_NO_SOUND |
313 | QSound::play( Resource::findSound( "cardmon/card" + what ) ); | 313 | QSound::play( Resource::findSound( "cardmon/card" + what ) ); |
314 | #endif | 314 | #endif |
315 | 315 | ||
316 | popUp( text, "cardmon/ide" ); // XX add SD pic | 316 | popUp( text, "cardmon/ide" ); // XX add SD pic |
317 | } | 317 | } |
318 | #else | 318 | #else |
319 | #error "Not on Linux" | 319 | #error "Not on Linux" |
320 | #endif | 320 | #endif |
321 | repaint( FALSE ); | 321 | repaint( FALSE ); |
322 | return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); | 322 | return ( ( cardWas == cardInSd ) ? FALSE : TRUE ); |
323 | } | 323 | } |
324 | 324 | ||
325 | void CardMonitor::paintEvent( QPaintEvent * ) { | 325 | void CardMonitor::paintEvent( QPaintEvent * ) { |
326 | 326 | ||
327 | QPainter p( this ); | 327 | QPainter p( this ); |
328 | 328 | ||
329 | if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { | 329 | if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { |
330 | p.drawPixmap( 0, 0, pm ); | 330 | p.drawPixmap( 0, 0, pm ); |
331 | show(); | 331 | show(); |
332 | } else { | 332 | } else { |
333 | //p.eraseRect(rect()); | 333 | //p.eraseRect(rect()); |
334 | hide(); | 334 | hide(); |
335 | } | 335 | } |
336 | } | 336 | } |
337 | 337 | ||
338 | int CardMonitor::position() { | 338 | int CardMonitor::position() { |
339 | return 7; | 339 | return 7; |
340 | } | 340 | } |
341 | 341 | ||
342 | void CardMonitor::execCommand( const QStringList &strList ) { | 342 | void CardMonitor::execCommand( const QStringList &strList ) { |
343 | delete m_process; | 343 | delete m_process; |
344 | m_process = 0; | 344 | m_process = 0; |
345 | 345 | ||
346 | if ( m_process == 0 ) { | 346 | if ( m_process == 0 ) { |
347 | m_process = new OProcess(); | 347 | m_process = new OProcess(); |
348 | 348 | ||
349 | 349 | ||
350 | for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { | 350 | for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { |
351 | *m_process << *it; | 351 | *m_process << *it; |
352 | } | 352 | } |
353 | 353 | ||
354 | connect(m_process, SIGNAL(processExited(Opie::Core::OProcess*)), | 354 | connect(m_process, SIGNAL(processExited(Opie::Core::OProcess*)), |
355 | this, SLOT( slotExited(Opie::Core::OProcess*))); | 355 | this, SLOT( slotExited(Opie::Core::OProcess*))); |
356 | 356 | ||