author | harlekin <harlekin> | 2002-06-24 22:26:27 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-24 22:26:27 (UTC) |
commit | b5e6ed78ad6075550985b092211318da47904897 (patch) (side-by-side diff) | |
tree | 1fa2bfa2dfddc89a7eabcdd996b312b1105f10e4 /core/applets | |
parent | 7b9de311a7f30d3acdcf78cbb447cd5c20057df2 (diff) | |
download | opie-b5e6ed78ad6075550985b092211318da47904897.zip opie-b5e6ed78ad6075550985b092211318da47904897.tar.gz opie-b5e6ed78ad6075550985b092211318da47904897.tar.bz2 |
gimmick (sound,pics) and hopefully dual sleeve handling right, thanks to Bruno David Rodrigues <bruno.rodrigues@litux.org>
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 54 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 3 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.pro | 31 | ||||
-rw-r--r-- | core/applets/cardmon/opie-cardmon.control | 2 |
4 files changed, 41 insertions, 49 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 0addb89..0bd1ed3 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -24,24 +24,25 @@ #include <qcopchannel_qws.h> #include <qpainter.h> #include <qmessagebox.h> #include <qfile.h> #include <qtextstream.h> #include <qtimer.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> #include <string.h> #include <fcntl.h> +#include <qsound.h> #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) #include <sys/vfs.h> #include <mntent.h> #endif CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) { QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this ); connect( pcmciaChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); @@ -90,30 +91,30 @@ void CardMonitor::popupTimeout() { } void CardMonitor::mousePressEvent( QMouseEvent * ) { QPopupMenu *menu = new QPopupMenu(); QString cmd; int err=0; if ( cardInSd ) { menu->insertItem( tr("Eject SD/MMC card"), 0 ); } if ( cardInPcmcia0 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia0Type) )), + menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 ); } if ( cardInPcmcia1 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( getIconName(cardInPcmcia1Type) )), + menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 ); } QPoint p = mapToGlobal ( QPoint ( 0, 0 )); QSize s = menu->sizeHint ( ); int opt = menu->exec( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ) ), 0); if ( opt == 1 ) { cmd = "/sbin/cardctl eject 0"; @@ -200,51 +201,50 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { } else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){ cardInPcmcia1Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 ); cardInPcmcia1Name.stripWhiteSpace(); cardInPcmcia1 = TRUE; show(); line++; int pos=(*line).find('\t')+1; cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos); } } } f.close(); + if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { + QString text = ""; + QString what = ""; + if(cardWas0 != cardInPcmcia0) { + if(cardInPcmcia0) { text += tr("New card: "); what="on";} + else { text += tr("Ejected: "); what="off";} + text += cardInPcmcia0Name; + popUp( text, "cardmon/" + cardInPcmcia0Type ); + } + if(cardWas1 != cardInPcmcia1) { + if(cardInPcmcia1) { text += tr("New card: "); what="on";} + else { text += tr("Ejected: "); what="off";} + text += cardInPcmcia1Name; + popUp( text, "cardmon/" + cardInPcmcia1Type ); + } + QSound::play(Resource::findSound("cardmon/card" + what)); + } + } else { // no file found qDebug("no file found"); cardInPcmcia0 = FALSE; cardInPcmcia1 = FALSE; - return FALSE; - } - if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { - QString text = ""; - if(cardWas0 != cardInPcmcia0) { - if(cardInPcmcia0) { text += tr("New card: "); } - else { text += tr("Ejected: "); } - text += cardInPcmcia0Name; - popUp( text, getIconName( cardInPcmcia0Type ) ); - } - if(cardWas1 != cardInPcmcia1) { - if(cardInPcmcia1) { text += tr("New card: "); } - else { text += tr("Ejected: "); } - text += cardInPcmcia1Name; - popUp( text, getIconName( cardInPcmcia1Type ) ); - } - } - - - return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE); + return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); } bool CardMonitor::getStatusSd( int showPopUp ) { bool cardWas=cardInSd; // remember last state cardInSd=false; #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) struct mntent *me; FILE *mntfp = setmntent( "/etc/mtab", "r" ); @@ -272,22 +272,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) { void CardMonitor::paintEvent( QPaintEvent * ) { QPainter p( this ); if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { p.drawPixmap( 0, 0, pm ); show(); } else { p.eraseRect( rect() ); hide(); } } - -QString CardMonitor::getIconName( QString type ) { - if( type != "network" && - type != "ide" ) { - type="cardmon"; - } - return "cardmon/"+type; -} - - diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index 3dcf235..9651783 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -43,17 +43,16 @@ private: // pcmcia socket 0 bool cardInPcmcia0; QString cardInPcmcia0Name; QString cardInPcmcia0Type; // pcmcia socket 1 bool cardInPcmcia1; QString cardInPcmcia1Name; QString cardInPcmcia1Type; bool cardInSd; void iconShow(); QPopupMenu *popupMenu; void popUp(QString message, QString icon=""); - QString getIconName(QString type); -}; + }; #endif diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro index e79e91a..3bddd22 100644 --- a/core/applets/cardmon/cardmon.pro +++ b/core/applets/cardmon/cardmon.pro @@ -1,25 +1,28 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = cardmon.h cardmonimpl.h SOURCES = cardmon.cpp cardmonimpl.cpp TARGET = cardmonapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include ../launcher LIBS += -lqpe VERSION = 1.0.0 -TRANSLATIONS = ../../i18n/de/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/es/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/pt/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/pt_BR/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/en/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/hu/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/sl/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/pl/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/ja/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/fr/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/ko/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/no/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/zh_CN/libcardmonapplet.ts -TRANSLATIONS += ../../i18n/zh_TW/libcardmonapplet.ts + + +TRANSLATIONS = ../../../i18n/de/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/en/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/es/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/fr/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/hu/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/ja/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/ko/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/no/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/pl/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/pt/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/pt_BR/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/sl/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/zh_CN/libcardmonapplet.ts +TRANSLATIONS += ../../../i18n/zh_TW/libcardmonapplet.ts + diff --git a/core/applets/cardmon/opie-cardmon.control b/core/applets/cardmon/opie-cardmon.control index bcd0326..6382fdb 100644 --- a/core/applets/cardmon/opie-cardmon.control +++ b/core/applets/cardmon/opie-cardmon.control @@ -1,9 +1,9 @@ -Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png +Files: plugins/applets/libcardmonapplet.so* pics/cardmon/*.png sound/cardmon/*.wav Priority: optional Section: opie/taskbar Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm Version: $QPE_VERSION-$SUB_VERSION Depends: opie-base ($QPE_VERSION) Description: CF/PCMCIA Card Monitor applet SD/MMC/CF/PCMCIA Card Monitor applet for the Opie environment taskbar. |