author | harlekin <harlekin> | 2002-07-21 20:02:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-21 20:02:13 (UTC) |
commit | 086b00610edfb25fb25cf54a0f8da8a16b55246a (patch) (unidiff) | |
tree | e16de393854040440ebc5ceeb6cbd48b27aff605 /noncore | |
parent | 8abe7e0604c930cbb46308febeec67d5bf70d255 (diff) | |
download | opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.zip opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.tar.gz opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.tar.bz2 |
connection to popups on services
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btdeviceitem.h | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.h | 39 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.h | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 35 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.h | 7 |
11 files changed, 71 insertions, 55 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index c81d4d1..ec05a95 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -264,48 +264,50 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) | |||
264 | 264 | ||
265 | deviceItem = new BTDeviceItem( ListView2 , (*it) ); | 265 | deviceItem = new BTDeviceItem( ListView2 , (*it) ); |
266 | deviceItem->setExpandable ( true ); | 266 | deviceItem->setExpandable ( true ); |
267 | 267 | ||
268 | // look if device is avail. atm, async | 268 | // look if device is avail. atm, async |
269 | deviceActive( (*it) ); | 269 | deviceActive( (*it) ); |
270 | 270 | ||
271 | // ggf auch hier? | 271 | // ggf auch hier? |
272 | addServicesToDevice( deviceItem ); | 272 | addServicesToDevice( deviceItem ); |
273 | } | 273 | } |
274 | } | 274 | } |
275 | 275 | ||
276 | 276 | ||
277 | /** | 277 | /** |
278 | * Action that is toggled on entrys on click | 278 | * Action that is toggled on entrys on click |
279 | */ | 279 | */ |
280 | void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { | 280 | void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { |
281 | } | 281 | } |
282 | 282 | ||
283 | 283 | ||
284 | /** | 284 | /** |
285 | * Action that are toggled on hold (mostly QPopups i guess) | 285 | * Action that are toggled on hold (mostly QPopups i guess) |
286 | */ | 286 | */ |
287 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { | 287 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { |
288 | if (!item ) | ||
289 | return; | ||
288 | 290 | ||
289 | QPopupMenu *menu = new QPopupMenu(); | 291 | QPopupMenu *menu = new QPopupMenu(); |
290 | int ret=0; | 292 | int ret=0; |
291 | 293 | ||
292 | if ( ((BTListItem*)item)->type() == "device") { | 294 | if ( ((BTListItem*)item)->type() == "device") { |
293 | 295 | ||
294 | QPopupMenu *groups = new QPopupMenu(); | 296 | QPopupMenu *groups = new QPopupMenu(); |
295 | 297 | ||
296 | menu->insertItem( tr("rescan sevices:"), 0); | 298 | menu->insertItem( tr("rescan sevices:"), 0); |
297 | menu->insertItem( tr("to group"), groups , 1); | 299 | menu->insertItem( tr("to group"), groups , 1); |
298 | // menu->insertItem( tr("bound device"), 2); | 300 | // menu->insertItem( tr("bound device"), 2); |
299 | menu->insertItem( tr("delete"), 3); | 301 | menu->insertItem( tr("delete"), 3); |
300 | 302 | ||
301 | ret = menu->exec( point , 0); | 303 | ret = menu->exec( point , 0); |
302 | 304 | ||
303 | switch(ret) { | 305 | switch(ret) { |
304 | case -1: | 306 | case -1: |
305 | break; | 307 | break; |
306 | case 0: | 308 | case 0: |
307 | addServicesToDevice( (BTDeviceItem*)item ); | 309 | addServicesToDevice( (BTDeviceItem*)item ); |
308 | break; | 310 | break; |
309 | case 1: | 311 | case 1: |
310 | 312 | ||
311 | break; | 313 | break; |
@@ -321,76 +323,77 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
321 | break; | 323 | break; |
322 | } | 324 | } |
323 | delete groups; | 325 | delete groups; |
324 | 326 | ||
325 | } | 327 | } |
326 | 328 | ||
327 | /* | 329 | /* |
328 | * We got service sensitive PopupMenus in our factory | 330 | * We got service sensitive PopupMenus in our factory |
329 | * We will create one through the factory and will insert | 331 | * We will create one through the factory and will insert |
330 | * our Separator + ShowInfo into the menu or create a new | 332 | * our Separator + ShowInfo into the menu or create a new |
331 | * one if the factory returns 0 | 333 | * one if the factory returns 0 |
332 | * PopupMenu deletion is kind of weird. | 334 | * PopupMenu deletion is kind of weird. |
333 | * If escaped( -1 ) or any of our items were chosen we'll | 335 | * If escaped( -1 ) or any of our items were chosen we'll |
334 | * delete the PopupMenu otherwise it's the responsibility of | 336 | * delete the PopupMenu otherwise it's the responsibility of |
335 | * the PopupMenu to delete itself | 337 | * the PopupMenu to delete itself |
336 | * | 338 | * |
337 | */ | 339 | */ |
338 | else if ( ((BTListItem*)item)->type() == "service") { | 340 | else if ( ((BTListItem*)item)->type() == "service") { |
339 | BTServiceItem* service = (BTServiceItem*)item; | 341 | BTServiceItem* service = (BTServiceItem*)item; |
340 | QMap<int, QString> list = service->services().classIdList(); | 342 | QMap<int, QString> list = service->services().classIdList(); |
341 | QMap<int, QString>::Iterator it = list.begin(); | 343 | QMap<int, QString>::Iterator it = list.begin(); |
342 | QPopupMenu *popup =0l; | 344 | QPopupMenu *popup =0l; |
343 | if ( it != list.end() ) { | 345 | if ( it != list.end() ) { |
344 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 346 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); |
345 | popup = m_popHelper.find( it.key(), | 347 | popup = m_popHelper.find( it.key() /*1*/, |
346 | service->services(), | 348 | service->services(), |
347 | service->parent() ); | 349 | (BTDeviceItem*)service->parent() ); |
348 | }else { | 350 | }else { |
349 | qWarning("Empty"); | 351 | qWarning("Empty"); |
350 | } | 352 | } |
351 | 353 | ||
352 | if ( popup == 0l ) { | 354 | if ( popup == 0l ) { |
353 | qWarning("factory returned 0l"); | 355 | qWarning("factory returned 0l"); |
354 | popup = new QPopupMenu(); | 356 | popup = new QPopupMenu(); |
355 | } | 357 | } |
356 | 358 | ||
357 | int test1 = popup->insertItem( tr("Test1:"), 0); | 359 | int test1 = popup->insertItem( tr("Test1:"), 0); |
358 | int con = popup->insertItem( tr("connect"), 1); | 360 | int con = popup->insertItem( tr("connect"), 1); |
359 | int del = popup->insertItem( tr("delete"), 2); | 361 | int del = popup->insertItem( tr("delete"), 2); |
360 | 362 | ||
361 | ret = popup->exec( point ); | 363 | ret = popup->exec( point ); |
362 | 364 | qWarning("returned from exec() "); | |
363 | if ( ret == -1 ) | 365 | if ( ret == -1 ) |
364 | delete popup; | 366 | ; |
365 | else if ( ret == test1 ) | 367 | else if ( ret == test1 ) |
366 | delete popup; | 368 | ; |
367 | else if ( ret == con ) | 369 | else if ( ret == con ) |
368 | delete popup; | 370 | ; |
369 | else if ( ret == del ) { | 371 | else if ( ret == del ) { |
370 | // take item first? -zecke | 372 | // take item first? -zecke |
371 | delete item; | 373 | delete item; |
372 | } | 374 | } |
375 | delete popup; | ||
373 | } | 376 | } |
374 | delete menu; | 377 | delete menu; |
375 | } | 378 | } |
376 | 379 | ||
377 | 380 | ||
378 | /** | 381 | /** |
379 | * Search and display avail. services for a device (on expand from device listing) | 382 | * Search and display avail. services for a device (on expand from device listing) |
380 | * @param item the service item returned | 383 | * @param item the service item returned |
381 | */ | 384 | */ |
382 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) { | 385 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) { |
383 | qDebug("addServicesToDevice"); | 386 | qDebug("addServicesToDevice"); |
384 | // row of mac adress text(3) | 387 | // row of mac adress text(3) |
385 | RemoteDevice device = item->remoteDevice(); | 388 | RemoteDevice device = item->remoteDevice(); |
386 | m_deviceList.insert( item->mac() , item ); | 389 | m_deviceList.insert( item->mac() , item ); |
387 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back | 390 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back |
388 | m_localDevice->searchServices( device ); | 391 | m_localDevice->searchServices( device ); |
389 | } | 392 | } |
390 | 393 | ||
391 | 394 | ||
392 | /** | 395 | /** |
393 | * Overloaded. This one it the one that is connected to the foundServices signal | 396 | * Overloaded. This one it the one that is connected to the foundServices signal |
394 | * @param device the mac address of the remote device | 397 | * @param device the mac address of the remote device |
395 | * @param servicesList the list with the service the device has. | 398 | * @param servicesList the list with the service the device has. |
396 | */ | 399 | */ |
diff --git a/noncore/net/opietooth/manager/btdeviceitem.h b/noncore/net/opietooth/manager/btdeviceitem.h index ae51483..e4c6ce7 100644 --- a/noncore/net/opietooth/manager/btdeviceitem.h +++ b/noncore/net/opietooth/manager/btdeviceitem.h | |||
@@ -1,26 +1,26 @@ | |||
1 | 1 | ||
2 | #ifndef OPIE_TOOTH_BT_DEVIVE_ITEM | 2 | #ifndef OPIE_TOOTH_BT_DEVICE_ITEM |
3 | #define OPIE_TOOTH_BT_DEVIVE_ITEM | 3 | #define OPIE_TOOTH_BT_DEVICE_ITEM |
4 | 4 | ||
5 | 5 | ||
6 | #include <remotedevice.h> | 6 | #include <remotedevice.h> |
7 | #include "btlistitem.h" | 7 | #include "btlistitem.h" |
8 | 8 | ||
9 | namespace OpieTooth { | 9 | namespace OpieTooth { |
10 | class BTDeviceItem : public BTListItem { | 10 | class BTDeviceItem : public BTListItem { |
11 | public: | 11 | public: |
12 | BTDeviceItem( QListView* parent, const RemoteDevice& dev ); | 12 | BTDeviceItem( QListView* parent, const RemoteDevice& dev ); |
13 | ~BTDeviceItem(); | 13 | ~BTDeviceItem(); |
14 | RemoteDevice remoteDevice() const; | 14 | RemoteDevice remoteDevice() const; |
15 | QString type()const; | 15 | QString type()const; |
16 | int typeId()const; | 16 | int typeId()const; |
17 | QString mac()const; | 17 | QString mac()const; |
18 | QString name() const; | 18 | QString name() const; |
19 | private: | 19 | private: |
20 | RemoteDevice m_device; | 20 | RemoteDevice m_device; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | }; | 23 | }; |
24 | 24 | ||
25 | 25 | ||
26 | #endif | 26 | #endif |
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 762b028..121c069 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro | |||
@@ -1,40 +1,41 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on debug | 2 | CONFIG = qt warn_on debug |
3 | #CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | HEADERS = btconnectionitem.h btdeviceitem.h \ | 4 | HEADERS = btconnectionitem.h btdeviceitem.h \ |
5 | btserviceitem.h stdpopups.h \ | 5 | btserviceitem.h stdpopups.h \ |
6 | popuphelper.h bluebase.h \ | 6 | popuphelper.h bluebase.h \ |
7 | scandialog.h btlistitem.h \ | 7 | scandialog.h btlistitem.h \ |
8 | hciconfwrapper.h bticonloader.h \ | 8 | hciconfwrapper.h bticonloader.h \ |
9 | pppdialog.h obexdialog.h \ | 9 | pppdialog.h obexdialog.h \ |
10 | devicehandler.h | 10 | devicehandler.h rfcpopup.h |
11 | 11 | ||
12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | 12 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ |
13 | btserviceitem.cpp stdpopups.cpp \ | 13 | btserviceitem.cpp stdpopups.cpp \ |
14 | popuphelper.cpp main.cpp \ | 14 | popuphelper.cpp main.cpp \ |
15 | bluebase.cpp scandialog.cpp \ | 15 | bluebase.cpp scandialog.cpp \ |
16 | btlistitem.cpp hciconfwrapper.cpp \ | 16 | btlistitem.cpp hciconfwrapper.cpp \ |
17 | bticonloader.cpp pppdialog.cpp \ | 17 | bticonloader.cpp pppdialog.cpp \ |
18 | obexdialog.cpp devicehandler.cpp | 18 | obexdialog.cpp devicehandler.cpp \ |
19 | rfcpopup.cpp | ||
19 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
20 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
21 | DEPENDPATH += $(OPIEDIR)/include | 22 | DEPENDPATH += $(OPIEDIR)/include |
22 | LIBS += -lqpe -lopietooth -lopie | 23 | LIBS += -lqpe -lopietooth -lopie |
23 | INTERFACES = bluetoothbase.ui devicedialog.ui | 24 | INTERFACES = bluetoothbase.ui devicedialog.ui |
24 | DESTDIR = $(OPIEDIR)/bin | 25 | DESTDIR = $(OPIEDIR)/bin |
25 | TARGET = bluetooth-manager | 26 | TARGET = bluetooth-manager |
26 | 27 | ||
27 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ | 28 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ |
28 | ../../../../i18n/en/bluetooth-manager.ts \ | 29 | ../../../../i18n/en/bluetooth-manager.ts \ |
29 | ../../../../i18n/es/bluetooth-manager.ts \ | 30 | ../../../../i18n/es/bluetooth-manager.ts \ |
30 | ../../../../i18n/fr/bluetooth-manager.ts \ | 31 | ../../../../i18n/fr/bluetooth-manager.ts \ |
31 | ../../../../i18n/hu/bluetooth-manager.ts \ | 32 | ../../../../i18n/hu/bluetooth-manager.ts \ |
32 | ../../../../i18n/ja/bluetooth-manager.ts \ | 33 | ../../../../i18n/ja/bluetooth-manager.ts \ |
33 | ../../../../i18n/ko/bluetooth-manager.ts \ | 34 | ../../../../i18n/ko/bluetooth-manager.ts \ |
34 | ../../../../i18n/no/bluetooth-manager.ts \ | 35 | ../../../../i18n/no/bluetooth-manager.ts \ |
35 | ../../../../i18n/pl/bluetooth-manager.ts \ | 36 | ../../../../i18n/pl/bluetooth-manager.ts \ |
36 | ../../../../i18n/pt/bluetooth-manager.ts \ | 37 | ../../../../i18n/pt/bluetooth-manager.ts \ |
37 | ../../../../i18n/pt_BR/bluetooth-manager.ts \ | 38 | ../../../../i18n/pt_BR/bluetooth-manager.ts \ |
38 | ../../../../i18n/sl/bluetooth-manager.ts \ | 39 | ../../../../i18n/sl/bluetooth-manager.ts \ |
39 | ../../../../i18n/zh_CN/bluetooth-manager.ts \ | 40 | ../../../../i18n/zh_CN/bluetooth-manager.ts \ |
40 | ../../../../i18n/zh_TW/bluetooth-manager.ts | 41 | ../../../../i18n/zh_TW/bluetooth-manager.ts |
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index cb142eb..15973d4 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -1,38 +1,40 @@ | |||
1 | 1 | ||
2 | #include "obexdialog.h" | 2 | #include "obexdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
9 | 9 | ||
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include <opie/oprocess.h> | 12 | #include <opie/oprocess.h> |
13 | #include <opie/ofiledialog.h> | 13 | #include <opie/ofiledialog.h> |
14 | 14 | ||
15 | using namespace OpieTooth; | ||
16 | |||
15 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 17 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
16 | : QDialog( parent, name, modal, fl ) { | 18 | : QDialog( parent, name, modal, fl ) { |
17 | 19 | ||
18 | if ( !name ) | 20 | if ( !name ) |
19 | setName( "ObexDialog" ); | 21 | setName( "ObexDialog" ); |
20 | setCaption( tr( "beam files " ) ) ; | 22 | setCaption( tr( "beam files " ) ) ; |
21 | 23 | ||
22 | m_device = device; | 24 | m_device = device; |
23 | 25 | ||
24 | layout = new QVBoxLayout( this ); | 26 | layout = new QVBoxLayout( this ); |
25 | 27 | ||
26 | QLabel* info = new QLabel( this ); | 28 | QLabel* info = new QLabel( this ); |
27 | info->setText( tr("Which file should be beamed?") ); | 29 | info->setText( tr("Which file should be beamed?") ); |
28 | 30 | ||
29 | cmdLine = new QLineEdit( this ); | 31 | cmdLine = new QLineEdit( this ); |
30 | 32 | ||
31 | QPushButton *browserButton; | 33 | QPushButton *browserButton; |
32 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); | 34 | browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton"); |
33 | connect( browserButton, SIGNAL(released() ), this , SLOT(browse() ) ); | 35 | connect( browserButton, SIGNAL(released() ), this , SLOT(browse() ) ); |
34 | 36 | ||
35 | chNameLine = new QLineEdit( this ); | 37 | chNameLine = new QLineEdit( this ); |
36 | 38 | ||
37 | sendButton = new QPushButton( this ); | 39 | sendButton = new QPushButton( this ); |
38 | sendButton->setText( tr( "Send" ) ); | 40 | sendButton->setText( tr( "Send" ) ); |
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h index 1a73b57..28d2be2 100644 --- a/noncore/net/opietooth/manager/obexdialog.h +++ b/noncore/net/opietooth/manager/obexdialog.h | |||
@@ -1,36 +1,39 @@ | |||
1 | #ifndef OBEXDIALOG_H | 1 | #ifndef OBEXDIALOG_H |
2 | #define OBEXDIALOG_H | 2 | #define OBEXDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | class ObexDialog : public QDialog { | ||
14 | 13 | ||
15 | Q_OBJECT | 14 | namespace OpieTooth { |
16 | 15 | ||
17 | public: | 16 | class ObexDialog : public QDialog { |
18 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); | ||
19 | ~ObexDialog(); | ||
20 | 17 | ||
18 | Q_OBJECT | ||
19 | |||
20 | public: | ||
21 | ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); | ||
22 | ~ObexDialog(); | ||
21 | 23 | ||
22 | private slots: | ||
23 | void browse(); | ||
24 | void sendData(); | ||
25 | |||
26 | protected: | ||
27 | QVBoxLayout* layout; | ||
28 | QLineEdit* cmdLine; | ||
29 | QLineEdit* chNameLine; | ||
30 | QPushButton* sendButton; | ||
31 | private: | ||
32 | // Device that is used | ||
33 | QString m_device; | ||
34 | }; | ||
35 | 24 | ||
25 | private slots: | ||
26 | void browse(); | ||
27 | void sendData(); | ||
28 | |||
29 | protected: | ||
30 | QVBoxLayout* layout; | ||
31 | QLineEdit* cmdLine; | ||
32 | QLineEdit* chNameLine; | ||
33 | QPushButton* sendButton; | ||
34 | private: | ||
35 | // Device that is used | ||
36 | QString m_device; | ||
37 | }; | ||
38 | } | ||
36 | #endif | 39 | #endif |
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index ba91e04..4a4daf2 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -1,35 +1,35 @@ | |||
1 | 1 | ||
2 | #include "stdpopups.h" | 2 | #include "stdpopups.h" |
3 | 3 | ||
4 | #include "popuphelper.h" | 4 | #include "popuphelper.h" |
5 | 5 | ||
6 | using namespace OpieTooth; | 6 | using namespace OpieTooth; |
7 | 7 | ||
8 | PopupHelper::PopupHelper() { | 8 | PopupHelper::PopupHelper() { |
9 | init(); | 9 | init(); |
10 | } | 10 | } |
11 | 11 | ||
12 | PopupHelper::~PopupHelper() { | 12 | PopupHelper::~PopupHelper() { |
13 | 13 | ||
14 | } | 14 | } |
15 | 15 | ||
16 | void PopupHelper::insert( int id, popupFactory fact ) { | 16 | void PopupHelper::insert( int id, popupFactory fact ) { |
17 | m_map.insert(id, fact ); | 17 | m_map.insert(id, fact ); |
18 | } | 18 | } |
19 | 19 | ||
20 | QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { | 20 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { |
21 | //qWarning("find"); | 21 | //qWarning("find"); |
22 | FactoryMap::Iterator it = m_map.find(id ); | 22 | FactoryMap::Iterator it = m_map.find(id ); |
23 | if ( it != m_map.end() ) { | 23 | if ( it != m_map.end() ) { |
24 | //qWarning("found"); | 24 | //qWarning("found"); |
25 | popupFactory fact = it.data(); | 25 | popupFactory fact = it.data(); |
26 | return (*fact)(ser, item); | 26 | return (*fact)(ser, item); |
27 | } | 27 | } |
28 | return 0l; | 28 | return 0l; |
29 | } | 29 | } |
30 | 30 | ||
31 | void PopupHelper::init() { | 31 | void PopupHelper::init() { |
32 | insert( 4355, newRfcComPopup ); | 32 | insert( 4355, newRfcComPopup ); |
33 | insert( 4353, newRfcComPopup ); | 33 | insert( 4353, newRfcComPopup ); |
34 | insert( 3, newObexPushPopup ); | 34 | insert( 3, newObexPushPopup ); |
35 | } | 35 | } |
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h index 7541ac5..6d4d413 100644 --- a/noncore/net/opietooth/manager/popuphelper.h +++ b/noncore/net/opietooth/manager/popuphelper.h | |||
@@ -1,27 +1,27 @@ | |||
1 | 1 | ||
2 | #ifndef OPIE_TOOTH_POPUP_HELPER | 2 | #ifndef OPIE_TOOTH_POPUP_HELPER |
3 | #define OPIE_TOOTH_POPUP_HELPER | 3 | #define OPIE_TOOTH_POPUP_HELPER |
4 | 4 | ||
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | #include <qmap.h> | 7 | #include <qmap.h> |
8 | 8 | ||
9 | #include <services.h> | 9 | #include <services.h> |
10 | 10 | ||
11 | namespace OpieTooth { | 11 | namespace OpieTooth { |
12 | typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*); | 12 | typedef QPopupMenu* (*popupFactory)(const Services&, BTDeviceItem*); |
13 | typedef QMap<int, popupFactory> FactoryMap; | 13 | typedef QMap<int, popupFactory> FactoryMap; |
14 | class PopupHelper { | 14 | class PopupHelper { |
15 | public: | 15 | public: |
16 | PopupHelper(); | 16 | PopupHelper(); |
17 | ~PopupHelper(); | 17 | ~PopupHelper(); |
18 | void insert( int id, popupFactory fact ); | 18 | void insert( int id, popupFactory fact ); |
19 | QPopupMenu* find( int id, const Services&, QListViewItem* ); | 19 | QPopupMenu* find( int id, const Services&, BTDeviceItem* ); |
20 | private: | 20 | private: |
21 | void init(); | 21 | void init(); |
22 | FactoryMap m_map; | 22 | FactoryMap m_map; |
23 | 23 | ||
24 | }; | 24 | }; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | #endif | 27 | #endif |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 4d926a5..1f347ce 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -1,33 +1,35 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <opie/oprocess.h> | 8 | #include <opie/oprocess.h> |
9 | 9 | ||
10 | using namespace OpieTooth; | ||
11 | |||
10 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 12 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
11 | : QDialog( parent, name, modal, fl ) { | 13 | : QDialog( parent, name, modal, fl ) { |
12 | 14 | ||
13 | if ( !name ) | 15 | if ( !name ) |
14 | setName( "PPPDialog" ); | 16 | setName( "PPPDialog" ); |
15 | setCaption( tr( "ppp connection " ) ) ; | 17 | setCaption( tr( "ppp connection " ) ) ; |
16 | 18 | ||
17 | m_device = device; | 19 | m_device = device; |
18 | 20 | ||
19 | layout = new QVBoxLayout( this ); | 21 | layout = new QVBoxLayout( this ); |
20 | 22 | ||
21 | QLabel* info = new QLabel( this ); | 23 | QLabel* info = new QLabel( this ); |
22 | info->setText( tr("Enter an ppp script name:") ); | 24 | info->setText( tr("Enter an ppp script name:") ); |
23 | 25 | ||
24 | cmdLine = new QLineEdit( this ); | 26 | cmdLine = new QLineEdit( this ); |
25 | 27 | ||
26 | outPut = new QMultiLineEdit( this ); | 28 | outPut = new QMultiLineEdit( this ); |
27 | QFont outPut_font( outPut->font() ); | 29 | QFont outPut_font( outPut->font() ); |
28 | outPut_font.setPointSize( 8 ); | 30 | outPut_font.setPointSize( 8 ); |
29 | outPut->setFont( outPut_font ); | 31 | outPut->setFont( outPut_font ); |
30 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); | 32 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); |
31 | 33 | ||
32 | connectButton = new QPushButton( this ); | 34 | connectButton = new QPushButton( this ); |
33 | connectButton->setText( tr( "Connect" ) ); | 35 | connectButton->setText( tr( "Connect" ) ); |
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h index b80b73d..6fdc90a 100644 --- a/noncore/net/opietooth/manager/pppdialog.h +++ b/noncore/net/opietooth/manager/pppdialog.h | |||
@@ -1,34 +1,37 @@ | |||
1 | #ifndef PPPDIALOG_H | 1 | #ifndef PPPDIALOG_H |
2 | #define PPPDIALOG_H | 2 | #define PPPDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | class PPPDialog : public QDialog { | ||
14 | 13 | ||
15 | Q_OBJECT | 14 | namespace OpieTooth { |
16 | 15 | ||
17 | public: | 16 | class PPPDialog : public QDialog { |
18 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); | ||
19 | ~PPPDialog(); | ||
20 | 17 | ||
18 | Q_OBJECT | ||
21 | 19 | ||
22 | private slots: | 20 | public: |
23 | void connectToDevice(); | 21 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); |
24 | void fillOutPut( OProcess* pppDial, char* cha, int len ); | 22 | ~PPPDialog(); |
25 | protected: | ||
26 | QVBoxLayout* layout; | ||
27 | QLineEdit* cmdLine; | ||
28 | QPushButton* connectButton; | ||
29 | QMultiLineEdit* outPut; | ||
30 | 23 | ||
31 | private: | 24 | private slots: |
32 | QString m_device; | 25 | void connectToDevice(); |
33 | }; | 26 | void fillOutPut( OProcess* pppDial, char* cha, int len ); |
27 | protected: | ||
28 | QVBoxLayout* layout; | ||
29 | QLineEdit* cmdLine; | ||
30 | QPushButton* connectButton; | ||
31 | QMultiLineEdit* outPut; | ||
32 | |||
33 | private: | ||
34 | QString m_device; | ||
35 | }; | ||
36 | } | ||
34 | #endif | 37 | #endif |
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp index 2290b9a..750365e 100644 --- a/noncore/net/opietooth/manager/stdpopups.cpp +++ b/noncore/net/opietooth/manager/stdpopups.cpp | |||
@@ -1,16 +1,15 @@ | |||
1 | 1 | ||
2 | //#include "rfccompopup.h" | 2 | #include "rfcpopup.h" |
3 | 3 | ||
4 | #include "stdpopups.h" | 4 | #include "stdpopups.h" |
5 | 5 | ||
6 | extern "C" { | 6 | extern "C" { |
7 | 7 | ||
8 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) { | 8 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, OpieTooth::BTDeviceItem* item ) { |
9 | // return OpieTooth::RfcComPopup( servive, item ); | 9 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters |
10 | return 0l; | 10 | //return 0l; |
11 | } | 11 | } |
12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) { | 12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { |
13 | return 0l; | 13 | return 0l; |
14 | } | 14 | } |
15 | |||
16 | } | 15 | } |
diff --git a/noncore/net/opietooth/manager/stdpopups.h b/noncore/net/opietooth/manager/stdpopups.h index 185d68d..b57d4de 100644 --- a/noncore/net/opietooth/manager/stdpopups.h +++ b/noncore/net/opietooth/manager/stdpopups.h | |||
@@ -1,15 +1,18 @@ | |||
1 | 1 | ||
2 | #ifndef OPIE_TOOTH_STD_POPUPS | 2 | #ifndef OPIE_TOOTH_STD_POPUPS |
3 | #define OPIE_TOOTH_STD_POPUPS | 3 | #define OPIE_TOOTH_STD_POPUPS |
4 | 4 | ||
5 | #include <qlistview.h> | 5 | #include <qlistview.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | 7 | ||
8 | #include <services.h> | 8 | #include <services.h> |
9 | 9 | ||
10 | #include "btdeviceitem.h" | ||
11 | |||
10 | extern "C" { | 12 | extern "C" { |
11 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, QListViewItem* ); | 13 | |
12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ); | 14 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); |
15 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | ||
13 | } | 16 | } |
14 | 17 | ||
15 | #endif | 18 | #endif |