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
@@ -1,131 +1,171 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>BluetoothBNEPGUI</class> 2<class>BluetoothBNEPGUI</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>BluetoothBNEP_FRM</cstring> 7 <cstring>BluetoothBNEP_FRM</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
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">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Bluetooth-bnep</string> 20 <string>Bluetooth-bnep</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
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,18 +1,26 @@
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
4 6
5BluetoothBNEPEdit::BluetoothBNEPEdit( QWidget * Parent ) : BluetoothBNEPGUI( Parent ){ 7BluetoothBNEPEdit::BluetoothBNEPEdit( QWidget * Parent ) : BluetoothBNEPGUI( Parent ){
6 8
7} 9}
8 10
9QString BluetoothBNEPEdit::acceptable( void ) { 11QString 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
@@ -1,13 +1,17 @@
1#include "bluetoothBNEPdata.h" 1#include "bluetoothBNEPdata.h"
2#include "bluetoothBNEPGUI.h" 2#include "bluetoothBNEPGUI.h"
3 3
4class BluetoothBNEPEdit : public BluetoothBNEPGUI { 4class BluetoothBNEPEdit : public BluetoothBNEPGUI {
5 5
6public : 6public :
7 7
8 BluetoothBNEPEdit( QWidget * parent ); 8 BluetoothBNEPEdit( QWidget * parent );
9 9
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
@@ -1,145 +1,153 @@
1#include "bluetooth_NN.h" 1#include "bluetooth_NN.h"
2#include "bluetoothBNEP_NNI.h" 2#include "bluetoothBNEP_NNI.h"
3#include "bluetoothRFCOMM_NNI.h" 3#include "bluetoothRFCOMM_NNI.h"
4 4
5// 5//
6// 6//
7// BLUETOOTH PAN/NAP node 7// BLUETOOTH PAN/NAP node
8// 8//
9// 9//
10 10
11static const char * BluetoothBNEPNeeds[] = 11static const char * BluetoothBNEPNeeds[] =
12 { 0 12 { 0
13 }; 13 };
14 14
15/** 15/**
16 * Constructor, find all of the possible interfaces 16 * Constructor, find all of the possible interfaces
17 */ 17 */
18BluetoothBNEPNetNode::BluetoothBNEPNetNode() : 18BluetoothBNEPNetNode::BluetoothBNEPNetNode() :
19 ANetNode(tr("Bluetooth PAN/NAP")) { 19 ANetNode(tr("Bluetooth PAN/NAP")) {
20 InstanceCount = 7; // default 20 InstanceCount = 7; // default
21} 21}
22 22
23/** 23/**
24 * Delete any interfaces that we own. 24 * Delete any interfaces that we own.
25 */ 25 */
26BluetoothBNEPNetNode::~BluetoothBNEPNetNode(){ 26BluetoothBNEPNetNode::~BluetoothBNEPNetNode(){
27} 27}
28 28
29const QString BluetoothBNEPNetNode::nodeDescription(){ 29const QString BluetoothBNEPNetNode::nodeDescription(){
30 return tr("\ 30 return tr("\
31<p>Sets up a bluetooth link using the bluetooth Network profile.</p>\ 31<p>Sets up a bluetooth link using the bluetooth Network profile.</p>\
32<p>Use this to connect two computing devices.</p>\ 32<p>Use this to connect two computing devices.</p>\
33" 33"
34); 34);
35} 35}
36 36
37ANetNodeInstance * BluetoothBNEPNetNode::createInstance( void ) { 37ANetNodeInstance * BluetoothBNEPNetNode::createInstance( void ) {
38 return new ABluetoothBNEP( this ); 38 return new ABluetoothBNEP( this );
39} 39}
40 40
41const char ** BluetoothBNEPNetNode::needs( void ) { 41const char ** BluetoothBNEPNetNode::needs( void ) {
42 return BluetoothBNEPNeeds; 42 return BluetoothBNEPNeeds;
43} 43}
44 44
45const char * BluetoothBNEPNetNode::provides( void ) { 45const char * BluetoothBNEPNetNode::provides( void ) {
46 return "device"; 46 return "device";
47} 47}
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 ) {
55 return S == "interfaces"; 55 return S == "interfaces";
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 ) {
65 QString S; 73 QString S;
66 return S.sprintf( "bnep%ld", nr ); 74 return S.sprintf( "bnep%ld", nr );
67} 75}
68 76
69 77
70void BluetoothBNEPNetNode::setSpecificAttribute( QString & A, QString & V ) { 78void BluetoothBNEPNetNode::setSpecificAttribute( QString & A, QString & V ) {
71 if( A == "interfacecount" ) { 79 if( A == "interfacecount" ) {
72 InstanceCount = V.toLong(); 80 InstanceCount = V.toLong();
73 } 81 }
74} 82}
75 83
76void BluetoothBNEPNetNode::saveSpecificAttribute( QTextStream & TS) { 84void BluetoothBNEPNetNode::saveSpecificAttribute( QTextStream & TS) {
77 TS << "interfacecount=" 85 TS << "interfacecount="
78 << InstanceCount 86 << InstanceCount
79 << endl; 87 << endl;
80} 88}
81 89
82// 90//
83// 91//
84// BLUETOOTH RFCOMM 92// BLUETOOTH RFCOMM
85// 93//
86// 94//
87 95
88static const char * BluetoothRFCOMMNeeds[] = 96static const char * BluetoothRFCOMMNeeds[] =
89 { 0 97 { 0
90 }; 98 };
91 99
92BluetoothRFCOMMNetNode::BluetoothRFCOMMNetNode() : 100BluetoothRFCOMMNetNode::BluetoothRFCOMMNetNode() :
93 ANetNode( tr("Bluetooth serial link") ) { 101 ANetNode( tr("Bluetooth serial link") ) {
94} 102}
95 103
96BluetoothRFCOMMNetNode::~BluetoothRFCOMMNetNode(){ 104BluetoothRFCOMMNetNode::~BluetoothRFCOMMNetNode(){
97} 105}
98 106
99const QString BluetoothRFCOMMNetNode::nodeDescription(){ 107const QString BluetoothRFCOMMNetNode::nodeDescription(){
100 return tr("\ 108 return tr("\
101<p>Sets up a bluetooth link using the bluetooth serial profile.</p>\ 109<p>Sets up a bluetooth link using the bluetooth serial profile.</p>\
102<p>Use this to connect to a GSM.</p>\ 110<p>Use this to connect to a GSM.</p>\
103" 111"
104); 112);
105} 113}
106 114
107ANetNodeInstance * BluetoothRFCOMMNetNode::createInstance( void ) { 115ANetNodeInstance * BluetoothRFCOMMNetNode::createInstance( void ) {
108 return new ABluetoothRFCOMM( this ); 116 return new ABluetoothRFCOMM( this );
109} 117}
110 118
111const char ** BluetoothRFCOMMNetNode::needs( void ) { 119const char ** BluetoothRFCOMMNetNode::needs( void ) {
112 return BluetoothRFCOMMNeeds; 120 return BluetoothRFCOMMNeeds;
113} 121}
114 122
115const char * BluetoothRFCOMMNetNode::provides( void ) { 123const char * BluetoothRFCOMMNetNode::provides( void ) {
116 return "line"; 124 return "line";
117} 125}
118 126
119bool BluetoothRFCOMMNetNode::generateProperFilesFor( 127bool BluetoothRFCOMMNetNode::generateProperFilesFor(
120 ANetNodeInstance * ) { 128 ANetNodeInstance * ) {
121 return 0; 129 return 0;
122} 130}
123 131
124bool BluetoothRFCOMMNetNode::hasDataFor( const QString & ) { 132bool BluetoothRFCOMMNetNode::hasDataFor( const QString & ) {
125 return 0; 133 return 0;
126} 134}
127 135
128bool BluetoothRFCOMMNetNode::generateDeviceDataForCommonFile( 136bool BluetoothRFCOMMNetNode::generateDeviceDataForCommonFile(
129 SystemFile & , 137 SystemFile & ,
130 long ) { 138 long ) {
131 return 0; 139 return 0;
132} 140}
133 141
134void BluetoothRFCOMMNetNode::setSpecificAttribute( QString &, QString & ) { 142void BluetoothRFCOMMNetNode::setSpecificAttribute( QString &, QString & ) {
135} 143}
136 144
137void BluetoothRFCOMMNetNode::saveSpecificAttribute( QTextStream & ) { 145void BluetoothRFCOMMNetNode::saveSpecificAttribute( QTextStream & ) {
138} 146}
139 147
140extern "C" { 148extern "C" {
141void create_plugin( QList<ANetNode> & PNN ) { 149void create_plugin( QList<ANetNode> & PNN ) {
142 PNN.append( new BluetoothBNEPNetNode() ); 150 PNN.append( new BluetoothBNEPNetNode() );
143 PNN.append( new BluetoothRFCOMMNetNode() ); 151 PNN.append( new BluetoothRFCOMMNetNode() );
144} 152}
145} 153}
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
@@ -1,60 +1,60 @@
1#include "cable_NN.h" 1#include "cable_NN.h"
2#include "cable_NNI.h" 2#include "cable_NNI.h"
3 3
4static const char * CableNeeds[] = 4static const char * CableNeeds[] =
5 { 0 5 { 0
6 }; 6 };
7 7
8/** 8/**
9 * Constructor, find all of the possible interfaces 9 * Constructor, find all of the possible interfaces
10 */ 10 */
11CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) { 11CableNetNode::CableNetNode() : ANetNode(tr("Cable Connection")) {
12} 12}
13 13
14/** 14/**
15 * Delete any interfaces that we own. 15 * Delete any interfaces that we own.
16 */ 16 */
17CableNetNode::~CableNetNode(){ 17CableNetNode::~CableNetNode(){
18} 18}
19 19
20const QString CableNetNode::nodeDescription(){ 20const QString CableNetNode::nodeDescription(){
21 return tr("\ 21 return tr("\
22<p>Sets up a wired serial or parallel.</p>\ 22<p>Sets up a wired serial or parallel.</p>\
23" 23"
24); 24);
25} 25}
26 26
27ANetNodeInstance * CableNetNode::createInstance( void ) { 27ANetNodeInstance * CableNetNode::createInstance( void ) {
28 return new ACable( this ); 28 return new ACable( this );
29} 29}
30 30
31const char ** CableNetNode::needs( void ) { 31const char ** CableNetNode::needs( void ) {
32 return CableNeeds; 32 return CableNeeds;
33} 33}
34 34
35const char * CableNetNode::provides( void ) { 35const char * CableNetNode::provides( void ) {
36 return "line"; 36 return "line";
37} 37}
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 & ) {
51} 51}
52 52
53void CableNetNode::saveSpecificAttribute( QTextStream & ) { 53void CableNetNode::saveSpecificAttribute( QTextStream & ) {
54} 54}
55 55
56extern "C" { 56extern "C" {
57void create_plugin( QList<ANetNode> & PNN ) { 57void create_plugin( QList<ANetNode> & PNN ) {
58 PNN.append( new CableNetNode() ); 58 PNN.append( new CableNetNode() );
59} 59}
60} 60}
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
@@ -1,60 +1,60 @@
1#include "irda_NN.h" 1#include "irda_NN.h"
2#include "irda_NNI.h" 2#include "irda_NNI.h"
3 3
4static const char * IRDANeeds[] = 4static const char * IRDANeeds[] =
5 { 0 5 { 0
6 }; 6 };
7 7
8/** 8/**
9 * Constructor, find all of the possible interfaces 9 * Constructor, find all of the possible interfaces
10 */ 10 */
11IRDANetNode::IRDANetNode() : ANetNode(tr("Infrared link")) { 11IRDANetNode::IRDANetNode() : ANetNode(tr("Infrared link")) {
12} 12}
13 13
14/** 14/**
15 * Delete any interfaces that we own. 15 * Delete any interfaces that we own.
16 */ 16 */
17IRDANetNode::~IRDANetNode(){ 17IRDANetNode::~IRDANetNode(){
18} 18}
19 19
20const QString IRDANetNode::nodeDescription(){ 20const QString IRDANetNode::nodeDescription(){
21 return tr("\ 21 return tr("\
22<p>Sets up a infra red serial link.</p>\ 22<p>Sets up a infra red serial link.</p>\
23" 23"
24); 24);
25} 25}
26 26
27ANetNodeInstance * IRDANetNode::createInstance( void ) { 27ANetNodeInstance * IRDANetNode::createInstance( void ) {
28 return new AIRDA( this ); 28 return new AIRDA( this );
29} 29}
30 30
31const char ** IRDANetNode::needs( void ) { 31const char ** IRDANetNode::needs( void ) {
32 return IRDANeeds; 32 return IRDANeeds;
33} 33}
34 34
35const char * IRDANetNode::provides( void ) { 35const char * IRDANetNode::provides( void ) {
36 return "line"; 36 return "line";
37} 37}
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 & ) {
51} 51}
52 52
53void IRDANetNode::saveSpecificAttribute( QTextStream & ) { 53void IRDANetNode::saveSpecificAttribute( QTextStream & ) {
54} 54}
55 55
56extern "C" { 56extern "C" {
57void create_plugin( QList<ANetNode> & PNN ) { 57void create_plugin( QList<ANetNode> & PNN ) {
58 PNN.append( new IRDANetNode() ); 58 PNN.append( new IRDANetNode() );
59} 59}
60} 60}
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
@@ -1,94 +1,94 @@
1#include "lancard_NN.h" 1#include "lancard_NN.h"
2#include "lancard_NNI.h" 2#include "lancard_NNI.h"
3 3
4static const char * LanCardNeeds[] = 4static const char * LanCardNeeds[] =
5 { 0 }; 5 { 0 };
6 6
7/** 7/**
8 * Constructor, find all of the possible interfaces 8 * Constructor, find all of the possible interfaces
9 */ 9 */
10LanCardNetNode::LanCardNetNode() : ANetNode(tr("LAN card")), NICMACAddresses() { 10LanCardNetNode::LanCardNetNode() : ANetNode(tr("LAN card")), NICMACAddresses() {
11 InstanceCount = 2; 11 InstanceCount = 2;
12} 12}
13 13
14/** 14/**
15 * Delete any interfaces that we own. 15 * Delete any interfaces that we own.
16 */ 16 */
17LanCardNetNode::~LanCardNetNode(){ 17LanCardNetNode::~LanCardNetNode(){
18} 18}
19 19
20const QString LanCardNetNode::nodeDescription(){ 20const QString LanCardNetNode::nodeDescription(){
21 return tr("\ 21 return tr("\
22<p>Sets up a wired regular LAN card.</p>\ 22<p>Sets up a wired regular LAN card.</p>\
23<p>Use this to set up 10/100/1000 MBit LAN cards.</p>\ 23<p>Use this to set up 10/100/1000 MBit LAN cards.</p>\
24" 24"
25); 25);
26} 26}
27 27
28ANetNodeInstance * LanCardNetNode::createInstance( void ) { 28ANetNodeInstance * LanCardNetNode::createInstance( void ) {
29 return new ALanCard( this ); 29 return new ALanCard( this );
30} 30}
31 31
32 32
33const char ** LanCardNetNode::needs( void ) { 33const char ** LanCardNetNode::needs( void ) {
34 return LanCardNeeds; 34 return LanCardNeeds;
35} 35}
36 36
37const char * LanCardNetNode::provides( void ) { 37const char * LanCardNetNode::provides( void ) {
38 return "device"; 38 return "device";
39} 39}
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 ) {
47 return S == "interfaces"; 47 return S == "interfaces";
48} 48}
49 49
50bool LanCardNetNode::generateDeviceDataForCommonFile( 50bool LanCardNetNode::generateDeviceDataForCommonFile(
51 SystemFile & S , 51 SystemFile & S ,
52 long DevNr ) { 52 long DevNr ) {
53 QString NIC = genNic( DevNr ); 53 QString NIC = genNic( DevNr );
54 54
55 if( S.name() == "interfaces" ) { 55 if( S.name() == "interfaces" ) {
56 // generate mapping stanza for this interface 56 // generate mapping stanza for this interface
57 S << "# check if " << NIC << " can be brought UP" << endl; 57 S << "# check if " << NIC << " can be brought UP" << endl;
58 S << "mapping " << NIC << endl; 58 S << "mapping " << NIC << endl;
59 S << " script networksettings2-request" << endl << endl; 59 S << " script networksettings2-request" << endl << endl;
60 } 60 }
61 return 0; 61 return 0;
62} 62}
63 63
64QString LanCardNetNode::genNic( long nr ) { 64QString LanCardNetNode::genNic( long nr ) {
65 QString S; 65 QString S;
66 return S.sprintf( "eth%ld", nr ); 66 return S.sprintf( "eth%ld", nr );
67} 67}
68 68
69void LanCardNetNode::setSpecificAttribute( QString & A, QString & V ) { 69void LanCardNetNode::setSpecificAttribute( QString & A, QString & V ) {
70 if( A == "interfacecount" ) { 70 if( A == "interfacecount" ) {
71 InstanceCount = V.toLong(); 71 InstanceCount = V.toLong();
72 } else if ( A == "macaddress" ) { 72 } else if ( A == "macaddress" ) {
73 NICMACAddresses.append( V ); 73 NICMACAddresses.append( V );
74 } 74 }
75} 75}
76 76
77void LanCardNetNode::saveSpecificAttribute( QTextStream & TS) { 77void LanCardNetNode::saveSpecificAttribute( QTextStream & TS) {
78 TS << "interfacecount=" 78 TS << "interfacecount="
79 << InstanceCount 79 << InstanceCount
80 << endl; 80 << endl;
81 for( QStringList::Iterator it = NICMACAddresses.begin(); 81 for( QStringList::Iterator it = NICMACAddresses.begin();
82 it != NICMACAddresses.end(); 82 it != NICMACAddresses.end();
83 ++it ) { 83 ++it ) {
84 TS << "macaddress=" 84 TS << "macaddress="
85 << (*it) 85 << (*it)
86 << endl; 86 << endl;
87 } 87 }
88} 88}
89 89
90extern "C" { 90extern "C" {
91void create_plugin( QList<ANetNode> & PNN ) { 91void create_plugin( QList<ANetNode> & PNN ) {
92 PNN.append( new LanCardNetNode() ); 92 PNN.append( new LanCardNetNode() );
93} 93}
94} 94}
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
@@ -1,61 +1,61 @@
1#include "modem_NN.h" 1#include "modem_NN.h"
2#include "modem_NNI.h" 2#include "modem_NNI.h"
3 3
4static const char * ModemNeeds[] = 4static const char * ModemNeeds[] =
5 { "line" 5 { "line"
6 }; 6 };
7 7
8/** 8/**
9 * Constructor, find all of the possible interfaces 9 * Constructor, find all of the possible interfaces
10 */ 10 */
11ModemNetNode::ModemNetNode() : ANetNode(tr("Dialup modem")) { 11ModemNetNode::ModemNetNode() : ANetNode(tr("Dialup modem")) {
12} 12}
13 13
14/** 14/**
15 * Delete any interfaces that we own. 15 * Delete any interfaces that we own.
16 */ 16 */
17ModemNetNode::~ModemNetNode(){ 17ModemNetNode::~ModemNetNode(){
18} 18}
19 19
20const QString ModemNetNode::nodeDescription(){ 20const QString ModemNetNode::nodeDescription(){
21 return tr("\ 21 return tr("\
22<p>Sets up a dialing procedures.</p>\ 22<p>Sets up a dialing procedures.</p>\
23<p>Use this to dial up over modems, ISDN, GSM, ...</p>\ 23<p>Use this to dial up over modems, ISDN, GSM, ...</p>\
24" 24"
25); 25);
26} 26}
27 27
28ANetNodeInstance * ModemNetNode::createInstance( void ) { 28ANetNodeInstance * ModemNetNode::createInstance( void ) {
29 return new AModem( this ); 29 return new AModem( this );
30} 30}
31 31
32const char ** ModemNetNode::needs( void ) { 32const char ** ModemNetNode::needs( void ) {
33 return ModemNeeds; 33 return ModemNeeds;
34} 34}
35 35
36const char * ModemNetNode::provides( void ) { 36const char * ModemNetNode::provides( void ) {
37 return "line"; 37 return "line";
38} 38}
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 & ) {
52} 52}
53 53
54void ModemNetNode::saveSpecificAttribute( QTextStream & ) { 54void ModemNetNode::saveSpecificAttribute( QTextStream & ) {
55} 55}
56 56
57extern "C" { 57extern "C" {
58void create_plugin( QList<ANetNode> & PNN ) { 58void create_plugin( QList<ANetNode> & PNN ) {
59 PNN.append( new ModemNetNode() ); 59 PNN.append( new ModemNetNode() );
60} 60}
61} 61}
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
@@ -1,62 +1,62 @@
1#include "network_NN.h" 1#include "network_NN.h"
2#include "network_NNI.h" 2#include "network_NNI.h"
3 3
4static const char * NetworkNeeds[] = 4static const char * NetworkNeeds[] =
5 { "device", 5 { "device",
6 0 6 0
7 }; 7 };
8 8
9/** 9/**
10 * Constructor, find all of the possible interfaces 10 * Constructor, find all of the possible interfaces
11 */ 11 */
12NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) { 12NetworkNetNode::NetworkNetNode() : ANetNode(tr("IP Configuration")) {
13} 13}
14 14
15/** 15/**
16 * Delete any interfaces that we own. 16 * Delete any interfaces that we own.
17 */ 17 */
18NetworkNetNode::~NetworkNetNode(){ 18NetworkNetNode::~NetworkNetNode(){
19} 19}
20 20
21const QString NetworkNetNode::nodeDescription(){ 21const QString NetworkNetNode::nodeDescription(){
22 return tr("\ 22 return tr("\
23<p>Sets up TCP/IP options.</p>\ 23<p>Sets up TCP/IP options.</p>\
24<p>Use this to configure the TCP/IP protocol</p>\ 24<p>Use this to configure the TCP/IP protocol</p>\
25" 25"
26); 26);
27} 27}
28 28
29ANetNodeInstance * NetworkNetNode::createInstance( void ) { 29ANetNodeInstance * NetworkNetNode::createInstance( void ) {
30 return new ANetwork( this ); 30 return new ANetwork( this );
31} 31}
32 32
33const char ** NetworkNetNode::needs( void ) { 33const char ** NetworkNetNode::needs( void ) {
34 return NetworkNeeds; 34 return NetworkNeeds;
35} 35}
36 36
37const char * NetworkNetNode::provides( void ) { 37const char * NetworkNetNode::provides( void ) {
38 return "connection"; 38 return "connection";
39} 39}
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 & ) {
53} 53}
54 54
55void NetworkNetNode::saveSpecificAttribute( QTextStream & ) { 55void NetworkNetNode::saveSpecificAttribute( QTextStream & ) {
56} 56}
57 57
58extern "C" { 58extern "C" {
59void create_plugin( QList<ANetNode> & PNN ) { 59void create_plugin( QList<ANetNode> & PNN ) {
60 PNN.append( new NetworkNetNode() ); 60 PNN.append( new NetworkNetNode() );
61} 61}
62} 62}
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
@@ -1,21 +1,21 @@
1# 1#
2CONFIG = qt warn_on debug 2CONFIG = qt warn_on debug
3#CONFIG = qt warn_on release 3#CONFIG = qt warn_on release
4HEADERS = networksettings.h \ 4HEADERS = networksettings.h \
5 activateprofile.h \ 5 activateprofile.h \
6 editconnection.h 6 editconnection.h
7SOURCES = main.cpp \ 7SOURCES = main.cpp \
8 networksettings.cpp \ 8 networksettings.cpp \
9 nsdata.cpp \ 9 nsdata.cpp \
10 activateprofile.cpp \ 10 activateprofile.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
18TARGET = $(OPIEDIR)/bin/networksettings2 18TARGET = $(OPIEDIR)/bin/networksettings2
19 19
20 20
21include ( $(OPIEDIR)/include.pro ) 21include ( $(OPIEDIR)/include.pro )
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
@@ -1,26 +1,26 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on release 2CONFIG += qt warn_on release
3 #CONFIG += qt warn_on debug 3 #CONFIG += qt warn_on debug
4 DESTDIR = $(OPIEDIR)/lib$(PROJMAK) 4 DESTDIR = $(OPIEDIR)/lib$(PROJMAK)
5 HEADERS = netnode.h \ 5 HEADERS = netnode.h \
6 resources.h \ 6 resources.h \
7 system.h \ 7 system.h \
8 asline.h \ 8 asline.h \
9 GUIUtils.h \ 9 GUIUtils.h \
10 asconnection.h \ 10 asconnection.h \
11 asfullsetup.h \ 11 asfullsetup.h \
12 systemfile.h \ 12 systemfile.h \
13 asdevice.h 13 asdevice.h
14 SOURCES = netnode.cpp \ 14 SOURCES = netnode.cpp \
15 GUIUtils.cpp \ 15 GUIUtils.cpp \
16 system.cpp \ 16 system.cpp \
17 systemfile.cpp \ 17 systemfile.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
25 25
26include ( $(OPIEDIR)/include.pro ) 26include ( $(OPIEDIR)/include.pro )
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
@@ -209,374 +209,374 @@ QString NetworkSettingsData::saveSettings( void ) {
209 209
210 QDir D("."); 210 QDir D(".");
211 D.rename( CfgFile + ".bup", CfgFile ); 211 D.rename( CfgFile + ".bup", CfgFile );
212 212
213 // 213 //
214 // proper files AND system files regenerated 214 // proper files AND system files regenerated
215 // 215 //
216 216
217 setModified( 0 ); 217 setModified( 0 );
218 return ErrS; 218 return ErrS;
219} 219}
220 220
221QString NetworkSettingsData::generateSettings( bool ForceReq ) { 221QString NetworkSettingsData::generateSettings( bool ForceReq ) {
222 bool ForceIt; 222 bool ForceIt;
223 QString S = ""; 223 QString S = "";
224 224
225 // include own force flag 225 // include own force flag
226 ForceIt = (Force) ? 1 : ForceReq; 226 ForceIt = (Force) ? 1 : ForceReq;
227 227
228 if( ! ForceIt && ! isModified() ) 228 if( ! ForceIt && ! isModified() )
229 return S; 229 return S;
230 230
231 // regenerate system files 231 // regenerate system files
232 fprintf( stderr, "Generating settings from %s\n", CfgFile.latin1() ); 232 fprintf( stderr, "Generating settings from %s\n", CfgFile.latin1() );
233 233
234 { Name2SystemFile_t & SFM = NSResources->systemFiles(); 234 { Name2SystemFile_t & SFM = NSResources->systemFiles();
235 Name2Connection_t & M = NSResources->connections(); 235 Name2Connection_t & M = NSResources->connections();
236 NodeCollection * NC; 236 NodeCollection * NC;
237 ANetNodeInstance * NNI; 237 ANetNodeInstance * NNI;
238 SystemFile * SF; 238 SystemFile * SF;
239 AsDevice * CurDev; 239 AsDevice * CurDev;
240 ANetNode * CurDevNN; 240 ANetNode * CurDevNN;
241 bool needToRegenerate = ForceIt; 241 bool needToRegenerate = ForceIt;
242 242
243 // 243 //
244 // check if we need to generate at least one of the system files 244 // check if we need to generate at least one of the system files
245 // 245 //
246 if( ! ForceIt ) { 246 if( ! ForceIt ) {
247 for( QDictIterator<SystemFile> sfit(SFM); 247 for( QDictIterator<SystemFile> sfit(SFM);
248 sfit.current(); 248 sfit.current();
249 ++sfit ) { 249 ++sfit ) {
250 SF = sfit.current(); 250 SF = sfit.current();
251 251
252 // check if there are nodes that are modified and require 252 // check if there are nodes that are modified and require
253 // data for this system file 253 // data for this system file
254 254
255 // for all connections 255 // for all connections
256 for( QDictIterator<NodeCollection> ncit(M); 256 for( QDictIterator<NodeCollection> ncit(M);
257 ncit.current(); 257 ncit.current();
258 ++ncit ) { 258 ++ncit ) {
259 NC = ncit.current(); 259 NC = ncit.current();
260 260
261 if( NC->isModified() ) { 261 if( NC->isModified() ) {
262 // does this connection 'touch' this system file ? 262 // does this connection 'touch' this system file ?
263 for( QListIterator<ANetNodeInstance> cncit(*NC); 263 for( QListIterator<ANetNodeInstance> cncit(*NC);
264 cncit.current(); 264 cncit.current();
265 ++cncit ) { 265 ++cncit ) {
266 NNI = cncit.current(); 266 NNI = cncit.current();
267 if( ( NNI->nodeClass()->hasDataFor( SF->name() ) || 267 if( ( NNI->nodeClass()->hasDataFor( SF->name() ) ||
268 NNI->hasDataFor( SF->name() ) 268 NNI->hasDataFor( SF->name() )
269 ) && 269 ) &&
270 NNI->isModified() ) { 270 NNI->isModified() ) {
271 needToRegenerate = 1; 271 needToRegenerate = 1;
272 break; 272 break;
273 } 273 }
274 } 274 }
275 } 275 }
276 if( needToRegenerate ) 276 if( needToRegenerate )
277 break; 277 break;
278 } 278 }
279 if( needToRegenerate ) 279 if( needToRegenerate )
280 break; 280 break;
281 } 281 }
282 } 282 }
283 283
284 // we cannot renumber with a FORCE request since 284 // we cannot renumber with a FORCE request since
285 // we probably are NOT going to save the config 285 // we probably are NOT going to save the config
286 // e.g. when using --regen option 286 // e.g. when using --regen option
287 if( ! ForceReq && needToRegenerate ) { 287 if( ! ForceReq && needToRegenerate ) {
288 NSResources->renumberConnections(); 288 NSResources->renumberConnections();
289 setModified(1); 289 setModified(1);
290 } 290 }
291 291
292 // 292 //
293 // generate files proper to each netnodeinstance 293 // generate files proper to each netnodeinstance
294 // 294 //
295 { Name2Instance_t & NNIs = NSResources->netNodeInstances(); 295 { Name2Instance_t & NNIs = NSResources->netNodeInstances();
296 296
297 for( QDictIterator<ANetNodeInstance> NNIIt(NNIs); 297 for( QDictIterator<ANetNodeInstance> NNIIt(NNIs);
298 NNIIt.current(); 298 NNIIt.current();
299 ++NNIIt 299 ++NNIIt
300 ){ 300 ){
301 // for all nodes find those that are modified 301 // for all nodes find those that are modified
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>" ).
309 arg(NNI->nodeClass()->name()) ; 309 arg(NNI->nodeClass()->name()) ;
310 return S; 310 return S;
311 } 311 }
312 } 312 }
313 } 313 }
314 } 314 }
315 315
316 // 316 //
317 // generate all system files 317 // generate all system files
318 // 318 //
319 for( QDictIterator<SystemFile> sfit(SFM); 319 for( QDictIterator<SystemFile> sfit(SFM);
320 sfit.current(); 320 sfit.current();
321 ++sfit ) { 321 ++sfit ) {
322 SF = sfit.current(); 322 SF = sfit.current();
323 323
324 fprintf( stderr, "Generating %s\n", SF->name().latin1() ); 324 fprintf( stderr, "Generating %s\n", SF->name().latin1() );
325 SF->open(); 325 SF->open();
326 326
327 do { // so we can break; 327 do { // so we can break;
328 328
329 // global presection for this system file 329 // global presection for this system file
330 if( SF->preSection() ) { 330 if( SF->preSection() ) {
331 S = qApp->translate( "NetworkSettings", 331 S = qApp->translate( "NetworkSettings",
332 "<p>Error in preSection for file \"%1\"</p>" ). 332 "<p>Error in preSection for file \"%1\"</p>" ).
333 arg( SF->name() ); 333 arg( SF->name() );
334 return S; 334 return S;
335 } 335 }
336 336
337 // find all netnodes and figure out if 337 // find all netnodes and figure out if
338 // for that node there are instances 338 // for that node there are instances
339 for( QDictIterator<NetNode_t> nnit( 339 for( QDictIterator<NetNode_t> nnit(
340 NSResources->netNodes() ); 340 NSResources->netNodes() );
341 nnit.current(); 341 nnit.current();
342 ++nnit ) { 342 ++nnit ) {
343 343
344 CurDevNN = nnit.current()->NetNode; 344 CurDevNN = nnit.current()->NetNode;
345 345
346 // are there instances for this netnode ? 346 // are there instances for this netnode ?
347 NNI = 0; 347 NNI = 0;
348 for( QDictIterator<ANetNodeInstance> nniit( 348 for( QDictIterator<ANetNodeInstance> nniit(
349 NSResources->netNodeInstances() ); 349 NSResources->netNodeInstances() );
350 nniit.current(); 350 nniit.current();
351 ++nniit ) { 351 ++nniit ) {
352 if( nniit.current()->nodeClass() == CurDevNN ) { 352 if( nniit.current()->nodeClass() == CurDevNN ) {
353 NNI = nniit.current(); 353 NNI = nniit.current();
354 break; 354 break;
355 } 355 }
356 } 356 }
357 357
358 if( ! NNI ) 358 if( ! NNI )
359 // no instances -> next netnode type 359 // no instances -> next netnode type
360 continue; 360 continue;
361 361
362 // has this node data for this system file ? 362 // has this node data for this system file ?
363 if( (CurDev = NNI->runtime()->asDevice() ) ) { 363 if( (CurDev = NNI->runtime()->asDevice() ) ) {
364 // generate start for this nodetype for all possible devices of this type 364 // generate start for this nodetype for all possible devices of this type
365 for( int i = 0; i < CurDevNN->instanceCount(); i ++ ) { 365 for( int i = 0; i < CurDevNN->instanceCount(); i ++ ) {
366 S = generateSystemFileNode( *SF, CurDev, NNI, i ); 366 S = generateSystemFileNode( *SF, CurDev, NNI, i );
367 if( ! S.isEmpty() ) 367 if( ! S.isEmpty() )
368 return S; 368 return S;
369 } 369 }
370 } else { 370 } else {
371 S = generateSystemFileNode( *SF, 0, NNI, -1 ); 371 S = generateSystemFileNode( *SF, 0, NNI, -1 );
372 if( ! S.isEmpty() ) 372 if( ! S.isEmpty() )
373 return S; 373 return S;
374 } 374 }
375 } 375 }
376 376
377 if( SF->postSection() ) { 377 if( SF->postSection() ) {
378 S = qApp->translate( "NetworkSettings", 378 S = qApp->translate( "NetworkSettings",
379 "<p>Error in postSection for file \"%1\"</p>" ). 379 "<p>Error in postSection for file \"%1\"</p>" ).
380 arg( SF->name() ); 380 arg( SF->name() );
381 return S; 381 return S;
382 } 382 }
383 383
384 } while( 0 ); 384 } while( 0 );
385 SF->close(); 385 SF->close();
386 } 386 }
387 } 387 }
388 Force = 0; 388 Force = 0;
389 return S; 389 return S;
390} 390}
391 391
392QList<NodeCollection> NetworkSettingsData::collectPossible( const char * Interface ) { 392QList<NodeCollection> NetworkSettingsData::collectPossible( const char * Interface ) {
393 // collect connections that can work on top of this interface 393 // collect connections that can work on top of this interface
394 NodeCollection * NC; 394 NodeCollection * NC;
395 QList<NodeCollection> PossibleConnections; 395 QList<NodeCollection> PossibleConnections;
396 Name2Connection_t & M = NSResources->connections(); 396 Name2Connection_t & M = NSResources->connections();
397 397
398 // for all connections 398 // for all connections
399 for( QDictIterator<NodeCollection> it(M); 399 for( QDictIterator<NodeCollection> it(M);
400 it.current(); 400 it.current();
401 ++it ) { 401 ++it ) {
402 NC = it.current(); 402 NC = it.current();
403 // check if this profile handles the requested interface 403 // check if this profile handles the requested interface
404 if( NC->handlesInterface( Interface ) && // if different Intf. 404 if( NC->handlesInterface( Interface ) && // if different Intf.
405 NC->state() != Disabled && // if not enabled 405 NC->state() != Disabled && // if not enabled
406 NC->state() != IsUp // if already used 406 NC->state() != IsUp // if already used
407 ) { 407 ) {
408 fprintf( stderr, "Append %s for %s\n", NC->name().latin1(), Interface); 408 fprintf( stderr, "Append %s for %s\n", NC->name().latin1(), Interface);
409 PossibleConnections.append( NC ); 409 PossibleConnections.append( NC );
410 } 410 }
411 } 411 }
412 return PossibleConnections; 412 return PossibleConnections;
413} 413}
414 414
415 415
416/* 416/*
417 Called by the system to see if interface can be brought UP 417 Called by the system to see if interface can be brought UP
418 418
419 if allowed, echo Interface-allowed else Interface-disallowed 419 if allowed, echo Interface-allowed else Interface-disallowed
420*/ 420*/
421 421
422bool NetworkSettingsData::canStart( const char * Interface ) { 422bool NetworkSettingsData::canStart( const char * Interface ) {
423 // load situation 423 // load situation
424 NodeCollection * NC = 0; 424 NodeCollection * NC = 0;
425 QList<NodeCollection> PossibleConnections; 425 QList<NodeCollection> PossibleConnections;
426 426
427 PossibleConnections = collectPossible( Interface ); 427 PossibleConnections = collectPossible( Interface );
428 428
429 fprintf( stderr, "Possiblilies %d\n", 429 fprintf( stderr, "Possiblilies %d\n",
430 PossibleConnections.count() ); 430 PossibleConnections.count() );
431 switch( PossibleConnections.count() ) { 431 switch( PossibleConnections.count() ) {
432 case 0 : // no connections 432 case 0 : // no connections
433 break; 433 break;
434 case 1 : // one connection 434 case 1 : // one connection
435 NC = PossibleConnections.first(); 435 NC = PossibleConnections.first();
436 break; 436 break;
437 default : // need to ask user ? 437 default : // need to ask user ?
438 return 1; 438 return 1;
439 } 439 }
440 440
441 if( NC ) { 441 if( NC ) {
442 switch( NC->state() ) { 442 switch( NC->state() ) {
443 case Unchecked : 443 case Unchecked :
444 case Unknown : 444 case Unknown :
445 case Unavailable : 445 case Unavailable :
446 case Disabled : 446 case Disabled :
447 // this profile does not allow interface to be UP 447 // this profile does not allow interface to be UP
448 // -> try others 448 // -> try others
449 break; 449 break;
450 case Off : 450 case Off :
451 // try to UP the device 451 // try to UP the device
452 if( ! NC->setState( Activate ) ) { 452 if( ! NC->setState( Activate ) ) {
453 // cannot bring device Online -> try other alters 453 // cannot bring device Online -> try other alters
454 break; 454 break;
455 } 455 }
456 // FT 456 // FT
457 case Available : 457 case Available :
458 case IsUp : // also called for 'ifdown' 458 case IsUp : // also called for 'ifdown'
459 // device is ready -> done 459 // device is ready -> done
460 printf( "%s-c%d-allowed\n", Interface, NC->number() ); 460 printf( "%s-c%d-allowed\n", Interface, NC->number() );
461 return 0; 461 return 0;
462 } 462 }
463 } 463 }
464 464
465 // if we come here no alternatives are possible 465 // if we come here no alternatives are possible
466 printf( "%s-cnn-disallowed\n", Interface ); 466 printf( "%s-cnn-disallowed\n", Interface );
467 return 0; 467 return 0;
468} 468}
469 469
470/* 470/*
471 Called by the system to regenerate config files 471 Called by the system to regenerate config files
472*/ 472*/
473 473
474bool NetworkSettingsData::regenerate( void ) { 474bool NetworkSettingsData::regenerate( void ) {
475 QString S; 475 QString S;
476 // load situation 476 // load situation
477 S = generateSettings( TRUE ); 477 S = generateSettings( TRUE );
478 if( ! S.isEmpty() ) { 478 if( ! S.isEmpty() ) {
479 fprintf( stdout, "%s\n", S.latin1() ); 479 fprintf( stdout, "%s\n", S.latin1() );
480 return 1; 480 return 1;
481 } 481 }
482 return 0; 482 return 0;
483} 483}
484 484
485QString NetworkSettingsData::generateSystemFileNode( 485QString NetworkSettingsData::generateSystemFileNode(
486 SystemFile &SF, 486 SystemFile &SF,
487 AsDevice * CurDev, 487 AsDevice * CurDev,
488 ANetNodeInstance * DevNNI, 488 ANetNodeInstance * DevNNI,
489 long DevInstNr ) { 489 long DevInstNr ) {
490 490
491 QString S=""; 491 QString S="";
492 ANetNode * CurDevNN = DevNNI->nodeClass(); 492 ANetNode * CurDevNN = DevNNI->nodeClass();
493 Name2Connection_t & M = NSResources->connections(); 493 Name2Connection_t & M = NSResources->connections();
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;
501 } 501 }
502 502
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;
510 } 510 }
511 } 511 }
512 512
513 // now generate profile specific data for all 513 // now generate profile specific data for all
514 // connections working on a device of the current 514 // connections working on a device of the current
515 // netnode type 515 // netnode type
516 for( QDictIterator<NodeCollection> ncit(M); 516 for( QDictIterator<NodeCollection> ncit(M);
517 ncit.current(); 517 ncit.current();
518 ++ncit ) { 518 ++ncit ) {
519 NodeCollection * NC = ncit.current(); 519 NodeCollection * NC = ncit.current();
520 520
521 // currenly only those connections that work on 521 // currenly only those connections that work on
522 // the current device (or on no device if no current) 522 // the current device (or on no device if no current)
523 AsDevice * Dev = NC->device(); 523 AsDevice * Dev = NC->device();
524 524
525 if( CurDev ) { 525 if( CurDev ) {
526 if( CurDevNN != Dev->netNode()->nodeClass() ) { 526 if( CurDevNN != Dev->netNode()->nodeClass() ) {
527 // other device type -> later 527 // other device type -> later
528 continue; 528 continue;
529 } 529 }
530 } else { 530 } else {
531 if( Dev ) { 531 if( Dev ) {
532 // other 532 // other
533 continue; 533 continue;
534 } 534 }
535 } 535 }
536 536
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;
544 } 544 }
545 545
546 // ask all nodes in connection 546 // ask all nodes in connection
547 for( QListIterator<ANetNodeInstance> cncit(*NC); 547 for( QListIterator<ANetNodeInstance> cncit(*NC);
548 cncit.current(); 548 cncit.current();
549 ++cncit ) { 549 ++cncit ) {
550 ANetNodeInstance * NNI = cncit.current(); 550 ANetNodeInstance * NNI = cncit.current();
551 551
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;
559 } 559 }
560 } 560 }
561 } 561 }
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;
569 } 569 }
570 SF << endl; 570 SF << endl;
571 } 571 }
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;
579 } 579 }
580 580
581 return S; 581 return S;
582} 582}
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
@@ -1,68 +1,68 @@
1#include "ppp_NN.h" 1#include "ppp_NN.h"
2#include "ppp_NNI.h" 2#include "ppp_NNI.h"
3 3
4static const char * PPPNeeds[] = 4static const char * PPPNeeds[] =
5 { "line", 5 { "line",
6 "modem", 6 "modem",
7 0 7 0
8 }; 8 };
9 9
10/** 10/**
11 * Constructor, find all of the possible interfaces 11 * Constructor, find all of the possible interfaces
12 */ 12 */
13PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) { 13PPPNetNode::PPPNetNode() : ANetNode(tr("PPP Connection")) {
14} 14}
15 15
16/** 16/**
17 * Delete any interfaces that we own. 17 * Delete any interfaces that we own.
18 */ 18 */
19PPPNetNode::~PPPNetNode(){ 19PPPNetNode::~PPPNetNode(){
20} 20}
21 21
22const QString PPPNetNode::nodeDescription(){ 22const QString PPPNetNode::nodeDescription(){
23 return tr("\ 23 return tr("\
24<p>Sets up IP using PPP.</p>\ 24<p>Sets up IP using PPP.</p>\
25<p>Use this for dialup devices or serial setups</p>\ 25<p>Use this for dialup devices or serial setups</p>\
26" 26"
27); 27);
28} 28}
29 29
30ANetNodeInstance * PPPNetNode::createInstance( void ) { 30ANetNodeInstance * PPPNetNode::createInstance( void ) {
31 return new APPP( this ); 31 return new APPP( this );
32} 32}
33 33
34const char ** PPPNetNode::needs( void ) { 34const char ** PPPNetNode::needs( void ) {
35 return PPPNeeds; 35 return PPPNeeds;
36} 36}
37 37
38const char * PPPNetNode::provides( void ) { 38const char * PPPNetNode::provides( void ) {
39 return "connection"; 39 return "connection";
40} 40}
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 ) {
54 QString S; 54 QString S;
55 return S.sprintf( "ppp%ld", NicNr ); 55 return S.sprintf( "ppp%ld", NicNr );
56} 56}
57 57
58void PPPNetNode::setSpecificAttribute( QString & , QString & ) { 58void PPPNetNode::setSpecificAttribute( QString & , QString & ) {
59} 59}
60 60
61void PPPNetNode::saveSpecificAttribute( QTextStream & ) { 61void PPPNetNode::saveSpecificAttribute( QTextStream & ) {
62} 62}
63 63
64extern "C" { 64extern "C" {
65void create_plugin( QList<ANetNode> & PNN ) { 65void create_plugin( QList<ANetNode> & PNN ) {
66 PNN.append( new PPPNetNode() ); 66 PNN.append( new PPPNetNode() );
67} 67}
68} 68}
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
@@ -1,62 +1,62 @@
1#include "profile_NN.h" 1#include "profile_NN.h"
2#include "profile_NNI.h" 2#include "profile_NNI.h"
3 3
4static const char * ProfileNeeds[] = 4static const char * ProfileNeeds[] =
5 { "connection", 5 { "connection",
6 0 6 0
7 }; 7 };
8 8
9/** 9/**
10 * Constructor, find all of the possible interfaces 10 * Constructor, find all of the possible interfaces
11 */ 11 */
12ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular profile")) { 12ProfileNetNode::ProfileNetNode() : ANetNode( tr("Regular profile")) {
13} 13}
14 14
15/** 15/**
16 * Delete any interfaces that we own. 16 * Delete any interfaces that we own.
17 */ 17 */
18ProfileNetNode::~ProfileNetNode(){ 18ProfileNetNode::~ProfileNetNode(){
19} 19}
20 20
21const QString ProfileNetNode::nodeDescription(){ 21const QString ProfileNetNode::nodeDescription(){
22 return tr("\ 22 return tr("\
23<p>Define use of an IP connection.</p>\ 23<p>Define use of an IP connection.</p>\
24<p>Configure if and when this connection needs to be established</p>\ 24<p>Configure if and when this connection needs to be established</p>\
25" 25"
26); 26);
27} 27}
28 28
29ANetNodeInstance * ProfileNetNode::createInstance( void ) { 29ANetNodeInstance * ProfileNetNode::createInstance( void ) {
30 return new AProfile( this ); 30 return new AProfile( this );
31} 31}
32 32
33const char ** ProfileNetNode::needs( void ) { 33const char ** ProfileNetNode::needs( void ) {
34 return ProfileNeeds; 34 return ProfileNeeds;
35} 35}
36 36
37const char * ProfileNetNode::provides( void ) { 37const char * ProfileNetNode::provides( void ) {
38 return "fullsetup"; 38 return "fullsetup";
39} 39}
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 & ) {
53} 53}
54 54
55void ProfileNetNode::saveSpecificAttribute( QTextStream & ) { 55void ProfileNetNode::saveSpecificAttribute( QTextStream & ) {
56} 56}
57 57
58extern "C" { 58extern "C" {
59void create_plugin( QList<ANetNode> & PNN ) { 59void create_plugin( QList<ANetNode> & PNN ) {
60 PNN.append( new ProfileNetNode() ); 60 PNN.append( new ProfileNetNode() );
61} 61}
62} 62}
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
@@ -1,77 +1,77 @@
1#include "usb_NN.h" 1#include "usb_NN.h"
2#include "usb_NNI.h" 2#include "usb_NNI.h"
3 3
4static const char * USBNeeds[] = 4static const char * USBNeeds[] =
5 { 0 5 { 0
6 }; 6 };
7 7
8/** 8/**
9 * Constructor, find all of the possible interfaces 9 * Constructor, find all of the possible interfaces
10 */ 10 */
11USBNetNode::USBNetNode() : ANetNode(tr("USB Cable Connect")) { 11USBNetNode::USBNetNode() : ANetNode(tr("USB Cable Connect")) {
12} 12}
13 13
14/** 14/**
15 * Delete any interfaces that we own. 15 * Delete any interfaces that we own.
16 */ 16 */
17USBNetNode::~USBNetNode(){ 17USBNetNode::~USBNetNode(){
18} 18}
19 19
20const QString USBNetNode::nodeDescription(){ 20const QString USBNetNode::nodeDescription(){
21 return tr("\ 21 return tr("\
22<p>Configure Ethernet over USB.</p>\ 22<p>Configure Ethernet over USB.</p>\
23<p>Use this for a computer to computer USB cable connection</p>\ 23<p>Use this for a computer to computer USB cable connection</p>\
24" 24"
25); 25);
26} 26}
27 27
28ANetNodeInstance * USBNetNode::createInstance( void ) { 28ANetNodeInstance * USBNetNode::createInstance( void ) {
29 return new AUSB( this ); 29 return new AUSB( this );
30} 30}
31 31
32const char ** USBNetNode::needs( void ) { 32const char ** USBNetNode::needs( void ) {
33 return USBNeeds; 33 return USBNeeds;
34} 34}
35 35
36const char * USBNetNode::provides( void ) { 36const char * USBNetNode::provides( void ) {
37 return "device"; 37 return "device";
38} 38}
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 ) {
46 return (S== "interfaces"); 46 return (S== "interfaces");
47} 47}
48 48
49bool USBNetNode::generateDeviceDataForCommonFile( 49bool USBNetNode::generateDeviceDataForCommonFile(
50 SystemFile & S , 50 SystemFile & S ,
51 long DevNr ) { 51 long DevNr ) {
52 QString NIC = genNic( DevNr ); 52 QString NIC = genNic( DevNr );
53 53
54 if( S.name() == "interfaces" ) { 54 if( S.name() == "interfaces" ) {
55 // generate mapping stanza for this interface 55 // generate mapping stanza for this interface
56 S << "# check if " << NIC << " can be brought UP" << endl; 56 S << "# check if " << NIC << " can be brought UP" << endl;
57 S << "mapping " << NIC << endl; 57 S << "mapping " << NIC << endl;
58 S << " script networksettings2-request" << endl << endl; 58 S << " script networksettings2-request" << endl << endl;
59 } 59 }
60 return 0; 60 return 0;
61} 61}
62 62
63QString USBNetNode::genNic( long ) { 63QString USBNetNode::genNic( long ) {
64 return QString( "usbf" ); 64 return QString( "usbf" );
65} 65}
66 66
67void USBNetNode::setSpecificAttribute( QString & , QString & ) { 67void USBNetNode::setSpecificAttribute( QString & , QString & ) {
68} 68}
69 69
70void USBNetNode::saveSpecificAttribute( QTextStream & ) { 70void USBNetNode::saveSpecificAttribute( QTextStream & ) {
71} 71}
72 72
73extern "C" { 73extern "C" {
74void create_plugin( QList<ANetNode> & PNN ) { 74void create_plugin( QList<ANetNode> & PNN ) {
75 PNN.append( new USBNetNode() ); 75 PNN.append( new USBNetNode() );
76} 76}
77} 77}
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
@@ -1,62 +1,62 @@
1#include "vpn_NN.h" 1#include "vpn_NN.h"
2#include "vpn_NNI.h" 2#include "vpn_NNI.h"
3 3
4static const char * VPNNeeds[] = 4static const char * VPNNeeds[] =
5 { "connection", 5 { "connection",
6 0 6 0
7 }; 7 };
8 8
9/** 9/**
10 * Constructor, find all of the possible interfaces 10 * Constructor, find all of the possible interfaces
11 */ 11 */
12VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) { 12VPNNetNode::VPNNetNode() : ANetNode(tr("VPN Connection")) {
13} 13}
14 14
15/** 15/**
16 * Delete any interfaces that we own. 16 * Delete any interfaces that we own.
17 */ 17 */
18VPNNetNode::~VPNNetNode(){ 18VPNNetNode::~VPNNetNode(){
19} 19}
20 20
21const QString VPNNetNode::nodeDescription(){ 21const QString VPNNetNode::nodeDescription(){
22 return tr("\ 22 return tr("\
23<p>Configure private IP connection.</p>\ 23<p>Configure private IP connection.</p>\
24<p>Defines Secure tunnels over non secure IP sessions</p>\ 24<p>Defines Secure tunnels over non secure IP sessions</p>\
25" 25"
26); 26);
27} 27}
28 28
29ANetNodeInstance * VPNNetNode::createInstance( void ) { 29ANetNodeInstance * VPNNetNode::createInstance( void ) {
30 return new AVPN( this ); 30 return new AVPN( this );
31} 31}
32 32
33const char ** VPNNetNode::needs( void ) { 33const char ** VPNNetNode::needs( void ) {
34 return VPNNeeds; 34 return VPNNeeds;
35} 35}
36 36
37const char * VPNNetNode::provides( void ) { 37const char * VPNNetNode::provides( void ) {
38 return "connection"; 38 return "connection";
39} 39}
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 & ) {
53} 53}
54 54
55void VPNNetNode::saveSpecificAttribute( QTextStream & ) { 55void VPNNetNode::saveSpecificAttribute( QTextStream & ) {
56} 56}
57 57
58extern "C" { 58extern "C" {
59void create_plugin( QList<ANetNode> & PNN ) { 59void create_plugin( QList<ANetNode> & PNN ) {
60 PNN.append( new VPNNetNode() ); 60 PNN.append( new VPNNetNode() );
61} 61}
62} 62}
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
@@ -1,990 +1,975 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>WLanGUI</class> 2<class>WLanGUI</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>WLanGUI</cstring> 7 <cstring>WLanGUI</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
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>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form1</string> 20 <string>Form1</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <vbox> 28 <vbox>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>0</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>0</number> 35 <number>0</number>
36 </property> 36 </property>
37 <widget> 37 <widget>
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>
45 <bool>true</bool> 45 <bool>true</bool>
46 </property> 46 </property>
47 <property> 47 <property>
48 <name>layoutMargin</name> 48 <name>layoutMargin</name>
49 </property> 49 </property>
50 <property> 50 <property>
51 <name>layoutSpacing</name> 51 <name>layoutSpacing</name>
52 </property> 52 </property>
53 <widget> 53 <widget>
54 <class>QWidget</class> 54 <class>QWidget</class>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>name</name> 56 <name>name</name>
57 <cstring>ConfigPage</cstring> 57 <cstring>ConfigPage</cstring>
58 </property> 58 </property>
59 <attribute> 59 <attribute>
60 <name>title</name> 60 <name>title</name>
61 <string>General</string> 61 <string>General</string>
62 </attribute> 62 </attribute>
63 <vbox> 63 <vbox>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>margin</name> 65 <name>margin</name>
66 <number>0</number> 66 <number>0</number>
67 </property> 67 </property>
68 <property stdset="1"> 68 <property stdset="1">
69 <name>spacing</name> 69 <name>spacing</name>
70 <number>2</number> 70 <number>2</number>
71 </property> 71 </property>
72 <widget> 72 <widget>
73 <class>QLayoutWidget</class> 73 <class>QLayoutWidget</class>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>name</name> 75 <name>name</name>
76 <cstring>Layout6</cstring> 76 <cstring>Layout6</cstring>
77 </property> 77 </property>
78 <property> 78 <property>
79 <name>layoutMargin</name> 79 <name>layoutMargin</name>
80 </property> 80 </property>
81 <grid> 81 <grid>
82 <property stdset="1"> 82 <property stdset="1">
83 <name>margin</name> 83 <name>margin</name>
84 <number>1</number> 84 <number>1</number>
85 </property> 85 </property>
86 <property stdset="1"> 86 <property stdset="1">
87 <name>spacing</name> 87 <name>spacing</name>
88 <number>6</number> 88 <number>6</number>
89 </property> 89 </property>
90 <widget row="1" column="0" > 90 <widget row="1" column="0" >
91 <class>QLabel</class> 91 <class>QLabel</class>
92 <property stdset="1"> 92 <property stdset="1">
93 <name>name</name> 93 <name>name</name>
94 <cstring>essidLabel</cstring> 94 <cstring>essidLabel</cstring>
95 </property> 95 </property>
96 <property stdset="1"> 96 <property stdset="1">
97 <name>enabled</name> 97 <name>enabled</name>
98 <bool>true</bool> 98 <bool>true</bool>
99 </property> 99 </property>
100 <property stdset="1"> 100 <property stdset="1">
101 <name>sizePolicy</name> 101 <name>sizePolicy</name>
102 <sizepolicy> 102 <sizepolicy>
103 <hsizetype>1</hsizetype> 103 <hsizetype>1</hsizetype>
104 <vsizetype>1</vsizetype> 104 <vsizetype>1</vsizetype>
105 </sizepolicy> 105 </sizepolicy>
106 </property> 106 </property>
107 <property stdset="1"> 107 <property stdset="1">
108 <name>text</name> 108 <name>text</name>
109 <string>ESS-ID</string> 109 <string>ESS-ID</string>
110 </property> 110 </property>
111 </widget> 111 </widget>
112 <widget row="1" column="1" > 112 <widget row="1" column="1" >
113 <class>QComboBox</class> 113 <class>QComboBox</class>
114 <item> 114 <item>
115 <property> 115 <property>
116 <name>text</name> 116 <name>text</name>
117 <string>any</string> 117 <string>any</string>
118 </property> 118 </property>
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>
126 <sizepolicy> 126 <sizepolicy>
127 <hsizetype>7</hsizetype> 127 <hsizetype>7</hsizetype>
128 <vsizetype>0</vsizetype> 128 <vsizetype>0</vsizetype>
129 </sizepolicy> 129 </sizepolicy>
130 </property> 130 </property>
131 <property stdset="1"> 131 <property stdset="1">
132 <name>editable</name> 132 <name>editable</name>
133 <bool>true</bool> 133 <bool>true</bool>
134 </property> 134 </property>
135 <property stdset="1"> 135 <property stdset="1">
136 <name>currentItem</name> 136 <name>currentItem</name>
137 <number>0</number> 137 <number>0</number>
138 </property> 138 </property>
139 <property stdset="1"> 139 <property stdset="1">
140 <name>sizeLimit</name> 140 <name>sizeLimit</name>
141 <number>5</number> 141 <number>5</number>
142 </property> 142 </property>
143 <property stdset="1"> 143 <property stdset="1">
144 <name>autoCompletion</name> 144 <name>autoCompletion</name>
145 <bool>true</bool> 145 <bool>true</bool>
146 </property> 146 </property>
147 <property stdset="1"> 147 <property stdset="1">
148 <name>duplicatesEnabled</name> 148 <name>duplicatesEnabled</name>
149 <bool>false</bool> 149 <bool>false</bool>
150 </property> 150 </property>
151 </widget> 151 </widget>
152 <widget row="0" column="0" > 152 <widget row="0" column="0" >
153 <class>QLabel</class> 153 <class>QLabel</class>
154 <property stdset="1"> 154 <property stdset="1">
155 <name>name</name> 155 <name>name</name>
156 <cstring>modeLabel</cstring> 156 <cstring>modeLabel</cstring>
157 </property> 157 </property>
158 <property stdset="1"> 158 <property stdset="1">
159 <name>enabled</name> 159 <name>enabled</name>
160 <bool>true</bool> 160 <bool>true</bool>
161 </property> 161 </property>
162 <property stdset="1"> 162 <property stdset="1">
163 <name>sizePolicy</name> 163 <name>sizePolicy</name>
164 <sizepolicy> 164 <sizepolicy>
165 <hsizetype>1</hsizetype> 165 <hsizetype>1</hsizetype>
166 <vsizetype>1</vsizetype> 166 <vsizetype>1</vsizetype>
167 </sizepolicy> 167 </sizepolicy>
168 </property> 168 </property>
169 <property stdset="1"> 169 <property stdset="1">
170 <name>text</name> 170 <name>text</name>
171 <string>Mode</string> 171 <string>Mode</string>
172 </property> 172 </property>
173 </widget> 173 </widget>
174 <widget row="0" column="1" > 174 <widget row="0" column="1" >
175 <class>QComboBox</class> 175 <class>QComboBox</class>
176 <item> 176 <item>
177 <property> 177 <property>
178 <name>text</name> 178 <name>text</name>
179 <string>Infrastructure</string> 179 <string>Infrastructure</string>
180 </property> 180 </property>
181 </item> 181 </item>
182 <item> 182 <item>
183 <property> 183 <property>
184 <name>text</name> 184 <name>text</name>
185 <string>Auto</string> 185 <string>Auto</string>
186 </property> 186 </property>
187 </item> 187 </item>
188 <item> 188 <item>
189 <property> 189 <property>
190 <name>text</name> 190 <name>text</name>
191 <string>Managed</string> 191 <string>Managed</string>
192 </property> 192 </property>
193 </item> 193 </item>
194 <item> 194 <item>
195 <property> 195 <property>
196 <name>text</name> 196 <name>text</name>
197 <string>Ad-Hoc</string> 197 <string>Ad-Hoc</string>
198 </property> 198 </property>
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>
206 <bool>true</bool> 206 <bool>true</bool>
207 </property> 207 </property>
208 <property stdset="1"> 208 <property stdset="1">
209 <name>sizePolicy</name> 209 <name>sizePolicy</name>
210 <sizepolicy> 210 <sizepolicy>
211 <hsizetype>1</hsizetype> 211 <hsizetype>1</hsizetype>
212 <vsizetype>0</vsizetype> 212 <vsizetype>0</vsizetype>
213 </sizepolicy> 213 </sizepolicy>
214 </property> 214 </property>
215 </widget> 215 </widget>
216 </grid> 216 </grid>
217 </widget> 217 </widget>
218 <widget> 218 <widget>
219 <class>QLayoutWidget</class> 219 <class>QLayoutWidget</class>
220 <property stdset="1"> 220 <property stdset="1">
221 <name>name</name> 221 <name>name</name>
222 <cstring>Layout8</cstring> 222 <cstring>Layout8</cstring>
223 </property> 223 </property>
224 <property> 224 <property>
225 <name>layoutMargin</name> 225 <name>layoutMargin</name>
226 </property> 226 </property>
227 <property> 227 <property>
228 <name>layoutSpacing</name> 228 <name>layoutSpacing</name>
229 </property> 229 </property>
230 <grid> 230 <grid>
231 <property stdset="1"> 231 <property stdset="1">
232 <name>margin</name> 232 <name>margin</name>
233 <number>1</number> 233 <number>1</number>
234 </property> 234 </property>
235 <property stdset="1"> 235 <property stdset="1">
236 <name>spacing</name> 236 <name>spacing</name>
237 <number>2</number> 237 <number>2</number>
238 </property> 238 </property>
239 <widget row="0" column="0" rowspan="1" colspan="3" > 239 <widget row="0" column="0" rowspan="1" colspan="3" >
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>
247 <string>Specify &amp;Access Point</string> 247 <string>Specify &amp;Access Point</string>
248 </property> 248 </property>
249 </widget> 249 </widget>
250 <widget row="1" column="1" > 250 <widget row="1" column="1" >
251 <class>QLabel</class> 251 <class>QLabel</class>
252 <property stdset="1"> 252 <property stdset="1">
253 <name>name</name> 253 <name>name</name>
254 <cstring>macLabel</cstring> 254 <cstring>macLabel</cstring>
255 </property> 255 </property>
256 <property stdset="1"> 256 <property stdset="1">
257 <name>enabled</name> 257 <name>enabled</name>
258 <bool>false</bool> 258 <bool>false</bool>
259 </property> 259 </property>
260 <property stdset="1"> 260 <property stdset="1">
261 <name>sizePolicy</name> 261 <name>sizePolicy</name>
262 <sizepolicy> 262 <sizepolicy>
263 <hsizetype>0</hsizetype> 263 <hsizetype>0</hsizetype>
264 <vsizetype>1</vsizetype> 264 <vsizetype>1</vsizetype>
265 </sizepolicy> 265 </sizepolicy>
266 </property> 266 </property>
267 <property stdset="1"> 267 <property stdset="1">
268 <name>text</name> 268 <name>text</name>
269 <string>MAC</string> 269 <string>MAC</string>
270 </property> 270 </property>
271 </widget> 271 </widget>
272 <widget row="1" column="2" > 272 <widget row="1" column="2" >
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>
280 <bool>false</bool> 280 <bool>false</bool>
281 </property> 281 </property>
282 <property stdset="1"> 282 <property stdset="1">
283 <name>sizePolicy</name> 283 <name>sizePolicy</name>
284 <sizepolicy> 284 <sizepolicy>
285 <hsizetype>7</hsizetype> 285 <hsizetype>7</hsizetype>
286 <vsizetype>1</vsizetype> 286 <vsizetype>1</vsizetype>
287 </sizepolicy> 287 </sizepolicy>
288 </property> 288 </property>
289 </widget> 289 </widget>
290 <spacer row="1" column="0" > 290 <spacer row="1" column="0" >
291 <property> 291 <property>
292 <name>name</name> 292 <name>name</name>
293 <cstring>Spacer8</cstring> 293 <cstring>Spacer8</cstring>
294 </property> 294 </property>
295 <property stdset="1"> 295 <property stdset="1">
296 <name>orientation</name> 296 <name>orientation</name>
297 <enum>Horizontal</enum> 297 <enum>Horizontal</enum>
298 </property> 298 </property>
299 <property stdset="1"> 299 <property stdset="1">
300 <name>sizeType</name> 300 <name>sizeType</name>
301 <enum>Fixed</enum> 301 <enum>Fixed</enum>
302 </property> 302 </property>
303 <property> 303 <property>
304 <name>sizeHint</name> 304 <name>sizeHint</name>
305 <size> 305 <size>
306 <width>20</width> 306 <width>20</width>
307 <height>20</height> 307 <height>20</height>
308 </size> 308 </size>
309 </property> 309 </property>
310 </spacer> 310 </spacer>
311 </grid> 311 </grid>
312 </widget> 312 </widget>
313 <widget> 313 <widget>
314 <class>QLayoutWidget</class> 314 <class>QLayoutWidget</class>
315 <property stdset="1"> 315 <property stdset="1">
316 <name>name</name> 316 <name>name</name>
317 <cstring>Layout7</cstring> 317 <cstring>Layout7</cstring>
318 </property> 318 </property>
319 <property> 319 <property>
320 <name>layoutMargin</name> 320 <name>layoutMargin</name>
321 </property> 321 </property>
322 <hbox> 322 <hbox>
323 <property stdset="1"> 323 <property stdset="1">
324 <name>margin</name> 324 <name>margin</name>
325 <number>1</number> 325 <number>1</number>
326 </property> 326 </property>
327 <property stdset="1"> 327 <property stdset="1">
328 <name>spacing</name> 328 <name>spacing</name>
329 <number>6</number> 329 <number>6</number>
330 </property> 330 </property>
331 <widget> 331 <widget>
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>
339 <string>Specific &amp;Channel</string> 339 <string>Specific &amp;Channel</string>
340 </property> 340 </property>
341 </widget> 341 </widget>
342 <widget> 342 <widget>
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>
350 <bool>false</bool> 350 <bool>false</bool>
351 </property> 351 </property>
352 <property stdset="1"> 352 <property stdset="1">
353 <name>maxValue</name> 353 <name>maxValue</name>
354 <number>15</number> 354 <number>15</number>
355 </property> 355 </property>
356 <property stdset="1"> 356 <property stdset="1">
357 <name>minValue</name> 357 <name>minValue</name>
358 <number>1</number> 358 <number>1</number>
359 </property> 359 </property>
360 <property stdset="1"> 360 <property stdset="1">
361 <name>value</name> 361 <name>value</name>
362 <number>1</number> 362 <number>1</number>
363 </property> 363 </property>
364 </widget> 364 </widget>
365 </hbox> 365 </hbox>
366 </widget> 366 </widget>
367 <spacer> 367 <spacer>
368 <property> 368 <property>
369 <name>name</name> 369 <name>name</name>
370 <cstring>Spacer7</cstring> 370 <cstring>Spacer7</cstring>
371 </property> 371 </property>
372 <property stdset="1"> 372 <property stdset="1">
373 <name>orientation</name> 373 <name>orientation</name>
374 <enum>Vertical</enum> 374 <enum>Vertical</enum>
375 </property> 375 </property>
376 <property stdset="1"> 376 <property stdset="1">
377 <name>sizeType</name> 377 <name>sizeType</name>
378 <enum>Expanding</enum> 378 <enum>Expanding</enum>
379 </property> 379 </property>
380 <property> 380 <property>
381 <name>sizeHint</name> 381 <name>sizeHint</name>
382 <size> 382 <size>
383 <width>20</width> 383 <width>20</width>
384 <height>20</height> 384 <height>20</height>
385 </size> 385 </size>
386 </property> 386 </property>
387 </spacer> 387 </spacer>
388 </vbox> 388 </vbox>
389 </widget> 389 </widget>
390 <widget> 390 <widget>
391 <class>QWidget</class> 391 <class>QWidget</class>
392 <property stdset="1"> 392 <property stdset="1">
393 <name>name</name> 393 <name>name</name>
394 <cstring>WepPage</cstring> 394 <cstring>WepPage</cstring>
395 </property> 395 </property>
396 <attribute> 396 <attribute>
397 <name>title</name> 397 <name>title</name>
398 <string>Encryption</string> 398 <string>Encryption</string>
399 </attribute> 399 </attribute>
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>
407 <number>2</number> 407 <number>2</number>
408 </property> 408 </property>
409 <widget> 409 <widget>
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>
417 <string>&amp;Enable Encryption</string> 417 <string>&amp;Enable Encryption</string>
418 </property> 418 </property>
419 </widget> 419 </widget>
420 <widget> 420 <widget>
421 <class>QButtonGroup</class> 421 <class>QButtonGroup</class>
422 <property stdset="1"> 422 <property stdset="1">
423 <name>name</name> 423 <name>name</name>
424 <cstring>KeyButtonGroup</cstring> 424 <cstring>KeyButtonGroup</cstring>
425 </property> 425 </property>
426 <property stdset="1"> 426 <property stdset="1">
427 <name>enabled</name> 427 <name>enabled</name>
428 <bool>false</bool> 428 <bool>false</bool>
429 </property> 429 </property>
430 <property stdset="1"> 430 <property stdset="1">
431 <name>title</name> 431 <name>title</name>
432 <string>&amp;Key Setting</string> 432 <string>&amp;Key Setting</string>
433 </property> 433 </property>
434 <property> 434 <property>
435 <name>layoutMargin</name> 435 <name>layoutMargin</name>
436 </property> 436 </property>
437 <property> 437 <property>
438 <name>layoutSpacing</name> 438 <name>layoutSpacing</name>
439 </property> 439 </property>
440 <grid> 440 <grid>
441 <property stdset="1"> 441 <property stdset="1">
442 <name>margin</name> 442 <name>margin</name>
443 <number>2</number> 443 <number>2</number>
444 </property> 444 </property>
445 <property stdset="1"> 445 <property stdset="1">
446 <name>spacing</name> 446 <name>spacing</name>
447 <number>2</number> 447 <number>2</number>
448 </property> 448 </property>
449 <widget row="0" column="0" > 449 <widget row="0" column="0" >
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>
457 <string>Key &amp;1</string> 457 <string>Key &amp;1</string>
458 </property> 458 </property>
459 <property stdset="1"> 459 <property stdset="1">
460 <name>checked</name> 460 <name>checked</name>
461 <bool>true</bool> 461 <bool>true</bool>
462 </property> 462 </property>
463 </widget> 463 </widget>
464 <widget row="3" column="0" > 464 <widget row="3" column="0" >
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>
472 <string>Key &amp;4</string> 472 <string>Key &amp;4</string>
473 </property> 473 </property>
474 </widget> 474 </widget>
475 <widget row="0" column="1" > 475 <widget row="0" column="1" >
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>
490 <string>Key &amp;2</string> 494 <string>Key &amp;2</string>
491 </property> 495 </property>
492 </widget> 496 </widget>
493 <widget row="2" column="0" > 497 <widget row="2" column="0" >
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>
501 <string>Key &amp;3</string> 505 <string>Key &amp;3</string>
502 </property> 506 </property>
503 </widget> 507 </widget>
504 <widget row="1" column="1" > 508 <widget row="1" column="1" >
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>
595 <name>name</name> 548 <name>name</name>
596 <cstring>Spacer30</cstring> 549 <cstring>Spacer30</cstring>
597 </property> 550 </property>
598 <property stdset="1"> 551 <property stdset="1">
599 <name>orientation</name> 552 <name>orientation</name>
600 <enum>Vertical</enum> 553 <enum>Vertical</enum>
601 </property> 554 </property>
602 <property stdset="1"> 555 <property stdset="1">
603 <name>sizeType</name> 556 <name>sizeType</name>
604 <enum>Expanding</enum> 557 <enum>Expanding</enum>
605 </property> 558 </property>
606 <property> 559 <property>
607 <name>sizeHint</name> 560 <name>sizeHint</name>
608 <size> 561 <size>
609 <width>20</width> 562 <width>20</width>
610 <height>20</height> 563 <height>20</height>
611 </size> 564 </size>
612 </property> 565 </property>
613 </spacer> 566 </spacer>
614 </vbox> 567 </vbox>
615 </widget> 568 </widget>
616 <widget> 569 <widget>
617 <class>QWidget</class> 570 <class>QWidget</class>
618 <property stdset="1"> 571 <property stdset="1">
619 <name>name</name> 572 <name>name</name>
620 <cstring>tab</cstring> 573 <cstring>tab</cstring>
621 </property> 574 </property>
622 <attribute> 575 <attribute>
623 <name>title</name> 576 <name>title</name>
624 <string>State</string> 577 <string>State</string>
625 </attribute> 578 </attribute>
626 <vbox> 579 <vbox>
627 <property stdset="1"> 580 <property stdset="1">
628 <name>margin</name> 581 <name>margin</name>
629 <number>0</number> 582 <number>0</number>
630 </property> 583 </property>
631 <property stdset="1"> 584 <property stdset="1">
632 <name>spacing</name> 585 <name>spacing</name>
633 <number>2</number> 586 <number>2</number>
634 </property> 587 </property>
635 <widget> 588 <widget>
636 <class>QLayoutWidget</class> 589 <class>QLayoutWidget</class>
637 <property stdset="1"> 590 <property stdset="1">
638 <name>name</name> 591 <name>name</name>
639 <cstring>Layout12</cstring> 592 <cstring>Layout12</cstring>
640 </property> 593 </property>
641 <property> 594 <property>
642 <name>layoutSpacing</name> 595 <name>layoutSpacing</name>
643 </property> 596 </property>
644 <grid> 597 <grid>
645 <property stdset="1"> 598 <property stdset="1">
646 <name>margin</name> 599 <name>margin</name>
647 <number>0</number> 600 <number>0</number>
648 </property> 601 </property>
649 <property stdset="1"> 602 <property stdset="1">
650 <name>spacing</name> 603 <name>spacing</name>
651 <number>2</number> 604 <number>2</number>
652 </property> 605 </property>
653 <widget row="0" column="0" > 606 <widget row="0" column="0" >
654 <class>QLabel</class> 607 <class>QLabel</class>
655 <property stdset="1"> 608 <property stdset="1">
656 <name>name</name> 609 <name>name</name>
657 <cstring>TextLabel1_3</cstring> 610 <cstring>TextLabel1_3</cstring>
658 </property> 611 </property>
659 <property stdset="1"> 612 <property stdset="1">
660 <name>text</name> 613 <name>text</name>
661 <string>Station</string> 614 <string>Station</string>
662 </property> 615 </property>
663 </widget> 616 </widget>
664 <widget row="3" column="1" > 617 <widget row="3" column="1" >
665 <class>QLabel</class> 618 <class>QLabel</class>
666 <property stdset="1"> 619 <property stdset="1">
667 <name>name</name> 620 <name>name</name>
668 <cstring>Channel_LBL</cstring> 621 <cstring>Channel_LBL</cstring>
669 </property> 622 </property>
670 <property stdset="1"> 623 <property stdset="1">
671 <name>frameShape</name> 624 <name>frameShape</name>
672 <enum>Panel</enum> 625 <enum>Panel</enum>
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" >
680 <class>QLabel</class> 637 <class>QLabel</class>
681 <property stdset="1"> 638 <property stdset="1">
682 <name>name</name> 639 <name>name</name>
683 <cstring>TextLabel4_3</cstring> 640 <cstring>TextLabel4_3</cstring>
684 </property> 641 </property>
685 <property stdset="1"> 642 <property stdset="1">
686 <name>text</name> 643 <name>text</name>
687 <string>Channel</string> 644 <string>Channel</string>
688 </property> 645 </property>
689 </widget> 646 </widget>
690 <widget row="2" column="0" > 647 <widget row="2" column="0" >
691 <class>QLabel</class> 648 <class>QLabel</class>
692 <property stdset="1"> 649 <property stdset="1">
693 <name>name</name> 650 <name>name</name>
694 <cstring>TextLabel3_3</cstring> 651 <cstring>TextLabel3_3</cstring>
695 </property> 652 </property>
696 <property stdset="1"> 653 <property stdset="1">
697 <name>text</name> 654 <name>text</name>
698 <string>Mode</string> 655 <string>Mode</string>
699 </property> 656 </property>
700 </widget> 657 </widget>
701 <widget row="1" column="0" > 658 <widget row="1" column="0" >
702 <class>QLabel</class> 659 <class>QLabel</class>
703 <property stdset="1"> 660 <property stdset="1">
704 <name>name</name> 661 <name>name</name>
705 <cstring>TextLabel2_3</cstring> 662 <cstring>TextLabel2_3</cstring>
706 </property> 663 </property>
707 <property stdset="1"> 664 <property stdset="1">
708 <name>text</name> 665 <name>text</name>
709 <string>ESSID</string> 666 <string>ESSID</string>
710 </property> 667 </property>
711 </widget> 668 </widget>
712 <widget row="4" column="0" > 669 <widget row="4" column="0" >
713 <class>QLabel</class> 670 <class>QLabel</class>
714 <property stdset="1"> 671 <property stdset="1">
715 <name>name</name> 672 <name>name</name>
716 <cstring>TextLabel9_2</cstring> 673 <cstring>TextLabel9_2</cstring>
717 </property> 674 </property>
718 <property stdset="1"> 675 <property stdset="1">
719 <name>text</name> 676 <name>text</name>
720 <string>AP</string> 677 <string>AP</string>
721 </property> 678 </property>
722 </widget> 679 </widget>
723 <widget row="0" column="1" > 680 <widget row="0" column="1" >
724 <class>QLabel</class> 681 <class>QLabel</class>
725 <property stdset="1"> 682 <property stdset="1">
726 <name>name</name> 683 <name>name</name>
727 <cstring>Station_LBL</cstring> 684 <cstring>Station_LBL</cstring>
728 </property> 685 </property>
729 <property stdset="1"> 686 <property stdset="1">
730 <name>frameShape</name> 687 <name>frameShape</name>
731 <enum>Panel</enum> 688 <enum>Panel</enum>
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" >
739 <class>QLabel</class> 700 <class>QLabel</class>
740 <property stdset="1"> 701 <property stdset="1">
741 <name>name</name> 702 <name>name</name>
742 <cstring>Rate_LBL</cstring> 703 <cstring>Rate_LBL</cstring>
743 </property> 704 </property>
744 <property stdset="1"> 705 <property stdset="1">
745 <name>sizePolicy</name> 706 <name>sizePolicy</name>
746 <sizepolicy> 707 <sizepolicy>
747 <hsizetype>7</hsizetype> 708 <hsizetype>7</hsizetype>
748 <vsizetype>1</vsizetype> 709 <vsizetype>1</vsizetype>
749 </sizepolicy> 710 </sizepolicy>
750 </property> 711 </property>
751 <property stdset="1"> 712 <property stdset="1">
752 <name>frameShape</name> 713 <name>frameShape</name>
753 <enum>Panel</enum> 714 <enum>Panel</enum>
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" >
761 <class>QLabel</class> 726 <class>QLabel</class>
762 <property stdset="1"> 727 <property stdset="1">
763 <name>name</name> 728 <name>name</name>
764 <cstring>TextLabel4_2_2</cstring> 729 <cstring>TextLabel4_2_2</cstring>
765 </property> 730 </property>
766 <property stdset="1"> 731 <property stdset="1">
767 <name>text</name> 732 <name>text</name>
768 <string>Rate</string> 733 <string>Rate</string>
769 </property> 734 </property>
770 </widget> 735 </widget>
771 <widget row="4" column="1" > 736 <widget row="4" column="1" >
772 <class>QLabel</class> 737 <class>QLabel</class>
773 <property stdset="1"> 738 <property stdset="1">
774 <name>name</name> 739 <name>name</name>
775 <cstring>AP_LBL</cstring> 740 <cstring>AP_LBL</cstring>
776 </property> 741 </property>
777 <property stdset="1"> 742 <property stdset="1">
778 <name>frameShape</name> 743 <name>frameShape</name>
779 <enum>Panel</enum> 744 <enum>Panel</enum>
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>
794 <enum>Panel</enum> 763 <enum>Panel</enum>
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>
809 <enum>Panel</enum> 782 <enum>Panel</enum>
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>
817 </widget> 794 </widget>
818 <widget> 795 <widget>
819 <class>QGroupBox</class> 796 <class>QGroupBox</class>
820 <property stdset="1"> 797 <property stdset="1">
821 <name>name</name> 798 <name>name</name>
822 <cstring>GroupBox1</cstring> 799 <cstring>GroupBox1</cstring>
823 </property> 800 </property>
824 <property stdset="1"> 801 <property stdset="1">
825 <name>title</name> 802 <name>title</name>
826 <string>Link Quality</string> 803 <string>Link Quality</string>
827 </property> 804 </property>
828 <property> 805 <property>
829 <name>layoutMargin</name> 806 <name>layoutMargin</name>
830 </property> 807 </property>
831 <property> 808 <property>
832 <name>layoutSpacing</name> 809 <name>layoutSpacing</name>
833 </property> 810 </property>
834 <grid> 811 <grid>
835 <property stdset="1"> 812 <property stdset="1">
836 <name>margin</name> 813 <name>margin</name>
837 <number>2</number> 814 <number>2</number>
838 </property> 815 </property>
839 <property stdset="1"> 816 <property stdset="1">
840 <name>spacing</name> 817 <name>spacing</name>
841 <number>2</number> 818 <number>2</number>
842 </property> 819 </property>
843 <widget row="1" column="0" > 820 <widget row="1" column="0" >
844 <class>QLabel</class> 821 <class>QLabel</class>
845 <property stdset="1"> 822 <property stdset="1">
846 <name>name</name> 823 <name>name</name>
847 <cstring>TextLabel2_2_2</cstring> 824 <cstring>TextLabel2_2_2</cstring>
848 </property> 825 </property>
849 <property stdset="1"> 826 <property stdset="1">
850 <name>text</name> 827 <name>text</name>
851 <string>Noise</string> 828 <string>Noise</string>
852 </property> 829 </property>
853 </widget> 830 </widget>
854 <widget row="2" column="0" > 831 <widget row="2" column="0" >
855 <class>QLabel</class> 832 <class>QLabel</class>
856 <property stdset="1"> 833 <property stdset="1">
857 <name>name</name> 834 <name>name</name>
858 <cstring>TextLabel3_2_2</cstring> 835 <cstring>TextLabel3_2_2</cstring>
859 </property> 836 </property>
860 <property stdset="1"> 837 <property stdset="1">
861 <name>text</name> 838 <name>text</name>
862 <string>Quality</string> 839 <string>Quality</string>
863 </property> 840 </property>
864 </widget> 841 </widget>
865 <widget row="1" column="2" > 842 <widget row="1" column="2" >
866 <class>QProgressBar</class> 843 <class>QProgressBar</class>
867 <property stdset="1"> 844 <property stdset="1">
868 <name>name</name> 845 <name>name</name>
869 <cstring>Noise_PB</cstring> 846 <cstring>Noise_PB</cstring>
870 </property> 847 </property>
871 <property stdset="1"> 848 <property stdset="1">
872 <name>progress</name> 849 <name>progress</name>
873 <number>0</number> 850 <number>0</number>
874 </property> 851 </property>
875 </widget> 852 </widget>
876 <widget row="2" column="2" > 853 <widget row="2" column="2" >
877 <class>QProgressBar</class> 854 <class>QProgressBar</class>
878 <property stdset="1"> 855 <property stdset="1">
879 <name>name</name> 856 <name>name</name>
880 <cstring>Quality_PB</cstring> 857 <cstring>Quality_PB</cstring>
881 </property> 858 </property>
882 <property stdset="1"> 859 <property stdset="1">
883 <name>progress</name> 860 <name>progress</name>
884 <number>0</number> 861 <number>0</number>
885 </property> 862 </property>
886 </widget> 863 </widget>
887 <widget row="0" column="0" > 864 <widget row="0" column="0" >
888 <class>QLabel</class> 865 <class>QLabel</class>
889 <property stdset="1"> 866 <property stdset="1">
890 <name>name</name> 867 <name>name</name>
891 <cstring>TextLabel1_2_2</cstring> 868 <cstring>TextLabel1_2_2</cstring>
892 </property> 869 </property>
893 <property stdset="1"> 870 <property stdset="1">
894 <name>text</name> 871 <name>text</name>
895 <string>Signal</string> 872 <string>Signal</string>
896 </property> 873 </property>
897 </widget> 874 </widget>
898 <spacer row="0" column="1" > 875 <spacer row="0" column="1" >
899 <property> 876 <property>
900 <name>name</name> 877 <name>name</name>
901 <cstring>Spacer28</cstring> 878 <cstring>Spacer28</cstring>
902 </property> 879 </property>
903 <property stdset="1"> 880 <property stdset="1">
904 <name>orientation</name> 881 <name>orientation</name>
905 <enum>Horizontal</enum> 882 <enum>Horizontal</enum>
906 </property> 883 </property>
907 <property stdset="1"> 884 <property stdset="1">
908 <name>sizeType</name> 885 <name>sizeType</name>
909 <enum>Fixed</enum> 886 <enum>Fixed</enum>
910 </property> 887 </property>
911 <property> 888 <property>
912 <name>sizeHint</name> 889 <name>sizeHint</name>
913 <size> 890 <size>
914 <width>16</width> 891 <width>16</width>
915 <height>20</height> 892 <height>20</height>
916 </size> 893 </size>
917 </property> 894 </property>
918 </spacer> 895 </spacer>
919 <widget row="0" column="2" > 896 <widget row="0" column="2" >
920 <class>QProgressBar</class> 897 <class>QProgressBar</class>
921 <property stdset="1"> 898 <property stdset="1">
922 <name>name</name> 899 <name>name</name>
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>
929 </widget> 914 </widget>
930 </grid> 915 </grid>
931 </widget> 916 </widget>
932 <spacer> 917 <spacer>
933 <property> 918 <property>
934 <name>name</name> 919 <name>name</name>
935 <cstring>Spacer11</cstring> 920 <cstring>Spacer11</cstring>
936 </property> 921 </property>
937 <property stdset="1"> 922 <property stdset="1">
938 <name>orientation</name> 923 <name>orientation</name>
939 <enum>Vertical</enum> 924 <enum>Vertical</enum>
940 </property> 925 </property>
941 <property stdset="1"> 926 <property stdset="1">
942 <name>sizeType</name> 927 <name>sizeType</name>
943 <enum>Expanding</enum> 928 <enum>Expanding</enum>
944 </property> 929 </property>
945 <property> 930 <property>
946 <name>sizeHint</name> 931 <name>sizeHint</name>
947 <size> 932 <size>
948 <width>20</width> 933 <width>20</width>
949 <height>20</height> 934 <height>20</height>
950 </size> 935 </size>
951 </property> 936 </property>
952 </spacer> 937 </spacer>
953 </vbox> 938 </vbox>
954 </widget> 939 </widget>
955 </widget> 940 </widget>
956 </vbox> 941 </vbox>
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>
990</UI> 975</UI>
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
@@ -1,85 +1,85 @@
1#include "wlan_NN.h" 1#include "wlan_NN.h"
2#include "wlan_NNI.h" 2#include "wlan_NNI.h"
3 3
4static const char * WLanNeeds[] = 4static const char * WLanNeeds[] =
5 { 0 5 { 0
6 }; 6 };
7 7
8/** 8/**
9 * Constructor, find all of the possible interfaces 9 * Constructor, find all of the possible interfaces
10 */ 10 */
11WLanNetNode::WLanNetNode() : ANetNode(tr("WLan Device")) { 11WLanNetNode::WLanNetNode() : ANetNode(tr("WLan Device")) {
12 InstanceCount = 2; 12 InstanceCount = 2;
13} 13}
14 14
15/** 15/**
16 * Delete any interfaces that we own. 16 * Delete any interfaces that we own.
17 */ 17 */
18WLanNetNode::~WLanNetNode(){ 18WLanNetNode::~WLanNetNode(){
19} 19}
20 20
21const QString WLanNetNode::nodeDescription(){ 21const QString WLanNetNode::nodeDescription(){
22 return tr("\ 22 return tr("\
23<p>Configure Wi/Fi or WLan network cards.</p>\ 23<p>Configure Wi/Fi or WLan network cards.</p>\
24<p>Defines Wireless options for those cards</p>\ 24<p>Defines Wireless options for those cards</p>\
25" 25"
26); 26);
27} 27}
28 28
29ANetNodeInstance * WLanNetNode::createInstance( void ) { 29ANetNodeInstance * WLanNetNode::createInstance( void ) {
30 return new AWLan( this ); 30 return new AWLan( this );
31} 31}
32 32
33const char ** WLanNetNode::needs( void ) { 33const char ** WLanNetNode::needs( void ) {
34 return WLanNeeds; 34 return WLanNeeds;
35} 35}
36 36
37const char * WLanNetNode::provides( void ) { 37const char * WLanNetNode::provides( void ) {
38 return "device"; 38 return "device";
39} 39}
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 ) {
47 return S == "interfaces"; 47 return S == "interfaces";
48} 48}
49 49
50bool WLanNetNode::generateDeviceDataForCommonFile( 50bool WLanNetNode::generateDeviceDataForCommonFile(
51 SystemFile & S, 51 SystemFile & S,
52 long DevNr ) { 52 long DevNr ) {
53 QString NIC = genNic( DevNr ); 53 QString NIC = genNic( DevNr );
54 54
55 if( S.name() == "interfaces" ) { 55 if( S.name() == "interfaces" ) {
56 // generate mapping stanza for this interface 56 // generate mapping stanza for this interface
57 S << "# check if " << NIC << " can be brought UP" << endl; 57 S << "# check if " << NIC << " can be brought UP" << endl;
58 S << "mapping " << NIC << endl; 58 S << "mapping " << NIC << endl;
59 S << " script networksettings2-request" << endl << endl; 59 S << " script networksettings2-request" << endl << endl;
60 } 60 }
61 return 0; 61 return 0;
62} 62}
63 63
64QString WLanNetNode::genNic( long nr ) { 64QString WLanNetNode::genNic( long nr ) {
65 QString S; 65 QString S;
66 return S.sprintf( "wlan%ld", nr ); 66 return S.sprintf( "wlan%ld", nr );
67} 67}
68 68
69void WLanNetNode::setSpecificAttribute( QString & A, QString & V ) { 69void WLanNetNode::setSpecificAttribute( QString & A, QString & V ) {
70 if( A == "interfacecount" ) { 70 if( A == "interfacecount" ) {
71 InstanceCount = V.toLong(); 71 InstanceCount = V.toLong();
72 } 72 }
73} 73}
74 74
75void WLanNetNode::saveSpecificAttribute( QTextStream & TS ) { 75void WLanNetNode::saveSpecificAttribute( QTextStream & TS ) {
76 TS << "interfacecount=" 76 TS << "interfacecount="
77 << InstanceCount 77 << InstanceCount
78 << endl; 78 << endl;
79} 79}
80 80
81extern "C" { 81extern "C" {
82void create_plugin( QList<ANetNode> & PNN ) { 82void create_plugin( QList<ANetNode> & PNN ) {
83 PNN.append( new WLanNetNode() ); 83 PNN.append( new WLanNetNode() );
84} 84}
85} 85}