summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui162
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp12
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h4
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp16
-rw-r--r--noncore/settings/networksettings2/cable/cable_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/irda/irda_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/lancard/lancard_NN.cpp2
-rw-r--r--noncore/settings/networksettings2/modem/modem_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/network/network_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/networksettings.pro2
-rw-r--r--noncore/settings/networksettings2/networksettings2/networksettings2.pro2
-rw-r--r--noncore/settings/networksettings2/nsdata.cpp14
-rw-r--r--noncore/settings/networksettings2/ppp/ppp_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/profile/profile_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/usb/usb_NN.cpp2
-rw-r--r--noncore/settings/networksettings2/vpn/vpn_NN.cpp4
-rw-r--r--noncore/settings/networksettings2/wlan/wlanGUI.ui165
-rw-r--r--noncore/settings/networksettings2/wlan/wlan_NN.cpp2
18 files changed, 228 insertions, 183 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
index ddb5ddd..498f50b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
@@ -11,8 +11,8 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>283</width> 14 <width>278</width>
15 <height>199</height> 15 <height>339</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
@@ -28,104 +28,144 @@
28 <vbox> 28 <vbox>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>2</number> 31 <number>0</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>2</number> 35 <number>0</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
38 <class>QLayoutWidget</class> 38 <class>QCheckBox</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>Layout4</cstring> 41 <cstring>AnyPAN_CB</cstring>
42 </property> 42 </property>
43 <hbox>
44 <property stdset="1">
45 <name>margin</name>
46 <number>0</number>
47 </property>
48 <property stdset="1">
49 <name>spacing</name>
50 <number>6</number>
51 </property>
52 <widget>
53 <class>QLabel</class>
54 <property stdset="1">
55 <name>name</name>
56 <cstring>TextLabel4</cstring>
57 </property>
58 <property stdset="1">
59 <name>text</name>
60 <string>Name</string>
61 </property>
62 </widget>
63 <widget>
64 <class>QLineEdit</class>
65 <property stdset="1">
66 <name>name</name>
67 <cstring>Name_LE</cstring>
68 </property>
69 </widget>
70 </hbox>
71 </widget>
72 <widget>
73 <class>QLabel</class>
74 <property stdset="1"> 43 <property stdset="1">
75 <name>name</name> 44 <name>text</name>
76 <cstring>TextLabel3</cstring> 45 <string>Any available PAN device</string>
77 </property> 46 </property>
78 <property stdset="1"> 47 <property stdset="1">
79 <name>text</name> 48 <name>checked</name>
80 <string>Description</string> 49 <bool>true</bool>
81 </property> 50 </property>
82 </widget> 51 </widget>
83 <widget> 52 <widget>
84 <class>QMultiLineEdit</class> 53 <class>QGroupBox</class>
85 <property stdset="1"> 54 <property stdset="1">
86 <name>name</name> 55 <name>name</name>
87 <cstring>Description_LE</cstring> 56 <cstring>GroupBox1</cstring>
88 </property> 57 </property>
89 </widget>
90 <widget>
91 <class>QLayoutWidget</class>
92 <property stdset="1"> 58 <property stdset="1">
93 <name>name</name> 59 <name>enabled</name>
94 <cstring>Layout5</cstring> 60 <bool>false</bool>
61 </property>
62 <property stdset="1">
63 <name>title</name>
64 <string>Select Card</string>
65 </property>
66 <property>
67 <name>layoutMargin</name>
95 </property> 68 </property>
96 <hbox> 69 <vbox>
97 <property stdset="1"> 70 <property stdset="1">
98 <name>margin</name> 71 <name>margin</name>
99 <number>0</number> 72 <number>5</number>
100 </property> 73 </property>
101 <property stdset="1"> 74 <property stdset="1">
102 <name>spacing</name> 75 <name>spacing</name>
103 <number>6</number> 76 <number>6</number>
104 </property> 77 </property>
105 <widget> 78 <widget>
106 <class>QCheckBox</class> 79 <class>QListView</class>
80 <column>
81 <property>
82 <name>text</name>
83 <string>BDAddress</string>
84 </property>
85 <property>
86 <name>clickable</name>
87 <bool>true</bool>
88 </property>
89 <property>
90 <name>resizeable</name>
91 <bool>true</bool>
92 </property>
93 </column>
107 <property stdset="1"> 94 <property stdset="1">
108 <name>name</name> 95 <name>name</name>
109 <cstring>Automatic_CB</cstring> 96 <cstring>BTPANServers_LV</cstring>
110 </property> 97 </property>
111 <property stdset="1"> 98 <property stdset="1">
112 <name>text</name> 99 <name>allColumnsShowFocus</name>
113 <string>Start automatically</string> 100 <bool>true</bool>
114 </property> 101 </property>
115 </widget> 102 </widget>
116 <widget> 103 <widget>
117 <class>QCheckBox</class> 104 <class>QLayoutWidget</class>
118 <property stdset="1"> 105 <property stdset="1">
119 <name>name</name> 106 <name>name</name>
120 <cstring>Confirm_CB</cstring> 107 <cstring>Layout2</cstring>
121 </property>
122 <property stdset="1">
123 <name>text</name>
124 <string>Confirm before start</string>
125 </property> 108 </property>
109 <hbox>
110 <property stdset="1">
111 <name>margin</name>
112 <number>0</number>
113 </property>
114 <property stdset="1">
115 <name>spacing</name>
116 <number>6</number>
117 </property>
118 <spacer>
119 <property>
120 <name>name</name>
121 <cstring>Spacer1</cstring>
122 </property>
123 <property stdset="1">
124 <name>orientation</name>
125 <enum>Horizontal</enum>
126 </property>
127 <property stdset="1">
128 <name>sizeType</name>
129 <enum>Expanding</enum>
130 </property>
131 <property>
132 <name>sizeHint</name>
133 <size>
134 <width>20</width>
135 <height>20</height>
136 </size>
137 </property>
138 </spacer>
139 <widget>
140 <class>QPushButton</class>
141 <property stdset="1">
142 <name>name</name>
143 <cstring>BTManager_BUT</cstring>
144 </property>
145 <property stdset="1">
146 <name>text</name>
147 <string>Rescan</string>
148 </property>
149 </widget>
150 </hbox>
126 </widget> 151 </widget>
127 </hbox> 152 </vbox>
128 </widget> 153 </widget>
129 </vbox> 154 </vbox>
130</widget> 155</widget>
156<connections>
157 <connection>
158 <sender>BTManager_BUT</sender>
159 <signal>clicked()</signal>
160 <receiver>BluetoothBNEP_FRM</receiver>
161 <slot>SLOT_StartBTMgr()</slot>
162 </connection>
163 <connection>
164 <sender>AnyPAN_CB</sender>
165 <signal>toggled(bool)</signal>
166 <receiver>GroupBox1</receiver>
167 <slot>setDisabled(bool)</slot>
168 </connection>
169 <slot access="public">SLOT_StartBTMgr()</slot>
170</connections>
131</UI> 171</UI>
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
index a27f1a7..9a3156b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
@@ -1,3 +1,5 @@
1#include <qtopia/qcopenvelope_qws.h>
2
1#include <GUIUtils.h> 3#include <GUIUtils.h>
2#include "bluetoothBNEPedit.h" 4#include "bluetoothBNEPedit.h"
3 5
@@ -10,9 +12,15 @@ QString BluetoothBNEPEdit::acceptable( void ) {
10 return QString(); 12 return QString();
11} 13}
12 14
13bool BluetoothBNEPEdit::commit( BluetoothBNEPData & Data ) { 15bool BluetoothBNEPEdit::commit( BluetoothBNEPData & ) {
14 return 0; 16 return 0;
15} 17}
16 18
17void BluetoothBNEPEdit::showData( BluetoothBNEPData & Data ) { 19void BluetoothBNEPEdit::showData( BluetoothBNEPData & ) {
20}
21
22void BluetoothBNEPEdit::SLOT_StartBTMgr( void ) {
23 QCopEnvelope e( "QPE/System", "execute(QString)" );
24 e << QString( "bluetooth-manager" );
25
18} 26}
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
index d546f1e..82d23ad 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
@@ -10,4 +10,8 @@ public :
10 QString acceptable( void ); 10 QString acceptable( void );
11 bool commit( BluetoothBNEPData & Data ); 11 bool commit( BluetoothBNEPData & Data );
12 void showData( BluetoothBNEPData & Data ); 12 void showData( BluetoothBNEPData & Data );
13
14public slots :
15
16 void SLOT_StartBTMgr( void );
13}; 17};
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index 1d0a0f7..b59b4f0 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -48,7 +48,7 @@ const char * BluetoothBNEPNetNode::provides( void ) {
48 48
49bool BluetoothBNEPNetNode::generateProperFilesFor( 49bool BluetoothBNEPNetNode::generateProperFilesFor(
50 ANetNodeInstance * ) { 50 ANetNodeInstance * ) {
51 return 1; 51 return 0;
52} 52}
53 53
54bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) { 54bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
@@ -56,9 +56,17 @@ bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
56} 56}
57 57
58bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 58bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile(
59 SystemFile & , 59 SystemFile & S ,
60 long ) { 60 long DevNr) {
61 return 1; 61 QString NIC = genNic( DevNr );
62
63 if( S.name() == "interfaces" ) {
64 // generate mapping stanza for this interface
65 S << "# check if " << NIC << " can be brought UP" << endl;
66 S << "mapping " << NIC << endl;
67 S << " script networksettings2-request" << endl << endl;
68 }
69 return 0;
62} 70}
63 71
64QString BluetoothBNEPNetNode::genNic( long nr ) { 72QString BluetoothBNEPNetNode::genNic( long nr ) {
diff --git a/noncore/settings/networksettings2/cable/cable_NN.cpp b/noncore/settings/networksettings2/cable/cable_NN.cpp
index e95b4f6..b8c690b 100644
--- a/noncore/settings/networksettings2/cable/cable_NN.cpp
+++ b/noncore/settings/networksettings2/cable/cable_NN.cpp
@@ -38,13 +38,13 @@ const char * CableNetNode::provides( void ) {
38 38
39bool CableNetNode::generateProperFilesFor( 39bool CableNetNode::generateProperFilesFor(
40 ANetNodeInstance * ) { 40 ANetNodeInstance * ) {
41 return 1; 41 return 0;
42} 42}
43 43
44bool CableNetNode::generateDeviceDataForCommonFile( 44bool CableNetNode::generateDeviceDataForCommonFile(
45 SystemFile & , 45 SystemFile & ,
46 long ) { 46 long ) {
47 return 1; 47 return 0;
48} 48}
49 49
50void CableNetNode::setSpecificAttribute( QString & , QString & ) { 50void CableNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/irda/irda_NN.cpp b/noncore/settings/networksettings2/irda/irda_NN.cpp
index f2fda5c..49bc06e 100644
--- a/noncore/settings/networksettings2/irda/irda_NN.cpp
+++ b/noncore/settings/networksettings2/irda/irda_NN.cpp
@@ -38,13 +38,13 @@ const char * IRDANetNode::provides( void ) {
38 38
39bool IRDANetNode::generateProperFilesFor( 39bool IRDANetNode::generateProperFilesFor(
40 ANetNodeInstance * ) { 40 ANetNodeInstance * ) {
41 return 1; 41 return 0;
42} 42}
43 43
44bool IRDANetNode::generateDeviceDataForCommonFile( 44bool IRDANetNode::generateDeviceDataForCommonFile(
45 SystemFile & , 45 SystemFile & ,
46 long ) { 46 long ) {
47 return 1; 47 return 0;
48} 48}
49 49
50void IRDANetNode::setSpecificAttribute( QString & , QString & ) { 50void IRDANetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/lancard/lancard_NN.cpp b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
index a4afab1..05cd06d 100644
--- a/noncore/settings/networksettings2/lancard/lancard_NN.cpp
+++ b/noncore/settings/networksettings2/lancard/lancard_NN.cpp
@@ -40,7 +40,7 @@ const char * LanCardNetNode::provides( void ) {
40 40
41bool LanCardNetNode::generateProperFilesFor( 41bool LanCardNetNode::generateProperFilesFor(
42 ANetNodeInstance * ) { 42 ANetNodeInstance * ) {
43 return 1; 43 return 0;
44} 44}
45 45
46bool LanCardNetNode::hasDataFor( const QString & S ) { 46bool LanCardNetNode::hasDataFor( const QString & S ) {
diff --git a/noncore/settings/networksettings2/modem/modem_NN.cpp b/noncore/settings/networksettings2/modem/modem_NN.cpp
index 9d70d7a..18aa480 100644
--- a/noncore/settings/networksettings2/modem/modem_NN.cpp
+++ b/noncore/settings/networksettings2/modem/modem_NN.cpp
@@ -39,13 +39,13 @@ const char * ModemNetNode::provides( void ) {
39 39
40bool ModemNetNode::generateProperFilesFor( 40bool ModemNetNode::generateProperFilesFor(
41 ANetNodeInstance * ) { 41 ANetNodeInstance * ) {
42 return 1; 42 return 0;
43} 43}
44 44
45bool ModemNetNode::generateDeviceDataForCommonFile( 45bool ModemNetNode::generateDeviceDataForCommonFile(
46 SystemFile & , 46 SystemFile & ,
47 long ) { 47 long ) {
48 return 1; 48 return 0;
49} 49}
50 50
51void ModemNetNode::setSpecificAttribute( QString & , QString & ) { 51void ModemNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/network/network_NN.cpp b/noncore/settings/networksettings2/network/network_NN.cpp
index b5989df..b4313c4 100644
--- a/noncore/settings/networksettings2/network/network_NN.cpp
+++ b/noncore/settings/networksettings2/network/network_NN.cpp
@@ -40,13 +40,13 @@ const char * NetworkNetNode::provides( void ) {
40 40
41bool NetworkNetNode::generateProperFilesFor( 41bool NetworkNetNode::generateProperFilesFor(
42 ANetNodeInstance * ) { 42 ANetNodeInstance * ) {
43 return 1; 43 return 0;
44} 44}
45 45
46bool NetworkNetNode::generateDeviceDataForCommonFile( 46bool NetworkNetNode::generateDeviceDataForCommonFile(
47 SystemFile & , 47 SystemFile & ,
48 long ) { 48 long ) {
49 return 1; 49 return 0;
50} 50}
51 51
52void NetworkNetNode::setSpecificAttribute( QString & , QString & ) { 52void NetworkNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/networksettings.pro b/noncore/settings/networksettings2/networksettings.pro
index 34b9cde..ff147b1 100644
--- a/noncore/settings/networksettings2/networksettings.pro
+++ b/noncore/settings/networksettings2/networksettings.pro
@@ -11,7 +11,7 @@ SOURCES = main.cpp \
11 editconnection.cpp 11 editconnection.cpp
12INCLUDEPATH += $(OPIEDIR)/include networksettings2/ 12INCLUDEPATH += $(OPIEDIR)/include networksettings2/
13DEPENDPATH += $(OPIEDIR)/include networksettings2/ 13DEPENDPATH += $(OPIEDIR)/include networksettings2/
14LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopie 14LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings2 -lnetworksettings2 -lopiecore2
15INTERFACES = networksettingsGUI.ui \ 15INTERFACES = networksettingsGUI.ui \
16 editconnectionGUI.ui \ 16 editconnectionGUI.ui \
17 activateprofileGUI.ui 17 activateprofileGUI.ui
diff --git a/noncore/settings/networksettings2/networksettings2/networksettings2.pro b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
index c9945ff..11b5f84 100644
--- a/noncore/settings/networksettings2/networksettings2/networksettings2.pro
+++ b/noncore/settings/networksettings2/networksettings2/networksettings2.pro
@@ -18,7 +18,7 @@ SOURCES = netnode.cpp \
18 resources.cpp 18 resources.cpp
19 INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 19 INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2
20 DEPENDPATH+= $(OPIEDIR)/include 20 DEPENDPATH+= $(OPIEDIR)/include
21LIBS += -lqpe -lopie 21LIBS += -lqpe -lopiecore2
22 INTERFACES= 22 INTERFACES=
23 TARGET = networksettings2 23 TARGET = networksettings2
24 VERSION = 1.0.0 24 VERSION = 1.0.0
diff --git a/noncore/settings/networksettings2/nsdata.cpp b/noncore/settings/networksettings2/nsdata.cpp
index 64b83f7..bb37f10 100644
--- a/noncore/settings/networksettings2/nsdata.cpp
+++ b/noncore/settings/networksettings2/nsdata.cpp
@@ -302,7 +302,7 @@ QString NetworkSettingsData::generateSettings( bool ForceReq ) {
302 NNI = NNIIt.current(); 302 NNI = NNIIt.current();
303 303
304 if( ForceIt || NNI->isModified() ) { 304 if( ForceIt || NNI->isModified() ) {
305 if( ! NNI->nodeClass()->generateProperFilesFor( NNI ) ) { 305 if( NNI->nodeClass()->generateProperFilesFor( NNI ) ) {
306 // problem generating 306 // problem generating
307 S = qApp->translate( "NetworkSettings", 307 S = qApp->translate( "NetworkSettings",
308 "<p>Cannot generate files proper to \"%1\"</p>" ). 308 "<p>Cannot generate files proper to \"%1\"</p>" ).
@@ -494,7 +494,7 @@ QString NetworkSettingsData::generateSystemFileNode(
494 494
495 if( SF.preDeviceSection( CurDevNN ) ) { 495 if( SF.preDeviceSection( CurDevNN ) ) {
496 S = qApp->translate( "NetworkSettings", 496 S = qApp->translate( "NetworkSettings",
497 "<p>Error in preDeviceSection for file \"%1\" and nodetype \"%2\"</p>" ). 497 "<p>Error in \"Pre-Device Part\" for file \"%1\" and nodetype \"%2\"</p>" ).
498 arg( SF.name() ). 498 arg( SF.name() ).
499 arg( CurDevNN->name() ); 499 arg( CurDevNN->name() );
500 return S; 500 return S;
@@ -503,7 +503,7 @@ QString NetworkSettingsData::generateSystemFileNode(
503 if( CurDevNN->hasDataFor( SF.name() ) ) { 503 if( CurDevNN->hasDataFor( SF.name() ) ) {
504 if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) { 504 if( CurDevNN->generateDeviceDataForCommonFile( SF, DevInstNr ) ) {
505 S = qApp->translate( "NetworkSettings", 505 S = qApp->translate( "NetworkSettings",
506 "<p>Error in node Device part for file \"%1\" and node \"%2\"</p>" ). 506 "<p>Error in \"Device Part\" for file \"%1\" and node \"%2\"</p>" ).
507 arg( SF.name() ). 507 arg( SF.name() ).
508 arg( CurDevNN->name() ); 508 arg( CurDevNN->name() );
509 return S; 509 return S;
@@ -537,7 +537,7 @@ QString NetworkSettingsData::generateSystemFileNode(
537 // generate 'entry' 537 // generate 'entry'
538 if( SF.preNodeSection( DevNNI, DevInstNr ) ) { 538 if( SF.preNodeSection( DevNNI, DevInstNr ) ) {
539 S = qApp->translate( "NetworkSettings", 539 S = qApp->translate( "NetworkSettings",
540 "<p>Error in preNodeSection for file \"%1\" and node \"%2\"</p>" ). 540 "<p>Error in \"Pre-Node Part\" for file \"%1\" and node \"%2\"</p>" ).
541 arg( SF.name() ). 541 arg( SF.name() ).
542 arg( CurDevNN->name() ); 542 arg( CurDevNN->name() );
543 return S; 543 return S;
@@ -552,7 +552,7 @@ QString NetworkSettingsData::generateSystemFileNode(
552 if( NNI->hasDataFor( SF.name() ) ) { 552 if( NNI->hasDataFor( SF.name() ) ) {
553 if( NNI->generateDataForCommonFile(SF,DevInstNr) ) { 553 if( NNI->generateDataForCommonFile(SF,DevInstNr) ) {
554 S = qApp->translate( "NetworkSettings", 554 S = qApp->translate( "NetworkSettings",
555 "<p>Error in node part for file \"%1\" and node \"%2\"</p>" ). 555 "<p>Error in \"Node Part\" for file \"%1\" and node \"%2\"</p>" ).
556 arg( SF.name() ). 556 arg( SF.name() ).
557 arg( NNI->nodeClass()->name() ); 557 arg( NNI->nodeClass()->name() );
558 return S; 558 return S;
@@ -562,7 +562,7 @@ QString NetworkSettingsData::generateSystemFileNode(
562 562
563 if( SF.postNodeSection( DevNNI, DevInstNr ) ) { 563 if( SF.postNodeSection( DevNNI, DevInstNr ) ) {
564 S = qApp->translate( "NetworkSettings", 564 S = qApp->translate( "NetworkSettings",
565 "<p>Error in postNodeSection for file \"%1\" and node \"%2\"</p>" ). 565 "<p>Error in \"Post-Node Part\" for file \"%1\" and node \"%2\"</p>" ).
566 arg( SF.name() ). 566 arg( SF.name() ).
567 arg( CurDevNN->name() ); 567 arg( CurDevNN->name() );
568 return S; 568 return S;
@@ -572,7 +572,7 @@ QString NetworkSettingsData::generateSystemFileNode(
572 572
573 if( SF.postDeviceSection( CurDevNN ) ) { 573 if( SF.postDeviceSection( CurDevNN ) ) {
574 S = qApp->translate( "NetworkSettings", 574 S = qApp->translate( "NetworkSettings",
575 "<p>Error in postDeviceSection for file \"%1\" and node \"%2\"</p>" ). 575 "<p>Error in \"Post-Device Part\" for file \"%1\" and node \"%2\"</p>" ).
576 arg( SF.name() ). 576 arg( SF.name() ).
577 arg( CurDevNN->name() ); 577 arg( CurDevNN->name() );
578 return S; 578 return S;
diff --git a/noncore/settings/networksettings2/ppp/ppp_NN.cpp b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
index 208c7c2..b7edf87 100644
--- a/noncore/settings/networksettings2/ppp/ppp_NN.cpp
+++ b/noncore/settings/networksettings2/ppp/ppp_NN.cpp
@@ -41,13 +41,13 @@ const char * PPPNetNode::provides( void ) {
41 41
42bool PPPNetNode::generateProperFilesFor( 42bool PPPNetNode::generateProperFilesFor(
43 ANetNodeInstance * ) { 43 ANetNodeInstance * ) {
44 return 1; 44 return 0;
45} 45}
46 46
47bool PPPNetNode::generateDeviceDataForCommonFile( 47bool PPPNetNode::generateDeviceDataForCommonFile(
48 SystemFile & , 48 SystemFile & ,
49 long ) { 49 long ) {
50 return 1; 50 return 0;
51} 51}
52 52
53QString PPPNetNode::genNic( long NicNr ) { 53QString PPPNetNode::genNic( long NicNr ) {
diff --git a/noncore/settings/networksettings2/profile/profile_NN.cpp b/noncore/settings/networksettings2/profile/profile_NN.cpp
index d06b7ef..59c34a3 100644
--- a/noncore/settings/networksettings2/profile/profile_NN.cpp
+++ b/noncore/settings/networksettings2/profile/profile_NN.cpp
@@ -40,13 +40,13 @@ const char * ProfileNetNode::provides( void ) {
40 40
41bool ProfileNetNode::generateProperFilesFor( 41bool ProfileNetNode::generateProperFilesFor(
42 ANetNodeInstance * ) { 42 ANetNodeInstance * ) {
43 return 1; 43 return 0;
44} 44}
45 45
46bool ProfileNetNode::generateDeviceDataForCommonFile( 46bool ProfileNetNode::generateDeviceDataForCommonFile(
47 SystemFile & , 47 SystemFile & ,
48 long ) { 48 long ) {
49 return 1; 49 return 0;
50} 50}
51 51
52void ProfileNetNode::setSpecificAttribute( QString & , QString & ) { 52void ProfileNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/usb/usb_NN.cpp b/noncore/settings/networksettings2/usb/usb_NN.cpp
index 9101490..c10a09c 100644
--- a/noncore/settings/networksettings2/usb/usb_NN.cpp
+++ b/noncore/settings/networksettings2/usb/usb_NN.cpp
@@ -39,7 +39,7 @@ const char * USBNetNode::provides( void ) {
39 39
40bool USBNetNode::generateProperFilesFor( 40bool USBNetNode::generateProperFilesFor(
41 ANetNodeInstance * ) { 41 ANetNodeInstance * ) {
42 return 1; 42 return 0;
43} 43}
44 44
45bool USBNetNode::hasDataFor( const QString & S ) { 45bool USBNetNode::hasDataFor( const QString & S ) {
diff --git a/noncore/settings/networksettings2/vpn/vpn_NN.cpp b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
index bfc30f9..6c7b308 100644
--- a/noncore/settings/networksettings2/vpn/vpn_NN.cpp
+++ b/noncore/settings/networksettings2/vpn/vpn_NN.cpp
@@ -40,13 +40,13 @@ const char * VPNNetNode::provides( void ) {
40 40
41bool VPNNetNode::generateProperFilesFor( 41bool VPNNetNode::generateProperFilesFor(
42 ANetNodeInstance * ) { 42 ANetNodeInstance * ) {
43 return 1; 43 return 0;
44} 44}
45 45
46bool VPNNetNode::generateDeviceDataForCommonFile( 46bool VPNNetNode::generateDeviceDataForCommonFile(
47 SystemFile & , 47 SystemFile & ,
48 long ) { 48 long ) {
49 return 1; 49 return 0;
50} 50}
51 51
52void VPNNetNode::setSpecificAttribute( QString & , QString & ) { 52void VPNNetNode::setSpecificAttribute( QString & , QString & ) {
diff --git a/noncore/settings/networksettings2/wlan/wlanGUI.ui b/noncore/settings/networksettings2/wlan/wlanGUI.ui
index 23d6f86..9614369 100644
--- a/noncore/settings/networksettings2/wlan/wlanGUI.ui
+++ b/noncore/settings/networksettings2/wlan/wlanGUI.ui
@@ -11,7 +11,7 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>196</width> 14 <width>192</width>
15 <height>329</height> 15 <height>329</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -38,7 +38,7 @@
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>tabWidget</cstring> 41 <cstring>WLan_TAB</cstring>
42 </property> 42 </property>
43 <property stdset="1"> 43 <property stdset="1">
44 <name>enabled</name> 44 <name>enabled</name>
@@ -119,7 +119,7 @@
119 </item> 119 </item>
120 <property stdset="1"> 120 <property stdset="1">
121 <name>name</name> 121 <name>name</name>
122 <cstring>essid</cstring> 122 <cstring>ESSID_CB</cstring>
123 </property> 123 </property>
124 <property stdset="1"> 124 <property stdset="1">
125 <name>sizePolicy</name> 125 <name>sizePolicy</name>
@@ -199,7 +199,7 @@
199 </item> 199 </item>
200 <property stdset="1"> 200 <property stdset="1">
201 <name>name</name> 201 <name>name</name>
202 <cstring>mode</cstring> 202 <cstring>Mode_CB</cstring>
203 </property> 203 </property>
204 <property stdset="1"> 204 <property stdset="1">
205 <name>enabled</name> 205 <name>enabled</name>
@@ -240,7 +240,7 @@
240 <class>QCheckBox</class> 240 <class>QCheckBox</class>
241 <property stdset="1"> 241 <property stdset="1">
242 <name>name</name> 242 <name>name</name>
243 <cstring>specifyAp</cstring> 243 <cstring>SpecifyAP_CB</cstring>
244 </property> 244 </property>
245 <property stdset="1"> 245 <property stdset="1">
246 <name>text</name> 246 <name>text</name>
@@ -273,7 +273,7 @@
273 <class>QLineEdit</class> 273 <class>QLineEdit</class>
274 <property stdset="1"> 274 <property stdset="1">
275 <name>name</name> 275 <name>name</name>
276 <cstring>macEdit</cstring> 276 <cstring>APMac_LE</cstring>
277 </property> 277 </property>
278 <property stdset="1"> 278 <property stdset="1">
279 <name>enabled</name> 279 <name>enabled</name>
@@ -332,7 +332,7 @@
332 <class>QCheckBox</class> 332 <class>QCheckBox</class>
333 <property stdset="1"> 333 <property stdset="1">
334 <name>name</name> 334 <name>name</name>
335 <cstring>specifyChan</cstring> 335 <cstring>SpecifyChannel_CB</cstring>
336 </property> 336 </property>
337 <property stdset="1"> 337 <property stdset="1">
338 <name>text</name> 338 <name>text</name>
@@ -343,7 +343,7 @@
343 <class>QSpinBox</class> 343 <class>QSpinBox</class>
344 <property stdset="1"> 344 <property stdset="1">
345 <name>name</name> 345 <name>name</name>
346 <cstring>networkChannel</cstring> 346 <cstring>ChannelNr_SB</cstring>
347 </property> 347 </property>
348 <property stdset="1"> 348 <property stdset="1">
349 <name>enabled</name> 349 <name>enabled</name>
@@ -400,7 +400,7 @@
400 <vbox> 400 <vbox>
401 <property stdset="1"> 401 <property stdset="1">
402 <name>margin</name> 402 <name>margin</name>
403 <number>0</number> 403 <number>2</number>
404 </property> 404 </property>
405 <property stdset="1"> 405 <property stdset="1">
406 <name>spacing</name> 406 <name>spacing</name>
@@ -410,7 +410,7 @@
410 <class>QCheckBox</class> 410 <class>QCheckBox</class>
411 <property stdset="1"> 411 <property stdset="1">
412 <name>name</name> 412 <name>name</name>
413 <cstring>wepEnabled</cstring> 413 <cstring>EnableWEB_CB</cstring>
414 </property> 414 </property>
415 <property stdset="1"> 415 <property stdset="1">
416 <name>text</name> 416 <name>text</name>
@@ -450,7 +450,7 @@
450 <class>QRadioButton</class> 450 <class>QRadioButton</class>
451 <property stdset="1"> 451 <property stdset="1">
452 <name>name</name> 452 <name>name</name>
453 <cstring>keyRadio0</cstring> 453 <cstring>Key1_RB</cstring>
454 </property> 454 </property>
455 <property stdset="1"> 455 <property stdset="1">
456 <name>text</name> 456 <name>text</name>
@@ -465,7 +465,7 @@
465 <class>QRadioButton</class> 465 <class>QRadioButton</class>
466 <property stdset="1"> 466 <property stdset="1">
467 <name>name</name> 467 <name>name</name>
468 <cstring>keyRadio3</cstring> 468 <cstring>Key4_RB</cstring>
469 </property> 469 </property>
470 <property stdset="1"> 470 <property stdset="1">
471 <name>text</name> 471 <name>text</name>
@@ -476,14 +476,18 @@
476 <class>QLineEdit</class> 476 <class>QLineEdit</class>
477 <property stdset="1"> 477 <property stdset="1">
478 <name>name</name> 478 <name>name</name>
479 <cstring>LineEdit6</cstring> 479 <cstring>Key1_LE</cstring>
480 </property>
481 <property stdset="1">
482 <name>frame</name>
483 <bool>true</bool>
480 </property> 484 </property>
481 </widget> 485 </widget>
482 <widget row="1" column="0" > 486 <widget row="1" column="0" >
483 <class>QRadioButton</class> 487 <class>QRadioButton</class>
484 <property stdset="1"> 488 <property stdset="1">
485 <name>name</name> 489 <name>name</name>
486 <cstring>keyRadio1</cstring> 490 <cstring>Key2_RB</cstring>
487 </property> 491 </property>
488 <property stdset="1"> 492 <property stdset="1">
489 <name>text</name> 493 <name>text</name>
@@ -494,7 +498,7 @@
494 <class>QRadioButton</class> 498 <class>QRadioButton</class>
495 <property stdset="1"> 499 <property stdset="1">
496 <name>name</name> 500 <name>name</name>
497 <cstring>keyRadio2</cstring> 501 <cstring>Key3_RB</cstring>
498 </property> 502 </property>
499 <property stdset="1"> 503 <property stdset="1">
500 <name>text</name> 504 <name>text</name>
@@ -505,90 +509,39 @@
505 <class>QLineEdit</class> 509 <class>QLineEdit</class>
506 <property stdset="1"> 510 <property stdset="1">
507 <name>name</name> 511 <name>name</name>
508 <cstring>LineEdit6_2</cstring> 512 <cstring>Key2_LE</cstring>
509 </property> 513 </property>
510 </widget> 514 </widget>
511 <widget row="3" column="1" > 515 <widget row="3" column="1" >
512 <class>QLineEdit</class> 516 <class>QLineEdit</class>
513 <property stdset="1"> 517 <property stdset="1">
514 <name>name</name> 518 <name>name</name>
515 <cstring>LineEdit6_4</cstring> 519 <cstring>Key4_LE</cstring>
516 </property> 520 </property>
517 </widget> 521 </widget>
518 <widget row="2" column="1" > 522 <widget row="2" column="1" >
519 <class>QLineEdit</class> 523 <class>QLineEdit</class>
520 <property stdset="1"> 524 <property stdset="1">
521 <name>name</name> 525 <name>name</name>
522 <cstring>LineEdit6_3</cstring> 526 <cstring>Key3_LE</cstring>
523 </property> 527 </property>
524 </widget> 528 </widget>
525 </grid> 529 </grid>
526 </widget> 530 </widget>
527 <widget> 531 <widget>
528 <class>QButtonGroup</class> 532 <class>QCheckBox</class>
529 <property stdset="1"> 533 <property stdset="1">
530 <name>name</name> 534 <name>name</name>
531 <cstring>NonEncButtonGroup</cstring> 535 <cstring>CheckBox4</cstring>
532 </property> 536 </property>
533 <property stdset="1"> 537 <property stdset="1">
534 <name>enabled</name> 538 <name>enabled</name>
535 <bool>false</bool> 539 <bool>false</bool>
536 </property> 540 </property>
537 <property stdset="1"> 541 <property stdset="1">
538 <name>title</name> 542 <name>text</name>
539 <string>Non-encrypted Packets</string> 543 <string>Accept Non-Encrypted packets</string>
540 </property>
541 <property stdset="1">
542 <name>radioButtonExclusive</name>
543 <bool>true</bool>
544 </property>
545 <property>
546 <name>layoutMargin</name>
547 </property> 544 </property>
548 <grid>
549 <property stdset="1">
550 <name>margin</name>
551 <number>2</number>
552 </property>
553 <property stdset="1">
554 <name>spacing</name>
555 <number>6</number>
556 </property>
557 <widget row="0" column="0" >
558 <class>QRadioButton</class>
559 <property stdset="1">
560 <name>name</name>
561 <cstring>acceptNonEnc</cstring>
562 </property>
563 <property stdset="1">
564 <name>text</name>
565 <string>&amp;Accept</string>
566 </property>
567 <property stdset="1">
568 <name>checked</name>
569 <bool>true</bool>
570 </property>
571 <property stdset="1">
572 <name>buttonGroupId</name>
573 <number>0</number>
574 </property>
575 </widget>
576 <widget row="0" column="1" >
577 <class>QRadioButton</class>
578 <property stdset="1">
579 <name>name</name>
580 <cstring>rejectNonEnc</cstring>
581 </property>
582 <property stdset="1">
583 <name>text</name>
584 <string>&amp;Reject</string>
585 </property>
586 <property stdset="1">
587 <name>buttonGroupId</name>
588 <number>1</number>
589 </property>
590 </widget>
591 </grid>
592 </widget> 545 </widget>
593 <spacer> 546 <spacer>
594 <property> 547 <property>
@@ -673,7 +626,11 @@
673 </property> 626 </property>
674 <property stdset="1"> 627 <property stdset="1">
675 <name>frameShadow</name> 628 <name>frameShadow</name>
676 <enum>Sunken</enum> 629 <enum>Plain</enum>
630 </property>
631 <property stdset="1">
632 <name>indent</name>
633 <number>0</number>
677 </property> 634 </property>
678 </widget> 635 </widget>
679 <widget row="3" column="0" > 636 <widget row="3" column="0" >
@@ -732,7 +689,11 @@
732 </property> 689 </property>
733 <property stdset="1"> 690 <property stdset="1">
734 <name>frameShadow</name> 691 <name>frameShadow</name>
735 <enum>Sunken</enum> 692 <enum>Plain</enum>
693 </property>
694 <property stdset="1">
695 <name>indent</name>
696 <number>0</number>
736 </property> 697 </property>
737 </widget> 698 </widget>
738 <widget row="5" column="1" > 699 <widget row="5" column="1" >
@@ -754,7 +715,11 @@
754 </property> 715 </property>
755 <property stdset="1"> 716 <property stdset="1">
756 <name>frameShadow</name> 717 <name>frameShadow</name>
757 <enum>Sunken</enum> 718 <enum>Plain</enum>
719 </property>
720 <property stdset="1">
721 <name>indent</name>
722 <number>0</number>
758 </property> 723 </property>
759 </widget> 724 </widget>
760 <widget row="5" column="0" > 725 <widget row="5" column="0" >
@@ -780,14 +745,18 @@
780 </property> 745 </property>
781 <property stdset="1"> 746 <property stdset="1">
782 <name>frameShadow</name> 747 <name>frameShadow</name>
783 <enum>Sunken</enum> 748 <enum>Plain</enum>
749 </property>
750 <property stdset="1">
751 <name>indent</name>
752 <number>0</number>
784 </property> 753 </property>
785 </widget> 754 </widget>
786 <widget row="1" column="1" > 755 <widget row="1" column="1" >
787 <class>QLabel</class> 756 <class>QLabel</class>
788 <property stdset="1"> 757 <property stdset="1">
789 <name>name</name> 758 <name>name</name>
790 <cstring>essidLabel_3</cstring> 759 <cstring>ESSID_LBL</cstring>
791 </property> 760 </property>
792 <property stdset="1"> 761 <property stdset="1">
793 <name>frameShape</name> 762 <name>frameShape</name>
@@ -795,14 +764,18 @@
795 </property> 764 </property>
796 <property stdset="1"> 765 <property stdset="1">
797 <name>frameShadow</name> 766 <name>frameShadow</name>
798 <enum>Sunken</enum> 767 <enum>Plain</enum>
768 </property>
769 <property stdset="1">
770 <name>indent</name>
771 <number>0</number>
799 </property> 772 </property>
800 </widget> 773 </widget>
801 <widget row="2" column="1" > 774 <widget row="2" column="1" >
802 <class>QLabel</class> 775 <class>QLabel</class>
803 <property stdset="1"> 776 <property stdset="1">
804 <name>name</name> 777 <name>name</name>
805 <cstring>modeLabel_3</cstring> 778 <cstring>Mode_LBL</cstring>
806 </property> 779 </property>
807 <property stdset="1"> 780 <property stdset="1">
808 <name>frameShape</name> 781 <name>frameShape</name>
@@ -810,7 +783,11 @@
810 </property> 783 </property>
811 <property stdset="1"> 784 <property stdset="1">
812 <name>frameShadow</name> 785 <name>frameShadow</name>
813 <enum>Sunken</enum> 786 <enum>Plain</enum>
787 </property>
788 <property stdset="1">
789 <name>indent</name>
790 <number>0</number>
814 </property> 791 </property>
815 </widget> 792 </widget>
816 </grid> 793 </grid>
@@ -923,6 +900,14 @@
923 <cstring>Signal_PB</cstring> 900 <cstring>Signal_PB</cstring>
924 </property> 901 </property>
925 <property stdset="1"> 902 <property stdset="1">
903 <name>frameShadow</name>
904 <enum>Plain</enum>
905 </property>
906 <property stdset="1">
907 <name>lineWidth</name>
908 <number>1</number>
909 </property>
910 <property stdset="1">
926 <name>progress</name> 911 <name>progress</name>
927 <number>0</number> 912 <number>0</number>
928 </property> 913 </property>
@@ -957,33 +942,33 @@
957</widget> 942</widget>
958<connections> 943<connections>
959 <connection> 944 <connection>
960 <sender>wepEnabled</sender> 945 <sender>EnableWEB_CB</sender>
961 <signal>toggled(bool)</signal> 946 <signal>toggled(bool)</signal>
962 <receiver>KeyButtonGroup</receiver> 947 <receiver>KeyButtonGroup</receiver>
963 <slot>setEnabled(bool)</slot> 948 <slot>setEnabled(bool)</slot>
964 </connection> 949 </connection>
965 <connection> 950 <connection>
966 <sender>wepEnabled</sender> 951 <sender>SpecifyAP_CB</sender>
967 <signal>toggled(bool)</signal> 952 <signal>toggled(bool)</signal>
968 <receiver>NonEncButtonGroup</receiver> 953 <receiver>APMac_LE</receiver>
969 <slot>setEnabled(bool)</slot> 954 <slot>setEnabled(bool)</slot>
970 </connection> 955 </connection>
971 <connection> 956 <connection>
972 <sender>specifyAp</sender> 957 <sender>SpecifyAP_CB</sender>
973 <signal>toggled(bool)</signal> 958 <signal>toggled(bool)</signal>
974 <receiver>macEdit</receiver> 959 <receiver>macLabel</receiver>
975 <slot>setEnabled(bool)</slot> 960 <slot>setEnabled(bool)</slot>
976 </connection> 961 </connection>
977 <connection> 962 <connection>
978 <sender>specifyAp</sender> 963 <sender>SpecifyChannel_CB</sender>
979 <signal>toggled(bool)</signal> 964 <signal>toggled(bool)</signal>
980 <receiver>macLabel</receiver> 965 <receiver>ChannelNr_SB</receiver>
981 <slot>setEnabled(bool)</slot> 966 <slot>setEnabled(bool)</slot>
982 </connection> 967 </connection>
983 <connection> 968 <connection>
984 <sender>specifyChan</sender> 969 <sender>EnableWEB_CB</sender>
985 <signal>toggled(bool)</signal> 970 <signal>toggled(bool)</signal>
986 <receiver>networkChannel</receiver> 971 <receiver>CheckBox4</receiver>
987 <slot>setEnabled(bool)</slot> 972 <slot>setEnabled(bool)</slot>
988 </connection> 973 </connection>
989</connections> 974</connections>
diff --git a/noncore/settings/networksettings2/wlan/wlan_NN.cpp b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
index 7a2c1a7..ce8a734 100644
--- a/noncore/settings/networksettings2/wlan/wlan_NN.cpp
+++ b/noncore/settings/networksettings2/wlan/wlan_NN.cpp
@@ -40,7 +40,7 @@ const char * WLanNetNode::provides( void ) {
40 40
41bool WLanNetNode::generateProperFilesFor( 41bool WLanNetNode::generateProperFilesFor(
42 ANetNodeInstance * ) { 42 ANetNodeInstance * ) {
43 return 1; 43 return 0;
44} 44}
45 45
46bool WLanNetNode::hasDataFor( const QString & S ) { 46bool WLanNetNode::hasDataFor( const QString & S ) {