summaryrefslogtreecommitdiff
Side-by-side diff
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 )
:ConfigDialogBase( parent, "pcmcia config dialog", true )
{
gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) );
- txtCardName->setText( card->productIdentity().join( " " ) );
+ txtCardName->setText( card->productIdentity() );
txtManfid->setText( card->manufacturerIdentity() );
txtFunction->setText( card->function() );
QString insertAction = preferredAction( card, "insert" );
QString resumeAction = preferredAction( card, "resume" );
- odebug << "pcmcia: preferred insertion action for card '" << card->name() << "' seems to be '" << insertAction << "'" << oendl;
- odebug << "pcmcia: preferred resume action for card '" << card->name() << "' seems to be '" << resumeAction << "'" << oendl;
+ odebug << "pcmcia: preferred insertion action for card '" << card->productIdentity() << "' seems to be '" << insertAction << "'" << oendl;
+ odebug << "pcmcia: preferred resume action for card '" << card->productIdentity() << "' seems to be '" << resumeAction << "'" << oendl;
if ( !insertAction.isEmpty() )
{
@@ -132,7 +132,7 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k
OConfig cfg( "PCMCIA" );
cfg.setGroup( "Global" );
int nCards = cfg.readNumEntry( "nCards", 0 );
- QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
+ QString cardName = card->productIdentity();
QString action;
for ( int i = 0; i < nCards; ++i )
@@ -154,7 +154,7 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString&
OConfig cfg( "PCMCIA" );
cfg.setGroup( "Global" );
int nCards = cfg.readNumEntry( "nCards", 0 );
- QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
+ QString cardName = card->productIdentity();
QString value;
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(
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 );
@@ -163,11 +163,15 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
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 );
@@ -213,7 +217,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
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 );
@@ -234,7 +238,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
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 ),
@@ -261,7 +265,7 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
{
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 );
}