| -rw-r--r-- | noncore/applets/pcmcia/pcmcia.cpp | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp index 7f24371..a1deb6b 100644 --- a/noncore/applets/pcmcia/pcmcia.cpp +++ b/noncore/applets/pcmcia/pcmcia.cpp @@ -188,29 +188,37 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) bool newCard = true; - - while ( it.current() && !it.current()->isEmpty() && newCard ) + QString cardName; + + while ( it.current() && newCard ) { - QString name = it.current()->identity(); - for ( int i = 0; i < nCards; ++i ) + if ( it.current()->isEmpty() ) + { + odebug << "skipping empty card in socket " << it.current()->number() << oendl; + ++it; + continue; + } + else { - QString cardSection = QString( "Card_%1" ).arg( i ); - cfg.setGroup( cardSection ); - QString cardName = cfg.readEntry( "name" ); - odebug << "comparing card '" << name << "' with known card '" << cardName << "'" << oendl; - if ( cardName == name ) + cardName = it.current()->identity(); + for ( int i = 0; i < nCards; ++i ) { - newCard = false; - break; + QString cardSection = QString( "Card_%1" ).arg( i ); + cfg.setGroup( cardSection ); + QString name = cfg.readEntry( "name" ); + odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl; + if ( cardName == name ) + { + newCard = false; + break; + } } + if ( !newCard ) ++it; else break; } - if ( !newCard ) ++it; else break; } - if ( newCard ) { - QString newCardName = it.current()->identity(); odebug << "pcmcia: new card detected" << oendl; cfg.setGroup( QString( "Card_%1" ).arg( nCards ) ); - cfg.writeEntry( "name", newCardName ); + cfg.writeEntry( "name", cardName ); cfg.setGroup( "Global" ); cfg.writeEntry( "nCards", nCards+1 ); @@ -219,8 +227,18 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) int result = QMessageBox::information( qApp->desktop(), tr( "PCMCIA/CF Subsystem" ), - tr( "You have inserted a new card\n%1\nDo you want to configure this card?" ).arg( newCardName ), + tr( "You have inserted a new card:\n%1\nDo you want to configure?" ).arg( cardName ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ); odebug << "result = " << result << oendl; - + if ( result == 0 ) + { + QMessageBox::information( qApp->desktop(), + tr( "PCMCIA/CF Subsystem" ), + tr( "Sorry, not yet implemented...\n~lart mickeyl :D" ), + tr( "No Problem" ), 0, 0, 0 ); + } + else + { + odebug << "pcmcia: user doesn't want to configure " << cardName << " now." << oendl; + } } else @@ -228,5 +246,5 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) odebug << "pcmcia: card has been previously inserted" << oendl; } - repaint( TRUE ); + repaint( true ); } |