summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/applets/pcmcia/configdialog.cpp115
-rw-r--r--noncore/applets/pcmcia/configdialog.h4
-rw-r--r--noncore/applets/pcmcia/pcmcia.cpp114
-rw-r--r--noncore/applets/pcmcia/pcmcia.h2
-rw-r--r--noncore/applets/pcmcia/pcmcia.pro6
-rw-r--r--noncore/applets/pcmcia/promptactiondialog.ui58
7 files changed, 198 insertions, 102 deletions
diff --git a/ChangeLog b/ChangeLog
index a820c09..f47d948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,12 +10,13 @@
* Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
* Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
* Checkbook - added configuration option to use smaller font for checkbook transaction tab (hrw)
* ZSafe - make UI conform to Opie standards (drw)
* Today Addressbook plugin - fix configuration to show/not show birthdays, use checkboxes for selection (hrw)
* Opie-Console: read initial fixed font configuration from qpe.conf (mickeyl)
+ * Opie-PcmciaApplet: card monitoring applet lets you configure insert/resume actions and bind unsupported cards (mickeyl)
Fixed Bugs
----------
* #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
- We actually suspend the complete Opie now in that case.
* #1384 - Battery status updated improperly when charging (skyhusker)
diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index 3b1b40c..010d691 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -30,22 +30,27 @@
#include "configdialog.h"
/* OPIE */
#include <opie2/oconfig.h>
#include <opie2/odebug.h>
#include <opie2/opcmciasystem.h>
+#include <qpe/global.h>
using namespace Opie::Core;
/* QT */
#include <qcombobox.h>
#include <qdir.h>
#include <qfile.h>
#include <qgroupbox.h>
#include <qlabel.h>
#include <qtextstream.h>
+/* STD */
+#include <errno.h>
+#include <string.h>
+
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() );
txtManfid->setText( card->manufacturerIdentity() );
@@ -56,19 +61,19 @@ ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
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() )
{
- for ( int i; i < cbInsertAction->count(); ++i )
+ for ( unsigned int i = 0; i < cbInsertAction->count(); ++i )
if ( cbInsertAction->text( i ) == insertAction ) cbInsertAction->setCurrentItem( i );
}
if ( !resumeAction.isEmpty() )
{
- for ( int i; i < cbResumeAction->count(); ++i )
+ for ( unsigned int i = 0; i < cbResumeAction->count(); ++i )
if ( cbResumeAction->text( i ) == resumeAction ) cbResumeAction->setCurrentItem( i );
}
if ( !card->isUnsupported() )
{
odebug << "pcmcia: card is recognized - hiding bindings" << oendl;
@@ -126,54 +131,108 @@ ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
ConfigDialog::~ConfigDialog()
{
}
void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& value )
{
- OConfig cfg( "PCMCIA" );
- cfg.setGroup( "Global" );
- int nCards = cfg.readNumEntry( "nCards", 0 );
- QString cardName = card->productIdentity();
- QString action;
-
- for ( int i = 0; i < nCards; ++i )
+ OConfig* cfg = cardConfig( card );
+ if ( cfg )
{
- QString cardSection = QString( "Card_%1" ).arg( i );
- cfg.setGroup( cardSection );
- QString name = cfg.readEntry( "name" );
- odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
- if ( cardName == name )
- {
- cfg.writeEntry( key, value );
- break;
- }
+ cfg->writeEntry( key, value );
}
+ delete cfg; // deleting a 0 pointer is within spec.
}
QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& defaultValue )
{
- OConfig cfg( "PCMCIA" );
- cfg.setGroup( "Global" );
- int nCards = cfg.readNumEntry( "nCards", 0 );
- QString cardName = card->productIdentity();
QString value;
+ OConfig* cfg = cardConfig( card );
+ if ( cfg )
+ {
+ value = cfg->readEntry( key, defaultValue );
+ }
+ delete cfg; // deleting a 0 pointer is within spec.
+ return value;
+}
+
+
+QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+{
+ return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
+}
+
+
+OConfig* ConfigDialog::cardConfig( const OPcmciaSocket* card )
+{
+ OConfig* cardcfg = 0;
+ OConfig* cfg = new OConfig( "PCMCIA" );
+ cfg->setGroup( "Global" );
+ int nCards = cfg->readNumEntry( "nCards", 0 );
+ QString cardName = card->productIdentity();
for ( int i = 0; i < nCards; ++i )
{
QString cardSection = QString( "Card_%1" ).arg( i );
- cfg.setGroup( cardSection );
- QString name = cfg.readEntry( "name" );
+ cfg->setGroup( cardSection );
+ QString name = cfg->readEntry( "name" );
odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
if ( cardName == name )
{
- value = cfg.readEntry( key, defaultValue );
+ cardcfg = cfg;
break;
}
}
- return value;
+ return cardcfg;
}
-QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+void ConfigDialog::writeConfiguration( const OPcmciaSocket* card )
{
- return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
+ odebug << "pcmcia: ConfigDialog::writeConfiguration()" << oendl;
+ OConfig* cfg = cardConfig( card );
+ if ( !cfg )
+ {
+ cfg = new OConfig( "PCMCIA" );
+ cfg->setGroup( "Global" );
+ int nCards = cfg->readNumEntry( "nCards", 0 );
+ cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+ cfg->writeEntry( "name", card->productIdentity() );
+ cfg->setGroup( "Global" );
+ cfg->writeEntry( "nCards", nCards+1 );
+ cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+ }
+
+ cfg->writeEntry( "insertAction", cbInsertAction->currentText() );
+ cfg->writeEntry( "resumeAction", cbResumeAction->currentText() );
+ cfg->write();
+
+ if ( cbBindTo->isVisible() && cbBindTo->currentText() != "<None>" )
+ {
+ QString driver = cbBindTo->currentText();
+ QString conf = bindEntries[driver];
+
+ // write binding
+
+ QFile confFile( conf );
+ if ( confFile.open( IO_ReadWrite | IO_Append ) )
+ {
+ QString entryCard = QString( "card \"%1\"" ).arg( card->productIdentity() );
+ QString entryVersion( " version " );
+ for ( QStringList::Iterator it = card->productIdentityVector().begin(); it != card->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..." );
+ OPcmciaSystem::instance()->restart();
+ }
+ else
+ {
+ owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
+ }
+ }
}
+
diff --git a/noncore/applets/pcmcia/configdialog.h b/noncore/applets/pcmcia/configdialog.h
index 169dadb..eb081a1 100644
--- a/noncore/applets/pcmcia/configdialog.h
+++ b/noncore/applets/pcmcia/configdialog.h
@@ -29,23 +29,25 @@
#ifndef CONFIGDIALOG_H
#define CONFIGDIALOG_H
#include "configdialogbase.h"
-namespace Opie { namespace Core { class OPcmciaSocket; }; };
+namespace Opie { namespace Core { class OPcmciaSocket; class OConfig; }; };
typedef QMap<QString,QString> StringMap;
class ConfigDialog : public ConfigDialogBase
{
Q_OBJECT
public:
ConfigDialog( const Opie::Core::OPcmciaSocket* card, QWidget* parent );
~ConfigDialog();
static QString preferredAction( const Opie::Core::OPcmciaSocket* card, const QString& type );
static QString readConfigEntry( const Opie::Core::OPcmciaSocket* card, const QString& key, const QString& defaultValue );
static void writeConfigEntry( const Opie::Core::OPcmciaSocket* card, const QString& key, const QString& value );
+ static Opie::Core::OConfig* cardConfig( const Opie::Core::OPcmciaSocket* card );
+ void writeConfiguration( const Opie::Core::OPcmciaSocket* card );
StringMap bindEntries;
};
#endif
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index c6386cb..187adc6 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -1,9 +1,9 @@
/*
                This file is part of the Opie Project
- =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
+ =. (C) 2005 Michael 'Mickey' Lauer <mickey@Vanille.de>
.=l.
           .>+-=
 _;:,     .>    :=|. This program is free software; you can
.> <`_,   >  .   <= redistribute it and/or modify it under
:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
.="- .-=="i,     .._ License as published by the Free Software
@@ -26,12 +26,13 @@
Boston, MA 02111-1307, USA.
*/
#include "pcmcia.h"
#include "configdialog.h"
+#include "promptactiondialog.h"
/* OPIE */
#include <opie2/odebug.h>
#include <opie2/odevice.h>
#include <opie2/oconfig.h>
#include <opie2/oprocess.h>
@@ -135,14 +136,14 @@ void PcmciaManager::popUp( QString message, QString icon )
void PcmciaManager::popupTimeout()
{
popupMenu->hide();
}
-enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE };
-static const char* actionText[] = { "eject", "insert", "suspend", "resum", "resett", "configur" };
+enum { EJECT, INSERT, SUSPEND, RESUME, RESET, CONFIGURE, ACTIVATE };
+static const char* actionText[] = { "eject", "insert", "suspend", "resum", "resett", "configur", "activat" };
void PcmciaManager::mousePressEvent( QMouseEvent* )
{
QPopupMenu* menu = new QPopupMenu( this );
QStringList cmd;
bool execute = true;
@@ -243,52 +244,13 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
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 )
- {
- odebug << "pcmcia: card has been configured. writing out to database" << oendl;
- cfg.setGroup( QString( "Card_%1" ).arg( nCards ) );
- 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->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
- {
- owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
- }
- }
- else
- {
- odebug << "pcmcia: card has not been configured this time. leaving as unknown card" << oendl;
- }
+ configure( theCard );
}
else
{
odebug << "pcmcia: user doesn't want to configure " << newCardName << " now." << oendl;
}
}
@@ -323,68 +285,80 @@ void PcmciaManager::userCardAction( int action )
switch ( what )
{
case CONFIGURE:
{
QString insertAction; QString resumeAction; QString driver; QString conf;
- configure( OPcmciaSystem::instance()->socket( socket ), insertAction, resumeAction, driver, conf );
+ configure( OPcmciaSystem::instance()->socket( socket ) );
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;
+ case ACTIVATE: success = true;
+ break;
+ default: odebug << "pcmcia: not yet implemented" << oendl;
}
if ( success )
{
+ odebug << tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) << oendl;
popUp( tr( "Successfully %1ed card in socket #%2" ).arg( actionText[action] ).arg( socket ) );
}
else
{
+ odebug << tr( "Error while %1ing card in socket #%2" ).arg( actionText[action] ).arg( socket ) << oendl;
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 )
+void PcmciaManager::configure( OPcmciaSocket* card )
{
configuring = true;
ConfigDialog dialog( card, qApp->desktop() );
- int configresult = QPEApplication::execDialog( &dialog, false );
+ int result = QPEApplication::execDialog( &dialog, false );
configuring = false;
- odebug << "pcmcia: configresult = " << configresult << oendl;
- if ( configresult )
+ odebug << "pcmcia: configresult = " << result << oendl;
+ if ( result )
{
- insertAction = dialog.cbInsertAction->currentText();
- resumeAction = dialog.cbResumeAction->currentText();
- driver = dialog.cbBindTo->currentText();
- conf = dialog.bindEntries[driver];
+ dialog.writeConfiguration( card );
}
- return configresult;
}
void PcmciaManager::executeAction( Opie::Core::OPcmciaSocket* card, const QString& type )
{
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" )
+
+ if ( theAction == "prompt for" )
{
- odebug << "pcmcia: sorry, not 'prompt for' is not yet implemented!" << oendl;
- return;
+ PromptActionDialog dialog( qApp->desktop(), "promptfor", true );
+ dialog.setCaption( QString( "Choose action for card #%1" ).arg( card->number() ) );
+ int result = QPEApplication::execDialog( &dialog, true );
+ odebug << "pcmcia: configresult = " << result << oendl;
+ if ( result )
+ {
+ theAction = dialog.cbAction->currentText();
+ }
+ else
+ {
+ odebug << "pcmcia: prompted to do nothing" << oendl;
+ return;
+ }
}
+ if ( theAction == "activate" ) intAction += ACTIVATE;
+ else if ( theAction == "eject" ) intAction += EJECT;
+ else if ( theAction == "suspend" ) intAction += SUSPEND;
else
{
owarn << "pcmcia: action '" << theAction << "' not known. Huh?" << oendl;
return;
}
userCardAction( intAction );
diff --git a/noncore/applets/pcmcia/pcmcia.h b/noncore/applets/pcmcia/pcmcia.h
index de7d6bf..0fe936c 100644
--- a/noncore/applets/pcmcia/pcmcia.h
+++ b/noncore/applets/pcmcia/pcmcia.h
@@ -52,13 +52,13 @@ class PcmciaManager : public QWidget
protected:
void paintEvent( QPaintEvent* );
void mousePressEvent( QMouseEvent * );
private:
- bool configure( Opie::Core::OPcmciaSocket*, QString&, QString&, QString&, QString& );
+ void configure( Opie::Core::OPcmciaSocket* );
void execCommand( const QStringList &command );
void executeAction( Opie::Core::OPcmciaSocket*, const QString& );
void popUp( QString message, QString icon = QString::null );
private:
bool configuring;
diff --git a/noncore/applets/pcmcia/pcmcia.pro b/noncore/applets/pcmcia/pcmcia.pro
index 4a893b5..b9af380 100644
--- a/noncore/applets/pcmcia/pcmcia.pro
+++ b/noncore/applets/pcmcia/pcmcia.pro
@@ -1,18 +1,20 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on
-INTERFACES = configdialogbase.ui
+INTERFACES = configdialogbase.ui \
+ promptactiondialog.ui
HEADERS = pcmcia.h \
configdialog.h
SOURCES = pcmcia.cpp \
configdialog.cpp
TARGET = pcmciaapplet
DESTDIR = $(OPIEDIR)/plugins/applets
+
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
-VERSION = 0.2.0
+VERSION = 0.9.0
include( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/pcmcia/promptactiondialog.ui b/noncore/applets/pcmcia/promptactiondialog.ui
new file mode 100644
index 0000000..c351b48
--- a/dev/null
+++ b/noncore/applets/pcmcia/promptactiondialog.ui
@@ -0,0 +1,58 @@
+<!DOCTYPE UI><UI>
+<class>PromptActionDialog</class>
+<widget>
+ <class>QDialog</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PromptActionDialog</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>273</width>
+ <height>55</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>caption</name>
+ <string>Choose Action for Card</string>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QComboBox</class>
+ <item>
+ <property>
+ <name>text</name>
+ <string>activate</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>suspend</string>
+ </property>
+ </item>
+ <item>
+ <property>
+ <name>text</name>
+ <string>eject</string>
+ </property>
+ </item>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>cbAction</cstring>
+ </property>
+ </widget>
+ </grid>
+</widget>
+</UI>