diff --git a/lib/channel.cc b/lib/channel.cc index 7700ae82..32279588 100644 --- a/lib/channel.cc +++ b/lib/channel.cc @@ -890,22 +890,20 @@ DMRChannel::serialize(const Context &context, const ErrorStack &err) { * ********************************************************************************************* */ M17Channel::M17Channel(QObject *parent) : DigitalChannel(parent), _mode(Mode::Voice), _accessNumber(0), _txContact(), - _rxGroup(), _gpsEnabled(false), _encryptionMode(EncryptionMode::None) + _gpsEnabled(false), _encryptionMode(EncryptionMode::None) { // Connect signals of references - connect(&_rxGroup, SIGNAL(modified()), this, SLOT(onReferenceModified())); connect(&_txContact, SIGNAL(modified()), this, SLOT(onReferenceModified())); } M17Channel::M17Channel(const M17Channel &other, QObject *parent) : DigitalChannel(other, parent), _mode(Mode::Voice), _accessNumber(0), - _txContact(), _rxGroup(), _gpsEnabled(false), + _txContact(), _gpsEnabled(false), _encryptionMode(EncryptionMode::None) { copy(other); // Connect signals of references - connect(&_rxGroup, SIGNAL(modified()), this, SLOT(onReferenceModified())); connect(&_txContact, SIGNAL(modified()), this, SLOT(onReferenceModified())); } @@ -915,7 +913,6 @@ M17Channel::clear() { setMode(Mode::Voice); setAccessNumber(0); setContact(nullptr); - setGroupList(nullptr); enableGPS(false); setEncryptionMode(EncryptionMode::None); } @@ -957,37 +954,6 @@ M17Channel::setAccessNumber(unsigned int can) { emit modified(this); } -const GroupListReference * -M17Channel::groupListRef() const { - return &_rxGroup; -} - -GroupListReference * -M17Channel::groupListRef() { - return &_rxGroup; -} - -void -M17Channel::setGroupListRef(GroupListReference *ref) { - if (nullptr == ref) - _rxGroup.clear(); - else - _rxGroup.copy(ref); -} - -RXGroupList * -M17Channel::groupList() const { - return _rxGroup.as(); -} - -bool -M17Channel::setGroupList(RXGroupList *g) { - if(! _rxGroup.set(g)) - return false; - emit modified(this); - return true; -} - const M17ContactReference * M17Channel::contactRef() const { return &_txContact; diff --git a/lib/channel.hh b/lib/channel.hh index 27dcab4d..79bb8929 100644 --- a/lib/channel.hh +++ b/lib/channel.hh @@ -486,8 +486,6 @@ class M17Channel: public DigitalChannel Q_PROPERTY(unsigned accessNumber READ accessNumber WRITE setAccessNumber) /** The transmit contact. */ Q_PROPERTY(M17ContactReference* contact READ contactRef WRITE setContactRef) - /** The rx group list. */ - Q_PROPERTY(GroupListReference* groupList READ groupListRef WRITE setGroupListRef) /** The channel mode. */ Q_PROPERTY(Mode mode READ mode WRITE setMode) /** The encryption mode. */ @@ -527,17 +525,6 @@ public: /** Sets the channel access number (0-15). */ void setAccessNumber(unsigned int can); - /** Returns a reference to the group list. */ - const GroupListReference *groupListRef() const; - /** Returns a reference to the group list. */ - GroupListReference *groupListRef(); - /** Sets the reference to the group list. */ - void setGroupListRef(GroupListReference *ref); - /** Returns the RX group list for the channel. */ - RXGroupList *groupList() const; - /** (Re-)Sets the RX group list for the channel. */ - bool setGroupList(RXGroupList *rxg); - /** Returns a reference to the transmit contact. */ const M17ContactReference *contactRef() const; /** Returns a reference to the transmit contact. */ @@ -569,8 +556,6 @@ protected: unsigned int _accessNumber; /** The default TX contact. */ M17ContactReference _txContact; - /** The RX group list for this channel. */ - GroupListReference _rxGroup; /** If @c true, positioning information is send alonside voice and data. */ bool _gpsEnabled; /** Holds the encryption mode for the channel. */ diff --git a/src/configitemwrapper.cc b/src/configitemwrapper.cc index 2e7cb133..18d16832 100644 --- a/src/configitemwrapper.cc +++ b/src/configitemwrapper.cc @@ -336,13 +336,7 @@ ChannelListWrapper::data(const QModelIndex &index, int role) const { } else { return tr("-"); } - } else if (M17Channel *m17 = channel->as()) { - if (m17->groupList()) { - return m17->groupList()->name(); - } else { - return tr("-"); - } - } else if (channel->is()) { + } else if (channel->is() || channel->is()) { return tr("[None]"); } break; diff --git a/src/m17channeldialog.cc b/src/m17channeldialog.cc index 7fb9998e..a468ccf8 100644 --- a/src/m17channeldialog.cc +++ b/src/m17channeldialog.cc @@ -57,8 +57,6 @@ M17ChannelDialog::construct() { if (_channel && (_myChannel->scanList() == _config->scanlists()->scanlist(i)) ) ui->scanList->setCurrentIndex(i+1); } - populateRXGroupListBox(ui->rxGroupList, _config->rxGroupLists(), - (_channel ? _myChannel->groupList() : nullptr)); ui->txContact->addItem(tr("[None]"), QVariant::fromValue(nullptr)); if (_channel && (nullptr == _myChannel->contact())) ui->txContact->setCurrentIndex(0); @@ -128,7 +126,6 @@ M17ChannelDialog::channel() { _myChannel->setScanList(ui->scanList->currentData().value()); _myChannel->setMode(ui->channelMode->currentData().value()); _myChannel->setAccessNumber(ui->accessNumber->value()); - _myChannel->setGroupList(ui->rxGroupList->currentData().value()); _myChannel->setContact(ui->txContact->currentData().value()); _myChannel->enableGPS(ui->sendGPS->isChecked()); diff --git a/src/m17channeldialog.ui b/src/m17channeldialog.ui index 41c4527a..a9c9e10f 100644 --- a/src/m17channeldialog.ui +++ b/src/m17channeldialog.ui @@ -246,33 +246,23 @@ - - - Rx Group List - - - - - - - Tx Contact - + - + Send position - +