summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp10
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp22
2 files changed, 18 insertions, 14 deletions
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index f94edde..3b1b40c 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -47,15 +47,15 @@ ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
47 :ConfigDialogBase( parent, "pcmcia config dialog", true ) 47 :ConfigDialogBase( parent, "pcmcia config dialog", true )
48{ 48{
49 gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) ); 49 gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) );
50 txtCardName->setText( card->productIdentity().join( " " ) ); 50 txtCardName->setText( card->productIdentity() );
51 txtManfid->setText( card->manufacturerIdentity() ); 51 txtManfid->setText( card->manufacturerIdentity() );
52 txtFunction->setText( card->function() ); 52 txtFunction->setText( card->function() );
53 53
54 QString insertAction = preferredAction( card, "insert" ); 54 QString insertAction = preferredAction( card, "insert" );
55 QString resumeAction = preferredAction( card, "resume" ); 55 QString resumeAction = preferredAction( card, "resume" );
56 56
57 odebug << "pcmcia: preferred insertion action for card '" << card->name() << "' seems to be '" << insertAction << "'" << oendl; 57 odebug << "pcmcia: preferred insertion action for card '" << card->productIdentity() << "' seems to be '" << insertAction << "'" << oendl;
58 odebug << "pcmcia: preferred resume action for card '" << card->name() << "' seems to be '" << resumeAction << "'" << oendl; 58 odebug << "pcmcia: preferred resume action for card '" << card->productIdentity() << "' seems to be '" << resumeAction << "'" << oendl;
59 59
60 if ( !insertAction.isEmpty() ) 60 if ( !insertAction.isEmpty() )
61 { 61 {
@@ -132,7 +132,7 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k
132 OConfig cfg( "PCMCIA" ); 132 OConfig cfg( "PCMCIA" );
133 cfg.setGroup( "Global" ); 133 cfg.setGroup( "Global" );
134 int nCards = cfg.readNumEntry( "nCards", 0 ); 134 int nCards = cfg.readNumEntry( "nCards", 0 );
135 QString cardName = card->productIdentity().join( " " ).stripWhiteSpace(); 135 QString cardName = card->productIdentity();
136 QString action; 136 QString action;
137 137
138 for ( int i = 0; i < nCards; ++i ) 138 for ( int i = 0; i < nCards; ++i )
@@ -154,7 +154,7 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString&
154 OConfig cfg( "PCMCIA" ); 154 OConfig cfg( "PCMCIA" );
155 cfg.setGroup( "Global" ); 155 cfg.setGroup( "Global" );
156 int nCards = cfg.readNumEntry( "nCards", 0 ); 156 int nCards = cfg.readNumEntry( "nCards", 0 );
157 QString cardName = card->productIdentity().join( " " ).stripWhiteSpace(); 157 QString cardName = card->productIdentity();
158 QString value; 158 QString value;
159 159
160 for ( int i = 0; i < nCards; ++i ) 160 for ( int i = 0; i < nCards; ++i )
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
@@ -76,7 +76,7 @@ PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ), popupMenu(
76 setFocusPolicy( NoFocus ); 76 setFocusPolicy( NoFocus );
77 setFixedWidth ( AppLnk::smallIconSize() ); 77 setFixedWidth ( AppLnk::smallIconSize() );
78 setFixedHeight ( AppLnk::smallIconSize() ); 78 setFixedHeight ( AppLnk::smallIconSize() );
79 pm = Opie::Core::OResource::loadPixmap( "pcmcia/pcmcia", Opie::Core::OResource::SmallIcon ); 79 pm = Opie::Core::OResource::loadPixmap( "pcmcia", Opie::Core::OResource::SmallIcon );
80 configuring = false; 80 configuring = false;
81 81
82 QCopChannel *channel = new QCopChannel( "QPE/System", this ); 82 QCopChannel *channel = new QCopChannel( "QPE/System", this );
@@ -163,11 +163,15 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
163 submenu->insertItem( "Rese&t", RESET+i*100 ); 163 submenu->insertItem( "Rese&t", RESET+i*100 );
164 submenu->insertItem( "&Configure", CONFIGURE+i*100 ); 164 submenu->insertItem( "&Configure", CONFIGURE+i*100 );
165 165
166 submenu->setItemEnabled( EJECT+i*100, !it.current()->isEmpty() ); 166 bool isSuspended = it.current()->isSuspended();
167 submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() ); 167 bool isEmpty = it.current()->isEmpty();
168 submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() ); 168
169 submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() ); 169 submenu->setItemEnabled( EJECT+i*100, !isEmpty );
170 submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring ); 170 submenu->setItemEnabled( INSERT+i*100, isEmpty );
171 submenu->setItemEnabled( SUSPEND+i*100, !isEmpty && !isSuspended );
172 submenu->setItemEnabled( RESUME+i*100, !isEmpty && isSuspended );
173 submenu->setItemEnabled( RESET+i*100, !isEmpty && !isSuspended );
174 submenu->setItemEnabled( CONFIGURE+i*100, !isEmpty && !configuring );
171 175
172 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) ); 176 connect( submenu, SIGNAL(activated(int)), this, SLOT(userCardAction(int)) );
173 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 ); 177 menu->insertItem( tr( "%1: %2" ).arg( i++ ).arg( it.current()->identity() ), submenu, 1 );
@@ -213,7 +217,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
213 else 217 else
214 { 218 {
215 theCard = it.current(); 219 theCard = it.current();
216 QString cardName = theCard->productIdentity().join( " " ).stripWhiteSpace(); 220 QString cardName = theCard->productIdentity();
217 for ( int i = 0; i < nCards; ++i ) 221 for ( int i = 0; i < nCards; ++i )
218 { 222 {
219 QString cardSection = QString( "Card_%1" ).arg( i ); 223 QString cardSection = QString( "Card_%1" ).arg( i );
@@ -234,7 +238,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
234 if ( newCard ) 238 if ( newCard )
235 { 239 {
236 odebug << "pcmcia: unconfigured card detected" << oendl; 240 odebug << "pcmcia: unconfigured card detected" << oendl;
237 QString newCardName = theCard->productIdentity().join( " " ).stripWhiteSpace(); 241 QString newCardName = theCard->productIdentity();
238 int result = QMessageBox::information( qApp->desktop(), 242 int result = QMessageBox::information( qApp->desktop(),
239 tr( "PCMCIA/CF Subsystem" ), 243 tr( "PCMCIA/CF Subsystem" ),
240 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 ), 244 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 ),
@@ -261,7 +265,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
261 { 265 {
262 QString entryCard = QString( "card \"%1\"" ).arg( newCardName ); 266 QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
263 QString entryVersion( " version " ); 267 QString entryVersion( " version " );
264 for ( QStringList::Iterator it = theCard->productIdentity().begin(); it != theCard->productIdentity().end(); ++it ) 268 for ( QStringList::Iterator it = theCard->productIdentityVector().begin(); it != theCard->productIdentityVector().end(); ++it )
265 { 269 {
266 entryVersion += QString( "\"%1\", " ).arg( *it ); 270 entryVersion += QString( "\"%1\", " ).arg( *it );
267 } 271 }