summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2/bluetooth
authorwimpie <wimpie>2004-04-08 01:25:02 (UTC)
committer wimpie <wimpie>2004-04-08 01:25:02 (UTC)
commit2ab70064958916733daf1b5f095cef562b2e9163 (patch) (unidiff)
tree445f054fee55b678dab07e10bd5571b4651586d8 /noncore/settings/networksettings2/bluetooth
parent93ead8f65765ec7af4c14efeb2758c1cf7bcbd89 (diff)
downloadopie-2ab70064958916733daf1b5f095cef562b2e9163.zip
opie-2ab70064958916733daf1b5f095cef562b2e9163.tar.gz
opie-2ab70064958916733daf1b5f095cef562b2e9163.tar.bz2
Link with libopiecore2
added linke to btmgr
Diffstat (limited to 'noncore/settings/networksettings2/bluetooth') (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui126
-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
4 files changed, 109 insertions, 49 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
index ddb5ddd..498f50b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPGUI.ui
@@ -11,8 +11,8 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>283</width> 14 <width>278</width>
15 <height>199</height> 15 <height>339</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
@@ -28,70 +28,83 @@
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"> 43 <property stdset="1">
45 <name>margin</name> 44 <name>text</name>
46 <number>0</number> 45 <string>Any available PAN device</string>
47 </property> 46 </property>
48 <property stdset="1"> 47 <property stdset="1">
49 <name>spacing</name> 48 <name>checked</name>
50 <number>6</number> 49 <bool>true</bool>
51 </property> 50 </property>
51 </widget>
52 <widget> 52 <widget>
53 <class>QLabel</class> 53 <class>QGroupBox</class>
54 <property stdset="1"> 54 <property stdset="1">
55 <name>name</name> 55 <name>name</name>
56 <cstring>TextLabel4</cstring> 56 <cstring>GroupBox1</cstring>
57 </property> 57 </property>
58 <property stdset="1"> 58 <property stdset="1">
59 <name>text</name> 59 <name>enabled</name>
60 <string>Name</string> 60 <bool>false</bool>
61 </property> 61 </property>
62 </widget>
63 <widget>
64 <class>QLineEdit</class>
65 <property stdset="1"> 62 <property stdset="1">
66 <name>name</name> 63 <name>title</name>
67 <cstring>Name_LE</cstring> 64 <string>Select Card</string>
68 </property> 65 </property>
69 </widget> 66 <property>
70 </hbox> 67 <name>layoutMargin</name>
71 </widget> 68 </property>
72 <widget> 69 <vbox>
73 <class>QLabel</class>
74 <property stdset="1"> 70 <property stdset="1">
75 <name>name</name> 71 <name>margin</name>
76 <cstring>TextLabel3</cstring> 72 <number>5</number>
77 </property> 73 </property>
78 <property stdset="1"> 74 <property stdset="1">
79 <name>text</name> 75 <name>spacing</name>
80 <string>Description</string> 76 <number>6</number>
81 </property> 77 </property>
82 </widget>
83 <widget> 78 <widget>
84 <class>QMultiLineEdit</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>
85 <property stdset="1"> 94 <property stdset="1">
86 <name>name</name> 95 <name>name</name>
87 <cstring>Description_LE</cstring> 96 <cstring>BTPANServers_LV</cstring>
97 </property>
98 <property stdset="1">
99 <name>allColumnsShowFocus</name>
100 <bool>true</bool>
88 </property> 101 </property>
89 </widget> 102 </widget>
90 <widget> 103 <widget>
91 <class>QLayoutWidget</class> 104 <class>QLayoutWidget</class>
92 <property stdset="1"> 105 <property stdset="1">
93 <name>name</name> 106 <name>name</name>
94 <cstring>Layout5</cstring> 107 <cstring>Layout2</cstring>
95 </property> 108 </property>
96 <hbox> 109 <hbox>
97 <property stdset="1"> 110 <property stdset="1">
@@ -102,30 +115,57 @@
102 <name>spacing</name> 115 <name>spacing</name>
103 <number>6</number> 116 <number>6</number>
104 </property> 117 </property>
105 <widget> 118 <spacer>
106 <class>QCheckBox</class> 119 <property>
107 <property stdset="1">
108 <name>name</name> 120 <name>name</name>
109 <cstring>Automatic_CB</cstring> 121 <cstring>Spacer1</cstring>
110 </property> 122 </property>
111 <property stdset="1"> 123 <property stdset="1">
112 <name>text</name> 124 <name>orientation</name>
113 <string>Start automatically</string> 125 <enum>Horizontal</enum>
114 </property> 126 </property>
115 </widget> 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>
116 <widget> 139 <widget>
117 <class>QCheckBox</class> 140 <class>QPushButton</class>
118 <property stdset="1"> 141 <property stdset="1">
119 <name>name</name> 142 <name>name</name>
120 <cstring>Confirm_CB</cstring> 143 <cstring>BTManager_BUT</cstring>
121 </property> 144 </property>
122 <property stdset="1"> 145 <property stdset="1">
123 <name>text</name> 146 <name>text</name>
124 <string>Confirm before start</string> 147 <string>Rescan</string>
125 </property> 148 </property>
126 </widget> 149 </widget>
127 </hbox> 150 </hbox>
128 </widget> 151 </widget>
129 </vbox> 152 </vbox>
130</widget> 153</widget>
154 </vbox>
155</widget>
156<connections>
157 <connection>
158 <sender>BTManager_BUT</sender>
159 <signal>clicked()</signal>
160 <receiver>BluetoothBNEP_FRM</receiver>
161 <slot>SLOT_StartBTMgr()</slot>
162 </connection>
163 <connection>
164 <sender>AnyPAN_CB</sender>
165 <signal>toggled(bool)</signal>
166 <receiver>GroupBox1</receiver>
167 <slot>setDisabled(bool)</slot>
168 </connection>
169 <slot access="public">SLOT_StartBTMgr()</slot>
170</connections>
131</UI> 171</UI>
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
index a27f1a7..9a3156b 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.cpp
@@ -1,3 +1,5 @@
1#include <qtopia/qcopenvelope_qws.h>
2
1#include <GUIUtils.h> 3#include <GUIUtils.h>
2#include "bluetoothBNEPedit.h" 4#include "bluetoothBNEPedit.h"
3 5
@@ -10,9 +12,15 @@ QString BluetoothBNEPEdit::acceptable( void ) {
10 return QString(); 12 return QString();
11} 13}
12 14
13bool BluetoothBNEPEdit::commit( BluetoothBNEPData & Data ) { 15bool BluetoothBNEPEdit::commit( BluetoothBNEPData & ) {
14 return 0; 16 return 0;
15} 17}
16 18
17void BluetoothBNEPEdit::showData( BluetoothBNEPData & Data ) { 19void BluetoothBNEPEdit::showData( BluetoothBNEPData & ) {
20}
21
22void BluetoothBNEPEdit::SLOT_StartBTMgr( void ) {
23 QCopEnvelope e( "QPE/System", "execute(QString)" );
24 e << QString( "bluetooth-manager" );
25
18} 26}
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
index d546f1e..82d23ad 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
+++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPedit.h
@@ -10,4 +10,8 @@ public :
10 QString acceptable( void ); 10 QString acceptable( void );
11 bool commit( BluetoothBNEPData & Data ); 11 bool commit( BluetoothBNEPData & Data );
12 void showData( BluetoothBNEPData & Data ); 12 void showData( BluetoothBNEPData & Data );
13
14public slots :
15
16 void SLOT_StartBTMgr( void );
13}; 17};
diff --git a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
index 1d0a0f7..b59b4f0 100644
--- a/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
+++ b/noncore/settings/networksettings2/bluetooth/bluetooth_NN.cpp
@@ -48,7 +48,7 @@ const char * BluetoothBNEPNetNode::provides( void ) {
48 48
49bool BluetoothBNEPNetNode::generateProperFilesFor( 49bool BluetoothBNEPNetNode::generateProperFilesFor(
50 ANetNodeInstance * ) { 50 ANetNodeInstance * ) {
51 return 1; 51 return 0;
52} 52}
53 53
54bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) { 54bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
@@ -56,9 +56,17 @@ bool BluetoothBNEPNetNode::hasDataFor( const QString & S ) {
56} 56}
57 57
58bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile( 58bool BluetoothBNEPNetNode::generateDeviceDataForCommonFile(
59 SystemFile & , 59 SystemFile & S ,
60 long ) { 60 long DevNr) {
61 return 1; 61 QString NIC = genNic( DevNr );
62
63 if( S.name() == "interfaces" ) {
64 // generate mapping stanza for this interface
65 S << "# check if " << NIC << " can be brought UP" << endl;
66 S << "mapping " << NIC << endl;
67 S << " script networksettings2-request" << endl << endl;
68 }
69 return 0;
62} 70}
63 71
64QString BluetoothBNEPNetNode::genNic( long nr ) { 72QString BluetoothBNEPNetNode::genNic( long nr ) {