author | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2006-05-04 08:54:33 (UTC) |
commit | b5d4d3425bc7f9d2518a15159f4a7b01071a68d7 (patch) (unidiff) | |
tree | 2cb1b9f7051cd06123c36eb8b75a9b6b7e49db0f | |
parent | 9e9148941974ce65fb733b14dd8bb15fe099ec2c (diff) | |
download | opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.zip opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.tar.gz opie-b5d4d3425bc7f9d2518a15159f4a7b01071a68d7.tar.bz2 |
destroys all child processes on the window closure. patch courtesy Dmitriy Korovkin
-rw-r--r-- | core/obex/btobex.cpp | 3 | ||||
-rw-r--r-- | core/obex/obexsend.cpp | 39 |
2 files changed, 26 insertions, 16 deletions
diff --git a/core/obex/btobex.cpp b/core/obex/btobex.cpp index b8556da..886f3dc 100644 --- a/core/obex/btobex.cpp +++ b/core/obex/btobex.cpp | |||
@@ -13,50 +13,49 @@ | |||
13 | #include <qmap.h> | 13 | #include <qmap.h> |
14 | #include <qmessagebox.h> | 14 | #include <qmessagebox.h> |
15 | 15 | ||
16 | using namespace OpieObex; | 16 | using namespace OpieObex; |
17 | 17 | ||
18 | using namespace Opie::Core; | 18 | using namespace Opie::Core; |
19 | /* TRANSLATOR OpieObex::Obex */ | 19 | /* TRANSLATOR OpieObex::Obex */ |
20 | using namespace OpieTooth; | 20 | using namespace OpieTooth; |
21 | 21 | ||
22 | BtObex::BtObex( QObject *parent, const char* name ) | 22 | BtObex::BtObex( QObject *parent, const char* name ) |
23 | : QObject(parent, name ) | 23 | : QObject(parent, name ) |
24 | { | 24 | { |
25 | m_rec = 0; | 25 | m_rec = 0; |
26 | m_send=0; | 26 | m_send=0; |
27 | m_count = 0; | 27 | m_count = 0; |
28 | m_receive = false; | 28 | m_receive = false; |
29 | connect( this, SIGNAL(error(int) ), // for recovering to receive | 29 | connect( this, SIGNAL(error(int) ), // for recovering to receive |
30 | SLOT(slotError() ) ); | 30 | SLOT(slotError() ) ); |
31 | connect( this, SIGNAL(sent(bool) ), | 31 | connect( this, SIGNAL(sent(bool) ), |
32 | SLOT(slotError() ) ); | 32 | SLOT(slotError() ) ); |
33 | btManager = NULL; | 33 | btManager = NULL; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | BtObex::~BtObex() { | 36 | BtObex::~BtObex() { |
37 | if (btManager) | 37 | delete btManager; |
38 | delete btManager; | ||
39 | delete m_rec; | 38 | delete m_rec; |
40 | delete m_send; | 39 | delete m_send; |
41 | } | 40 | } |
42 | 41 | ||
43 | void BtObex::receive() { | 42 | void BtObex::receive() { |
44 | m_receive = true; | 43 | m_receive = true; |
45 | m_outp = QString::null; | 44 | m_outp = QString::null; |
46 | m_rec = new OProcess(); | 45 | m_rec = new OProcess(); |
47 | 46 | ||
48 | // TODO mbhaynie: No idea if this actually works -- maybe opd is better. | 47 | // TODO mbhaynie: No idea if this actually works -- maybe opd is better. |
49 | *m_rec << "obexftpd" << "-b"; | 48 | *m_rec << "obexftpd" << "-b"; |
50 | // connect to the necessary slots | 49 | // connect to the necessary slots |
51 | connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), | 50 | connect(m_rec, SIGNAL(processExited(Opie::Core::OProcess*) ), |
52 | this, SLOT(slotExited(Opie::Core::OProcess*) ) ); | 51 | this, SLOT(slotExited(Opie::Core::OProcess*) ) ); |
53 | 52 | ||
54 | connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 53 | connect(m_rec, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
55 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); | 54 | this, SLOT(slotStdOut(Opie::Core::OProcess*, char*, int) ) ); |
56 | 55 | ||
57 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 56 | if(!m_rec->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
58 | emit done( false ); | 57 | emit done( false ); |
59 | delete m_rec; | 58 | delete m_rec; |
60 | m_rec = 0; | 59 | m_rec = 0; |
61 | } | 60 | } |
62 | } | 61 | } |
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp index dbbb7b3..8432d16 100644 --- a/core/obex/obexsend.cpp +++ b/core/obex/obexsend.cpp | |||
@@ -71,128 +71,131 @@ void SendWidget::send( const QString& file, const QString& desc ) { | |||
71 | } | 71 | } |
72 | 72 | ||
73 | int SendWidget::addReceiver(const char *r, const char *icon) | 73 | int SendWidget::addReceiver(const char *r, const char *icon) |
74 | { | 74 | { |
75 | QListViewItem * item = new QListViewItem( receiverList, 0 ); | 75 | QListViewItem * item = new QListViewItem( receiverList, 0 ); |
76 | item->setText( 0, r); | 76 | item->setText( 0, r); |
77 | item->setPixmap( 1, Resource::loadPixmap( icon ) ); | 77 | item->setPixmap( 1, Resource::loadPixmap( icon ) ); |
78 | 78 | ||
79 | int id=receivers.count(); | 79 | int id=receivers.count(); |
80 | receivers[id]=item; | 80 | receivers[id]=item; |
81 | return id; | 81 | return id; |
82 | } | 82 | } |
83 | 83 | ||
84 | bool SendWidget::receiverSelected(int id) | 84 | bool SendWidget::receiverSelected(int id) |
85 | { | 85 | { |
86 | return (bool)(receivers[id]->pixmap(2) != NULL); | 86 | return (bool)(receivers[id]->pixmap(2) != NULL); |
87 | } | 87 | } |
88 | 88 | ||
89 | void SendWidget::setReceiverStatus( int id, const QString& status ) { | 89 | void SendWidget::setReceiverStatus( int id, const QString& status ) { |
90 | if ( !receivers.contains(id) ) return; | 90 | if ( !receivers.contains(id) ) return; |
91 | receivers[id]->setText(3, status ); | 91 | receivers[id]->setText(3, status ); |
92 | } | 92 | } |
93 | 93 | ||
94 | void SendWidget::slotIrDaDevices( const QStringList& list) { | 94 | void SendWidget::slotIrDaDevices( const QStringList& list) { |
95 | for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 95 | for (QStringList::ConstIterator it = list.begin(); |
96 | int id = addReceiver(*it, "obex/irda.png"); | 96 | it != list.end(); ++it ) { |
97 | m_irDa.insert( id, (*it) ); | 97 | int id = addReceiver(*it, "obex/irda.png"); |
98 | m_irDa.insert( id, (*it) ); | ||
98 | } | 99 | } |
99 | irdaStatus->setText( tr("ready.")); | 100 | irdaStatus->setText( tr("ready.")); |
100 | m_irDaIt = m_irDa.begin(); | 101 | m_irDaIt = m_irDa.begin(); |
101 | 102 | ||
102 | } | 103 | } |
103 | 104 | ||
104 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { | 105 | void SendWidget::slotBTDevices( const QMap<QString, QString>& str ) { |
105 | for(QMap<QString, QString>::ConstIterator it = str.begin(); it != str.end(); ++it ) { | 106 | for(QMap<QString, QString>::ConstIterator it = str.begin(); |
106 | int id = addReceiver(it.key(), "obex/bt.png"); | 107 | it != str.end(); ++it ) { |
108 | int id = addReceiver(it.key(), "obex/bt.png"); | ||
107 | m_bt.insert( id, Pair( it.key(), it.data() ) ); | 109 | m_bt.insert( id, Pair( it.key(), it.data() ) ); |
108 | } | 110 | } |
109 | btStatus->setText(tr("ready.")); | 111 | btStatus->setText(tr("ready.")); |
110 | m_btIt = m_bt.begin(); | 112 | m_btIt = m_bt.begin(); |
111 | 113 | ||
112 | } | 114 | } |
113 | void SendWidget::slotSelectedDevice( int, int ) { | 115 | void SendWidget::slotSelectedDevice( int, int ) { |
114 | /* if ( name == m_irDeSearch ) { | 116 | /* if ( name == m_irDeSearch ) { |
115 | for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it ) | 117 | for (QMap<int, QString>::Iterator it= m_irDa.begin(); it != m_irDa.end(); ++it ) |
116 | m_devBox->removeDevice( it.key() ); | 118 | m_devBox->removeDevice( it.key() ); |
117 | 119 | ||
118 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); | 120 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); |
119 | }*/ | 121 | }*/ |
120 | } | 122 | } |
121 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { | 123 | void SendWidget::dispatchIrda( const QCString& str, const QByteArray& ar ) { |
122 | if ( str == "devices(QStringList)" ) { | 124 | if ( str == "devices(QStringList)" ) { |
123 | QDataStream stream( ar, IO_ReadOnly ); | 125 | QDataStream stream( ar, IO_ReadOnly ); |
124 | QStringList list; | 126 | QStringList list; |
125 | stream >> list; | 127 | stream >> list; |
126 | slotIrDaDevices( list ); | 128 | slotIrDaDevices( list ); |
127 | } | 129 | } |
128 | } | 130 | } |
129 | void SendWidget::slotIrError( int ) { | 131 | void SendWidget::slotIrError( int ) { |
130 | irdaStatus->setText(tr("error :(")); | 132 | irdaStatus->setText(tr("error :(")); |
131 | } | 133 | } |
132 | void SendWidget::slotIrSent( bool b) { | 134 | void SendWidget::slotIrSent( bool b) { |
133 | QString text = b ? tr("Sent") : tr("Failure"); | 135 | QString text = b ? tr("Sent") : tr("Failure"); |
134 | setReceiverStatus( m_irDaIt.key(), text ); | 136 | setReceiverStatus( m_irDaIt.key(), text ); |
135 | ++m_irDaIt; | 137 | ++m_irDaIt; |
136 | slotStartIrda(); | 138 | slotStartIrda(); |
137 | } | 139 | } |
138 | void SendWidget::slotIrTry(unsigned int trI) { | 140 | void SendWidget::slotIrTry(unsigned int trI) { |
139 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); | 141 | setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); |
140 | } | 142 | } |
141 | void SendWidget::slotStartIrda() { | 143 | void SendWidget::slotStartIrda() { |
142 | if ( !m_irDa.count() ) return; | 144 | if ( !m_irDa.count() ) |
143 | if ( m_irDaIt == m_irDa.end() ) { | 145 | return; |
146 | if ( m_irDaIt == m_irDa.end() || !receiverSelected(m_irDaIt.key())) { | ||
144 | irdaStatus->setText(tr("complete.")); | 147 | irdaStatus->setText(tr("complete.")); |
145 | return; | 148 | return; |
146 | } | 149 | } |
147 | setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); | 150 | setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); |
148 | m_obex->send( m_file ); | 151 | m_obex->send( m_file ); |
149 | } | 152 | } |
150 | 153 | ||
151 | void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { | 154 | void SendWidget::dispatchBt( const QCString& str, const QByteArray& ar ) { |
152 | if ( str == "devices(QStringMap)" ) { | 155 | if ( str == "devices(QStringMap)" ) { |
153 | QDataStream stream( ar, IO_ReadOnly ); | 156 | QDataStream stream( ar, IO_ReadOnly ); |
154 | QMap<QString, QString> btmap; | 157 | QMap<QString, QString> btmap; |
155 | stream >> btmap; | 158 | stream >> btmap; |
156 | slotBTDevices( btmap ); | 159 | slotBTDevices( btmap ); |
157 | } | 160 | } |
158 | } | 161 | } |
159 | void SendWidget::slotBtError( int ) { | 162 | void SendWidget::slotBtError( int ) { |
160 | btStatus->setText(tr("error :(")); | 163 | btStatus->setText(tr("error :(")); |
161 | } | 164 | } |
162 | void SendWidget::slotBtSent( bool b) { | 165 | void SendWidget::slotBtSent( bool b) { |
163 | QString text = b ? tr("Sent") : tr("Failure"); | 166 | QString text = b ? tr("Sent") : tr("Failure"); |
164 | setReceiverStatus( m_btIt.key(), text ); | 167 | setReceiverStatus( m_btIt.key(), text ); |
165 | ++m_btIt; | 168 | ++m_btIt; |
166 | slotStartBt(); | 169 | slotStartBt(); |
167 | } | 170 | } |
168 | void SendWidget::slotBtTry(unsigned int trI) { | 171 | void SendWidget::slotBtTry(unsigned int trI) { |
169 | setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); | 172 | setReceiverStatus( m_btIt.key(), tr("Try %1").arg( QString::number( trI ) ) ); |
170 | } | 173 | } |
171 | void SendWidget::slotStartBt() { | 174 | void SendWidget::slotStartBt() { |
172 | // skip past unselected receivers | 175 | // skip past unselected receivers |
173 | while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) | 176 | while((m_btIt != m_bt.end()) && !receiverSelected(m_btIt.key())) |
174 | ++m_btIt; | 177 | ++m_btIt; |
175 | if (m_btIt == m_bt.end() ) { | 178 | if (m_btIt == m_bt.end() ) { |
176 | btStatus->setText(tr("complete.")); | 179 | btStatus->setText(tr("complete.")); |
177 | return; | 180 | return; |
178 | } | 181 | } |
179 | setReceiverStatus( m_btIt.key(), tr("Start sending") ); | 182 | setReceiverStatus( m_btIt.key(), tr("Start sending") ); |
180 | m_btobex->send( m_file, m_btIt.data().second() ); | 183 | m_btobex->send( m_file, m_btIt.data().second() ); |
181 | } | 184 | } |
182 | 185 | ||
183 | void SendWidget::send_to_receivers() { | 186 | void SendWidget::send_to_receivers() { |
184 | slotStartIrda(); | 187 | slotStartIrda(); |
185 | slotStartBt(); | 188 | slotStartBt(); |
186 | } | 189 | } |
187 | 190 | ||
188 | void SendWidget::scan_for_receivers() | 191 | void SendWidget::scan_for_receivers() |
189 | { | 192 | { |
190 | receiverList->clear(); | 193 | receiverList->clear(); |
191 | receivers.clear(); | 194 | receivers.clear(); |
192 | sendButton->setDisabled( true ); | 195 | sendButton->setDisabled( true ); |
193 | 196 | ||
194 | if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) | 197 | if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) |
195 | { | 198 | { |
196 | irdaStatus->setText(tr("not enabled.")); | 199 | irdaStatus->setText(tr("not enabled.")); |
197 | } | 200 | } |
198 | else | 201 | else |
@@ -201,41 +204,49 @@ void SendWidget::scan_for_receivers() | |||
201 | irdaStatus->setText(tr("searching...")); | 204 | irdaStatus->setText(tr("searching...")); |
202 | sendButton->setEnabled( true ); | 205 | sendButton->setEnabled( true ); |
203 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); | 206 | QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); |
204 | } | 207 | } |
205 | 208 | ||
206 | if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) | 209 | if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) |
207 | { | 210 | { |
208 | btStatus->setText(tr("not enabled.")); | 211 | btStatus->setText(tr("not enabled.")); |
209 | } | 212 | } |
210 | else | 213 | else |
211 | { | 214 | { |
212 | QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); | 215 | QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); |
213 | btStatus->setText(tr("searching...")); | 216 | btStatus->setText(tr("searching...")); |
214 | sendButton->setEnabled( true ); | 217 | sendButton->setEnabled( true ); |
215 | QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); | 218 | QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); |
216 | } | 219 | } |
217 | } | 220 | } |
218 | 221 | ||
219 | void SendWidget::toggle_receiver(QListViewItem* item) | 222 | void SendWidget::toggle_receiver(QListViewItem* item) |
220 | { | 223 | { |
221 | // toggle the state of an individual receiver. | 224 | // toggle the state of an individual receiver. |
222 | if(item->pixmap(2)) | 225 | if(item->pixmap(2)) |
223 | item->setPixmap(2,QPixmap()); | 226 | item->setPixmap(2,QPixmap()); |
224 | else | 227 | else |
225 | item->setPixmap(2,Resource::loadPixmap("backup/check.png")); | 228 | item->setPixmap(2,Resource::loadPixmap("obex/check.png")); |
226 | } | 229 | } |
227 | 230 | ||
228 | 231 | ||
229 | void SendWidget::closeEvent( QCloseEvent* e) { | 232 | void SendWidget::closeEvent( QCloseEvent* evt) { |
230 | obexSendBase::closeEvent(e); | 233 | delete m_obex; |
231 | QCopEnvelope e0("QPE/IrDaApplet", "disableIrda()"); | 234 | m_obex = NULL; |
232 | QCopEnvelope e1("QPE/Bluetooth", "disableBluetooth()"); | 235 | delete m_btobex; |
236 | m_btobex = NULL; | ||
237 | obexSendBase::closeEvent(evt); | ||
238 | { | ||
239 | QCopEnvelope e("QPE/IrDaApplet", "disableIrda()"); | ||
240 | } | ||
241 | { | ||
242 | QCopEnvelope e("QPE/Bluetooth", "disableBluetooth()"); | ||
243 | } | ||
233 | } | 244 | } |
234 | 245 | ||
235 | void SendWidget::userDone() { | 246 | void SendWidget::userDone() { |
236 | close(); | 247 | close(); |
237 | } | 248 | } |
238 | 249 | ||
239 | QString SendWidget::file()const { | 250 | QString SendWidget::file()const { |
240 | return m_file; | 251 | return m_file; |
241 | } | 252 | } |