10 files changed, 197 insertions, 80 deletions
diff --git a/noncore/net/opietooth/manager/TODO.txt b/noncore/net/opietooth/manager/TODO.txt index e6bd9b1..76fae68 100644 --- a/noncore/net/opietooth/manager/TODO.txt +++ b/noncore/net/opietooth/manager/TODO.txt | |||
@@ -1,4 +1,3 @@ | |||
1 | 1. Make bind table edit /etc/bluetooth/rfcomm.conf file. | 1 | 1. Add an rfcomm port number to the connection dialog. |
2 | 2. Add an rfcomm port number to the connection dialog. | 2 | 2. Collect requirements from others. |
3 | 3. Collect requirements from others. | ||
4 | 3 | ||
diff --git a/noncore/net/opietooth/manager/btdeviceitem.cpp b/noncore/net/opietooth/manager/btdeviceitem.cpp index fb1b1c1..c112463 100644 --- a/noncore/net/opietooth/manager/btdeviceitem.cpp +++ b/noncore/net/opietooth/manager/btdeviceitem.cpp | |||
@@ -9,3 +9,3 @@ BTDeviceItem::BTDeviceItem( QListView* parent, const RemoteDevice& dev ) | |||
9 | 9 | ||
10 | setText( 0, dev.name() ); | 10 | setText( 0, dev.name().utf8() ); |
11 | m_device = dev; | 11 | m_device = dev; |
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp index be720b8..7943deb 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp | |||
@@ -1 +1,11 @@ | |||
1 | /* $Id$ */ | ||
2 | /* RFCOMM binding table edit dialog */ | ||
3 | /*************************************************************************** | ||
4 | * * | ||
5 | * This program is free software; you can redistribute it and/or modify * | ||
6 | * it under the terms of the GNU General Public License as published by * | ||
7 | * the Free Software Foundation; either version 2 of the License, or * | ||
8 | * (at your option) any later version. * | ||
9 | * * | ||
10 | ***************************************************************************/ | ||
1 | 11 | ||
@@ -24,3 +34,2 @@ RfcommAssignDialog::RfcommAssignDialog( QWidget* parent, const char* name, bool | |||
24 | { | 34 | { |
25 | |||
26 | m_range = 5; | 35 | m_range = 5; |
@@ -50,3 +59,3 @@ RfcommAssignDialog::~RfcommAssignDialog() | |||
50 | 59 | ||
51 | void RfcommAssignDialog::newDevice( const QString & mac ) | 60 | void RfcommAssignDialog::newDevice(const QString & mac, int channel) |
52 | { | 61 | { |
@@ -55,5 +64,4 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
55 | { | 64 | { |
56 | |||
57 | QMap<QString, RfCommConfObject*>::Iterator it; | 65 | QMap<QString, RfCommConfObject*>::Iterator it; |
58 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); | 66 | it = confHandler->foundEntries().find(QString::number(i)); |
59 | // make sure that rfcommX is not assigned yet | 67 | // make sure that rfcommX is not assigned yet |
@@ -64,6 +72,11 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
64 | (QSizePolicy::SizeType)7, sizePolicy().hasHeightForWidth())); | 72 | (QSizePolicy::SizeType)7, sizePolicy().hasHeightForWidth())); |
73 | QVBoxLayout layout(&dialog); | ||
74 | layout.setSpacing( 0 ); | ||
75 | layout.setMargin( 0 ); | ||
65 | 76 | ||
66 | RfcommDialogItem *newDev = new RfcommDialogItem( &dialog ); | 77 | RfcommDialogItem newDev(&dialog); |
67 | newDev->setIdent( i ); | 78 | newDev.setIdent( i ); |
68 | newDev->setMac( mac ); | 79 | newDev.setMac( mac ); |
80 | newDev.setChannel( channel ); | ||
81 | layout.addWidget(&newDev); | ||
69 | 82 | ||
@@ -71,10 +84,13 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
71 | { | 84 | { |
72 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); | 85 | QMap<int, RfcommDialogItem*>::Iterator it; |
73 | m_itemList.insert( i , rfcomm ); | 86 | it = m_itemList.find( i ); |
87 | RfcommDialogItem *rfcomm = it.data(); | ||
74 | rfcomm->setIdent( i ); | 88 | rfcomm->setIdent( i ); |
75 | rfcomm->setMac( mac ); | 89 | rfcomm->setMac( mac ); |
76 | rfcomm->setChannel( newDev->channel() ); | 90 | rfcomm->setChannel( newDev.channel() ); |
77 | rfcomm->setComment( newDev->comment() ); | 91 | rfcomm->setComment( newDev.comment() ); |
92 | rfcomm->setBind( newDev.isBind() ); | ||
78 | odebug << "New device set up" << oendl; | 93 | odebug << "New device set up" << oendl; |
79 | } | 94 | } |
95 | break; | ||
80 | } | 96 | } |
@@ -83,10 +99,9 @@ void RfcommAssignDialog::newDevice( const QString & mac ) | |||
83 | 99 | ||
100 | /* | ||
101 | * Load rfcomm bind configuration | ||
102 | */ | ||
84 | void RfcommAssignDialog::loadConfig() | 103 | void RfcommAssignDialog::loadConfig() |
85 | { | 104 | { |
86 | |||
87 | //Config cfg( "bluetoothmanager-rfcommbind" ); | ||
88 | |||
89 | for ( int i = 0 ; i < m_range; i++ ) | 105 | for ( int i = 0 ; i < m_range; i++ ) |
90 | { | 106 | { |
91 | // cfg.setGroup( QString("%1").arg( i ) ); | ||
92 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); | 107 | RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box ); |
@@ -95,6 +110,5 @@ void RfcommAssignDialog::loadConfig() | |||
95 | QMap<QString, RfCommConfObject*>::Iterator it; | 110 | QMap<QString, RfCommConfObject*>::Iterator it; |
96 | it = confHandler->foundEntries().find( QString("%1").arg( i ) ); | 111 | it = confHandler->foundEntries().find(QString::number(i)); |
97 | if ( it != confHandler->foundEntries().end() ) | 112 | if ( it != confHandler->foundEntries().end() ) |
98 | { | 113 | { |
99 | odebug << "Found key in foundEntries() " << oendl; | ||
100 | rfcomm->setMac( it.data()->mac() ); | 114 | rfcomm->setMac( it.data()->mac() ); |
@@ -102,8 +116,4 @@ void RfcommAssignDialog::loadConfig() | |||
102 | rfcomm->setComment( it.data()->comment() ); | 116 | rfcomm->setComment( it.data()->comment() ); |
117 | rfcomm->setBind(it.data()->isBind()); | ||
103 | } | 118 | } |
104 | /* Use rfcomm.conf directly for now | ||
105 | * rfcomm->setMac( cfg.readEntry( "mac", "" ) ); | ||
106 | * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) ); | ||
107 | * rfcomm->setComment( cfg.readEntry( "comment", "" ) ); | ||
108 | */ | ||
109 | } | 119 | } |
@@ -112,9 +122,8 @@ void RfcommAssignDialog::loadConfig() | |||
112 | 122 | ||
123 | /* | ||
124 | * Save rfcomm bind configuration | ||
125 | */ | ||
113 | void RfcommAssignDialog::saveConfig() | 126 | void RfcommAssignDialog::saveConfig() |
114 | { | 127 | { |
115 | |||
116 | //Config cfg( "bluetoothmanager-rfcommbind" ); | ||
117 | |||
118 | QMap< int, RfcommDialogItem*>::Iterator it; | 128 | QMap< int, RfcommDialogItem*>::Iterator it; |
119 | |||
120 | QMap< QString, RfCommConfObject*> outMap; | 129 | QMap< QString, RfCommConfObject*> outMap; |
@@ -123,17 +132,23 @@ void RfcommAssignDialog::saveConfig() | |||
123 | { | 132 | { |
124 | |||
125 | //cfg.setGroup( QString("%1").arg( it.key() ) ); | ||
126 | RfcommDialogItem *rfcomm = it.data(); | 133 | RfcommDialogItem *rfcomm = it.data(); |
127 | 134 | if (rfcomm->mac().isEmpty()) | |
128 | 135 | continue; | |
129 | outMap.insert( QString( "%1").arg( it.key() ), new RfCommConfObject( it.key(), rfcomm->mac(), rfcomm->channel(), rfcomm->comment() ) ); | 136 | outMap.insert(QString::number(it.key()), |
130 | 137 | new RfCommConfObject(it.key(), | |
131 | 138 | rfcomm->mac(), rfcomm->channel(), rfcomm->comment(), | |
132 | //cfg.writeEntry( "mac", rfcomm->mac() ); | 139 | rfcomm->isBind())); |
133 | //cfg.writeEntry( "channel", rfcomm->channel() ); | ||
134 | //cfg.writeEntry( "comment", rfcomm->comment() ); | ||
135 | } | 140 | } |
136 | |||
137 | confHandler->save( outMap ); | 141 | confHandler->save( outMap ); |
142 | } | ||
138 | 143 | ||
144 | /* | ||
145 | * Reaction on the OK button | ||
146 | */ | ||
147 | void RfcommAssignDialog::accept() | ||
148 | { | ||
149 | odebug << "save configuration" << oendl; | ||
150 | saveConfig(); | ||
151 | RfcommAssignDialogBase::accept(); | ||
139 | } | 152 | } |
153 | |||
154 | //eof | ||
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.h b/noncore/net/opietooth/manager/rfcommassigndialogimpl.h index 9983632..12cde0e 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogimpl.h +++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.h | |||
@@ -1 +1,11 @@ | |||
1 | /* $Id$ */ | ||
2 | /* RFCOMM binding table edit dialog */ | ||
3 | /*************************************************************************** | ||
4 | * * | ||
5 | * This program is free software; you can redistribute it and/or modify * | ||
6 | * it under the terms of the GNU General Public License as published by * | ||
7 | * the Free Software Foundation; either version 2 of the License, or * | ||
8 | * (at your option) any later version. * | ||
9 | * * | ||
10 | ***************************************************************************/ | ||
1 | #ifndef RFCOMMASSIGN | 11 | #ifndef RFCOMMASSIGN |
@@ -14,8 +24,6 @@ namespace OpieTooth { | |||
14 | class RfcommAssignDialog: public RfcommAssignDialogBase { | 24 | class RfcommAssignDialog: public RfcommAssignDialogBase { |
15 | |||
16 | Q_OBJECT | 25 | Q_OBJECT |
17 | |||
18 | public: | 26 | public: |
19 | 27 | RfcommAssignDialog(QWidget* parent = 0, const char* name = 0, | |
20 | RfcommAssignDialog( QWidget* parent = 0, const char* name = 0,bool modal = 0, WFlags fl = 0 ); | 28 | bool modal = 0, WFlags fl = 0); |
21 | ~RfcommAssignDialog(); | 29 | ~RfcommAssignDialog(); |
@@ -25,3 +33,3 @@ namespace OpieTooth { | |||
25 | 33 | ||
26 | void newDevice( const QString & mac ); | 34 | void newDevice( const QString & mac, int channel ); |
27 | 35 | ||
@@ -34,2 +42,4 @@ namespace OpieTooth { | |||
34 | RfCommConfHandler *confHandler; | 42 | RfCommConfHandler *confHandler; |
43 | protected slots: | ||
44 | virtual void accept(); | ||
35 | }; | 45 | }; |
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp index a41f304..472b86c 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp +++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp | |||
@@ -6,2 +6,3 @@ | |||
6 | #include <qgroupbox.h> | 6 | #include <qgroupbox.h> |
7 | #include <qcheckbox.h> | ||
7 | 8 | ||
@@ -35,2 +36,6 @@ QString RfcommDialogItem::comment() { | |||
35 | 36 | ||
37 | bool RfcommDialogItem::isBind() { | ||
38 | return m_bind->isChecked(); | ||
39 | } | ||
40 | |||
36 | void RfcommDialogItem::setIdent( int ident ) { | 41 | void RfcommDialogItem::setIdent( int ident ) { |
@@ -52,2 +57,6 @@ void RfcommDialogItem::setComment( const QString &comment ) { | |||
52 | 57 | ||
58 | void RfcommDialogItem::setBind( bool dobind ) { | ||
59 | m_bind->setChecked( dobind ); | ||
60 | } | ||
53 | 61 | ||
62 | //eof | ||
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.h b/noncore/net/opietooth/manager/rfcommassigndialogitem.h index 34a794f..cc9c8db 100644 --- a/noncore/net/opietooth/manager/rfcommassigndialogitem.h +++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.h | |||
@@ -23,2 +23,3 @@ namespace OpieTooth { | |||
23 | QString comment(); | 23 | QString comment(); |
24 | bool isBind(); | ||
24 | 25 | ||
@@ -28,2 +29,3 @@ namespace OpieTooth { | |||
28 | void setComment( const QString& comment ); | 29 | void setComment( const QString& comment ); |
30 | void setBind(bool dobind); | ||
29 | 31 | ||
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp index f82d2c8..054b446 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.cpp +++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp | |||
@@ -13,3 +13,4 @@ using namespace OpieTooth; | |||
13 | 13 | ||
14 | RfCommConfObject::RfCommConfObject( int number, QString mac, int channel, QString comment ) { | 14 | RfCommConfObject::RfCommConfObject(int number, QString mac, int channel, |
15 | QString comment, bool bind) { | ||
15 | m_number = number; | 16 | m_number = number; |
@@ -18,3 +19,3 @@ RfCommConfObject::RfCommConfObject( int number, QString mac, int channel, QStrin | |||
18 | m_comment = comment; | 19 | m_comment = comment; |
19 | // m_foundEntries = 0; | 20 | m_doBind = bind; |
20 | } | 21 | } |
@@ -43,3 +44,2 @@ RfCommConfObject::~RfCommConfObject() { | |||
43 | RfCommConfHandler::RfCommConfHandler( const QString & filename ) { | 44 | RfCommConfHandler::RfCommConfHandler( const QString & filename ) { |
44 | |||
45 | m_filename = filename; | 45 | m_filename = filename; |
@@ -54,15 +54,28 @@ void RfCommConfHandler::save( QMap<QString, RfCommConfObject*> devices ) { | |||
54 | 54 | ||
55 | QFile rfCommConf( "/tmp/test" ); | 55 | //// For debugging purposes |
56 | //// QFile rfCommConf( "/mnt/net/opie/bin/rfcomm.conf" ); | ||
57 | QFile rfCommConf( m_filename ); | ||
56 | QTextStream outStream( &rfCommConf ); | 58 | QTextStream outStream( &rfCommConf ); |
57 | if ( rfCommConf.open( IO_WriteOnly ) ) { | 59 | if ( rfCommConf.open( IO_WriteOnly ) ) { |
58 | |||
59 | QMap<QString, RfCommConfObject*>::Iterator it; | 60 | QMap<QString, RfCommConfObject*>::Iterator it; |
61 | outStream << "#\n"; | ||
62 | outStream << "# RFCOMM configuration file.\n"; | ||
63 | outStream << "#\n"; | ||
64 | outStream << "# $Id$\n"; | ||
65 | outStream << "#\n\n"; | ||
60 | for( it = devices.begin(); it != devices.end(); ++it ) { | 66 | for( it = devices.begin(); it != devices.end(); ++it ) { |
61 | outStream << "rfcomm" + QString("%1").arg( it.data()->number() ) + " {\n"; | 67 | outStream << "rfcomm" + QString("%1").arg( it.data()->number() ) + " {\n"; |
62 | outStream << " device " + it.data()->mac() + ";\n"; | 68 | outStream << "\t# Automatically bind the device at startup\n"; |
63 | outStream << " channel " + QString( "%1" ).arg( it.data()->channel() ) + ";\n"; | 69 | outStream << "\tbind " << ((it.data()->isBind())? "yes": "no") << ";\n"; |
64 | outStream << " comment \"" + it.data()->comment() + "\";\n"; | 70 | outStream << "\n"; |
71 | outStream << "\t# Bluetooth address of the device\n"; | ||
72 | outStream << "\tdevice " + it.data()->mac() + ";\n"; | ||
73 | outStream << "\n"; | ||
74 | outStream << "\t# RFCOMM channel for the connection\n"; | ||
75 | outStream << "\tchannel\t" + QString( "%1" ).arg( it.data()->channel() ) + ";\n"; | ||
76 | outStream << "\n"; | ||
77 | outStream << "\t# Description of the connection\n"; | ||
78 | outStream << "\tcomment \"" + it.data()->comment() + "\";\n"; | ||
65 | outStream << "}\n\n"; | 79 | outStream << "}\n\n"; |
66 | } | 80 | } |
67 | |||
68 | rfCommConf.close(); | 81 | rfCommConf.close(); |
@@ -77,4 +90,11 @@ QMap<QString, RfCommConfObject*> RfCommConfHandler::foundEntries() { | |||
77 | void RfCommConfHandler::load() { | 90 | void RfCommConfHandler::load() { |
78 | 91 | //Keywords | |
79 | QFile rfCommConf( m_filename ); | 92 | QCString k_rfcomm("rfcomm"); |
93 | QCString k_device("device "); | ||
94 | QCString k_channel("channel "); | ||
95 | QCString k_comment("comment "); | ||
96 | QCString k_bind("bind "); | ||
97 | |||
98 | m_foundEntries.clear(); | ||
99 | QFile rfCommConf(m_filename); //File we read | ||
80 | if ( rfCommConf.open( IO_ReadOnly ) ) { | 100 | if ( rfCommConf.open( IO_ReadOnly ) ) { |
@@ -85,3 +105,2 @@ void RfCommConfHandler::load() { | |||
85 | 105 | ||
86 | QString number; | ||
87 | QString mac; | 106 | QString mac; |
@@ -89,22 +108,45 @@ void RfCommConfHandler::load() { | |||
89 | QString comment; | 108 | QString comment; |
109 | QString bind; | ||
110 | bool bbind; | ||
111 | QString number; | ||
90 | 112 | ||
91 | for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ ) { | 113 | for (QStringList::Iterator line = list.begin(); |
114 | line != list.end(); line++) { | ||
92 | 115 | ||
93 | QString tmpLine = ( *line ).stripWhiteSpace(); | 116 | QString tmpLine = (*line).simplifyWhiteSpace(); |
94 | 117 | ||
95 | if ( tmpLine.startsWith("rfcomm") ) { | 118 | if (tmpLine.startsWith(k_rfcomm)) { |
96 | QString number = tmpLine.mid( 6,1 ); | 119 | number = tmpLine.mid( k_rfcomm.length(), 1 ); |
97 | odebug << tmpLine << oendl; | 120 | odebug << tmpLine << oendl; |
98 | odebug << "TEST " + number << oendl; | 121 | odebug << "device " << number << oendl; |
99 | } else if ( tmpLine.startsWith( "}" ) ) { | 122 | } else if ( tmpLine.startsWith( "}" ) ) { |
100 | m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(), comment ) ); | 123 | m_foundEntries.insert(number, |
101 | } else if ( tmpLine.startsWith( "device" ) ) { | 124 | new RfCommConfObject(number.toInt(), mac, channel.toInt(), |
102 | mac = tmpLine.mid( 7, 17 ); | 125 | comment, bbind)); |
126 | } else if ( tmpLine.startsWith(k_device) ) { | ||
127 | mac = tmpLine.mid(k_device.length(), | ||
128 | tmpLine.find(';') - k_device.length()); | ||
103 | odebug << "mac" + mac << oendl; | 129 | odebug << "mac" + mac << oendl; |
104 | } else if ( tmpLine.startsWith( "channel" ) ) { | 130 | } else if ( tmpLine.startsWith(k_channel) ) { |
105 | channel = tmpLine.mid( 8, 1 ); | 131 | channel = tmpLine.mid(k_channel.length(), |
132 | tmpLine.find(';') - k_channel.length()); | ||
106 | odebug << "Channel :" << channel << oendl; | 133 | odebug << "Channel :" << channel << oendl; |
107 | } else if ( tmpLine.startsWith( "comment" ) ) { | 134 | } else if ( tmpLine.startsWith(k_comment) ) { |
108 | comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 ); | 135 | comment = tmpLine.mid(k_comment.length(), |
136 | tmpLine.find(';') - k_comment.length()); | ||
137 | if (comment.left(1) == "\"") | ||
138 | comment.remove(0, 1); | ||
139 | if (comment.right(1) == "\"") | ||
140 | comment.remove(comment.length() - 1, 1); | ||
109 | odebug << "Comment: " + comment << oendl; | 141 | odebug << "Comment: " + comment << oendl; |
142 | } else if ( tmpLine.startsWith(k_bind) ) { | ||
143 | bind = tmpLine.mid(k_bind.length(), | ||
144 | tmpLine.find(';') - k_bind.length()); | ||
145 | if (bind == "no") | ||
146 | bbind = false; | ||
147 | else if (bind == "yes") | ||
148 | bbind = true; | ||
149 | else | ||
150 | bbind = true; | ||
151 | odebug << "bind: " + bind << oendl; | ||
110 | } | 152 | } |
@@ -116 +158,3 @@ void RfCommConfHandler::load() { | |||
116 | } | 158 | } |
159 | |||
160 | //eof | ||
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.h b/noncore/net/opietooth/manager/rfcommconfhandler.h index e13c833..46aaa26 100644 --- a/noncore/net/opietooth/manager/rfcommconfhandler.h +++ b/noncore/net/opietooth/manager/rfcommconfhandler.h | |||
@@ -13,3 +13,4 @@ namespace OpieTooth { | |||
13 | public: | 13 | public: |
14 | RfCommConfObject( int number, QString mac, int channel, QString comment ); | 14 | RfCommConfObject( int number, QString mac, int channel, QString comment, |
15 | bool bind); | ||
15 | ~RfCommConfObject(); | 16 | ~RfCommConfObject(); |
@@ -24,5 +25,7 @@ namespace OpieTooth { | |||
24 | QString comment() { return m_comment; }; | 25 | QString comment() { return m_comment; }; |
25 | 26 | bool isBind() { return m_doBind; } | |
27 | void doBind(bool arg) { m_doBind = arg; } | ||
26 | 28 | ||
27 | private: | 29 | private: |
30 | bool m_doBind; | ||
28 | int m_number; | 31 | int m_number; |
diff --git a/noncore/net/opietooth/manager/rfcommdialogitembase.ui b/noncore/net/opietooth/manager/rfcommdialogitembase.ui index dd8f121..43f3269 100644 --- a/noncore/net/opietooth/manager/rfcommdialogitembase.ui +++ b/noncore/net/opietooth/manager/rfcommdialogitembase.ui | |||
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>239</width> | 14 | <width>235</width> |
15 | <height>95</height> | 15 | <height>95</height> |
@@ -46,6 +46,6 @@ | |||
46 | </property> | 46 | </property> |
47 | <grid> | 47 | <vbox> |
48 | <property stdset="1"> | 48 | <property stdset="1"> |
49 | <name>margin</name> | 49 | <name>margin</name> |
50 | <number>5</number> | 50 | <number>0</number> |
51 | </property> | 51 | </property> |
@@ -53,5 +53,5 @@ | |||
53 | <name>spacing</name> | 53 | <name>spacing</name> |
54 | <number>5</number> | 54 | <number>2</number> |
55 | </property> | 55 | </property> |
56 | <widget row="0" column="0" > | 56 | <widget> |
57 | <class>QLayoutWidget</class> | 57 | <class>QLayoutWidget</class> |
@@ -61,2 +61,34 @@ | |||
61 | </property> | 61 | </property> |
62 | <property> | ||
63 | <name>layoutSpacing</name> | ||
64 | </property> | ||
65 | <vbox> | ||
66 | <property stdset="1"> | ||
67 | <name>margin</name> | ||
68 | <number>0</number> | ||
69 | </property> | ||
70 | <property stdset="1"> | ||
71 | <name>spacing</name> | ||
72 | <number>2</number> | ||
73 | </property> | ||
74 | <widget> | ||
75 | <class>QCheckBox</class> | ||
76 | <property stdset="1"> | ||
77 | <name>name</name> | ||
78 | <cstring>m_bind</cstring> | ||
79 | </property> | ||
80 | <property stdset="1"> | ||
81 | <name>text</name> | ||
82 | <string>bind automatically</string> | ||
83 | </property> | ||
84 | </widget> | ||
85 | <widget> | ||
86 | <class>QLayoutWidget</class> | ||
87 | <property stdset="1"> | ||
88 | <name>name</name> | ||
89 | <cstring>Layout3</cstring> | ||
90 | </property> | ||
91 | <property> | ||
92 | <name>layoutSpacing</name> | ||
93 | </property> | ||
62 | <hbox> | 94 | <hbox> |
@@ -174,3 +206,3 @@ | |||
174 | </widget> | 206 | </widget> |
175 | <widget row="1" column="0" > | 207 | <widget> |
176 | <class>QLayoutWidget</class> | 208 | <class>QLayoutWidget</class> |
@@ -216,3 +248,5 @@ | |||
216 | </widget> | 248 | </widget> |
217 | </grid> | 249 | </vbox> |
250 | </widget> | ||
251 | </vbox> | ||
218 | </widget> | 252 | </widget> |
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 7711f0a..04da19f 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp | |||
@@ -107,3 +107,4 @@ void RfcCommPopup::slotBind() | |||
107 | 107 | ||
108 | rfcommAssign.newDevice( m_item->mac() ); | 108 | rfcommAssign.newDevice( m_item->mac(), |
109 | m_service.protocolDescriptorList().last().port()); | ||
109 | 110 | ||