summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-23 20:37:03 (UTC)
committer mickeyl <mickeyl>2005-08-23 20:37:03 (UTC)
commit68c01ad5f6e7dc12192c9ce77f0a2ee48b813831 (patch) (unidiff)
tree054dd974156c8e49400979eb9b226bb7bd32fd31
parent95210ac41729a4c264e830963cdae3a4cdd218fb (diff)
downloadopie-68c01ad5f6e7dc12192c9ce77f0a2ee48b813831.zip
opie-68c01ad5f6e7dc12192c9ce77f0a2ee48b813831.tar.gz
opie-68c01ad5f6e7dc12192c9ce77f0a2ee48b813831.tar.bz2
- fix SIGSEGV when trying to send but IrDA is not enabled
- rename 'scan' button to 'rescan' - disable 'send' button if IrDA and BT is both disabled
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obexsend.cpp51
-rw-r--r--core/obex/obexsendbase.ui8
2 files changed, 32 insertions, 27 deletions
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index a80a48b..9cd9972 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -14,12 +14,13 @@ using namespace OpieObex;
14#include <qpe/resource.h> 14#include <qpe/resource.h>
15 15
16using namespace Opie::Core; 16using namespace Opie::Core;
17 17
18/* QT */ 18/* QT */
19#include <qlabel.h> 19#include <qlabel.h>
20#include <qpushbutton.h>
20#include <qpixmap.h> 21#include <qpixmap.h>
21#include <qlistview.h> 22#include <qlistview.h>
22#include <qtimer.h> 23#include <qtimer.h>
23 24
24/* TRANSLATOR OpieObex::SendWidget */ 25/* TRANSLATOR OpieObex::SendWidget */
25 26
@@ -135,13 +136,14 @@ void SendWidget::slotIrSent( bool b) {
135 slotStartIrda(); 136 slotStartIrda();
136} 137}
137void SendWidget::slotIrTry(unsigned int trI) { 138void SendWidget::slotIrTry(unsigned int trI) {
138 setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) )); 139 setReceiverStatus(m_irDaIt.key(), tr("Try %1").arg( QString::number( trI ) ));
139} 140}
140void SendWidget::slotStartIrda() { 141void SendWidget::slotStartIrda() {
141 if (m_irDaIt == m_irDa.end() ) { 142 if ( !m_irDa.count() ) return;
143 if ( m_irDaIt == m_irDa.end() ) {
142 irdaStatus->setText(tr("complete.")); 144 irdaStatus->setText(tr("complete."));
143 return; 145 return;
144 } 146 }
145 setReceiverStatus( m_irDaIt.key(), tr("Start sending") ); 147 setReceiverStatus( m_irDaIt.key(), tr("Start sending") );
146 m_obex->send( m_file ); 148 m_obex->send( m_file );
147} 149}
@@ -180,37 +182,40 @@ void SendWidget::slotStartBt() {
180 182
181void SendWidget::send_to_receivers() { 183void SendWidget::send_to_receivers() {
182 slotStartIrda(); 184 slotStartIrda();
183 slotStartBt(); 185 slotStartBt();
184} 186}
185 187
186void SendWidget::scan_for_receivers() { 188void SendWidget::scan_for_receivers()
187 189{
188 bool enable_irda=false; 190 //FIXME: Clean ListBox prior to (re)scan
189 bool enable_bt=false; 191 sendButton->setDisabled( true );
190
191 if ( !QCopChannel::isRegistered("QPE/IrDaApplet") ) {
192 irdaStatus->setText(tr("not enabled."));
193 enable_irda=true;
194 } else
195 irdaStatus->setText(tr("searching..."));
196 192
197 if ( !QCopChannel::isRegistered("QPE/Bluetooth") ) { 193 if ( !QCopChannel::isRegistered("QPE/IrDaApplet") )
198 btStatus->setText(tr("not enabled.")); 194 {
199 enable_bt=true; 195 irdaStatus->setText(tr("not enabled."));
200 } else 196 }
201 btStatus->setText(tr("searching...")); 197 else
198 {
199 QCopEnvelope e1("QPE/IrDaApplet", "enableIrda()");
200 irdaStatus->setText(tr("searching..."));
201 sendButton->setEnabled( true );
202 QCopEnvelope e2("QPE/IrDaApplet", "listDevices()");
203 }
202 204
203 if (enable_irda) 205 if ( !QCopChannel::isRegistered("QPE/Bluetooth") )
204 QCopEnvelope e0("QPE/IrDaApplet", "enableIrda()"); 206 {
205 if (enable_bt) 207 btStatus->setText(tr("not enabled."));
208 }
209 else
210 {
206 QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()"); 211 QCopEnvelope e1("QPE/Bluetooth", "enableBluetooth()");
207 212 btStatus->setText(tr("searching..."));
208 QCopEnvelope e2("QPE/IrDaApplet", "listDevices()"); 213 sendButton->setEnabled( true );
209 QCopEnvelope e3("QPE/Bluetooth", "listDevices()"); 214 QCopEnvelope e3("QPE/Bluetooth", "listDevices()");
210 215 }
211} 216}
212 217
213void SendWidget::toggle_receiver(QListViewItem* item) 218void SendWidget::toggle_receiver(QListViewItem* item)
214{ 219{
215 // toggle the state of an individual receiver. 220 // toggle the state of an individual receiver.
216 if(item->pixmap(2)) 221 if(item->pixmap(2))
diff --git a/core/obex/obexsendbase.ui b/core/obex/obexsendbase.ui
index a192dd3..4619842 100644
--- a/core/obex/obexsendbase.ui
+++ b/core/obex/obexsendbase.ui
@@ -13,13 +13,13 @@ for selecting destination hosts.</comment>
13 </property> 13 </property>
14 <property stdset="1"> 14 <property stdset="1">
15 <name>geometry</name> 15 <name>geometry</name>
16 <rect> 16 <rect>
17 <x>0</x> 17 <x>0</x>
18 <y>0</y> 18 <y>0</y>
19 <width>363</width> 19 <width>359</width>
20 <height>221</height> 20 <height>221</height>
21 </rect> 21 </rect>
22 </property> 22 </property>
23 <property stdset="1"> 23 <property stdset="1">
24 <name>caption</name> 24 <name>caption</name>
25 <string>Send via OBEX</string> 25 <string>Send via OBEX</string>
@@ -294,35 +294,35 @@ for selecting destination hosts.</comment>
294 <property stdset="1"> 294 <property stdset="1">
295 <name>name</name> 295 <name>name</name>
296 <cstring>scanButton</cstring> 296 <cstring>scanButton</cstring>
297 </property> 297 </property>
298 <property stdset="1"> 298 <property stdset="1">
299 <name>text</name> 299 <name>text</name>
300 <string>Scan</string> 300 <string>&amp;Rescan</string>
301 </property> 301 </property>
302 </widget> 302 </widget>
303 <widget> 303 <widget>
304 <class>QPushButton</class> 304 <class>QPushButton</class>
305 <property stdset="1"> 305 <property stdset="1">
306 <name>name</name> 306 <name>name</name>
307 <cstring>sendButton</cstring> 307 <cstring>sendButton</cstring>
308 </property> 308 </property>
309 <property stdset="1"> 309 <property stdset="1">
310 <name>text</name> 310 <name>text</name>
311 <string>Send</string> 311 <string>&amp;Send</string>
312 </property> 312 </property>
313 </widget> 313 </widget>
314 <widget> 314 <widget>
315 <class>QPushButton</class> 315 <class>QPushButton</class>
316 <property stdset="1"> 316 <property stdset="1">
317 <name>name</name> 317 <name>name</name>
318 <cstring>doneButton</cstring> 318 <cstring>doneButton</cstring>
319 </property> 319 </property>
320 <property stdset="1"> 320 <property stdset="1">
321 <name>text</name> 321 <name>text</name>
322 <string>Done</string> 322 <string>&amp;Close</string>
323 </property> 323 </property>
324 </widget> 324 </widget>
325 </hbox> 325 </hbox>
326 </widget> 326 </widget>
327 </vbox> 327 </vbox>
328</widget> 328</widget>