Diffstat (limited to 'noncore/applets/networkapplet') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 7 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 18 |
2 files changed, 15 insertions, 10 deletions
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(); |