author | drw <drw> | 2005-05-04 21:59:13 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-04 21:59:13 (UTC) |
commit | a829bcb3e78882cf9070a75dfacf9906931e8e80 (patch) (unidiff) | |
tree | 4343a0e70a08c1a10edf0ca460177682ef990474 /core | |
parent | 56fa3f4bcedabb5255fedca463724d57316e2cdb (diff) | |
download | opie-a829bcb3e78882cf9070a75dfacf9906931e8e80.zip opie-a829bcb3e78882cf9070a75dfacf9906931e8e80.tar.gz opie-a829bcb3e78882cf9070a75dfacf9906931e8e80.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/irdaapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 14 | ||||
-rw-r--r-- | core/applets/irdaapplet/irdaapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/opie-irdaapplet.control | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in index 0976e8f..49f55ef 100644 --- a/core/applets/irdaapplet/config.in +++ b/core/applets/irdaapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config IRDAAPPLET | 1 | config IRDAAPPLET |
2 | boolean "opie-irdaapplet (applet for IR beaming/discovery)" | 2 | boolean "opie-irdaapplet (applet for IR beaming/discovery)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 7709bed..cea836e 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -14,15 +14,16 @@ | |||
14 | ** | 14 | ** |
15 | **********************************************************************/ | 15 | **********************************************************************/ |
16 | 16 | ||
17 | #include "irda.h" | 17 | #include "irda.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <opie2/oresource.h> | ||
20 | #include <opie2/otaskbarapplet.h> | 21 | #include <opie2/otaskbarapplet.h> |
22 | |||
21 | #include <qpe/applnk.h> | 23 | #include <qpe/applnk.h> |
22 | #include <qpe/resource.h> | ||
23 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
24 | #include <qpe/ir.h> | 25 | #include <qpe/ir.h> |
25 | 26 | ||
26 | 27 | ||
27 | /* QT */ | 28 | /* QT */ |
28 | #include <qpainter.h> | 29 | #include <qpainter.h> |
@@ -45,16 +46,16 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | |||
45 | { | 46 | { |
46 | setFixedHeight( AppLnk::smallIconSize() ); | 47 | setFixedHeight( AppLnk::smallIconSize() ); |
47 | setFixedWidth( AppLnk::smallIconSize() ); | 48 | setFixedWidth( AppLnk::smallIconSize() ); |
48 | 49 | ||
49 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); | 50 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); |
50 | 51 | ||
51 | m_irdaOnPixmap = Resource::loadImage( "irdaapplet/irdaon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 52 | m_irdaOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaon", Opie::Core::OResource::SmallIcon ); |
52 | m_irdaOffPixmap = Resource::loadImage( "irdaapplet/irdaoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 53 | m_irdaOffPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/irdaoff", Opie::Core::OResource::SmallIcon ); |
53 | m_irdaDiscoveryOnPixmap = Resource::loadImage( "irdaapplet/magglass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 54 | m_irdaDiscoveryOnPixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/magglass", Opie::Core::OResource::SmallIcon ); |
54 | m_receiveActivePixmap = Resource::loadImage( "irdaapplet/receive" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize()); | 55 | m_receiveActivePixmap = Opie::Core::OResource::loadPixmap( "irdaapplet/receive", Opie::Core::OResource::SmallIcon ); |
55 | 56 | ||
56 | m_irda_active = false; | 57 | m_irda_active = false; |
57 | m_irda_discovery_active = false; | 58 | m_irda_discovery_active = false; |
58 | m_receive_active = false; | 59 | m_receive_active = false; |
59 | m_receive_state_changed = false; | 60 | m_receive_state_changed = false; |
60 | m_popup = 0; | 61 | m_popup = 0; |
@@ -90,13 +91,14 @@ void IrdaApplet::popup ( QString message, QString icon ) | |||
90 | 91 | ||
91 | m_popup-> clear ( ); | 92 | m_popup-> clear ( ); |
92 | 93 | ||
93 | if ( icon. isEmpty ( )) | 94 | if ( icon. isEmpty ( )) |
94 | m_popup-> insertItem ( message, 0 ); | 95 | m_popup-> insertItem ( message, 0 ); |
95 | else | 96 | else |
96 | m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 ); | 97 | m_popup-> insertItem ( QIconSet ( Opie::Core::OResource::loadPixmap ( icon, Opie::Core::OResource::SmallIcon )), |
98 | message, 0 ); | ||
97 | 99 | ||
98 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); | 100 | QPoint p = mapToGlobal ( QPoint ( 0, 0 )); |
99 | QSize s = m_popup-> sizeHint ( ); | 101 | QSize s = m_popup-> sizeHint ( ); |
100 | m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), | 102 | m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), |
101 | p. y ( ) - s. height ( ))); | 103 | p. y ( ) - s. height ( ))); |
102 | 104 | ||
diff --git a/core/applets/irdaapplet/irdaapplet.pro b/core/applets/irdaapplet/irdaapplet.pro index 095c13c..f1145e1 100644 --- a/core/applets/irdaapplet/irdaapplet.pro +++ b/core/applets/irdaapplet/irdaapplet.pro | |||
@@ -3,11 +3,11 @@ CONFIG += qt plugin warn_on | |||
3 | HEADERS = irda.h | 3 | HEADERS = irda.h |
4 | SOURCES = irda.cpp | 4 | SOURCES = irda.cpp |
5 | TARGET = irdaapplet | 5 | TARGET = irdaapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH += | 8 | DEPENDPATH += |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
diff --git a/core/applets/irdaapplet/opie-irdaapplet.control b/core/applets/irdaapplet/opie-irdaapplet.control index bcc6603..ef2eaef 100644 --- a/core/applets/irdaapplet/opie-irdaapplet.control +++ b/core/applets/irdaapplet/opie-irdaapplet.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-irdaapplet | 1 | Package: opie-irdaapplet |
2 | Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav | 2 | Files: plugins/applets/libirdaapplet.so* pics/irdaapplet/* sounds/irdaapplet/*.wav |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal, libopieobex1 | 7 | Depends: task-opie-minimal, libopieobex1, libopiecore2 |
8 | Description: IrDA Applet | 8 | Description: IrDA Applet |
9 | An IrDA taskbar applet for the Opie environment | 9 | An IrDA taskbar applet for the Opie environment |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |