-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 22 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index 4e658da..9a08568 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp | |||
@@ -29,20 +29,25 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "networkapplet.h" | 31 | #include "networkapplet.h" |
32 | |||
33 | /* OPIE */ | ||
34 | #include <opie2/odebug.h> | ||
35 | #include <opie2/onetwork.h> | ||
32 | #include <opie2/otaskbarapplet.h> | 36 | #include <opie2/otaskbarapplet.h> |
37 | #include <qpe/applnk.h> | ||
33 | #include <qpe/qlibrary.h> | 38 | #include <qpe/qlibrary.h> |
34 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
35 | #include <qpainter.h> | 40 | #include <qpainter.h> |
36 | #include <opie2/odebug.h> | ||
37 | #include <opie2/onetwork.h> | ||
38 | 41 | ||
39 | #include <qpushbutton.h> | 42 | /* QT */ |
43 | #include <qhostaddress.h> | ||
44 | #include <qimage.h> | ||
40 | #include <qlabel.h> | 45 | #include <qlabel.h> |
41 | #include <qlayout.h> | 46 | #include <qlayout.h> |
42 | #include <qlineedit.h> | 47 | #include <qlineedit.h> |
43 | #include <qtoolbutton.h> | ||
44 | #include <qhostaddress.h> | ||
45 | #include <qobjectlist.h> | 48 | #include <qobjectlist.h> |
49 | #include <qpushbutton.h> | ||
50 | #include <qtoolbutton.h> | ||
46 | 51 | ||
47 | #include <assert.h> | 52 | #include <assert.h> |
48 | 53 | ||
@@ -210,7 +215,10 @@ QSize NetworkAppletControl::sizeHint() const | |||
210 | NetworkApplet::NetworkApplet( QWidget *parent, const char *name ) | 215 | NetworkApplet::NetworkApplet( QWidget *parent, const char *name ) |
211 | :OTaskbarApplet( parent, name ) | 216 | :OTaskbarApplet( parent, name ) |
212 | { | 217 | { |
213 | _control = new NetworkAppletControl( this, "control" ); | 218 | setFixedHeight( AppLnk::smallIconSize() ); |
219 | setFixedWidth( AppLnk::smallIconSize() ); | ||
220 | _pixmap.convertFromImage( Resource::loadImage( "networkapplet/network" ).smoothScale( height(), width() ) ); | ||
221 | _control = new NetworkAppletControl( this, "control" ); | ||
214 | } | 222 | } |
215 | 223 | ||
216 | 224 | ||
@@ -228,7 +236,7 @@ int NetworkApplet::position() | |||
228 | void NetworkApplet::paintEvent( QPaintEvent* ) | 236 | void NetworkApplet::paintEvent( QPaintEvent* ) |
229 | { | 237 | { |
230 | QPainter p(this); | 238 | QPainter p(this); |
231 | p.drawPixmap(0, 2, Resource::loadPixmap( "networkapplet/network" ) ); | 239 | p.drawPixmap(0, 2, _pixmap ); |
232 | } | 240 | } |
233 | 241 | ||
234 | 242 | ||
diff --git a/noncore/applets/networkapplet/networkapplet.h b/noncore/applets/networkapplet/networkapplet.h index 7b5fa97..8022537 100644 --- a/noncore/applets/networkapplet/networkapplet.h +++ b/noncore/applets/networkapplet/networkapplet.h | |||
@@ -36,6 +36,7 @@ | |||
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 | 40 | ||
40 | class ONetworkInterface; | 41 | class ONetworkInterface; |
41 | class QShowEvent; | 42 | class QShowEvent; |
@@ -106,6 +107,7 @@ class NetworkApplet : public OTaskbarApplet | |||
106 | 107 | ||
107 | private: | 108 | private: |
108 | NetworkAppletControl* _control; | 109 | NetworkAppletControl* _control; |
110 | QPixmap _pixmap; | ||
109 | }; | 111 | }; |
110 | 112 | ||
111 | #endif | 113 | #endif |