-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 21 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index f8f7b15..ec8df82 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp | |||
@@ -89,8 +89,9 @@ namespace OpieTooth { | |||
89 | localDevice = new Manager( "hci0" ); | 89 | localDevice = new Manager( "hci0" ); |
90 | 90 | ||
91 | connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); | 91 | connect( StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); |
92 | connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); | 92 | connect( StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); |
93 | connect( (QObject*)localDevice, SIGNAL( foundDevices( const QString& , RemoteDevices::ValueList ) ), | 93 | connect( localDevice, SIGNAL( foundDevices( const QString& , RemoteDevice::ValueList ) ), |
94 | this, SLOT(fillList(const QString& , RemoteDevices::ValueList ) ) ) ; | 94 | this, SLOT(fillList(const QString& , RemoteDevice::ValueList ) ) ) ; |
95 | // connect( this, SIGNAL( accept() ), this, SLOT( emitToManager() )); | ||
95 | progressStat = 0; | 96 | progressStat = 0; |
96 | } | 97 | } |
@@ -107,4 +108,10 @@ namespace OpieTooth { | |||
107 | } | 108 | } |
108 | 109 | ||
110 | void ScanDialog::accept() { | ||
111 | emitToManager(); | ||
112 | QDialog::accept(); | ||
113 | } | ||
114 | |||
115 | |||
109 | void ScanDialog::startSearch() { | 116 | void ScanDialog::startSearch() { |
110 | progress->setProgress(0); | 117 | progress->setProgress(0); |
@@ -127,4 +134,5 @@ namespace OpieTooth { | |||
127 | void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) { | 134 | void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) { |
128 | 135 | ||
136 | qDebug("fill List"); | ||
129 | QCheckListItem * deviceItem; | 137 | QCheckListItem * deviceItem; |
130 | 138 | ||
@@ -132,5 +140,5 @@ namespace OpieTooth { | |||
132 | for( it = deviceList.begin(); it != deviceList.end(); ++it ) { | 140 | for( it = deviceList.begin(); it != deviceList.end(); ++it ) { |
133 | 141 | ||
134 | deviceItem = new QCheckListItem( ListView1, (*it).name() ); | 142 | deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox ); |
135 | deviceItem->setText(1, (*it).mac() ); | 143 | deviceItem->setText(1, (*it).mac() ); |
136 | } | 144 | } |
@@ -142,4 +150,5 @@ namespace OpieTooth { | |||
142 | */ | 150 | */ |
143 | void ScanDialog::emitToManager() { | 151 | void ScanDialog::emitToManager() { |
152 | qDebug("vor liste durchsuchen"); | ||
144 | 153 | ||
145 | if (!ListView1) { | 154 | if (!ListView1) { |
@@ -157,4 +166,5 @@ namespace OpieTooth { | |||
157 | } | 166 | } |
158 | } | 167 | } |
168 | qDebug("vor emit"); | ||
159 | emit selectedDevices( *deviceList ); | 169 | emit selectedDevices( *deviceList ); |
160 | delete deviceList; | 170 | delete deviceList; |
@@ -165,5 +175,4 @@ namespace OpieTooth { | |||
165 | */ | 175 | */ |
166 | ScanDialog::~ScanDialog() { | 176 | ScanDialog::~ScanDialog() { |
167 | emitToManager(); | ||
168 | delete localDevice; | 177 | delete localDevice; |
169 | } | 178 | } |
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h index adc960c..7c84ce2 100644 --- a/noncore/net/opietooth/manager/scandialog.h +++ b/noncore/net/opietooth/manager/scandialog.h | |||
@@ -53,4 +53,6 @@ class Device; | |||
53 | QListView* ListView1; | 53 | QListView* ListView1; |
54 | 54 | ||
55 | public slots: | ||
56 | void accept(); | ||
55 | 57 | ||
56 | protected: | 58 | protected: |
@@ -60,5 +62,5 @@ class Device; | |||
60 | void stopSearch(); | 62 | void stopSearch(); |
61 | void startSearch(); | 63 | void startSearch(); |
62 | void progressTimer(); | 64 | void progressTimer(); |
63 | void fillList(const QString& device, RemoteDevice::ValueList list); | 65 | void fillList(const QString& device, RemoteDevice::ValueList list); |
64 | 66 | ||