summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/irdaapplet/irda.cpp28
-rw-r--r--core/applets/irdaapplet/irda.h3
-rw-r--r--core/applets/irdaapplet/irdaapplet.pro31
-rw-r--r--core/applets/irdaapplet/opie-irdaapplet.control2
4 files changed, 36 insertions, 28 deletions
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index c0f11c0..42bed5e 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -35,50 +35,54 @@
#include <qpainter.h>
#include <qcombobox.h>
#include <qspinbox.h>
#include <qslider.h>
#include <qlayout.h>
#include <qframe.h>
#include <qpixmap.h>
#include <qstring.h>
#include <qfile.h>
#include <qtimer.h>
#include <qtextstream.h>
#include <qpopupmenu.h>
+#include <qsound.h>
#include <net/if.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
//===========================================================================
IrdaApplet::IrdaApplet( QWidget *parent, const char *name )
: QWidget( parent, name ) {
setFixedHeight( 14 );
setFixedWidth( 14 );
sockfd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" );
irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" );
irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
receiveActivePixmap = Resource::loadPixmap("irdaapplet/receive");
receiveActive = false;
- startTimer(5000);
- timerEvent(NULL);
popupMenu = 0;
devicesAvailable.setAutoDelete(TRUE);
}
+void IrdaApplet::show() {
+ QWidget::show();
+ startTimer(2000);
+}
+
IrdaApplet::~IrdaApplet() {
close(sockfd);
if( popupMenu ) { delete popupMenu; }
}
void IrdaApplet::popup(QString message, QString icon="") {
if ( ! popupMenu ) {
popupMenu = new QPopupMenu();
}
popupMenu->clear();
if( icon == "" ) {
popupMenu->insertItem( message, 0 );
@@ -197,71 +201,72 @@ void IrdaApplet::showDiscovered() {
streamIn = stream.read();
list = QStringList::split("\n", streamIn);
QDictIterator<QString> it( devicesAvailable );
while ( it.current() ) {
devicesAvailable.replace( it.currentKey(), new QString("+++" + *devicesAvailable[it.currentKey()]) );
//qDebug("IrdaMon: " + it.currentKey());
//qDebug(" =" + *devicesAvailable[it.currentKey()] );
++it;
}
for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
- qDebug( (*line) );
+ // qDebug( (*line) );
if( (*line).startsWith("nickname:") ){
discoveredDevice = (*line).mid(((*line).find(':'))+2,(*line).find(',')-(*line).find(':')-2);
deviceAddr = (*line).mid( (*line).find( "daddr:" )+9, 8 );
- qDebug(discoveredDevice + "(" + deviceAddr + ")");
+ // qDebug(discoveredDevice + "(" + deviceAddr + ")");
if( ! devicesAvailable.find(deviceAddr) ) {
popup( tr("Found:") + " " + discoveredDevice );
+ QSound::play(Resource::findSound("irdaapplet/irdaon"));
qcopsend = TRUE;
}
devicesAvailable.replace( deviceAddr, new QString(discoveredDevice) );
- //qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] );
+ // qDebug("IrdaMon: " + deviceAddr + "=" + *devicesAvailable[deviceAddr] );
}
}
it.toFirst();
while ( it.current() ) {
- qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
+ // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
if ( (*it.current()).left(3) == "+++" ) {
popup( tr("Lost:") + " " + (*devicesAvailable[it.currentKey()]).mid(3) );
+ QSound::play(Resource::findSound("irdaapplet/irdaoff"));
devicesAvailable.remove( it.currentKey() );
- qDebug("IrdaMon: delete " + it.currentKey() + "!");
+ // qDebug("IrdaMon: delete " + it.currentKey() + "!");
qcopsend = TRUE;
}
++it;
}
/* XXX if( qcopsend ) {
QCopEnvelope e("QPE/Network", "irdaSend(bool)" );
e << (devicesAvailable.count() > 0) ;
} */
}
}
void IrdaApplet::mousePressEvent( QMouseEvent *) {
QPopupMenu *menu = new QPopupMenu();
QString cmd;
int ret=0;
/* Refresh active state */
timerEvent(NULL);
// menu->insertItem( tr("More..."), 4 );
if (irdaactive && devicesAvailable.count() > 0) {
- menu->insertItem( tr("Discovered Device:"), 9);
-
+ menu->insertItem( tr("Discovered Device:"), 9);
QDictIterator<QString> it( devicesAvailable );
while ( it.current() ) {
menu->insertItem( *devicesAvailable[it.currentKey()]);
++it;
}
menu->insertSeparator();
}
if (irdaactive) {
menu->insertItem( tr("Disable IrDA"), 0 );
} else {
menu->insertItem( tr("Enable IrDA"), 1 );
@@ -307,27 +312,24 @@ void IrdaApplet::mousePressEvent( QMouseEvent *) {
timerEvent(NULL); // NULL is undefined in c++ use 0 or 0l
break;
case 4: { // enable receive
setIrdaReceiveStatus(0);
timerEvent(NULL);
break;
}
case 5: { // disable receive
setIrdaReceiveStatus(1);
timerEvent(NULL);
break;
}
- case 6:
- qDebug("FIXME: Bring up pretty menu...\n");
- // With table of currently-detected devices.
}
delete menu; // Can somebody explain why use a QPopupMenu* and not QPopupMenu nor QAction. with out delete we will leak cause QPopupMenu doesn't have a parent in this case
}
void IrdaApplet::timerEvent( QTimerEvent * ) {
int oldactive = irdaactive;
int olddiscovery = irdaDiscoveryActive;
bool receiveUpdate = false;
if (receiveStateChanged) {
receiveUpdate = true;
receiveStateChanged = false;
@@ -340,25 +342,25 @@ void IrdaApplet::timerEvent( QTimerEvent * ) {
if (irdaDiscoveryActive) {
showDiscovered();
}
if ((irdaactive != oldactive) || (irdaDiscoveryActive != olddiscovery) || receiveUpdate ) {
paintEvent(NULL);
}
}
void IrdaApplet::paintEvent( QPaintEvent* ) {
QPainter p(this);
- qDebug("paint irda pixmap");
+ // qDebug("paint irda pixmap");
p.eraseRect ( 0, 0, this->width(), this->height() );
if (irdaactive > 0) {
p.drawPixmap( 0, 0, irdaOnPixmap );
} else {
p.drawPixmap( 0, 0, irdaOffPixmap );
}
if (irdaDiscoveryActive > 0) {
p.drawPixmap( 0, 0, irdaDiscoveryOnPixmap );
}
if (receiveActive) {
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 7b37847..e878946 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -38,24 +38,27 @@ protected:
private:
void mousePressEvent( QMouseEvent * );
void paintEvent( QPaintEvent* );
int checkIrdaStatus();
int setIrdaStatus(int);
int checkIrdaDiscoveryStatus();
int setIrdaDiscoveryStatus(int);
int setIrdaReceiveStatus(int);
void showDiscovered();
int sockfd;
+public slots:
+ void show();
+
private slots:
void popupTimeout();
private:
QPixmap irdaOnPixmap;
QPixmap irdaOffPixmap;
QPixmap irdaDiscoveryOnPixmap;
QPixmap receiveActivePixmap;
int irdaactive; // bool and bitfields later bool irdaactive :1 ;
int irdaDiscoveryActive;
bool receiveActive : 1;
bool receiveStateChanged;
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro
index 035b0c1..47267f7 100644
--- a/core/applets/irdaapplet/irdaapplet.pro
+++ b/core/applets/irdaapplet/irdaapplet.pro
@@ -1,25 +1,28 @@
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = irda.h irdaappletimpl.h
SOURCES = irda.cpp irdaappletimpl.cpp
TARGET = irdaapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include
LIBS += -lqpe
VERSION = 1.0.0
-TRANSLATIONS = ../../i18n/de/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/en/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/es/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/fr/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/hu/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/ja/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/ko/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/no/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pl/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pt/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/pt_BR/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/sl/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/zh_CN/libirdaapplet.ts
-TRANSLATIONS += ../../i18n/zh_TW/libirdaapplet.ts
+
+
+TRANSLATIONS = ../../../i18n/de/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/en/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/es/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/fr/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/hu/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/ja/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/ko/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/no/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pl/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pt/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/pt_BR/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/sl/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/zh_CN/libirdaapplet.ts
+TRANSLATIONS += ../../../i18n/zh_TW/libirdaapplet.ts
+
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control
index 85c3386..5b901de 100644
--- a/core/applets/irdaapplet/opie-irdaapplet.control
+++ b/core/applets/irdaapplet/opie-irdaapplet.control
@@ -1,9 +1,9 @@
-Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/*
+Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav
Priority: optional
Section: opie/system
Maintainer: David Woodhouse <dwmw2@infradead.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION.1
Depends: opie-base ($QPE_VERSION), libopieobex
Description: Irda Applet
An IrDA taskbar applet for the Opie environment