summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp35
-rw-r--r--noncore/applets/pcmcia/pcmcia.h5
2 files changed, 39 insertions, 1 deletions
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 186dfea..0787c3c 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -78,6 +78,10 @@ PcmciaManager::PcmciaManager( QWidget * parent ) : QWidget( parent )
78 setFixedHeight ( AppLnk::smallIconSize() ); 78 setFixedHeight ( AppLnk::smallIconSize() );
79 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ); 79 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
80 configuring = false; 80 configuring = false;
81
82 QCopChannel *channel = new QCopChannel( "QPE/System", this );
83 connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
84 this, SLOT(handleSystemChannel(const QCString&,const QByteArray&)) );
81} 85}
82 86
83 87
@@ -85,6 +89,25 @@ PcmciaManager::~PcmciaManager()
85{ 89{
86} 90}
87 91
92void PcmciaManager::handleSystemChannel( const QCString&msg, const QByteArray& )
93{
94 if ( msg == "returnFromSuspend()" )
95 {
96 if ( !OPcmciaSystem::instance()->cardCount() ) return;
97 OPcmciaSystem* sys = OPcmciaSystem::instance();
98 OPcmciaSystem::CardIterator it = sys->iterator();
99 OPcmciaSocket* theCard = 0;
100
101 while ( it.current() )
102 {
103 if ( it.current()->isEmpty() )
104 {
105 executeResumeAction( theCard );
106 }
107 ++it;
108 }
109 }
110}
88 111
89void PcmciaManager::popUp( QString message, QString icon ) 112void PcmciaManager::popUp( QString message, QString icon )
90{ 113{
@@ -197,6 +220,8 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
197 if ( cardName == name ) 220 if ( cardName == name )
198 { 221 {
199 newCard = false; 222 newCard = false;
223 odebug << "pcmcia: we have seen this card before" << oendl;
224 executeInsertAction( theCard );
200 break; 225 break;
201 } 226 }
202 } 227 }
@@ -344,6 +369,16 @@ bool PcmciaManager::configure( OPcmciaSocket* card, QString& insertAction, QStri
344 return configresult; 369 return configresult;
345} 370}
346 371
372void PcmciaManager::executeInsertAction( Opie::Core::OPcmciaSocket* card )
373{
374 odebug << "pcmcia: execute insert action" << oendl;
375}
376
377void PcmciaManager::executeResumeAction( Opie::Core::OPcmciaSocket* card )
378{
379 odebug << "pcmcia: execute resume action" << oendl;
380}
381
347 382
348EXPORT_OPIE_APPLET_v1( PcmciaManager ) 383EXPORT_OPIE_APPLET_v1( PcmciaManager )
349 384
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index 94203d3..6567cd7 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -45,7 +45,8 @@ class PcmciaManager : public QWidget
45 static int position(); 45 static int position();
46 46
47 private slots: 47 private slots:
48 void cardMessage( const QCString& msg, const QByteArray& ); 48 void handleSystemChannel( const QCString&, const QByteArray& );
49 void cardMessage( const QCString&, const QByteArray& );
49 void userCardAction( int action ); 50 void userCardAction( int action );
50 void popupTimeout(); 51 void popupTimeout();
51 52
@@ -56,6 +57,8 @@ class PcmciaManager : public QWidget
56 private: 57 private:
57 bool configure( Opie::Core::OPcmciaSocket*, QString&, QString&, QString&, QString& ); 58 bool configure( Opie::Core::OPcmciaSocket*, QString&, QString&, QString&, QString& );
58 void execCommand( const QStringList &command ); 59 void execCommand( const QStringList &command );
60 void executeInsertAction( Opie::Core::OPcmciaSocket* );
61 void executeResumeAction( Opie::Core::OPcmciaSocket* );
59 void popUp(QString message, QString icon = QString::null ); 62 void popUp(QString message, QString icon = QString::null );
60 63
61 private: 64 private: