28 files changed, 46 insertions, 53 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index b2cef55..18e368e 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp | |||
@@ -13,33 +13,36 @@ | |||
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "battery.h" | 20 | #include "battery.h" |
21 | #include "batterystatus.h" | 21 | #include "batterystatus.h" |
22 | 22 | ||
23 | /* OPIE */ | 23 | /* OPIE */ |
24 | #include <opie2/otaskbarapplet.h> | 24 | #include <opie2/otaskbarapplet.h> |
25 | |||
26 | #include <qpe/qpeapplication.h> | ||
25 | #include <qpe/applnk.h> | 27 | #include <qpe/applnk.h> |
26 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
27 | #include <qpe/power.h> | 29 | #include <qpe/power.h> |
28 | 30 | ||
29 | /* QT */ | 31 | /* QT */ |
30 | #include <qpainter.h> | 32 | #include <qpainter.h> |
31 | #include <qtimer.h> | 33 | #include <qtimer.h> |
32 | 34 | ||
33 | 35 | ||
36 | using namespace Opie::Ui; | ||
34 | BatteryMeter::BatteryMeter( QWidget *parent ) | 37 | BatteryMeter::BatteryMeter( QWidget *parent ) |
35 | : QWidget( parent ), charging(false) | 38 | : QWidget( parent ), charging(false) |
36 | { | 39 | { |
37 | ps = new PowerStatus; | 40 | ps = new PowerStatus; |
38 | startTimer( 10000 ); | 41 | startTimer( 10000 ); |
39 | 42 | ||
40 | setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); | 43 | setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); |
41 | setFixedHeight( AppLnk::smallIconSize() ); | 44 | setFixedHeight( AppLnk::smallIconSize() ); |
42 | 45 | ||
43 | chargeTimer = new QTimer( this ); | 46 | chargeTimer = new QTimer( this ); |
44 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); | 47 | connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); |
45 | timerEvent(0); | 48 | timerEvent(0); |
@@ -166,17 +169,14 @@ void BatteryMeter::paintEvent( QPaintEvent* ) | |||
166 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); | 169 | p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 ); |
167 | p.setPen( color.dark( 100+i*20 ) ); | 170 | p.setPen( color.dark( 100+i*20 ) ); |
168 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); | 171 | p.drawLine( x1+middle-i, y, x1+middle-i, y2 ); |
169 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); | 172 | p.drawLine( x1+middle+i, y, x1+middle+i, y2 ); |
170 | } | 173 | } |
171 | } | 174 | } |
172 | 175 | ||
173 | int BatteryMeter::position() | 176 | int BatteryMeter::position() |
174 | { | 177 | { |
175 | return 8; | 178 | return 8; |
176 | } | 179 | } |
177 | 180 | ||
178 | Q_EXPORT_INTERFACE() | 181 | EXPORT_OPIE_APPLET_v1( BatteryMeter ) |
179 | { | ||
180 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> ); | ||
181 | } | ||
182 | 182 | ||
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index ea11495..bd86f77 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -4,25 +4,25 @@ | |||
4 | /* OPIE */ | 4 | /* OPIE */ |
5 | #include <opie2/odevice.h> | 5 | #include <opie2/odevice.h> |
6 | #include <qpe/power.h> | 6 | #include <qpe/power.h> |
7 | 7 | ||
8 | /* QT */ | 8 | /* QT */ |
9 | #include <qpushbutton.h> | 9 | #include <qpushbutton.h> |
10 | #include <qdrawutil.h> | 10 | #include <qdrawutil.h> |
11 | #include <qfile.h> | 11 | #include <qfile.h> |
12 | #include <qlayout.h> | 12 | #include <qlayout.h> |
13 | #include <qtextstream.h> | 13 | #include <qtextstream.h> |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | 15 | ||
16 | using namespace Opie; | 16 | using namespace Opie::Core; |
17 | 17 | ||
18 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) | 18 | BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) |
19 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { | 19 | : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { |
20 | setCaption( tr("Battery status") ); | 20 | setCaption( tr("Battery status") ); |
21 | setMinimumSize( 150, 200 ); | 21 | setMinimumSize( 150, 200 ); |
22 | 22 | ||
23 | QPushButton *pb = new QPushButton( tr("Close"), this ); | 23 | QPushButton *pb = new QPushButton( tr("Close"), this ); |
24 | QVBoxLayout *layout = new QVBoxLayout ( this ); | 24 | QVBoxLayout *layout = new QVBoxLayout ( this ); |
25 | 25 | ||
26 | jackPercent = 0; | 26 | jackPercent = 0; |
27 | 27 | ||
28 | pb->setMaximumSize( 120, 40 ); | 28 | pb->setMaximumSize( 120, 40 ); |
diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in index 3067317..eca07e3 100644 --- a/core/applets/batteryapplet/config.in +++ b/core/applets/batteryapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config BATTERYAPPLET | 1 | config BATTERYAPPLET |
2 | boolean "opie-batteryapplet (Applet to monitor battery status)" | 2 | boolean "opie-batteryapplet (Applet to monitor battery status)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 6090b68..ed4bfc7 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -38,24 +38,25 @@ | |||
38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
39 | #include <string.h> | 39 | #include <string.h> |
40 | #include <fcntl.h> | 40 | #include <fcntl.h> |
41 | 41 | ||
42 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 42 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
43 | #include <sys/vfs.h> | 43 | #include <sys/vfs.h> |
44 | #include <mntent.h> | 44 | #include <mntent.h> |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | using namespace Opie; | 47 | using namespace Opie; |
48 | 48 | ||
49 | using namespace Opie::Ui; | 49 | using namespace Opie::Ui; |
50 | using namespace Opie::Ui; | ||
50 | using namespace Opie::Core; | 51 | using namespace Opie::Core; |
51 | 52 | ||
52 | CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), | 53 | CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), |
53 | pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) | 54 | pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) |
54 | { | 55 | { |
55 | 56 | ||
56 | QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); | 57 | QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); |
57 | connect( pcmciaChannel, | 58 | connect( pcmciaChannel, |
58 | SIGNAL( received(const QCString&,const QByteArray&) ), this, | 59 | SIGNAL( received(const QCString&,const QByteArray&) ), this, |
59 | SLOT( cardMessage(const QCString&,const QByteArray&) ) ); | 60 | SLOT( cardMessage(const QCString&,const QByteArray&) ) ); |
60 | 61 | ||
61 | QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this ); | 62 | QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this ); |
diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in index f3d57fd..8626c75 100644 --- a/core/applets/cardmon/config.in +++ b/core/applets/cardmon/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config CARDMON | 1 | config CARDMON |
2 | boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)" | 2 | boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp index 4fc8076..57a4088 100644 --- a/core/applets/clipboardapplet/clipboard.cpp +++ b/core/applets/clipboardapplet/clipboard.cpp | |||
@@ -25,24 +25,25 @@ | |||
25 | #include <qpe/applnk.h> | 25 | #include <qpe/applnk.h> |
26 | 26 | ||
27 | #include <qpainter.h> | 27 | #include <qpainter.h> |
28 | #include <qpopupmenu.h> | 28 | #include <qpopupmenu.h> |
29 | #include <qwindowsystem_qws.h> | 29 | #include <qwindowsystem_qws.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | #include <qclipboard.h> | 31 | #include <qclipboard.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | 33 | ||
34 | //=========================================================================== | 34 | //=========================================================================== |
35 | 35 | ||
36 | 36 | ||
37 | using namespace Opie::Ui; | ||
37 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) | 38 | ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) |
38 | { | 39 | { |
39 | setFixedWidth ( AppLnk::smallIconSize() ); | 40 | setFixedWidth ( AppLnk::smallIconSize() ); |
40 | setFixedHeight ( AppLnk::smallIconSize() ); | 41 | setFixedHeight ( AppLnk::smallIconSize() ); |
41 | 42 | ||
42 | QImage img = Resource::loadImage( "paste"); | 43 | QImage img = Resource::loadImage( "paste"); |
43 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); | 44 | img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
44 | 45 | ||
45 | m_clipboardPixmap.convertFromImage( img ); | 46 | m_clipboardPixmap.convertFromImage( img ); |
46 | 47 | ||
47 | m_timer = new QTimer ( this ); | 48 | m_timer = new QTimer ( this ); |
48 | 49 | ||
@@ -174,16 +175,14 @@ void ClipboardApplet::newData ( ) | |||
174 | 175 | ||
175 | if ( m_history. count ( ) > 5 ) | 176 | if ( m_history. count ( ) > 5 ) |
176 | m_history. remove ( m_history. begin ( )); | 177 | m_history. remove ( m_history. begin ( )); |
177 | 178 | ||
178 | m_dirty = true; | 179 | m_dirty = true; |
179 | } | 180 | } |
180 | 181 | ||
181 | m_timer-> start ( 1500, true ); | 182 | m_timer-> start ( 1500, true ); |
182 | 183 | ||
183 | excllock = false; | 184 | excllock = false; |
184 | } | 185 | } |
185 | 186 | ||
186 | Q_EXPORT_INTERFACE() | 187 | EXPORT_OPIE_APPLET_v1( ClipboardApplet ) |
187 | { | 188 | |
188 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ClipboardApplet> ); | ||
189 | } | ||
diff --git a/core/applets/clipboardapplet/config.in b/core/applets/clipboardapplet/config.in index 1205b26..e58d239 100644 --- a/core/applets/clipboardapplet/config.in +++ b/core/applets/clipboardapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config CLIPBOARDAPPLET | 1 | config CLIPBOARDAPPLET |
2 | boolean "opie-clipboardapplet (copy/cut/paste applet)" | 2 | boolean "opie-clipboardapplet (copy/cut/paste applet)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp index 120a019..3b13d74 100644 --- a/core/applets/clockapplet/clock.cpp +++ b/core/applets/clockapplet/clock.cpp | |||
@@ -16,24 +16,25 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <opie2/otaskbarapplet.h> | 23 | #include <opie2/otaskbarapplet.h> |
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | 27 | ||
28 | using namespace Opie::Ui; | ||
28 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) | 29 | LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent ) |
29 | { | 30 | { |
30 | // If you want a sunken border around the clock do this: | 31 | // If you want a sunken border around the clock do this: |
31 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 32 | // setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
32 | //setFont( QFont( "Helvetica", , QFont::Normal ) ); | 33 | //setFont( QFont( "Helvetica", , QFont::Normal ) ); |
33 | connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) ); | 34 | connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) ); |
34 | connect( qApp, SIGNAL( clockChanged(bool) ), | 35 | connect( qApp, SIGNAL( clockChanged(bool) ), |
35 | this, SLOT( slotClockChanged(bool) ) ); | 36 | this, SLOT( slotClockChanged(bool) ) ); |
36 | readConfig(); | 37 | readConfig(); |
37 | timerId = 0; | 38 | timerId = 0; |
38 | timerEvent( 0 ); | 39 | timerEvent( 0 ); |
39 | show(); | 40 | show(); |
@@ -105,17 +106,15 @@ void LauncherClock::changeTime( void ) | |||
105 | setText( d+s ); | 106 | setText( d+s ); |
106 | } else { | 107 | } else { |
107 | setText( s ); | 108 | setText( s ); |
108 | } | 109 | } |
109 | } | 110 | } |
110 | 111 | ||
111 | void LauncherClock::slotClockChanged( bool pm ) | 112 | void LauncherClock::slotClockChanged( bool pm ) |
112 | { | 113 | { |
113 | readConfig(); | 114 | readConfig(); |
114 | updateTime(); | 115 | updateTime(); |
115 | } | 116 | } |
116 | 117 | ||
117 | Q_EXPORT_INTERFACE() | 118 | |
118 | { | 119 | EXPORT_OPIE_APPLET_v1( LauncherClock ) |
119 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> ); | ||
120 | } | ||
121 | 120 | ||
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in index 20bd39d..6c32f79 100644 --- a/core/applets/clockapplet/config.in +++ b/core/applets/clockapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config CLOCKAPPLET | 1 | config CLOCKAPPLET |
2 | boolean "opie-clockapplet (Digital clock applet)" | 2 | boolean "opie-clockapplet (Digital clock applet)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/homeapplet/config.in b/core/applets/homeapplet/config.in index 1828da0..53d7882 100644 --- a/core/applets/homeapplet/config.in +++ b/core/applets/homeapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config HOMEAPPLET | 1 | config HOMEAPPLET |
2 | boolean "Home" | 2 | boolean "Home" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/irdaapplet/config.in b/core/applets/irdaapplet/config.in index 56ec664..0976e8f 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 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index dde8050..2196d18 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -28,24 +28,25 @@ | |||
28 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
29 | 29 | ||
30 | /* STD */ | 30 | /* STD */ |
31 | #include <unistd.h> | 31 | #include <unistd.h> |
32 | #include <net/if.h> | 32 | #include <net/if.h> |
33 | #include <netinet/in.h> | 33 | #include <netinet/in.h> |
34 | #include <sys/types.h> | 34 | #include <sys/types.h> |
35 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |
36 | #include <sys/ioctl.h> | 36 | #include <sys/ioctl.h> |
37 | 37 | ||
38 | //=========================================================================== | 38 | //=========================================================================== |
39 | 39 | ||
40 | using namespace Opie::Ui; | ||
40 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) | 41 | IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) |
41 | : QWidget ( parent, name ) | 42 | : QWidget ( parent, name ) |
42 | { | 43 | { |
43 | setFixedHeight ( 18 ); | 44 | setFixedHeight ( 18 ); |
44 | setFixedWidth ( 14 ); | 45 | setFixedWidth ( 14 ); |
45 | 46 | ||
46 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); | 47 | m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ); |
47 | 48 | ||
48 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); | 49 | m_irdaOnPixmap = Resource::loadPixmap( "irdaapplet/irdaon" ); |
49 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); | 50 | m_irdaOffPixmap = Resource::loadPixmap( "irdaapplet/irdaoff" ); |
50 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); | 51 | m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" ); |
51 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); | 52 | m_receiveActivePixmap = Resource::loadPixmap( "irdaapplet/receive" ); |
@@ -350,16 +351,13 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | |||
350 | } else if ( str == "listDevices()") { | 351 | } else if ( str == "listDevices()") { |
351 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 352 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
352 | 353 | ||
353 | QStringList list; | 354 | QStringList list; |
354 | QMap<QString, QString>::Iterator it; | 355 | QMap<QString, QString>::Iterator it; |
355 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 356 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
356 | list << (*it); | 357 | list << (*it); |
357 | 358 | ||
358 | e << list; | 359 | e << list; |
359 | } | 360 | } |
360 | } | 361 | } |
361 | 362 | ||
362 | Q_EXPORT_INTERFACE() | 363 | EXPORT_OPIE_APPLET_v1( IrdaApplet ) |
363 | { | ||
364 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<IrdaApplet> ); | ||
365 | } | ||
diff --git a/core/applets/logoutapplet/config.in b/core/applets/logoutapplet/config.in index 385b02f..0d48c6a 100644 --- a/core/applets/logoutapplet/config.in +++ b/core/applets/logoutapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config LOGOUTAPPLET | 1 | config LOGOUTAPPLET |
2 | boolean "Logout" | 2 | boolean "Logout" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp index fc5f093..195ada5 100644 --- a/core/applets/multikeyapplet/multikey.cpp +++ b/core/applets/multikeyapplet/multikey.cpp | |||
@@ -8,28 +8,30 @@ | |||
8 | ** packaging of this file. | 8 | ** packaging of this file. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 11 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
12 | ** | 12 | ** |
13 | **********************************************************************/ | 13 | **********************************************************************/ |
14 | 14 | ||
15 | #include "multikey.h" | 15 | #include "multikey.h" |
16 | 16 | ||
17 | /* OPIE */ | 17 | /* OPIE */ |
18 | #include <opie2/otaskbarapplet.h> | 18 | #include <opie2/otaskbarapplet.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/qpeapplication.h> | ||
20 | 21 | ||
21 | /* QT */ | 22 | /* QT */ |
22 | #include <qdir.h> | 23 | #include <qdir.h> |
23 | 24 | ||
25 | using namespace Opie::Ui; | ||
24 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") | 26 | Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN") |
25 | { | 27 | { |
26 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); | 28 | QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this); |
27 | connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 29 | connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
28 | this, SLOT(message(const QCString&,const QByteArray&))); | 30 | this, SLOT(message(const QCString&,const QByteArray&))); |
29 | 31 | ||
30 | setFont( QFont( "Helvetica", 10, QFont::Normal ) ); | 32 | setFont( QFont( "Helvetica", 10, QFont::Normal ) ); |
31 | QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold); | 33 | QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold); |
32 | lang = 0; | 34 | lang = 0; |
33 | QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); | 35 | QCopEnvelope e("MultiKey/Keyboard", "getmultikey()"); |
34 | setText("EN"); | 36 | setText("EN"); |
35 | popupMenu.insertItem("EN", 0); | 37 | popupMenu.insertItem("EN", 0); |
@@ -128,16 +130,13 @@ void Multikey::message(const QCString &message, const QByteArray &data) | |||
128 | } | 130 | } |
129 | } | 131 | } |
130 | 132 | ||
131 | setText(current); | 133 | setText(current); |
132 | } | 134 | } |
133 | } | 135 | } |
134 | 136 | ||
135 | int Multikey::position() | 137 | int Multikey::position() |
136 | { | 138 | { |
137 | return 10; | 139 | return 10; |
138 | } | 140 | } |
139 | 141 | ||
140 | Q_EXPORT_INTERFACE() | 142 | EXPORT_OPIE_APPLET_v1( Multikey ) |
141 | { | ||
142 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<Multikey> ); | ||
143 | } | ||
diff --git a/core/applets/restartapplet/config.in b/core/applets/restartapplet/config.in index aa2580f..764ae58 100644 --- a/core/applets/restartapplet/config.in +++ b/core/applets/restartapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config RESTARTAPPLET | 1 | config RESTARTAPPLET |
2 | boolean "opie-restartapplet (Restart Opie via taskbar)" | 2 | boolean "opie-restartapplet (Restart Opie via taskbar)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/rotateapplet/config.in b/core/applets/rotateapplet/config.in index 1a0d923..d3de89a 100644 --- a/core/applets/rotateapplet/config.in +++ b/core/applets/rotateapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config ROTATEAPPLET | 1 | config ROTATEAPPLET |
2 | boolean "Rotate" | 2 | boolean "Rotate" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp index 0488c36..f621aa9 100644 --- a/core/applets/rotateapplet/rotate.cpp +++ b/core/applets/rotateapplet/rotate.cpp | |||
@@ -22,30 +22,30 @@ | |||
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-= this library; see the file COPYING.LIB. | 25 | -- :-= this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "rotate.h" | 31 | #include "rotate.h" |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <opie/odevice.h> | 34 | #include <opie2/odevice.h> |
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
36 | #include <qpe/power.h> | 36 | #include <qpe/power.h> |
37 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
38 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
39 | using namespace Opie; | 39 | using namespace Opie::Core; |
40 | 40 | ||
41 | /* QT */ | 41 | /* QT */ |
42 | 42 | ||
43 | #include <time.h> | 43 | #include <time.h> |
44 | 44 | ||
45 | RotateApplet::RotateApplet() | 45 | RotateApplet::RotateApplet() |
46 | :QObject( 0, "RotateApplet" ), m_flipped( false ) | 46 | :QObject( 0, "RotateApplet" ), m_flipped( false ) |
47 | { | 47 | { |
48 | 48 | ||
49 | #if !defined(QT_NO_COP) | 49 | #if !defined(QT_NO_COP) |
50 | QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); | 50 | QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this ); |
51 | connect ( rotateChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | 51 | connect ( rotateChannel, SIGNAL( received(const QCString&,const QByteArray&) ), |
diff --git a/core/applets/rotateapplet/rotateapplet.pro b/core/applets/rotateapplet/rotateapplet.pro index f24682c..7a4420f 100644 --- a/core/applets/rotateapplet/rotateapplet.pro +++ b/core/applets/rotateapplet/rotateapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt plugn warn_on release | 2 | CONFIG += qt plugn warn_on release |
3 | HEADERS = rotate.h | 3 | HEADERS = rotate.h |
4 | SOURCES = rotate.cpp | 4 | SOURCES = rotate.cpp |
5 | TARGET = rotateapplet | 5 | TARGET = rotateapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
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/screenshotapplet/config.in b/core/applets/screenshotapplet/config.in index cafd470..98f2b61 100644 --- a/core/applets/screenshotapplet/config.in +++ b/core/applets/screenshotapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config SCREENSHOTAPPLET | 1 | config SCREENSHOTAPPLET |
2 | boolean "opie-screenshotapplet (create images from your current display)" | 2 | boolean "opie-screenshotapplet (create images from your current display)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/screenshotapplet/inputDialog.cpp b/core/applets/screenshotapplet/inputDialog.cpp index 73ec773..ce03ec0 100644 --- a/core/applets/screenshotapplet/inputDialog.cpp +++ b/core/applets/screenshotapplet/inputDialog.cpp | |||
@@ -6,24 +6,25 @@ | |||
6 | ** | 6 | ** |
7 | ** WARNING! All changes made in this file will be lost! | 7 | ** WARNING! All changes made in this file will be lost! |
8 | ****************************************************************************/ | 8 | ****************************************************************************/ |
9 | #include "inputDialog.h" | 9 | #include "inputDialog.h" |
10 | 10 | ||
11 | #include <qpe/resource.h> | 11 | #include <qpe/resource.h> |
12 | 12 | ||
13 | #include <opie2/ofiledialog.h> | 13 | #include <opie2/ofiledialog.h> |
14 | 14 | ||
15 | #include <qlineedit.h> | 15 | #include <qlineedit.h> |
16 | #include <qpushbutton.h> | 16 | #include <qpushbutton.h> |
17 | 17 | ||
18 | using namespace Opie::Ui; | ||
18 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 19 | InputDialog::InputDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) |
19 | : QDialog( parent, name, modal, fl ) | 20 | : QDialog( parent, name, modal, fl ) |
20 | { | 21 | { |
21 | if ( !name ) | 22 | if ( !name ) |
22 | setName( "InputDialog" ); | 23 | setName( "InputDialog" ); |
23 | resize( 234, 115); | 24 | resize( 234, 115); |
24 | setMaximumSize( QSize( 240, 40)); | 25 | setMaximumSize( QSize( 240, 40)); |
25 | setCaption( tr(name ) ); | 26 | setCaption( tr(name ) ); |
26 | 27 | ||
27 | QPushButton *browserButton; | 28 | QPushButton *browserButton; |
28 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 29 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
29 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); | 30 | browserButton->setGeometry( QRect( 205, 10, 22, 22)); |
@@ -49,16 +50,16 @@ void InputDialog::browse() { | |||
49 | audio << "playlist/plain"; | 50 | audio << "playlist/plain"; |
50 | audio << "audio/x-mpegurl"; | 51 | audio << "audio/x-mpegurl"; |
51 | 52 | ||
52 | video << "video/*"; | 53 | video << "video/*"; |
53 | video << "playlist/plain"; | 54 | video << "playlist/plain"; |
54 | 55 | ||
55 | all += audio; | 56 | all += audio; |
56 | all += video; | 57 | all += video; |
57 | types.insert("All Media Files", all ); | 58 | types.insert("All Media Files", all ); |
58 | types.insert("Audio", audio ); | 59 | types.insert("Audio", audio ); |
59 | types.insert("Video", video ); | 60 | types.insert("Video", video ); |
60 | 61 | ||
61 | QString str = Opie::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); | 62 | QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/","", types, 0 ); |
62 | LineEdit1->setText(str); | 63 | LineEdit1->setText(str); |
63 | } | 64 | } |
64 | 65 | ||
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp index 20e1c9b..9aa012a 100644 --- a/core/applets/screenshotapplet/screenshot.cpp +++ b/core/applets/screenshotapplet/screenshot.cpp | |||
@@ -30,24 +30,25 @@ | |||
30 | #include <qlayout.h> | 30 | #include <qlayout.h> |
31 | #include <qcheckbox.h> | 31 | #include <qcheckbox.h> |
32 | #include <qmessagebox.h> | 32 | #include <qmessagebox.h> |
33 | 33 | ||
34 | /* STD */ | 34 | /* STD */ |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include <sys/socket.h> | 36 | #include <sys/socket.h> |
37 | #include <netinet/in.h> | 37 | #include <netinet/in.h> |
38 | #include <netdb.h> | 38 | #include <netdb.h> |
39 | #include <unistd.h> | 39 | #include <unistd.h> |
40 | 40 | ||
41 | /* XPM */ | 41 | /* XPM */ |
42 | using namespace Opie::Ui; | ||
42 | static char * snapshot_xpm[] = { | 43 | static char * snapshot_xpm[] = { |
43 | "32 32 177 2", | 44 | "32 32 177 2", |
44 | " c None", | 45 | " c None", |
45 | ". c #042045", | 46 | ". c #042045", |
46 | "+ c #0D2B47", | 47 | "+ c #0D2B47", |
47 | "@ c #0E325E", | 48 | "@ c #0E325E", |
48 | "# c #0D2E50", | 49 | "# c #0D2E50", |
49 | "$ c #0A1C32", | 50 | "$ c #0A1C32", |
50 | "% c #0F3A69", | 51 | "% c #0F3A69", |
51 | "& c #164680", | 52 | "& c #164680", |
52 | "* c #165EAE", | 53 | "* c #165EAE", |
53 | "= c #134D89", | 54 | "= c #134D89", |
@@ -527,17 +528,15 @@ void ScreenshotApplet::mousePressEvent( QMouseEvent *) | |||
527 | } | 528 | } |
528 | 529 | ||
529 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); | 530 | sc-> move ( ZwindowPosX, curPos. y ( ) - sc-> sizeHint ( ). height ( ) ); |
530 | sc-> show ( ); | 531 | sc-> show ( ); |
531 | } | 532 | } |
532 | 533 | ||
533 | void ScreenshotApplet::paintEvent( QPaintEvent* ) | 534 | void ScreenshotApplet::paintEvent( QPaintEvent* ) |
534 | { | 535 | { |
535 | QPainter p ( this ); | 536 | QPainter p ( this ); |
536 | p.drawPixmap( 0,0, m_icon ); | 537 | p.drawPixmap( 0,0, m_icon ); |
537 | } | 538 | } |
538 | 539 | ||
539 | Q_EXPORT_INTERFACE() | 540 | |
540 | { | 541 | EXPORT_OPIE_APPLET_v1( ScreenshotApplet ) |
541 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ScreenshotApplet> ); | ||
542 | } | ||
543 | 542 | ||
diff --git a/core/applets/suspendapplet/config.in b/core/applets/suspendapplet/config.in index fdbe8b3..d75f581 100644 --- a/core/applets/suspendapplet/config.in +++ b/core/applets/suspendapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config SUSPENDAPPLET | 1 | config SUSPENDAPPLET |
2 | boolean "Suspend" | 2 | boolean "Suspend" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/vmemo/config.in b/core/applets/vmemo/config.in index d13492d..356ab16 100644 --- a/core/applets/vmemo/config.in +++ b/core/applets/vmemo/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config VMEMO | 1 | config VMEMO |
2 | boolean "opie-vmemo (take voice memos)" | 2 | boolean "opie-vmemo (take voice memos)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 27f6015..7dd5b4b 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -184,24 +184,25 @@ static char * vmemo_xpm[] = { | |||
184 | " 4 5 6 7 8 9 0 a b c ", | 184 | " 4 5 6 7 8 9 0 a b c ", |
185 | " d e f g h i j 3 k l m n ", | 185 | " d e f g h i j 3 k l m n ", |
186 | " o p q r s t u v w n ", | 186 | " o p q r s t u v w n ", |
187 | " o x y z A B C D E n ", | 187 | " o x y z A B C D E n ", |
188 | " F G H I J K L M N O ", | 188 | " F G H I J K L M N O ", |
189 | " P Q R S T U V W X ", | 189 | " P Q R S T U V W X ", |
190 | " Y Z ` b ...+. ", | 190 | " Y Z ` b ...+. ", |
191 | " @.#.$.%.&. ", | 191 | " @.#.$.%.&. ", |
192 | " *.B =. ", | 192 | " *.B =. ", |
193 | " n n n n n n n n n "}; | 193 | " n n n n n n n n n "}; |
194 | 194 | ||
195 | 195 | ||
196 | using namespace Opie::Ui; | ||
196 | VMemo::VMemo( QWidget *parent, const char *_name ) | 197 | VMemo::VMemo( QWidget *parent, const char *_name ) |
197 | : QWidget( parent, _name ) { | 198 | : QWidget( parent, _name ) { |
198 | setFixedHeight( 18 ); | 199 | setFixedHeight( 18 ); |
199 | setFixedWidth( 14 ); | 200 | setFixedWidth( 14 ); |
200 | 201 | ||
201 | t_timer = new QTimer( this ); | 202 | t_timer = new QTimer( this ); |
202 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); | 203 | connect( t_timer, SIGNAL( timeout() ), SLOT( timerBreak() ) ); |
203 | 204 | ||
204 | Config vmCfg("Vmemo"); | 205 | Config vmCfg("Vmemo"); |
205 | vmCfg.setGroup("Defaults"); | 206 | vmCfg.setGroup("Defaults"); |
206 | int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); | 207 | int toggleKey = setToggleButton(vmCfg.readNumEntry("toggleKey", -1)); |
207 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); | 208 | useADPCM = vmCfg.readBoolEntry("use_ADPCM", 0); |
@@ -629,17 +630,15 @@ int VMemo::setToggleButton(int tog) { | |||
629 | break; | 630 | break; |
630 | }; | 631 | }; |
631 | } | 632 | } |
632 | return -1; | 633 | return -1; |
633 | } | 634 | } |
634 | 635 | ||
635 | void VMemo::timerBreak() { | 636 | void VMemo::timerBreak() { |
636 | //stop | 637 | //stop |
637 | stopRecording(); | 638 | stopRecording(); |
638 | QMessageBox::message("Vmemo","Vmemo recording has ended"); | 639 | QMessageBox::message("Vmemo","Vmemo recording has ended"); |
639 | } | 640 | } |
640 | 641 | ||
641 | Q_EXPORT_INTERFACE() | 642 | |
642 | { | 643 | EXPORT_OPIE_APPLET_v1( VMemo ) |
643 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VMemo> ); | ||
644 | } | ||
645 | 644 | ||
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in index 1233d9f..f097591 100644 --- a/core/applets/volumeapplet/config.in +++ b/core/applets/volumeapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config VOLUMEAPPLET | 1 | config VOLUMEAPPLET |
2 | boolean "opie-volumeapplet (set volume for microphone and speaker)" | 2 | boolean "opie-volumeapplet (set volume for microphone and speaker)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 942cebb..276f47f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp | |||
@@ -30,32 +30,33 @@ | |||
30 | 30 | ||
31 | #include <qpainter.h> | 31 | #include <qpainter.h> |
32 | #include <qcheckbox.h> | 32 | #include <qcheckbox.h> |
33 | #include <qslider.h> | 33 | #include <qslider.h> |
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qvbox.h> | 35 | #include <qvbox.h> |
36 | #include <qlabel.h> | 36 | #include <qlabel.h> |
37 | #include <qpushbutton.h> | 37 | #include <qpushbutton.h> |
38 | #include <qtimer.h> | 38 | #include <qtimer.h> |
39 | 39 | ||
40 | #include <stdio.h> | 40 | #include <stdio.h> |
41 | 41 | ||
42 | using namespace Opie; | 42 | using namespace Opie::Core; |
43 | 43 | ||
44 | #define RATE_TIMER_INTERVAL 100 | 44 | #define RATE_TIMER_INTERVAL 100 |
45 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time | 45 | // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time |
46 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. | 46 | // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. |
47 | 47 | ||
48 | 48 | ||
49 | /* XPM */ | 49 | /* XPM */ |
50 | using namespace Opie::Ui; | ||
50 | static const char * vol_xpm[] = { | 51 | static const char * vol_xpm[] = { |
51 | "20 20 3 1", | 52 | "20 20 3 1", |
52 | " c None", | 53 | " c None", |
53 | ". c #0000FF", | 54 | ". c #0000FF", |
54 | "+ c #000000", | 55 | "+ c #000000", |
55 | " ", | 56 | " ", |
56 | " . ", | 57 | " . ", |
57 | " . . . . ", | 58 | " . . . . ", |
58 | " . . . . . . ", | 59 | " . . . . . . ", |
59 | " . . . . . . . ", | 60 | " . . . . . . . ", |
60 | " . . ..... . . ", | 61 | " . . ..... . . ", |
61 | " . ... ..... ... ", | 62 | " . ... ..... ... ", |
@@ -768,16 +769,13 @@ void VolumeApplet::paintEvent ( QPaintEvent * ) | |||
768 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); | 769 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); |
769 | 770 | ||
770 | if ( m_dialog-> volMuted ( )) { | 771 | if ( m_dialog-> volMuted ( )) { |
771 | p. setPen ( red ); | 772 | p. setPen ( red ); |
772 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); | 773 | p. drawLine ( 1, 2, width() - 2, height() - 5 ); |
773 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); | 774 | p. drawLine ( 1, 3, width() - 2, height() - 4 ); |
774 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); | 775 | p. drawLine ( width() - 2, 2, 1, height() - 5 ); |
775 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); | 776 | p. drawLine ( width() - 2, 3, 1, height() - 4 ); |
776 | } | 777 | } |
777 | } | 778 | } |
778 | 779 | ||
779 | 780 | ||
780 | Q_EXPORT_INTERFACE() | 781 | EXPORT_OPIE_APPLET_v1( VolumeApplet ) |
781 | { | ||
782 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> ); | ||
783 | } | ||
diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index b14956e..b478ed1 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro | |||
@@ -1,13 +1,13 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on release | 2 | CONFIG += qt plugin warn_on release |
3 | HEADERS = volume.h oledbox.h | 3 | HEADERS = volume.h oledbox.h |
4 | SOURCES = volume.cpp oledbox.cpp | 4 | SOURCES = volume.cpp oledbox.cpp |
5 | TARGET = volumeapplet | 5 | TARGET = volumeapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += ../$(OPIEDIR)/include | 8 | DEPENDPATH += ../$(OPIEDIR)/include |
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/vtapplet/config.in b/core/applets/vtapplet/config.in index 85692a5..8fe4200 100644 --- a/core/applets/vtapplet/config.in +++ b/core/applets/vtapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config VTAPPLET | 1 | config VTAPPLET |
2 | boolean "VT (switch to another virtual terminal)" | 2 | boolean "VT (switch to another virtual terminal)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |