Make missing frame indicator user configurable
This commit is contained in:
parent
c2d1300a8e
commit
fcb49d8028
@ -594,6 +594,7 @@ private:
|
|||||||
QStringList primary_highlight_words_;
|
QStringList primary_highlight_words_;
|
||||||
QStringList secondary_highlight_words_;
|
QStringList secondary_highlight_words_;
|
||||||
QString eot_;
|
QString eot_;
|
||||||
|
QString mfi_;
|
||||||
QString my_info_;
|
QString my_info_;
|
||||||
QString my_status_;
|
QString my_status_;
|
||||||
QString cq_;
|
QString cq_;
|
||||||
@ -1089,6 +1090,10 @@ QString Configuration::eot() const {
|
|||||||
return m_->eot_;
|
return m_->eot_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString Configuration::mfi() const {
|
||||||
|
return m_->mfi_;
|
||||||
|
}
|
||||||
|
|
||||||
QString Configuration::my_info() const
|
QString Configuration::my_info() const
|
||||||
{
|
{
|
||||||
auto info = m_->my_info_;
|
auto info = m_->my_info_;
|
||||||
@ -1529,7 +1534,8 @@ void Configuration::impl::initialize_models ()
|
|||||||
ui_->spot_blacklist_line_edit->setText(spot_blacklist_.join(", "));
|
ui_->spot_blacklist_line_edit->setText(spot_blacklist_.join(", "));
|
||||||
ui_->primaryHighlightLineEdit->setText(primary_highlight_words_.join(", "));
|
ui_->primaryHighlightLineEdit->setText(primary_highlight_words_.join(", "));
|
||||||
ui_->secondaryHighlightLineEdit->setText(secondary_highlight_words_.join(", "));
|
ui_->secondaryHighlightLineEdit->setText(secondary_highlight_words_.join(", "));
|
||||||
ui_->eot_line_edit->setText(eot_.trimmed().left(2));
|
ui_->eot_line_edit->setText(eot_);
|
||||||
|
ui_->mfi_line_edit->setText(mfi_);
|
||||||
ui_->info_message_line_edit->setText (my_info_.toUpper());
|
ui_->info_message_line_edit->setText (my_info_.toUpper());
|
||||||
ui_->status_message_line_edit->setText (my_status_.toUpper());
|
ui_->status_message_line_edit->setText (my_status_.toUpper());
|
||||||
ui_->cq_message_line_edit->setText(cq_.toUpper().replace("CQCQCQ", "CQ CQ CQ"));
|
ui_->cq_message_line_edit->setText(cq_.toUpper().replace("CQCQCQ", "CQ CQ CQ"));
|
||||||
@ -1814,7 +1820,8 @@ void Configuration::impl::read_settings ()
|
|||||||
secondary_highlight_words_ = settings_->value("SecondaryHighlightWords", QStringList{}).toStringList();
|
secondary_highlight_words_ = settings_->value("SecondaryHighlightWords", QStringList{}).toStringList();
|
||||||
callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
|
callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
|
||||||
activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
|
activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
|
||||||
eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString().trimmed().left(2);
|
eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString();
|
||||||
|
mfi_ = settings_->value("MFICharacter", QString{"\u2026\u2026"}).toString();
|
||||||
my_info_ = settings_->value("MyInfo", QString {}).toString();
|
my_info_ = settings_->value("MyInfo", QString {}).toString();
|
||||||
my_status_ = settings_->value("MyStatus", QString {"IDLE <MYIDLE> VERSION <MYVERSION>"}).toString();
|
my_status_ = settings_->value("MyStatus", QString {"IDLE <MYIDLE> VERSION <MYVERSION>"}).toString();
|
||||||
hb_ = settings_->value("HBMessage", QString {"HB <MYGRID4>"}).toString();
|
hb_ = settings_->value("HBMessage", QString {"HB <MYGRID4>"}).toString();
|
||||||
@ -2140,6 +2147,7 @@ void Configuration::impl::write_settings ()
|
|||||||
settings_->setValue ("PrimaryHighlightWords", primary_highlight_words_);
|
settings_->setValue ("PrimaryHighlightWords", primary_highlight_words_);
|
||||||
settings_->setValue ("SecondaryHighlightWords", secondary_highlight_words_);
|
settings_->setValue ("SecondaryHighlightWords", secondary_highlight_words_);
|
||||||
settings_->setValue ("EOTCharacter", eot_);
|
settings_->setValue ("EOTCharacter", eot_);
|
||||||
|
settings_->setValue ("MFICharacter", mfi_);
|
||||||
settings_->setValue ("MyInfo", my_info_);
|
settings_->setValue ("MyInfo", my_info_);
|
||||||
settings_->setValue ("MyStatus", my_status_);
|
settings_->setValue ("MyStatus", my_status_);
|
||||||
settings_->setValue ("CQMessage", cq_);
|
settings_->setValue ("CQMessage", cq_);
|
||||||
@ -2836,7 +2844,8 @@ void Configuration::impl::accept ()
|
|||||||
cq_ = ui_->cq_message_line_edit->text().toUpper();
|
cq_ = ui_->cq_message_line_edit->text().toUpper();
|
||||||
hb_ = ui_->hb_message_line_edit->text().toUpper();
|
hb_ = ui_->hb_message_line_edit->text().toUpper();
|
||||||
reply_ = ui_->reply_message_line_edit->text().toUpper();
|
reply_ = ui_->reply_message_line_edit->text().toUpper();
|
||||||
eot_ = ui_->eot_line_edit->text().trimmed().left(2);
|
eot_ = ui_->eot_line_edit->text();
|
||||||
|
mfi_ = ui_->mfi_line_edit->text();
|
||||||
my_info_ = ui_->info_message_line_edit->text().toUpper();
|
my_info_ = ui_->info_message_line_edit->text().toUpper();
|
||||||
my_status_ = ui_->status_message_line_edit->text().toUpper();
|
my_status_ = ui_->status_message_line_edit->text().toUpper();
|
||||||
callsign_aging_ = ui_->callsign_aging_spin_box->value();
|
callsign_aging_ = ui_->callsign_aging_spin_box->value();
|
||||||
|
@ -116,6 +116,7 @@ public:
|
|||||||
int activity_aging() const;
|
int activity_aging() const;
|
||||||
int callsign_aging() const;
|
int callsign_aging() const;
|
||||||
QString eot() const;
|
QString eot() const;
|
||||||
|
QString mfi() const;
|
||||||
QString my_info () const;
|
QString my_info () const;
|
||||||
QString my_status () const;
|
QString my_status () const;
|
||||||
QString hb_message () const;
|
QString hb_message () const;
|
||||||
|
@ -314,9 +314,9 @@
|
|||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>-136</y>
|
||||||
<width>724</width>
|
<width>724</width>
|
||||||
<height>566</height>
|
<height>597</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_26">
|
<layout class="QVBoxLayout" name="verticalLayout_26">
|
||||||
@ -714,12 +714,15 @@ text message.</string>
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label_24">
|
<widget class="QLabel" name="label_24">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>End of Transmission Character:</string>
|
<string>End of Transmission Character Indicator:</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLineEdit" name="eot_line_edit">
|
<widget class="QLineEdit" name="eot_line_edit">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><html><head/><body><p>Character to display when a transmission has been detected to have ended. </p></body></html></string>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>♢</string>
|
<string>♢</string>
|
||||||
</property>
|
</property>
|
||||||
@ -728,6 +731,23 @@ text message.</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_32">
|
||||||
|
<property name="text">
|
||||||
|
<string>Missing Frame Character Indicator:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="mfi_line_edit">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string><html><head/><body><p>Character sequence to display when a transmission has been detected to have a missing frame. </p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>……</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -4754,12 +4774,12 @@ soundcard changes</string>
|
|||||||
</connection>
|
</connection>
|
||||||
</connections>
|
</connections>
|
||||||
<buttongroups>
|
<buttongroups>
|
||||||
<buttongroup name="split_mode_button_group"/>
|
|
||||||
<buttongroup name="PTT_method_button_group"/>
|
|
||||||
<buttongroup name="CAT_handshake_button_group"/>
|
|
||||||
<buttongroup name="CAT_data_bits_button_group"/>
|
|
||||||
<buttongroup name="TX_audio_source_button_group"/>
|
<buttongroup name="TX_audio_source_button_group"/>
|
||||||
<buttongroup name="CAT_stop_bits_button_group"/>
|
<buttongroup name="CAT_stop_bits_button_group"/>
|
||||||
|
<buttongroup name="CAT_data_bits_button_group"/>
|
||||||
|
<buttongroup name="PTT_method_button_group"/>
|
||||||
|
<buttongroup name="split_mode_button_group"/>
|
||||||
|
<buttongroup name="CAT_handshake_button_group"/>
|
||||||
<buttongroup name="TX_mode_button_group"/>
|
<buttongroup name="TX_mode_button_group"/>
|
||||||
</buttongroups>
|
</buttongroups>
|
||||||
</ui>
|
</ui>
|
||||||
|
@ -10601,7 +10601,7 @@ void MainWindow::processIdleActivity() {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(last.text == " . . . "){
|
if(last.text == m_config.mfi()){
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10610,7 +10610,7 @@ void MainWindow::processIdleActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ActivityDetail d = {};
|
ActivityDetail d = {};
|
||||||
d.text = " . . . ";
|
d.text = m_config.mfi();
|
||||||
d.isFree = true;
|
d.isFree = true;
|
||||||
d.utcTimestamp = last.utcTimestamp;
|
d.utcTimestamp = last.utcTimestamp;
|
||||||
d.snr = last.snr;
|
d.snr = last.snr;
|
||||||
|
Loading…
Reference in New Issue
Block a user