-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 24 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.h | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/protolistview.cpp | 16 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/protolistview.h | 3 |
4 files changed, 45 insertions, 3 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 2305403..5bec7ed 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp @@ -117,3 +117,3 @@ int WellenreiterConfigWindow::hoppingInterval() const -bool WellenreiterConfigWindow::usePrismHeader() +bool WellenreiterConfigWindow::usePrismHeader() const { @@ -123,2 +123,24 @@ bool WellenreiterConfigWindow::usePrismHeader() +bool WellenreiterConfigWindow::isChannelChecked( int channel ) const +{ + switch ( channel ) + { + case 1: return channel1->isOn(); + case 2: return channel2->isOn(); + case 3: return channel3->isOn(); + case 4: return channel4->isOn(); + case 5: return channel5->isOn(); + case 6: return channel6->isOn(); + case 7: return channel7->isOn(); + case 8: return channel8->isOn(); + case 9: return channel9->isOn(); + case 10: return channel10->isOn(); + case 11: return channel11->isOn(); + case 12: return channel12->isOn(); + case 13: return channel13->isOn(); + case 14: return channel14->isOn(); + } +} + + void WellenreiterConfigWindow::changedDeviceType(int t) diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h index 057bed6..32dc840 100644 --- a/noncore/net/wellenreiter/gui/configwindow.h +++ b/noncore/net/wellenreiter/gui/configwindow.h @@ -40,3 +40,2 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase int driverType() const; - int hoppingInterval() const; const QString soundOnNetwork() const { return "";/*netSound->currentText();*/ }; @@ -45,3 +44,5 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase - bool usePrismHeader(); + int hoppingInterval() const; + bool usePrismHeader() const; + bool isChannelChecked( int ) const; diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp index 8b86072..05ff5e7 100644 --- a/noncore/net/wellenreiter/gui/protolistview.cpp +++ b/noncore/net/wellenreiter/gui/protolistview.cpp @@ -92,2 +92,4 @@ void ProtocolListView::addProtocol( const QString& name ) combo->insertItem( "LedOff" ); + combo->insertItem( "LogMessage" ); + combo->insertItem( "MessageBox" ); } @@ -95 +97,15 @@ void ProtocolListView::addProtocol( const QString& name ) + +bool ProtocolListView::isProtocolChecked( const QString& name ) +{ + QCheckBox* box = (QCheckBox*) child( (const char*) name ); + return ( box && box->isOn() ); +} + + +QString ProtocolListView::protocolAction( const QString& name ) const +{ + //FIXME +} + + diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h index 42aec7d..723e8cd 100644 --- a/noncore/net/wellenreiter/gui/protolistview.h +++ b/noncore/net/wellenreiter/gui/protolistview.h @@ -33,2 +33,5 @@ class ProtocolListView : public QScrollView + bool isProtocolChecked( const QString& name ); + QString protocolAction( const QString& name ) const; + protected: |