| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 18 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 1 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/rfcpopup.cpp | 4 |
4 files changed, 12 insertions, 13 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index ec05a95..f400ce6 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -79,6 +79,7 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) //Load all icons needed - m_offPix = Resource::loadPixmap( "editdelete" ); - m_onPix = Resource::loadPixmap( "installed" ); + m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); + m_onPix = Resource::loadPixmap( "opietooth/connected" ); + m_findPix = Resource::loadPixmap( "opietooth/find" ); QPalette pal = this->palette(); @@ -358,18 +359,11 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin int test1 = popup->insertItem( tr("Test1:"), 0); - int con = popup->insertItem( tr("connect"), 1); - int del = popup->insertItem( tr("delete"), 2); ret = popup->exec( point ); qWarning("returned from exec() "); - if ( ret == -1 ) + if ( ret == -1 ) { ; - else if ( ret == test1 ) + } else if ( ret == test1 ) { ; - else if ( ret == con ) - ; - else if ( ret == del ) { - // take item first? -zecke - delete item; } delete popup; @@ -387,5 +381,5 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) { // row of mac adress text(3) RemoteDevice device = item->remoteDevice(); - m_deviceList.insert( item->mac() , item ); + m_deviceList.insert( item->mac() , item ); // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back m_localDevice->searchServices( device ); diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index a68a04b..0326daf 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -71,4 +71,5 @@ namespace OpieTooth { QPixmap m_offPix; QPixmap m_onPix; + QPixmap m_findPix; BTIconLoader *m_iconLoader; diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h index 6fdc90a..bb8b734 100644 --- a/noncore/net/opietooth/manager/pppdialog.h +++ b/noncore/net/opietooth/manager/pppdialog.h @@ -19,5 +19,5 @@ namespace OpieTooth { public: - PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0); + PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); ~PPPDialog(); diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp index 1b53f4b..cc87b6c 100644 --- a/noncore/net/opietooth/manager/rfcpopup.cpp +++ b/noncore/net/opietooth/manager/rfcpopup.cpp @@ -59,5 +59,9 @@ RfcCommPopup::~RfcCommPopup() { void RfcCommPopup::slotConnect() { + qWarning("connect"); + + + PPPDialog pppDialog; pppDialog.showMaximized(); |