author | korovkin <korovkin> | 2006-04-20 12:37:33 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-04-20 12:37:33 (UTC) |
commit | fce7a143353e2bdd41d878c6f0a1224e0f2a158e (patch) (unidiff) | |
tree | 41fc68d13e148b8979dde51401ce160f10197a6c /noncore/net/opietooth/manager/bluebase.cpp | |
parent | 6d3a8eaf3b92f8eec9908eed91568342fac5de1d (diff) | |
download | opie-fce7a143353e2bdd41d878c6f0a1224e0f2a158e.zip opie-fce7a143353e2bdd41d878c6f0a1224e0f2a158e.tar.gz opie-fce7a143353e2bdd41d878c6f0a1224e0f2a158e.tar.bz2 |
Added services configuration dialog.
Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 924d191..13954c5 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -1,48 +1,49 @@ | |||
1 | /* | 1 | /* |
2 | * bluebase.cpp * | 2 | * bluebase.cpp * |
3 | * --------------------- | 3 | * --------------------- |
4 | * | 4 | * |
5 | * copyright : (c) 2002 by Maximilian Reiß | 5 | * copyright : (c) 2002 by Maximilian Reiß |
6 | * email : max.reiss@gmx.de | 6 | * email : max.reiss@gmx.de |
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include "bluebase.h" | 18 | #include "bluebase.h" |
19 | #include "scandialog.h" | 19 | #include "scandialog.h" |
20 | #include "hciconfwrapper.h" | 20 | #include "hciconfwrapper.h" |
21 | #include "devicehandler.h" | 21 | #include "devicehandler.h" |
22 | #include "btconnectionitem.h" | 22 | #include "btconnectionitem.h" |
23 | #include "rfcommassigndialogimpl.h" | 23 | #include "rfcommassigndialogimpl.h" |
24 | #include "forwarder.h" | 24 | #include "forwarder.h" |
25 | #include "servicesdialog.h" | ||
25 | #include <termios.h> | 26 | #include <termios.h> |
26 | #include <string.h> | 27 | #include <string.h> |
27 | #include <errno.h> | 28 | #include <errno.h> |
28 | 29 | ||
29 | /* OPIE */ | 30 | /* OPIE */ |
30 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
31 | #include <qpe/resource.h> | 32 | #include <qpe/resource.h> |
32 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
33 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
34 | using namespace Opie::Core; | 35 | using namespace Opie::Core; |
35 | 36 | ||
36 | /* QT */ | 37 | /* QT */ |
37 | #include <qframe.h> | 38 | #include <qframe.h> |
38 | #include <qlabel.h> | 39 | #include <qlabel.h> |
39 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
40 | #include <qlayout.h> | 41 | #include <qlayout.h> |
41 | #include <qvariant.h> | 42 | #include <qvariant.h> |
42 | #include <qimage.h> | 43 | #include <qimage.h> |
43 | #include <qpixmap.h> | 44 | #include <qpixmap.h> |
44 | #include <qtabwidget.h> | 45 | #include <qtabwidget.h> |
45 | #include <qscrollview.h> | 46 | #include <qscrollview.h> |
46 | #include <qvbox.h> | 47 | #include <qvbox.h> |
47 | #include <qmessagebox.h> | 48 | #include <qmessagebox.h> |
48 | #include <qcombobox.h> | 49 | #include <qcombobox.h> |
@@ -75,85 +76,80 @@ struct SerSpeed { | |||
75 | BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) | 76 | BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) |
76 | : BluetoothBase( parent, name, fl ) | 77 | : BluetoothBase( parent, name, fl ) |
77 | { | 78 | { |
78 | m_localDevice = new Manager( "hci0" ); | 79 | m_localDevice = new Manager( "hci0" ); |
79 | 80 | ||
80 | connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); | 81 | connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); |
81 | connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); | 82 | connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); |
82 | 83 | ||
83 | connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) ); | 84 | connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) ); |
84 | 85 | ||
85 | connect( devicesView, SIGNAL( clicked(QListViewItem*)), | 86 | connect( devicesView, SIGNAL( clicked(QListViewItem*)), |
86 | this, SLOT( startServiceActionClicked(QListViewItem*) ) ); | 87 | this, SLOT( startServiceActionClicked(QListViewItem*) ) ); |
87 | connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ), | 88 | connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ), |
88 | this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) ); | 89 | this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) ); |
89 | connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ), | 90 | connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ), |
90 | this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) ); | 91 | this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) ); |
91 | connect( m_localDevice, SIGNAL( available(const QString&,bool) ), | 92 | connect( m_localDevice, SIGNAL( available(const QString&,bool) ), |
92 | this, SLOT( deviceActive(const QString&,bool) ) ); | 93 | this, SLOT( deviceActive(const QString&,bool) ) ); |
93 | connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ), | 94 | connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ), |
94 | this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) ); | 95 | this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) ); |
95 | connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ), | 96 | connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ), |
96 | this, SLOT( addSignalStrength(const QString&,const QString&) ) ); | 97 | this, SLOT( addSignalStrength(const QString&,const QString&) ) ); |
97 | connect(runButton, SIGNAL(clicked()), this, SLOT(doForward())); | 98 | connect(runButton, SIGNAL(clicked()), this, SLOT(doForward())); |
98 | connect(encCheckBox, SIGNAL(toggled(bool)), this, SLOT(doEncrypt(bool))); | 99 | connect(encCheckBox, SIGNAL(toggled(bool)), this, SLOT(doEncrypt(bool))); |
100 | connect(servicesEditButton, SIGNAL(clicked()), this, SLOT(editServices())); | ||
99 | 101 | ||
100 | // let hold be rightButtonClicked() | 102 | // let hold be rightButtonClicked() |
101 | QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold); | 103 | QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold); |
102 | QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold); | 104 | QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold); |
103 | 105 | ||
104 | //Load all icons needed | 106 | //Load all icons needed |
105 | m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); | 107 | m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); |
106 | m_onPix = Resource::loadPixmap( "opietooth/connected" ); | 108 | m_onPix = Resource::loadPixmap( "opietooth/connected" ); |
107 | m_findPix = Resource::loadPixmap( "opietooth/find" ); | 109 | m_findPix = Resource::loadPixmap( "opietooth/find" ); |
108 | 110 | ||
109 | QPalette pal = this->palette(); | 111 | QPalette pal = this->palette(); |
110 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); | 112 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); |
111 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); | 113 | pal.setColor( QPalette::Active, QColorGroup::Button, col ); |
112 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); | 114 | pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); |
113 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); | 115 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); |
114 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 116 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |
115 | this->setPalette( pal ); | 117 | this->setPalette( pal ); |
116 | 118 | ||
117 | setCaption( tr( "Bluetooth Manager" ) ); | 119 | setCaption( tr( "Bluetooth Manager" ) ); |
118 | 120 | ||
119 | readConfig(); | 121 | readConfig(); |
120 | initGui(); | 122 | initGui(); |
121 | 123 | ||
122 | devicesView->setRootIsDecorated(true); | 124 | devicesView->setRootIsDecorated(true); |
123 | m_iconLoader = new BTIconLoader(); | 125 | m_iconLoader = new BTIconLoader(); |
124 | writeToHciConfig(); | 126 | writeToHciConfig(); |
125 | addConnectedDevices(); | 127 | addConnectedDevices(); |
126 | readSavedDevices(); | 128 | readSavedDevices(); |
127 | addServicesToDevices(); | 129 | addServicesToDevices(); |
128 | QTimer::singleShot( 3000, this, SLOT( addServicesToDevices() ) ); | 130 | QTimer::singleShot( 3000, this, SLOT( addServicesToDevices() ) ); |
129 | forwarder = NULL; | 131 | forwarder = NULL; |
130 | serDevName->setText(tr("/dev/ircomm0")); | ||
131 | for (unsigned int i = 0; i < (sizeof(speeds) / sizeof(speeds[0])); i++) { | ||
132 | serSpeed->insertItem(speeds[i].str); | ||
133 | } | ||
134 | serSpeed->setCurrentItem((sizeof(speeds) / sizeof(speeds[0])) - 1); | ||
135 | encCheckBox->setChecked(true); | ||
136 | } | 132 | } |
137 | 133 | ||
138 | /** | 134 | /** |
139 | * Reads all options from the config file | 135 | * Reads all options from the config file |
140 | */ | 136 | */ |
141 | void BlueBase::readConfig() | 137 | void BlueBase::readConfig() |
142 | { | 138 | { |
143 | 139 | ||
144 | Config cfg( "bluetoothmanager" ); | 140 | Config cfg( "bluetoothmanager" ); |
145 | cfg.setGroup( "bluezsettings" ); | 141 | cfg.setGroup( "bluezsettings" ); |
146 | 142 | ||
147 | m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with | 143 | m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with |
148 | m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak | 144 | m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak |
149 | m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE ); | 145 | m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE ); |
150 | m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE ); | 146 | m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE ); |
151 | m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE ); | 147 | m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE ); |
152 | m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE ); | 148 | m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE ); |
153 | } | 149 | } |
154 | 150 | ||
155 | /** | 151 | /** |
156 | * Writes all options to the config file | 152 | * Writes all options to the config file |
157 | */ | 153 | */ |
158 | void BlueBase::writeConfig() | 154 | void BlueBase::writeConfig() |
159 | { | 155 | { |
@@ -232,48 +228,54 @@ void BlueBase::writeSavedDevices() | |||
232 | /* | 228 | /* |
233 | * if not empty save the List through DeviceHandler | 229 | * if not empty save the List through DeviceHandler |
234 | */ | 230 | */ |
235 | if ( list.isEmpty() ) | 231 | if ( list.isEmpty() ) |
236 | return; | 232 | return; |
237 | DeviceHandler handler; | 233 | DeviceHandler handler; |
238 | handler.save( list ); | 234 | handler.save( list ); |
239 | } | 235 | } |
240 | 236 | ||
241 | 237 | ||
242 | /** | 238 | /** |
243 | * Set up the gui | 239 | * Set up the gui |
244 | */ | 240 | */ |
245 | void BlueBase::initGui() | 241 | void BlueBase::initGui() |
246 | { | 242 | { |
247 | StatusLabel->setText( status() ); // maybe move it to getStatus() | 243 | StatusLabel->setText( status() ); // maybe move it to getStatus() |
248 | cryptCheckBox->setChecked( m_useEncryption ); | 244 | cryptCheckBox->setChecked( m_useEncryption ); |
249 | authCheckBox->setChecked( m_enableAuthentification ); | 245 | authCheckBox->setChecked( m_enableAuthentification ); |
250 | pagescanCheckBox->setChecked( m_enablePagescan ); | 246 | pagescanCheckBox->setChecked( m_enablePagescan ); |
251 | inquiryscanCheckBox->setChecked( m_enableInquiryscan ); | 247 | inquiryscanCheckBox->setChecked( m_enableInquiryscan ); |
252 | deviceNameLine->setText( m_deviceName ); | 248 | deviceNameLine->setText( m_deviceName ); |
253 | passkeyLine->setText( m_defaultPasskey ); | 249 | passkeyLine->setText( m_defaultPasskey ); |
254 | // set info tab | 250 | // set info tab |
255 | setInfo(); | 251 | setInfo(); |
252 | serDevName->setText(tr("/dev/ircomm0")); | ||
253 | for (unsigned int i = 0; i < (sizeof(speeds) / sizeof(speeds[0])); i++) { | ||
254 | serSpeed->insertItem(speeds[i].str); | ||
255 | } | ||
256 | serSpeed->setCurrentItem((sizeof(speeds) / sizeof(speeds[0])) - 1); | ||
257 | encCheckBox->setChecked(true); | ||
256 | } | 258 | } |
257 | 259 | ||
258 | 260 | ||
259 | /** | 261 | /** |
260 | * Get the status informations and returns it | 262 | * Get the status informations and returns it |
261 | * @return QString the status informations gathered | 263 | * @return QString the status informations gathered |
262 | */ | 264 | */ |
263 | QString BlueBase::status()const | 265 | QString BlueBase::status()const |
264 | { | 266 | { |
265 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); | 267 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); |
266 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); | 268 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); |
267 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); | 269 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); |
268 | 270 | ||
269 | return (infoString); | 271 | return (infoString); |
270 | } | 272 | } |
271 | 273 | ||
272 | 274 | ||
273 | /** | 275 | /** |
274 | * Read the current values from the gui and invoke writeConfig() | 276 | * Read the current values from the gui and invoke writeConfig() |
275 | */ | 277 | */ |
276 | void BlueBase::applyConfigChanges() | 278 | void BlueBase::applyConfigChanges() |
277 | { | 279 | { |
278 | m_deviceName = deviceNameLine->text(); | 280 | m_deviceName = deviceNameLine->text(); |
279 | m_defaultPasskey = passkeyLine->text(); | 281 | m_defaultPasskey = passkeyLine->text(); |
@@ -739,25 +741,41 @@ void BlueBase::doForward() | |||
739 | } | 741 | } |
740 | 742 | ||
741 | /** | 743 | /** |
742 | * React on the process end | 744 | * React on the process end |
743 | */ | 745 | */ |
744 | void BlueBase::forwardExit(Opie::Core::OProcess* proc) | 746 | void BlueBase::forwardExit(Opie::Core::OProcess* proc) |
745 | { | 747 | { |
746 | if (proc->exitStatus() != 0) | 748 | if (proc->exitStatus() != 0) |
747 | QMessageBox::critical(this, tr("Forwarder Error"), | 749 | QMessageBox::critical(this, tr("Forwarder Error"), |
748 | tr("Forwarder start error")); | 750 | tr("Forwarder start error")); |
749 | delete proc; | 751 | delete proc; |
750 | forwarder = NULL; | 752 | forwarder = NULL; |
751 | runButton->setText("start gateway"); | 753 | runButton->setText("start gateway"); |
752 | } | 754 | } |
753 | 755 | ||
754 | /** | 756 | /** |
755 | * Encrypt entered passkey | 757 | * Encrypt entered passkey |
756 | * doit - do encryption of the key | 758 | * doit - do encryption of the key |
757 | */ | 759 | */ |
758 | void BlueBase::doEncrypt(bool doit) | 760 | void BlueBase::doEncrypt(bool doit) |
759 | { | 761 | { |
760 | passkeyLine->setEchoMode((doit)? QLineEdit::Password: QLineEdit::Normal); | 762 | passkeyLine->setEchoMode((doit)? QLineEdit::Password: QLineEdit::Normal); |
761 | } | 763 | } |
762 | 764 | ||
765 | /** | ||
766 | * Start services edit dialog | ||
767 | */ | ||
768 | void BlueBase::editServices() | ||
769 | { | ||
770 | QString conf = "/etc/default/bluetooth"; | ||
771 | //// Use for debugging purposes | ||
772 | //// QString conf = "/mnt/net/opie/bin/bluetooth"; | ||
773 | ServicesDialog svcEdit(conf, this, "ServicesDialog", true, | ||
774 | WStyle_ContextHelp); | ||
775 | |||
776 | if (QPEApplication::execDialog(&svcEdit) == QDialog::Accepted) | ||
777 | { | ||
778 | } | ||
779 | } | ||
780 | |||
763 | //eof | 781 | //eof |