Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/panpopup.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.h | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index f813e65..6fad6ae 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro | |||
@@ -1,49 +1,49 @@ | |||
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 rfcpopup.h obexpopup.h \ | 10 | devicehandler.h rfcpopup.h obexpopup.h \ |
11 | rfcommhelper.h panpopup.h | 11 | rfcommhelper.h panpopup.h dunpopup.h |
12 | 12 | ||
13 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | 13 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ |
14 | btserviceitem.cpp stdpopups.cpp \ | 14 | btserviceitem.cpp stdpopups.cpp \ |
15 | popuphelper.cpp main.cpp \ | 15 | popuphelper.cpp main.cpp \ |
16 | bluebase.cpp scandialog.cpp \ | 16 | bluebase.cpp scandialog.cpp \ |
17 | btlistitem.cpp hciconfwrapper.cpp \ | 17 | btlistitem.cpp hciconfwrapper.cpp \ |
18 | bticonloader.cpp pppdialog.cpp \ | 18 | bticonloader.cpp pppdialog.cpp \ |
19 | obexdialog.cpp devicehandler.cpp \ | 19 | obexdialog.cpp devicehandler.cpp \ |
20 | rfcpopup.cpp obexpopup.cpp \ | 20 | rfcpopup.cpp obexpopup.cpp \ |
21 | rfcommhelper.cpp panpopup.cpp | 21 | rfcommhelper.cpp panpopup.cpp dunpopup.cpp |
22 | INCLUDEPATH += $(OPIEDIR)/include | 22 | INCLUDEPATH += $(OPIEDIR)/include |
23 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 23 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
24 | DEPENDPATH += $(OPIEDIR)/include | 24 | DEPENDPATH += $(OPIEDIR)/include |
25 | LIBS += -lqpe -lopietooth -lopie | 25 | LIBS += -lqpe -lopietooth -lopie |
26 | INTERFACES = bluetoothbase.ui devicedialog.ui | 26 | INTERFACES = bluetoothbase.ui devicedialog.ui |
27 | DESTDIR = $(OPIEDIR)/bin | 27 | DESTDIR = $(OPIEDIR)/bin |
28 | TARGET = bluetooth-manager | 28 | TARGET = bluetooth-manager |
29 | 29 | ||
30 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ | 30 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ |
31 | ../../../../i18n/da/bluetooth-manager.ts \ | 31 | ../../../../i18n/da/bluetooth-manager.ts \ |
32 | ../../../../i18n/xx/bluetooth-manager.ts \ | 32 | ../../../../i18n/xx/bluetooth-manager.ts \ |
33 | ../../../../i18n/en/bluetooth-manager.ts \ | 33 | ../../../../i18n/en/bluetooth-manager.ts \ |
34 | ../../../../i18n/es/bluetooth-manager.ts \ | 34 | ../../../../i18n/es/bluetooth-manager.ts \ |
35 | ../../../../i18n/fr/bluetooth-manager.ts \ | 35 | ../../../../i18n/fr/bluetooth-manager.ts \ |
36 | ../../../../i18n/hu/bluetooth-manager.ts \ | 36 | ../../../../i18n/hu/bluetooth-manager.ts \ |
37 | ../../../../i18n/ja/bluetooth-manager.ts \ | 37 | ../../../../i18n/ja/bluetooth-manager.ts \ |
38 | ../../../../i18n/ko/bluetooth-manager.ts \ | 38 | ../../../../i18n/ko/bluetooth-manager.ts \ |
39 | ../../../../i18n/no/bluetooth-manager.ts \ | 39 | ../../../../i18n/no/bluetooth-manager.ts \ |
40 | ../../../../i18n/pl/bluetooth-manager.ts \ | 40 | ../../../../i18n/pl/bluetooth-manager.ts \ |
41 | ../../../../i18n/pt/bluetooth-manager.ts \ | 41 | ../../../../i18n/pt/bluetooth-manager.ts \ |
42 | ../../../../i18n/pt_BR/bluetooth-manager.ts \ | 42 | ../../../../i18n/pt_BR/bluetooth-manager.ts \ |
43 | ../../../../i18n/sl/bluetooth-manager.ts \ | 43 | ../../../../i18n/sl/bluetooth-manager.ts \ |
44 | ../../../../i18n/zh_CN/bluetooth-manager.ts \ | 44 | ../../../../i18n/zh_CN/bluetooth-manager.ts \ |
45 | ../../../../i18n/zh_TW/bluetooth-manager.ts | 45 | ../../../../i18n/zh_TW/bluetooth-manager.ts |
46 | 46 | ||
47 | 47 | ||
48 | 48 | ||
49 | include ( $(OPIEDIR)/include.pro ) | 49 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/net/opietooth/manager/panpopup.cpp b/noncore/net/opietooth/manager/panpopup.cpp index 7a0ee55..695f349 100644 --- a/noncore/net/opietooth/manager/panpopup.cpp +++ b/noncore/net/opietooth/manager/panpopup.cpp | |||
@@ -13,51 +13,51 @@ PanPopup::PanPopup( OpieTooth::BTDeviceItem* item ) : QPopupMenu() { | |||
13 | 13 | ||
14 | qWarning("PanPopup c'tor"); | 14 | qWarning("PanPopup c'tor"); |
15 | 15 | ||
16 | m_item = item; | 16 | m_item = item; |
17 | QAction *a, *b, *c; | 17 | QAction *a, *b, *c; |
18 | 18 | ||
19 | m_panconnection = 0l; | 19 | m_panconnection = 0l; |
20 | /* connect action */ | 20 | /* connect action */ |
21 | 21 | ||
22 | 22 | ||
23 | a = new QAction(); // so it's get deleted | 23 | a = new QAction(); // so it's get deleted |
24 | a->setText( tr("connect") ); | 24 | a->setText( tr("connect") ); |
25 | a->addTo( this ); | 25 | a->addTo( this ); |
26 | connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) ); | 26 | connect( a, SIGNAL( activated() ), this, SLOT( slotConnect() ) ); |
27 | 27 | ||
28 | 28 | ||
29 | b = new QAction(); | 29 | b = new QAction(); |
30 | b->setText( tr( "connect+conf" ) ); | 30 | b->setText( tr( "connect+conf" ) ); |
31 | b->addTo( this ); | 31 | b->addTo( this ); |
32 | connect( b, SIGNAL( activated() ), this, SLOT( slotConnectAndConfig() ) ); | 32 | connect( b, SIGNAL( activated() ), this, SLOT( slotConnectAndConfig() ) ); |
33 | 33 | ||
34 | c = new QAction(); | 34 | c = new QAction(); |
35 | c->setText( tr( "disconnect" ) ); | 35 | c->setText( tr( "disconnect" ) ); |
36 | c->addTo( this ); | 36 | c->addTo( this ); |
37 | connect( c, SIGNAL( activated() ), this, SLOT( slotDisconnect() ) ); | 37 | connect( c, SIGNAL( activated() ), this, SLOT( slotDisconnect() ) ); |
38 | 38 | ||
39 | }; | 39 | }; |
40 | 40 | ||
41 | PanPopup::~PanPopup() { | 41 | PanPopup::~PanPopup() { |
42 | 42 | ||
43 | } | 43 | } |
44 | 44 | ||
45 | void PanPopup::slotConnect() { | 45 | void PanPopup::slotConnect() { |
46 | 46 | ||
47 | m_panconnection = new StartPanConnection( m_item->mac() ); | 47 | m_panconnection = new StartPanConnection( m_item->mac() ); |
48 | m_panconnection->start(); | 48 | m_panconnection->start(); |
49 | } | 49 | } |
50 | 50 | ||
51 | void PanPopup::slotDisconnect() { | 51 | void PanPopup::slotDisconnect() { |
52 | m_panconnection->stop(); | 52 | m_panconnection->stop(); |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | void PanPopup::slotConnectAndConfig() { | 56 | void PanPopup::slotConnectAndConfig() { |
57 | slotConnect(); | 57 | slotConnect(); |
58 | 58 | ||
59 | // more intelligence here later like passing the device ( bnepX ) | 59 | // more intelligence here later like passing the device ( bnepX ) |
60 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 60 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
61 | e << QString( "networksetup" ); | 61 | e << QString( "networksettings" ); |
62 | 62 | ||
63 | } | 63 | } |
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index 7da7002..ab22fea 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -1,35 +1,36 @@ | |||
1 | 1 | ||
2 | #include "stdpopups.h" | 2 | #include "stdpopups.h" |
3 | #include "popuphelper.h" | 3 | #include "popuphelper.h" |
4 | 4 | ||
5 | using namespace OpieTooth; | 5 | using namespace OpieTooth; |
6 | 6 | ||
7 | PopupHelper::PopupHelper() { | 7 | PopupHelper::PopupHelper() { |
8 | init(); | 8 | init(); |
9 | } | 9 | } |
10 | 10 | ||
11 | PopupHelper::~PopupHelper() { | 11 | PopupHelper::~PopupHelper() { |
12 | } | 12 | } |
13 | 13 | ||
14 | void PopupHelper::insert( int id, popupFactory fact ) { | 14 | void PopupHelper::insert( int id, popupFactory fact ) { |
15 | m_map.insert(id, fact ); | 15 | m_map.insert(id, fact ); |
16 | } | 16 | } |
17 | 17 | ||
18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { | 18 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { |
19 | //qWarning("find"); | 19 | //qWarning("find"); |
20 | FactoryMap::Iterator it = m_map.find(id ); | 20 | FactoryMap::Iterator it = m_map.find(id ); |
21 | if ( it != m_map.end() ) { | 21 | if ( it != m_map.end() ) { |
22 | //qWarning("found"); | 22 | //qWarning("found"); |
23 | popupFactory fact = it.data(); | 23 | popupFactory fact = it.data(); |
24 | return (*fact)(ser, item); | 24 | return (*fact)(ser, item); |
25 | } | 25 | } |
26 | return 0l; | 26 | return 0l; |
27 | } | 27 | } |
28 | 28 | ||
29 | void PopupHelper::init() { | 29 | void PopupHelper::init() { |
30 | insert( 4355, newRfcComPopup ); | 30 | insert( 4355, newRfcComPopup ); |
31 | insert( 4354, newDunPopup ); | ||
31 | insert( 4353, newRfcComPopup ); | 32 | insert( 4353, newRfcComPopup ); |
32 | insert( 4357, newObexPushPopup ); | 33 | insert( 4357, newObexPushPopup ); |
33 | insert( 4358, newObexPushPopup ); | 34 | insert( 4358, newObexPushPopup ); |
34 | insert( 4374, newPanPopup ); | 35 | insert( 4374, newPanPopup ); |
35 | } | 36 | } |
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp index 934e58b..38b8ee7 100644 --- a/noncore/net/opietooth/manager/stdpopups.cpp +++ b/noncore/net/opietooth/manager/stdpopups.cpp | |||
@@ -1,21 +1,26 @@ | |||
1 | 1 | ||
2 | #include "rfcpopup.h" | 2 | #include "rfcpopup.h" |
3 | #include "obexpopup.h" | 3 | #include "obexpopup.h" |
4 | #include "panpopup.h" | 4 | #include "panpopup.h" |
5 | #include "dunpopup.h" | ||
5 | 6 | ||
6 | #include "stdpopups.h" | 7 | #include "stdpopups.h" |
7 | 8 | ||
8 | extern "C" { | 9 | extern "C" { |
9 | 10 | ||
10 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { | 11 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { |
11 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters | 12 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters |
12 | //return 0l; | 13 | //return 0l; |
13 | } | 14 | } |
14 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { | 15 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { |
15 | return new OpieTooth::ObexPopup(); | 16 | return new OpieTooth::ObexPopup(); |
16 | } | 17 | } |
17 | QPopupMenu* newPanPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { | 18 | QPopupMenu* newPanPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { |
18 | return new OpieTooth::PanPopup( item ); | 19 | return new OpieTooth::PanPopup( item ); |
19 | } | 20 | } |
21 | |||
22 | QPopupMenu* newDunPopup( const OpieTooth::Services& service, OpieTooth::BTDeviceItem* item ) { | ||
23 | return new OpieTooth::DunPopup( item ); | ||
24 | } | ||
20 | } | 25 | } |
21 | 26 | ||
diff --git a/noncore/net/opietooth/manager/stdpopups.h b/noncore/net/opietooth/manager/stdpopups.h index 7f2f6b3..f52dc3a 100644 --- a/noncore/net/opietooth/manager/stdpopups.h +++ b/noncore/net/opietooth/manager/stdpopups.h | |||
@@ -1,19 +1,20 @@ | |||
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" | 10 | #include "btdeviceitem.h" |
11 | 11 | ||
12 | extern "C" { | 12 | extern "C" { |
13 | 13 | ||
14 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | 14 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); |
15 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | 15 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); |
16 | QPopupMenu* newPanPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | 16 | QPopupMenu* newPanPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); |
17 | QPopupMenu* newDunPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | ||
17 | } | 18 | } |
18 | 19 | ||
19 | #endif | 20 | #endif |