author | zecke <zecke> | 2004-03-13 21:53:54 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 21:53:54 (UTC) |
commit | 2eb5c075b612498c4b65f3d49389b8612612a930 (patch) (unidiff) | |
tree | a0230cd9007f71bbb387b71b8e58684937e0cf70 | |
parent | 184a0cd9935d0a249038cdbe05488c181b273d64 (diff) | |
download | opie-2eb5c075b612498c4b65f3d49389b8612612a930.zip opie-2eb5c075b612498c4b65f3d49389b8612612a930.tar.gz opie-2eb5c075b612498c4b65f3d49389b8612612a930.tar.bz2 |
Introduce the namespace
and the new APPLET_EXPORT define
-rw-r--r-- | noncore/applets/autorotateapplet/autorotate.cpp | 8 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorymeter.cpp | 26 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 1 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.h | 4 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 7 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 18 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 8 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 9 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.h | 9 | ||||
-rw-r--r-- | noncore/applets/zkbapplet/zkbwidget.cpp | 11 |
10 files changed, 51 insertions, 50 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp index 94be0ae..ae7fbd0 100644 --- a/noncore/applets/autorotateapplet/autorotate.cpp +++ b/noncore/applets/autorotateapplet/autorotate.cpp | |||
@@ -19,14 +19,13 @@ | |||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | 21 | ||
22 | /* QT */ | 22 | /* QT */ |
23 | #include <qpainter.h> | 23 | #include <qpainter.h> |
24 | 24 | ||
25 | using namespace Opie; | 25 | using namespace Opie::Ui; |
26 | |||
27 | AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) | 26 | AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) |
28 | { | 27 | { |
29 | setFixedWidth( AppLnk::smallIconSize() ); | 28 | setFixedWidth( AppLnk::smallIconSize() ); |
30 | setFixedHeight( AppLnk::smallIconSize() ); | 29 | setFixedHeight( AppLnk::smallIconSize() ); |
31 | 30 | ||
32 | enabledPm.convertFromImage( Resource::loadImage("autorotate/rotate").smoothScale( height(), width() ) ); | 31 | enabledPm.convertFromImage( Resource::loadImage("autorotate/rotate").smoothScale( height(), width() ) ); |
@@ -91,11 +90,8 @@ bool AutoRotate::isRotateEnabled() | |||
91 | qDebug("Enabled"); | 90 | qDebug("Enabled"); |
92 | else | 91 | else |
93 | qDebug("Disabled"); | 92 | qDebug("Disabled"); |
94 | return res; | 93 | return res; |
95 | } | 94 | } |
96 | 95 | ||
97 | Q_EXPORT_INTERFACE() | 96 | EXPORT_OPIE_APPLET_v1( AutoRotate ) |
98 | { | ||
99 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<AutoRotate> ); | ||
100 | } | ||
101 | 97 | ||
diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp index 9299f49..9cdeaf4 100644 --- a/noncore/applets/memoryapplet/memorymeter.cpp +++ b/noncore/applets/memoryapplet/memorymeter.cpp | |||
@@ -28,22 +28,23 @@ | |||
28 | #include <qpainter.h> | 28 | #include <qpainter.h> |
29 | #include <qtimer.h> | 29 | #include <qtimer.h> |
30 | #include <qapplication.h> | 30 | #include <qapplication.h> |
31 | 31 | ||
32 | #include <qtopia/applnk.h> | 32 | #include <qtopia/applnk.h> |
33 | 33 | ||
34 | using namespace Opie::Ui; | ||
34 | MemoryMeter::MemoryMeter( QWidget *parent ) | 35 | MemoryMeter::MemoryMeter( QWidget *parent ) |
35 | : QWidget( parent ), memoryView(0) | 36 | : QWidget( parent ), memoryView(0) |
36 | { | 37 | { |
37 | bvsz = QSize(); | 38 | bvsz = QSize(); |
38 | if ( qApp->desktop()->height() >= 300 ) | 39 | if ( qApp->desktop()->height() >= 300 ) |
39 | { | 40 | { |
40 | memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); | 41 | memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); |
41 | memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); | 42 | memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); |
42 | } | 43 | } |
43 | else | 44 | else |
44 | { | 45 | { |
45 | memoryView = new MemoryStatus( 0 ); | 46 | memoryView = new MemoryStatus( 0 ); |
46 | memoryView->showMaximized(); | 47 | memoryView->showMaximized(); |
47 | } | 48 | } |
48 | 49 | ||
49 | Config config("MemoryPlugin"); | 50 | Config config("MemoryPlugin"); |
@@ -76,17 +77,17 @@ QSize MemoryMeter::sizeHint() const | |||
76 | 77 | ||
77 | bool MemoryMeter::updateMemoryViewGeometry() | 78 | bool MemoryMeter::updateMemoryViewGeometry() |
78 | { | 79 | { |
79 | if (memoryView != 0) | 80 | if (memoryView != 0) |
80 | { | 81 | { |
81 | QSize sz = memoryView->sizeHint(); | 82 | QSize sz = memoryView->sizeHint(); |
82 | if ( sz != bvsz ) | 83 | if ( sz != bvsz ) |
83 | { | 84 | { |
84 | bvsz = sz; | 85 | bvsz = sz; |
85 | QRect r(memoryView->pos(), memoryView->sizeHint()); | 86 | QRect r(memoryView->pos(), memoryView->sizeHint()); |
86 | if ( qApp->desktop()->height() >= 300 ) | 87 | if ( qApp->desktop()->height() >= 300 ) |
87 | { | 88 | { |
88 | QPoint curPos = mapToGlobal( rect().topLeft() ); | 89 | QPoint curPos = mapToGlobal( rect().topLeft() ); |
89 | int lp = qApp->desktop()->width() - memoryView->sizeHint().width(); | 90 | int lp = qApp->desktop()->width() - memoryView->sizeHint().width(); |
90 | r.moveTopLeft( QPoint(lp, curPos.y() - memoryView->sizeHint().height()-1) ); | 91 | r.moveTopLeft( QPoint(lp, curPos.y() - memoryView->sizeHint().height()-1) ); |
91 | } | 92 | } |
92 | memoryView->setGeometry(r); | 93 | memoryView->setGeometry(r); |
@@ -97,17 +98,17 @@ bool MemoryMeter::updateMemoryViewGeometry() | |||
97 | 98 | ||
98 | return FALSE; | 99 | return FALSE; |
99 | } | 100 | } |
100 | 101 | ||
101 | void MemoryMeter::mousePressEvent( QMouseEvent *) | 102 | void MemoryMeter::mousePressEvent( QMouseEvent *) |
102 | { | 103 | { |
103 | if ( memoryView->isVisible() ) | 104 | if ( memoryView->isVisible() ) |
104 | { | 105 | { |
105 | memoryView->hide(); | 106 | memoryView->hide(); |
106 | } | 107 | } |
107 | else | 108 | else |
108 | { | 109 | { |
109 | bvsz = QSize(); | 110 | bvsz = QSize(); |
110 | updateMemoryViewGeometry(); | 111 | updateMemoryViewGeometry(); |
111 | memoryView->raise(); | 112 | memoryView->raise(); |
112 | memoryView->show(); | 113 | memoryView->show(); |
113 | } | 114 | } |
@@ -203,13 +204,13 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
203 | if (used_height < 0) | 204 | if (used_height < 0) |
204 | used_height = 0; | 205 | used_height = 0; |
205 | 206 | ||
206 | // | 207 | // |
207 | // Drained section. | 208 | // Drained section. |
208 | // | 209 | // |
209 | if (used_height != 0) | 210 | if (used_height != 0) |
210 | { | 211 | { |
211 | p.setPen(NoPen); | 212 | p.setPen(NoPen); |
212 | p.setBrush(gray); | 213 | p.setBrush(gray); |
213 | p.drawRect(batt_xoffset, batt_yoffset, band_width, used_height); | 214 | p.drawRect(batt_xoffset, batt_yoffset, band_width, used_height); |
214 | p.drawRect(batt_xoffset + 2 * band_width, batt_yoffset, band_width, used_height); | 215 | p.drawRect(batt_xoffset + 2 * band_width, batt_yoffset, band_width, used_height); |
215 | 216 | ||
@@ -220,13 +221,13 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
220 | p.drawRect(batt_xoffset + 3 * band_width, batt_yoffset, band_width, used_height); | 221 | p.drawRect(batt_xoffset + 3 * band_width, batt_yoffset, band_width, used_height); |
221 | } | 222 | } |
222 | 223 | ||
223 | // | 224 | // |
224 | // Unused section. | 225 | // Unused section. |
225 | // | 226 | // |
226 | if ( batt_height - used_height > 0 ) | 227 | if ( batt_height - used_height > 0 ) |
227 | { | 228 | { |
228 | int unused_offset = used_height + batt_yoffset; | 229 | int unused_offset = used_height + batt_yoffset; |
229 | int unused_height = batt_height - used_height; | 230 | int unused_height = batt_height - used_height; |
230 | p.setPen(NoPen); | 231 | p.setPen(NoPen); |
231 | p.setBrush(c); | 232 | p.setBrush(c); |
232 | p.drawRect(batt_xoffset, unused_offset, band_width, unused_height); | 233 | p.drawRect(batt_xoffset, unused_offset, band_width, unused_height); |
@@ -237,11 +238,8 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
237 | 238 | ||
238 | p.setBrush(darkc); | 239 | p.setBrush(darkc); |
239 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); | 240 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); |
240 | } | 241 | } |
241 | } | 242 | } |
242 | 243 | ||
243 | Q_EXPORT_INTERFACE() | 244 | EXPORT_OPIE_APPLET_v1( MemoryMeter ) |
244 | { | ||
245 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> ); | ||
246 | } | ||
247 | 245 | ||
diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp index c01ba28..95ae06b 100644 --- a/noncore/applets/memoryapplet/memorystatus.cpp +++ b/noncore/applets/memoryapplet/memorystatus.cpp | |||
@@ -25,12 +25,13 @@ | |||
25 | #include <qpushbutton.h> | 25 | #include <qpushbutton.h> |
26 | #include <qdrawutil.h> | 26 | #include <qdrawutil.h> |
27 | #include <qlabel.h> | 27 | #include <qlabel.h> |
28 | 28 | ||
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | 30 | ||
31 | using namespace Opie::Ui; | ||
31 | MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) | 32 | MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) |
32 | : QFrame(parent, 0, f), mi(0), sf(0) | 33 | : QFrame(parent, 0, f), mi(0), sf(0) |
33 | { | 34 | { |
34 | setCaption( tr("Memory Status") ); | 35 | setCaption( tr("Memory Status") ); |
35 | //resize( 220, 180 ); | 36 | //resize( 220, 180 ); |
36 | 37 | ||
diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h index c3926db..d16787b 100644 --- a/noncore/applets/memoryapplet/memorystatus.h +++ b/noncore/applets/memoryapplet/memorystatus.h | |||
@@ -23,13 +23,13 @@ | |||
23 | #include <qframe.h> | 23 | #include <qframe.h> |
24 | 24 | ||
25 | #include <opie2/otabwidget.h> | 25 | #include <opie2/otabwidget.h> |
26 | 26 | ||
27 | class MemoryInfo; | 27 | class MemoryInfo; |
28 | class Swapfile; | 28 | class Swapfile; |
29 | using Opie::OTabWidget; | 29 | |
30 | 30 | ||
31 | class MemoryStatus : public QFrame | 31 | class MemoryStatus : public QFrame |
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | public: | 34 | public: |
35 | MemoryStatus(QWidget *parent = 0, WFlags f = 0); | 35 | MemoryStatus(QWidget *parent = 0, WFlags f = 0); |
@@ -39,11 +39,11 @@ public: | |||
39 | MemoryInfo* mi; | 39 | MemoryInfo* mi; |
40 | Swapfile* sf; | 40 | Swapfile* sf; |
41 | 41 | ||
42 | int percent(); | 42 | int percent(); |
43 | 43 | ||
44 | private: | 44 | private: |
45 | OTabWidget *tab; | 45 | Opie::Ui::OTabWidget *tab; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | #endif | 48 | #endif |
49 | 49 | ||
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index 955ed2e..5eb5ad2 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp | |||
@@ -42,12 +42,14 @@ | |||
42 | #include <qlabel.h> | 42 | #include <qlabel.h> |
43 | #include <qlayout.h> | 43 | #include <qlayout.h> |
44 | #include <qobjectlist.h> | 44 | #include <qobjectlist.h> |
45 | 45 | ||
46 | #include <assert.h> | 46 | #include <assert.h> |
47 | 47 | ||
48 | using namespace Opie::Ui; | ||
49 | using namespace Opie::Net; | ||
48 | IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) | 50 | IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) |
49 | :QToolButton( parent, name ) | 51 | :QToolButton( parent, name ) |
50 | { | 52 | { |
51 | _iface = ONetwork::instance()->interface( name ); | 53 | _iface = ONetwork::instance()->interface( name ); |
52 | assert( _iface ); | 54 | assert( _iface ); |
53 | setToggleButton( true ); | 55 | setToggleButton( true ); |
@@ -243,12 +245,9 @@ void NetworkApplet::mousePressEvent( QMouseEvent* ) | |||
243 | else | 245 | else |
244 | { | 246 | { |
245 | _control->hide(); | 247 | _control->hide(); |
246 | } | 248 | } |
247 | } | 249 | } |
248 | 250 | ||
251 | EXPORT_OPIE_APPLET_v1( NetworkApplet ) | ||
249 | 252 | ||
250 | Q_EXPORT_INTERFACE() | ||
251 | { | ||
252 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NetworkApplet> ); | ||
253 | } | ||
254 | 253 | ||
diff --git a/noncore/applets/networkapplet/networkapplet.h b/noncore/applets/networkapplet/networkapplet.h index 8022537..1e2cac8 100644 --- a/noncore/applets/networkapplet/networkapplet.h +++ b/noncore/applets/networkapplet/networkapplet.h | |||
@@ -35,13 +35,19 @@ | |||
35 | #include <qframe.h> | 35 | #include <qframe.h> |
36 | #include <qstring.h> | 36 | #include <qstring.h> |
37 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
38 | #include <qlineedit.h> | 38 | #include <qlineedit.h> |
39 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | 40 | ||
41 | class ONetworkInterface; | 41 | |
42 | namespace Opie { | ||
43 | namespace Net { | ||
44 | class ONetwork; | ||
45 | class ONetworkInterface; | ||
46 | } | ||
47 | } | ||
42 | class QShowEvent; | 48 | class QShowEvent; |
43 | class QHideEvent; | 49 | class QHideEvent; |
44 | class QVBoxLayout; | 50 | class QVBoxLayout; |
45 | 51 | ||
46 | class IfaceUpDownButton : public QToolButton | 52 | class IfaceUpDownButton : public QToolButton |
47 | { | 53 | { |
@@ -52,13 +58,13 @@ class IfaceUpDownButton : public QToolButton | |||
52 | virtual ~IfaceUpDownButton(); | 58 | virtual ~IfaceUpDownButton(); |
53 | 59 | ||
54 | public slots: | 60 | public slots: |
55 | virtual void clicked(); | 61 | virtual void clicked(); |
56 | 62 | ||
57 | private: | 63 | private: |
58 | ONetworkInterface* _iface; | 64 | Opie::Net::ONetworkInterface* _iface; |
59 | }; | 65 | }; |
60 | 66 | ||
61 | 67 | ||
62 | class IfaceIPAddress : public QLineEdit | 68 | class IfaceIPAddress : public QLineEdit |
63 | { | 69 | { |
64 | Q_OBJECT | 70 | Q_OBJECT |
@@ -68,36 +74,36 @@ class IfaceIPAddress : public QLineEdit | |||
68 | virtual ~IfaceIPAddress(); | 74 | virtual ~IfaceIPAddress(); |
69 | 75 | ||
70 | public slots: | 76 | public slots: |
71 | virtual void returnPressed(); | 77 | virtual void returnPressed(); |
72 | 78 | ||
73 | private: | 79 | private: |
74 | ONetworkInterface* _iface; | 80 | Opie::Net::ONetworkInterface* _iface; |
75 | }; | 81 | }; |
76 | 82 | ||
77 | class NetworkAppletControl : public QFrame | 83 | class NetworkAppletControl : public QFrame |
78 | { | 84 | { |
79 | public: | 85 | public: |
80 | NetworkAppletControl( OTaskbarApplet* parent, const char* name = 0 ); | 86 | NetworkAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); |
81 | ~NetworkAppletControl(); | 87 | ~NetworkAppletControl(); |
82 | 88 | ||
83 | virtual QSize sizeHint() const; | 89 | virtual QSize sizeHint() const; |
84 | 90 | ||
85 | protected: | 91 | protected: |
86 | virtual void showEvent( QShowEvent* ); | 92 | virtual void showEvent( QShowEvent* ); |
87 | virtual void hideEvent( QHideEvent* ); | 93 | virtual void hideEvent( QHideEvent* ); |
88 | QString guessDevice( ONetworkInterface* iface ); | 94 | QString guessDevice( Opie::Net::ONetworkInterface* iface ); |
89 | void build(); | 95 | void build(); |
90 | 96 | ||
91 | private: | 97 | private: |
92 | QVBoxLayout* l; | 98 | QVBoxLayout* l; |
93 | 99 | ||
94 | }; | 100 | }; |
95 | 101 | ||
96 | 102 | ||
97 | class NetworkApplet : public OTaskbarApplet | 103 | class NetworkApplet : public Opie::Ui::OTaskbarApplet |
98 | { | 104 | { |
99 | public: | 105 | public: |
100 | NetworkApplet( QWidget* parent = 0, const char* name = 0 ); | 106 | NetworkApplet( QWidget* parent = 0, const char* name = 0 ); |
101 | ~NetworkApplet(); | 107 | ~NetworkApplet(); |
102 | 108 | ||
103 | static int position(); | 109 | static int position(); |
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 9b5e475..13f7cf3 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp | |||
@@ -43,12 +43,13 @@ | |||
43 | #include <qframe.h> | 43 | #include <qframe.h> |
44 | #include <qpixmap.h> | 44 | #include <qpixmap.h> |
45 | #include <qstring.h> | 45 | #include <qstring.h> |
46 | #include <qtimer.h> | 46 | #include <qtimer.h> |
47 | 47 | ||
48 | /* XPM */ | 48 | /* XPM */ |
49 | using namespace Opie::Ui; | ||
49 | static char * notes_xpm[] = { | 50 | static char * notes_xpm[] = { |
50 | "16 16 11 1", | 51 | "16 16 11 1", |
51 | " c None", | 52 | " c None", |
52 | ". c #000000", | 53 | ". c #000000", |
53 | "+ c #7F7F7F", | 54 | "+ c #7F7F7F", |
54 | "@ c #BFBFBF", | 55 | "@ c #BFBFBF", |
@@ -505,10 +506,9 @@ void NotesApplet::mousePressEvent( QMouseEvent *) { | |||
505 | 506 | ||
506 | void NotesApplet::paintEvent( QPaintEvent* ) { | 507 | void NotesApplet::paintEvent( QPaintEvent* ) { |
507 | QPainter p(this); | 508 | QPainter p(this); |
508 | p.drawPixmap( 0, 1, ( const char** ) notes_xpm ); | 509 | p.drawPixmap( 0, 1, ( const char** ) notes_xpm ); |
509 | } | 510 | } |
510 | 511 | ||
511 | Q_EXPORT_INTERFACE() | 512 | |
512 | { | 513 | EXPORT_OPIE_APPLET_v1( NotesApplet ) |
513 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NotesApplet> ); | 514 | |
514 | } | ||
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp index 6ef2e44..f244426 100644 --- a/noncore/applets/wirelessapplet/wireless.cpp +++ b/noncore/applets/wirelessapplet/wireless.cpp | |||
@@ -23,12 +23,13 @@ | |||
23 | #include "nowireless.xpm" | 23 | #include "nowireless.xpm" |
24 | 24 | ||
25 | /* OPIE */ | 25 | /* OPIE */ |
26 | #include <opie2/onetwork.h> | 26 | #include <opie2/onetwork.h> |
27 | #include <opie2/otaskbarapplet.h> | 27 | #include <opie2/otaskbarapplet.h> |
28 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
29 | #include <qpe/qpeapplication.h> | ||
29 | 30 | ||
30 | /* QT */ | 31 | /* QT */ |
31 | #include <qradiobutton.h> | 32 | #include <qradiobutton.h> |
32 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
33 | #include <qpainter.h> | 34 | #include <qpainter.h> |
34 | #include <qlabel.h> | 35 | #include <qlabel.h> |
@@ -45,12 +46,14 @@ | |||
45 | #define STYLE_BARS 0 | 46 | #define STYLE_BARS 0 |
46 | #define STYLE_ANTENNA 1 | 47 | #define STYLE_ANTENNA 1 |
47 | 48 | ||
48 | //#define MDEBUG | 49 | //#define MDEBUG |
49 | #undef MDEBUG | 50 | #undef MDEBUG |
50 | 51 | ||
52 | using namespace Opie::Ui; | ||
53 | using namespace Opie::Net; | ||
51 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) | 54 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) |
52 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) | 55 | : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) |
53 | { | 56 | { |
54 | 57 | ||
55 | readConfig(); | 58 | readConfig(); |
56 | writeConfigEntry( "UpdateFrequency", updateFrequency ); | 59 | writeConfigEntry( "UpdateFrequency", updateFrequency ); |
@@ -547,12 +550,8 @@ void WirelessApplet::paintEvent( QPaintEvent* ) | |||
547 | 550 | ||
548 | int WirelessApplet::position() | 551 | int WirelessApplet::position() |
549 | { | 552 | { |
550 | return 6; | 553 | return 6; |
551 | } | 554 | } |
552 | 555 | ||
553 | 556 | EXPORT_OPIE_APPLET_v1( WirelessApplet ) | |
554 | Q_EXPORT_INTERFACE() | ||
555 | { | ||
556 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> ); | ||
557 | } | ||
558 | 557 | ||
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h index 27f8c90..b475a46 100644 --- a/noncore/applets/wirelessapplet/wireless.h +++ b/noncore/applets/wirelessapplet/wireless.h | |||
@@ -16,13 +16,16 @@ | |||
16 | #define __WIRELESS_APPLET_H__ | 16 | #define __WIRELESS_APPLET_H__ |
17 | 17 | ||
18 | #include <qwidget.h> | 18 | #include <qwidget.h> |
19 | #include <qframe.h> | 19 | #include <qframe.h> |
20 | #include <qpixmap.h> | 20 | #include <qpixmap.h> |
21 | 21 | ||
22 | class OWirelessNetworkInterface; | 22 | namespace Opie {namespace Net { |
23 | class OWirelessNetworkInterface; | ||
24 | } | ||
25 | } | ||
23 | class Y; | 26 | class Y; |
24 | class QLabel; | 27 | class QLabel; |
25 | class WirelessApplet; | 28 | class WirelessApplet; |
26 | class MGraph; | 29 | class MGraph; |
27 | 30 | ||
28 | class WirelessControl : public QFrame | 31 | class WirelessControl : public QFrame |
@@ -83,17 +86,17 @@ class WirelessApplet : public QWidget | |||
83 | 86 | ||
84 | private: | 87 | private: |
85 | QPixmap snapshotPixmap; | 88 | QPixmap snapshotPixmap; |
86 | int visualStyle; | 89 | int visualStyle; |
87 | int timer; | 90 | int timer; |
88 | 91 | ||
89 | OWirelessNetworkInterface* interface; | 92 | Opie::Net::OWirelessNetworkInterface* interface; |
90 | 93 | ||
91 | private: | 94 | private: |
92 | const char** oldpixmap; | 95 | const char** oldpixmap; |
93 | OWirelessNetworkInterface* oldiface; | 96 | Opie::Net::OWirelessNetworkInterface* oldiface; |
94 | int oldqualityH; | 97 | int oldqualityH; |
95 | int oldsignalH; | 98 | int oldsignalH; |
96 | int oldnoiseH; | 99 | int oldnoiseH; |
97 | 100 | ||
98 | QString oldESSID; | 101 | QString oldESSID; |
99 | QString oldAP; | 102 | QString oldAP; |
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp index 0083e9b..3acff1e 100644 --- a/noncore/applets/zkbapplet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/zkbwidget.cpp | |||
@@ -5,17 +5,18 @@ | |||
5 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <unistd.h> | 7 | #include <unistd.h> |
8 | #include "zkbwidget.h" | 8 | #include "zkbwidget.h" |
9 | #include "zkbcfg.h" | 9 | #include "zkbcfg.h" |
10 | 10 | ||
11 | using namespace Opie::Ui; | ||
11 | ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0), | 12 | ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0), |
12 | disabled(Resource::loadPixmap("zkb-disabled")) { | 13 | disabled(Resource::loadPixmap("zkb-disabled")) { |
13 | 14 | ||
14 | labels = new QPopupMenu(); | 15 | labels = new QPopupMenu(); |
15 | connect(labels, SIGNAL(activated(int)), this, | 16 | connect(labels, SIGNAL(activated(int)), this, |
16 | SLOT(labelChanged(int))); | 17 | SLOT(labelChanged(int))); |
17 | 18 | ||
18 | loadKeymap(); | 19 | loadKeymap(); |
19 | 20 | ||
20 | channel = new QCopChannel("QPE/zkb", this); | 21 | channel = new QCopChannel("QPE/zkb", this); |
21 | connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), | 22 | connect(channel, SIGNAL(received(const QCString&,const QByteArray&)), |
@@ -65,13 +66,13 @@ bool ZkbWidget::loadKeymap() { | |||
65 | 66 | ||
66 | labels->clear(); | 67 | labels->clear(); |
67 | QStringList l = keymap->listLabels(); | 68 | QStringList l = keymap->listLabels(); |
68 | labels->insertItem(disabled, 0, 0); | 69 | labels->insertItem(disabled, 0, 0); |
69 | int n = 1; | 70 | int n = 1; |
70 | w = 0; | 71 | w = 0; |
71 | for(QStringList::Iterator it = l.begin(); it != l.end(); | 72 | for(QStringList::Iterator it = l.begin(); it != l.end(); |
72 | ++it, n++) { | 73 | ++it, n++) { |
73 | 74 | ||
74 | // printf("label: %s\n", (const char*) (*it).utf8()); | 75 | // printf("label: %s\n", (const char*) (*it).utf8()); |
75 | 76 | ||
76 | labels->insertItem(*it, n, n); | 77 | labels->insertItem(*it, n, n); |
77 | int lw = fm.width(*it); | 78 | int lw = fm.width(*it); |
@@ -152,11 +153,9 @@ void ZkbWidget::signalReceived(const QCString& msg, const QByteArray& data) { | |||
152 | 153 | ||
153 | void ZkbWidget::reload() { | 154 | void ZkbWidget::reload() { |
154 | loadKeymap(); | 155 | loadKeymap(); |
155 | QCopEnvelope("QPE/System", "notBusy()"); | 156 | QCopEnvelope("QPE/System", "notBusy()"); |
156 | } | 157 | } |
157 | 158 | ||
158 | Q_EXPORT_INTERFACE() | 159 | EXPORT_OPIE_APPLET_v1( ZkbWidget ) |
159 | { | 160 | |
160 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> ); | ||
161 | } | ||
162 | 161 | ||