summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/networkapplet/networkapplet.cpp22
-rw-r--r--noncore/applets/networkapplet/networkapplet.h2
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
@@ -26,26 +26,31 @@
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28 28
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
49IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) 54IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
50 :QToolButton( parent, name ) 55 :QToolButton( parent, name )
51{ 56{
@@ -207,13 +212,16 @@ QSize NetworkAppletControl::sizeHint() const
207} 212}
208 213
209 214
210NetworkApplet::NetworkApplet( QWidget *parent, const char *name ) 215NetworkApplet::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
217NetworkApplet::~NetworkApplet() 225NetworkApplet::~NetworkApplet()
218{ 226{
219} 227}
@@ -225,13 +233,13 @@ int NetworkApplet::position()
225} 233}
226 234
227 235
228void NetworkApplet::paintEvent( QPaintEvent* ) 236void 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
235void NetworkApplet::mousePressEvent( QMouseEvent* ) 243void NetworkApplet::mousePressEvent( QMouseEvent* )
236{ 244{
237 if ( !_control->isVisible() ) 245 if ( !_control->isVisible() )
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
@@ -33,12 +33,13 @@
33 33
34#include <opie2/otaskbarapplet.h> 34#include <opie2/otaskbarapplet.h>
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 40
40class ONetworkInterface; 41class ONetworkInterface;
41class QShowEvent; 42class QShowEvent;
42class QHideEvent; 43class QHideEvent;
43class QVBoxLayout; 44class QVBoxLayout;
44 45
@@ -103,10 +104,11 @@ class NetworkApplet : public OTaskbarApplet
103 protected: 104 protected:
104 virtual void paintEvent( QPaintEvent* ); 105 virtual void paintEvent( QPaintEvent* );
105 virtual void mousePressEvent( QMouseEvent* ); 106 virtual void mousePressEvent( QMouseEvent* );
106 107
107 private: 108 private:
108 NetworkAppletControl* _control; 109 NetworkAppletControl* _control;
110 QPixmap _pixmap;
109}; 111};
110 112
111#endif 113#endif
112 114