summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp10
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp98
-rw-r--r--noncore/applets/pcmcia/pcmcia.h5
3 files changed, 60 insertions, 53 deletions
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index f5812ba..f94edde 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -131,17 +131,18 @@ 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 action;
for ( int i = 0; i < nCards; ++i )
{
QString cardSection = QString( "Card_%1" ).arg( i );
cfg.setGroup( cardSection );
QString name = cfg.readEntry( "name" );
- odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
- if ( card->name() == name )
+ odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+ if ( cardName == name )
{
cfg.writeEntry( key, value );
break;
}
@@ -152,17 +153,18 @@ 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 value;
for ( int i = 0; i < nCards; ++i )
{
QString cardSection = QString( "Card_%1" ).arg( i );
cfg.setGroup( cardSection );
QString name = cfg.readEntry( "name" );
- odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
- if ( card->name() == name )
+ odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+ if ( cardName == name )
{
value = cfg.readEntry( key, defaultValue );
break;
}
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index e435f61..af23f58 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -65,9 +65,9 @@ using namespace Opie::Ui;
#include <sys/vfs.h>
#include <mntent.h>
#endif
-PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
+PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent ), popupMenu( 0 )
{
QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
connect( pcmciaChannel,
SIGNAL( received(const QCString&,const QByteArray&) ), this,
@@ -95,28 +95,29 @@ void PcmciaManager::handleSystemChannel( const QCString&msg, const QByteArray& )
{
if ( !OPcmciaSystem::instance()->cardCount() ) return;
OPcmciaSystem* sys = OPcmciaSystem::instance();
OPcmciaSystem::CardIterator it = sys->iterator();
- OPcmciaSocket* theCard = 0;
while ( it.current() )
{
- if ( it.current()->isEmpty() )
+ if ( !it.current()->isEmpty() )
{
- executeResumeAction( theCard );
+ executeAction( it.current(), "resume" );
}
++it;
}
}
}
void PcmciaManager::popUp( QString message, QString icon )
{
- if ( !popupMenu ) {
+ if ( !popupMenu)
+ {
popupMenu = new QPopupMenu( this );
+ popupMenu->setFocusPolicy( QWidget::NoFocus );
}
-
popupMenu->clear();
+
if ( icon.isEmpty() ) {
popupMenu->insertItem( message, 0 );
} else {
popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
@@ -137,16 +138,18 @@ void PcmciaManager::popupTimeout()
popupMenu->hide();
}
enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE };
+static const char* actionText[] = { "eject", "insert", "suspend", "resum", "resett", "configur" };
void PcmciaManager::mousePressEvent( QMouseEvent* )
{
QPopupMenu* menu = new QPopupMenu( this );
QStringList cmd;
bool execute = true;
OPcmciaSystem* sys = OPcmciaSystem::instance();
+ sys->synchronize();
OPcmciaSystem::CardIterator it = sys->iterator();
if ( !sys->count() ) return;
int i = 0;
@@ -209,9 +212,9 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
}
else
{
theCard = it.current();
- QString cardName = theCard->productIdentity().join( " " );
+ QString cardName = theCard->productIdentity().join( " " ).stripWhiteSpace();
for ( int i = 0; i < nCards; ++i )
{
QString cardSection = QString( "Card_%1" ).arg( i );
cfg.setGroup( cardSection );
@@ -220,9 +223,9 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
if ( cardName == name )
{
newCard = false;
odebug << "pcmcia: we have seen this card before" << oendl;
- executeInsertAction( theCard );
+ executeAction( theCard, "insert" );
break;
}
}
if ( !newCard ) ++it; else break;
@@ -252,9 +255,9 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
cfg.setGroup( "Global" );
cfg.writeEntry( "nCards", nCards+1 );
cfg.write();
- QFile confFile( QString( "/etc/pcmcia/%1" ).arg( conf ) );
+ QFile confFile( conf );
if ( confFile.open( IO_ReadWrite | IO_Append ) )
{
QString entryCard = QString( "card \"%1\"" ).arg( newCardName );
QString entryVersion( " version " );
@@ -271,9 +274,9 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
::system( "/etc/init.d/pcmcia restart" );
}
else
{
- owarn << "pcmcia: couldn't write binding to '" << conf << "'." << oendl;
+ owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
}
}
else
{
@@ -286,30 +289,16 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
}
}
else // it's an already configured card
{
- QString insertAction = ConfigDialog::preferredAction( theCard, "insert" );
- odebug << "pcmcia: card has been previously configured" << oendl;
- odebug << "pcmcia: TODO: need to perform action'" << insertAction << "' now... sorry, not yet implemented..." << oendl;
+ odebug << "pcmcia: doing nothing... why do we come here?" << oendl;
}
- repaint( true );
}
-
void PcmciaManager::paintEvent( QPaintEvent * )
{
QPainter p( this );
- odebug << "sockets = " << OPcmciaSystem::instance()->count() << ", cards = " << OPcmciaSystem::instance()->cardCount() << oendl;
-
- if ( OPcmciaSystem::instance()->cardCount() )
- {
- p.drawPixmap( 0, 0, pm );
- show();
- }
- else
- {
- hide();
- }
+ p.drawPixmap( 0, 0, pm );
}
int PcmciaManager::position()
{
@@ -332,25 +321,32 @@ void PcmciaManager::userCardAction( int action )
{
case CONFIGURE:
{
QString insertAction; QString resumeAction; QString driver; QString conf;
- bool result = configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
- success = true;
- break;
+ configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
+ return;
}
- case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject(); break;
- case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert(); break;
- case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend(); break;
- case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume(); break;
- case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset(); break;
- default: odebug << "pcmcia: not yet implemented" << oendl;
+ case EJECT: success = OPcmciaSystem::instance()->socket( socket )->eject();
+ break;
+ case INSERT: success = OPcmciaSystem::instance()->socket( socket )->insert();
+ break;
+ case SUSPEND: success = OPcmciaSystem::instance()->socket( socket )->suspend();
+ break;
+ case RESUME: success = OPcmciaSystem::instance()->socket( socket )->resume();
+ break;
+ case RESET: success = OPcmciaSystem::instance()->socket( socket )->reset();
+ break;
+ default: odebug << "pcmcia: not yet implemented" << oendl;
}
- if ( !success )
+ if ( success )
{
- owarn << "pcmcia: couldn't perform user action (" << strerror( errno ) << ")" << oendl;
+ popUp( tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
+ }
+ else
+ {
+ popUp( tr( "Error while %1ing card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
}
-
}
bool PcmciaManager::configure( OPcmciaSocket* card, QString& insertAction, QString& resumeAction, QString& driver, QString& conf )
{
@@ -368,17 +364,27 @@ bool PcmciaManager::configure( OPcmciaSocket* card, QString& insertAction, QStri
}
return configresult;
}
-void PcmciaManager::executeInsertAction( Opie::Core::OPcmciaSocket* card )
-{
- odebug << "pcmcia: execute insert action" << oendl;
-}
-
-void PcmciaManager::executeResumeAction( Opie::Core::OPcmciaSocket* card )
+void PcmciaManager::executeAction( Opie::Core::OPcmciaSocket* card, const QString& type )
{
- odebug << "pcmcia: execute resume action" << oendl;
+ odebug << "pcmcia: performing " << type << " action ..." << oendl;
+ QString theAction = ConfigDialog::preferredAction( card, type );
+ int intAction = card->number() * 100;
+ if ( theAction == "activate" ) ;
+ else if ( theAction == "eject" ) intAction += EJECT;
+ else if ( theAction == "suspend" ) intAction += SUSPEND;
+ else if ( theAction == "prompt for" )
+ {
+ odebug << "pcmcia: sorry, not 'prompt for' is not yet implemented!" << oendl;
+ return;
+ }
+ else
+ {
+ owarn << "pcmcia: action '" << theAction << "' not known. Huh?" << oendl;
+ return;
+ }
+ userCardAction( intAction );
}
-
EXPORT_OPIE_APPLET_v1( PcmciaManager )
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index 6567cd7..de7d6bf 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -56,11 +56,10 @@ class PcmciaManager : public QWidget
private:
bool configure( Opie::Core::OPcmciaSocket*, QString&, QString&, QString&, QString& );
void execCommand( const QStringList &command );
- void executeInsertAction( Opie::Core::OPcmciaSocket* );
- void executeResumeAction( Opie::Core::OPcmciaSocket* );
- void popUp(QString message, QString icon = QString::null );
+ void executeAction( Opie::Core::OPcmciaSocket*, const QString& );
+ void popUp( QString message, QString icon = QString::null );
private:
bool configuring;
int commandOrig;