author | mickeyl <mickeyl> | 2005-06-25 15:28:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-06-25 15:28:21 (UTC) |
commit | 3d434ac35915afe7f7035468ca18656264a91c52 (patch) (side-by-side diff) | |
tree | f71edcbb83d4566f098da4de68f77a2f6058062f /noncore/applets/pcmcia/pcmcia.cpp | |
parent | 3ec008c17167a17f89cc096779113c6b8369b257 (diff) | |
download | opie-3d434ac35915afe7f7035468ca18656264a91c52.zip opie-3d434ac35915afe7f7035468ca18656264a91c52.tar.gz opie-3d434ac35915afe7f7035468ca18656264a91c52.tar.bz2 |
fix enable/disable logic for menu entries in popup
Diffstat (limited to 'noncore/applets/pcmcia/pcmcia.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/applets/pcmcia/pcmcia.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp index af23f58..c6386cb 100644 --- a/noncore/applets/pcmcia/pcmcia.cpp +++ b/noncore/applets/pcmcia/pcmcia.cpp @@ -67,25 +67,25 @@ using namespace Opie::Ui; #endif PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ), popupMenu( 0 ) { QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); connect( pcmciaChannel, SIGNAL( received(const QCString&,const QByteArray&) ), this, SLOT( cardMessage(const QCString&,const QByteArray&) ) ); setFocusPolicy( NoFocus ); setFixedWidth ( AppLnk::smallIconSize() ); setFixedHeight ( AppLnk::smallIconSize() ); - pm = Opie::Core::OResource::loadPixmap( "pcmcia/pcmcia", Opie::Core::OResource::SmallIcon ); + pm = Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon ); configuring = false; QCopChannel *channel = new QCopChannel( "QPE/System", this ); connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(handleSystemChannel(const QCString&,const QByteArray&)) ); } PcmciaManager::~PcmciaManager() { } @@ -154,29 +154,33 @@ void PcmciaManager::mousePressEvent( QMouseEvent* ) int i = 0; while ( it.current() ) { QPopupMenu* submenu = new QPopupMenu( menu ); submenu->insertItem( "&Eject", EJECT+i*100 ); submenu->insertItem( "&Insert", INSERT+i*100 ); submenu->insertItem( "&Suspend", SUSPEND+i*100 ); submenu->insertItem( "&Resume", RESUME+i*100 ); submenu->insertItem( "Rese&t", RESET+i*100 ); submenu->insertItem( "&Configure", CONFIGURE+i*100 ); - submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() ); - submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() ); - submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() ); - submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() ); - submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring ); + bool isSuspended = it.current()->isSuspended(); + bool isEmpty = it.current()->isEmpty(); + + submenu->setItemEnabled( EJECT+i*100, !isEmpty ); + submenu->setItemEnabled( INSERT+i*100, isEmpty ); + submenu->setItemEnabled( SUSPEND+i*100, !isEmpty && !isSuspended ); + submenu->setItemEnabled( RESUME+i*100, !isEmpty && isSuspended ); + submenu->setItemEnabled( RESET+i*100, !isEmpty && !isSuspended ); + submenu->setItemEnabled( CONFIGURE+i*100, !isEmpty && !configuring ); connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) ); menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 ); ++it; } QPoint p = mapToGlobal( QPoint( 0, 0 ) ); QSize s = menu->sizeHint(); int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ), p.y() - s.height() ), 0 ); qDebug( "pcmcia: menu result = %d", opt ); delete menu; } @@ -204,46 +208,46 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) while ( it.current() && newCard ) { if ( it.current()->isEmpty() ) { odebug << "pcmcia: skipping empty card in socket " << it.current()->number() << oendl; ++it; continue; } else { theCard = it.current(); - QString cardName = theCard->productIdentity().join( " " ).stripWhiteSpace(); + QString cardName = theCard->productIdentity(); for ( int i = 0; i < nCards; ++i ) { QString cardSection = QString( "Card_%1" ).arg( i ); cfg.setGroup( cardSection ); QString name = cfg.readEntry( "name" ); odebug << "pcmcia: comparing card '" << cardName << "' with known card '" << name << "'" << oendl; if ( cardName == name ) { newCard = false; odebug << "pcmcia: we have seen this card before" << oendl; executeAction( theCard, "insert" ); break; } } if ( !newCard ) ++it; else break; } } if ( newCard ) { odebug << "pcmcia: unconfigured card detected" << oendl; - QString newCardName = theCard->productIdentity().join( " " ).stripWhiteSpace(); + QString newCardName = theCard->productIdentity(); int result = QMessageBox::information( qApp->desktop(), tr( "PCMCIA/CF Subsystem" ), tr( "<qt>You have inserted the card<br/><b>%1</b><br/>This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ), tr( "Yes" ), tr( "No" ), 0, 0, 1 ); odebug << "pcmcia: result = " << result << oendl; if ( result == 0 ) { QString insertAction; QString resumeAction; QString driver; QString conf; bool configured = configure( theCard, insertAction, resumeAction, driver, conf ); if ( configured ) { @@ -252,25 +256,25 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & ) cfg.writeEntry( "name", newCardName ); cfg.writeEntry( "insertAction", insertAction ); cfg.writeEntry( "resumeAction", resumeAction ); cfg.setGroup( "Global" ); cfg.writeEntry( "nCards", nCards+1 ); cfg.write(); QFile confFile( conf ); if ( confFile.open( IO_ReadWrite | IO_Append ) ) { QString entryCard = QString( "card \"%1\"" ).arg( newCardName ); QString entryVersion( " version " ); - for ( QStringList::Iterator it = theCard->productIdentity().begin(); it != theCard->productIdentity().end(); ++it ) + for ( QStringList::Iterator it = theCard->productIdentityVector().begin(); it != theCard->productIdentityVector().end(); ++it ) { entryVersion += QString( "\"%1\", " ).arg( *it ); } QString entryBind = QString( " bind %1" ).arg( driver ); QString entry = QString( "\n%1\n%2\n%3\n" ).arg( entryCard ).arg( entryVersion ).arg( entryBind ); odebug << "pcmcia: writing entry...:" << entry << oendl; confFile.writeBlock( (const char*) entry, entry.length() ); Global::statusMessage( "restarting pcmcia services..." ); ::system( "/etc/init.d/pcmcia restart" ); } else |