summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-05 02:28:57 (UTC)
committer wimpie <wimpie>2005-01-05 02:28:57 (UTC)
commit2f343aab63dd30e97a893e3691501cdd55114e82 (patch) (unidiff)
tree819ec07fa02e9a422a9ba834663b18bc34bbb208
parent46a75181b493c25304f06cbd9f757f4165ac2b5e (diff)
downloadopie-2f343aab63dd30e97a893e3691501cdd55114e82.zip
opie-2f343aab63dd30e97a893e3691501cdd55114e82.tar.gz
opie-2f343aab63dd30e97a893e3691501cdd55114e82.tar.bz2
Networksettings2 also uses ledboxes -> hence added namespaces
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/networksettings.cpp6
-rw-r--r--noncore/settings/networksettings2/networksettings.h13
2 files changed, 14 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp
index a0d4c7c..dca6631 100644
--- a/noncore/settings/networksettings2/networksettings.cpp
+++ b/noncore/settings/networksettings2/networksettings.cpp
@@ -35,29 +35,29 @@ NetworkSettings::NetworkSettings( QWidget *parent,
35 Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) ); 35 Delete_TB->setPixmap( NSResources->getPixmap( "remove" ) );
36 CheckState_TB->setPixmap( NSResources->getPixmap( "check" ) ); 36 CheckState_TB->setPixmap( NSResources->getPixmap( "check" ) );
37 GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) ); 37 GenConfig_TB->setPixmap( NSResources->getPixmap( "configure" ) );
38 38
39 Disable_TB->setPixmap( NSResources->getPixmap( "disabled" ) ); 39 Disable_TB->setPixmap( NSResources->getPixmap( "disabled" ) );
40 Up_TB->setPixmap( NSResources->getPixmap( "more" ) ); 40 Up_TB->setPixmap( NSResources->getPixmap( "more" ) );
41 Down_TB->setPixmap( NSResources->getPixmap( "less" ) ); 41 Down_TB->setPixmap( NSResources->getPixmap( "less" ) );
42 42
43 QVBoxLayout* V = new QVBoxLayout( LED_Frm ); 43 QVBoxLayout* V = new QVBoxLayout( LED_Frm );
44 QHBoxLayout * H = new QHBoxLayout( 0 ); 44 QHBoxLayout * H = new QHBoxLayout( 0 );
45 V->addStretch(1); 45 V->addStretch(1);
46 V->addLayout( H ); 46 V->addLayout( H );
47 Leds[0] = new OLedBox( red, LED_Frm ); 47 Leds[0] = new Opie::Ui::OLedBox( red, LED_Frm );
48 H->addWidget( Leds[0], 0, Qt::AlignVCenter ); 48 H->addWidget( Leds[0], 0, Qt::AlignVCenter );
49 Leds[1] = new OLedBox( red, LED_Frm ); 49 Leds[1] = new Opie::Ui::OLedBox( red, LED_Frm );
50 H->addWidget( Leds[1], 0, Qt::AlignVCenter ); 50 H->addWidget( Leds[1], 0, Qt::AlignVCenter );
51 Leds[2] = new OLedBox( red, LED_Frm ); 51 Leds[2] = new Opie::Ui::OLedBox( red, LED_Frm );
52 H->addWidget( Leds[2], 0, Qt::AlignVCenter ); 52 H->addWidget( Leds[2], 0, Qt::AlignVCenter );
53 V->addStretch(1); 53 V->addStretch(1);
54 54
55 55
56 SLOT_ToProfile(); 56 SLOT_ToProfile();
57 57
58 // populate main Listbox 58 // populate main Listbox
59 Profiles_LB->clear(); 59 Profiles_LB->clear();
60 QPEApplication::setStylusOperation( 60 QPEApplication::setStylusOperation(
61 Profiles_LB->viewport(), QPEApplication::RightOnHold ); 61 Profiles_LB->viewport(), QPEApplication::RightOnHold );
62 62
63 connect( Profiles_LB, 63 connect( Profiles_LB,
diff --git a/noncore/settings/networksettings2/networksettings.h b/noncore/settings/networksettings2/networksettings.h
index 987e311..e1c2b80 100644
--- a/noncore/settings/networksettings2/networksettings.h
+++ b/noncore/settings/networksettings2/networksettings.h
@@ -1,22 +1,31 @@
1#include "nsdata.h" 1#include "nsdata.h"
2#include "networksettingsGUI.h" 2#include "networksettingsGUI.h"
3#include "resources.h" 3#include "resources.h"
4 4
5class ANetNode; 5class ANetNode;
6class ANetNodeInstance; 6class ANetNodeInstance;
7class QTimer; 7class QTimer;
8class QListBoxItem; 8class QListBoxItem;
9class QEvent; 9class QEvent;
10class OLedBox; 10
11namespace Opie {
12
13 namespace Ui {
14
15 class OLedBox;
16
17 };
18
19};
11 20
12class NetworkSettings : public NetworkSettingsGUI { 21class NetworkSettings : public NetworkSettingsGUI {
13 22
14 Q_OBJECT 23 Q_OBJECT
15 24
16public : 25public :
17 26
18 NetworkSettings( QWidget *parent=0, 27 NetworkSettings( QWidget *parent=0,
19 const char *name=0, 28 const char *name=0,
20 WFlags fl = 0 ); 29 WFlags fl = 0 );
21 virtual ~NetworkSettings( void ); 30 virtual ~NetworkSettings( void );
22 31
@@ -46,14 +55,14 @@ private :
46 55
47 void updateProfileState( QListBoxItem * it ); 56 void updateProfileState( QListBoxItem * it );
48 QTimer * UpdateTimer; 57 QTimer * UpdateTimer;
49 NetworkSettingsData NSD; 58 NetworkSettingsData NSD;
50 /* 59 /*
51 60
52 no leds : not present, unknown, unchecked or disabled 61 no leds : not present, unknown, unchecked or disabled
53 (1) down : hardware present but inactive 62 (1) down : hardware present but inactive
54 (2) available : hardware present and active 63 (2) available : hardware present and active
55 (3) up : present active and connected 64 (3) up : present active and connected
56 65
57 */ 66 */
58 OLedBox * Leds[3]; 67 Opie::Ui::OLedBox * Leds[3];
59}; 68};