Diffstat (limited to 'noncore/settings/networksettings2/bluetooth') (more/less context) (ignore whitespace changes)
4 files changed, 127 insertions, 67 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 | |||
@@ -13,4 +13,4 @@ | |||
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> |
@@ -30,3 +30,3 @@ | |||
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>2</number> | 31 | <number>0</number> |
32 | </property> | 32 | </property> |
@@ -34,48 +34,17 @@ | |||
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> |
@@ -83,18 +52,22 @@ | |||
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> |
@@ -105,10 +78,24 @@ | |||
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> |
@@ -116,13 +103,51 @@ | |||
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> |
@@ -130,2 +155,17 @@ | |||
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 +1,3 @@ | |||
1 | #include <qtopia/qcopenvelope_qws.h> | ||
2 | |||
1 | #include <GUIUtils.h> | 3 | #include <GUIUtils.h> |
@@ -12,3 +14,3 @@ QString BluetoothBNEPEdit::acceptable( void ) { | |||
12 | 14 | ||
13 | bool BluetoothBNEPEdit::commit( BluetoothBNEPData & Data ) { | 15 | bool BluetoothBNEPEdit::commit( BluetoothBNEPData & ) { |
14 | return 0; | 16 | return 0; |
@@ -16,3 +18,9 @@ bool BluetoothBNEPEdit::commit( BluetoothBNEPData & Data ) { | |||
16 | 18 | ||
17 | void BluetoothBNEPEdit::showData( BluetoothBNEPData & Data ) { | 19 | void BluetoothBNEPEdit::showData( BluetoothBNEPData & ) { |
20 | } | ||
21 | |||
22 | void 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 | |||
@@ -12,2 +12,6 @@ public : | |||
12 | void showData( BluetoothBNEPData & Data ); | 12 | void showData( BluetoothBNEPData & Data ); |
13 | |||
14 | public 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 | |||
@@ -50,3 +50,3 @@ bool BluetoothBNEPNetNode::generateProperFilesFor( | |||
50 | ANetNodeInstance * ) { | 50 | ANetNodeInstance * ) { |
51 | return 1; | 51 | return 0; |
52 | } | 52 | } |
@@ -58,5 +58,13 @@ bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) { | |||
58 | bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( | 58 | bool 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 | } |