mirror of https://github.com/saitohirga/WSJT-X.git
Add radio buttons for None, FieldDay, RTTYroundup, NA_VHF_Contest, and EU_VHF_Contest.
This commit is contained in:
Joe Taylor
parent
ed7f2a2aa6
commit
394efcae71
|
|
@ -570,6 +570,10 @@ private:
|
|||
bool bHound_;
|
||||
bool bGenerate77_;
|
||||
bool bDecode77_;
|
||||
bool bFieldDay_;
|
||||
bool bRTTYroundup_;
|
||||
bool bNA_VHF_Contest_;
|
||||
bool bEU_VHF_Contest_;
|
||||
bool x2ToneSpacing_;
|
||||
bool x4ToneSpacing_;
|
||||
bool use_dynamic_grid_;
|
||||
|
|
@ -673,6 +677,10 @@ bool Configuration::bFox() const {return m_->bFox_;}
|
|||
bool Configuration::bHound() const {return m_->bHound_;}
|
||||
bool Configuration::bGenerate77() const {return m_->bGenerate77_;}
|
||||
bool Configuration::bDecode77() const {return m_->bDecode77_;}
|
||||
bool Configuration::bFieldDay() const {return m_->bFieldDay_;}
|
||||
bool Configuration::bRTTYroundup() const {return m_->bRTTYroundup_;}
|
||||
bool Configuration::bNA_VHF_Contest() const {return m_->bNA_VHF_Contest_;}
|
||||
bool Configuration::bEU_VHF_Contest() const {return m_->bEU_VHF_Contest_;}
|
||||
bool Configuration::x2ToneSpacing() const {return m_->x2ToneSpacing_;}
|
||||
bool Configuration::x4ToneSpacing() const {return m_->x4ToneSpacing_;}
|
||||
bool Configuration::split_mode () const {return m_->split_mode ();}
|
||||
|
|
@ -1166,6 +1174,10 @@ void Configuration::impl::initialize_models ()
|
|||
ui_->cbHound->setChecked(bHound_);
|
||||
ui_->cbGenerate77->setChecked(bGenerate77_);
|
||||
ui_->cbDecode77->setChecked(bDecode77_);
|
||||
ui_->rbFieldDay->setChecked(bFieldDay_);
|
||||
ui_->rbRTTYroundup->setChecked(bRTTYroundup_);
|
||||
ui_->rbNA_VHF_Contest->setChecked(bNA_VHF_Contest_);
|
||||
ui_->rbEU_VHF_Contest->setChecked(bEU_VHF_Contest_);
|
||||
ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_);
|
||||
ui_->cbx4ToneSpacing->setChecked(x4ToneSpacing_);
|
||||
ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_);
|
||||
|
|
@ -1405,6 +1417,10 @@ void Configuration::impl::read_settings ()
|
|||
bHound_ = settings_->value("Hound",false).toBool ();
|
||||
bGenerate77_ = settings_->value("Generate77",false).toBool ();
|
||||
bDecode77_ = settings_->value("Decode77",false).toBool ();
|
||||
bFieldDay_ = settings_->value("FieldDay",false).toBool ();
|
||||
bRTTYroundup_ = settings_->value("RTTYroundup",false).toBool ();
|
||||
bNA_VHF_Contest_ = settings_->value("NA_VHF_Contest",false).toBool ();
|
||||
bEU_VHF_Contest_ = settings_->value("EU_VHF_Contest",false).toBool ();
|
||||
x2ToneSpacing_ = settings_->value("x2ToneSpacing",false).toBool ();
|
||||
x4ToneSpacing_ = settings_->value("x4ToneSpacing",false).toBool ();
|
||||
rig_params_.poll_interval = settings_->value ("Polling", 0).toInt ();
|
||||
|
|
@ -1512,6 +1528,10 @@ void Configuration::impl::write_settings ()
|
|||
settings_->setValue ("Hound", bHound_);
|
||||
settings_->setValue ("Generate77", bGenerate77_);
|
||||
settings_->setValue ("Decode77", bDecode77_);
|
||||
settings_->setValue ("FieldDay", bFieldDay_);
|
||||
settings_->setValue ("RTTYroundup", bRTTYroundup_);
|
||||
settings_->setValue ("NA_VHF_Contest", bNA_VHF_Contest_);
|
||||
settings_->setValue ("EU_VHF_Contest", bEU_VHF_Contest_);
|
||||
settings_->setValue ("x2ToneSpacing", x2ToneSpacing_);
|
||||
settings_->setValue ("x4ToneSpacing", x4ToneSpacing_);
|
||||
settings_->setValue ("OpCall", opCall_);
|
||||
|
|
@ -1917,6 +1937,10 @@ void Configuration::impl::accept ()
|
|||
bHound_ = ui_->cbHound->isChecked ();
|
||||
bGenerate77_ = ui_->cbGenerate77->isChecked();
|
||||
bDecode77_ = ui_->cbDecode77->isChecked();
|
||||
bFieldDay_ = ui_->rbFieldDay->isChecked ();
|
||||
bRTTYroundup_ = ui_->rbRTTYroundup->isChecked ();
|
||||
bNA_VHF_Contest_ = ui_->rbNA_VHF_Contest->isChecked ();
|
||||
bEU_VHF_Contest_ = ui_->rbEU_VHF_Contest->isChecked ();
|
||||
x2ToneSpacing_ = ui_->cbx2ToneSpacing->isChecked ();
|
||||
x4ToneSpacing_ = ui_->cbx4ToneSpacing->isChecked ();
|
||||
calibration_.intercept = ui_->calibration_intercept_spin_box->value ();
|
||||
|
|
|
|||
|
|
@ -130,6 +130,10 @@ public:
|
|||
bool bHound() const;
|
||||
bool bGenerate77() const;
|
||||
bool bDecode77() const;
|
||||
bool bFieldDay() const;
|
||||
bool bRTTYroundup() const;
|
||||
bool bNA_VHF_Contest() const;
|
||||
bool bEU_VHF_Contest() const;
|
||||
bool x2ToneSpacing() const;
|
||||
bool x4ToneSpacing() const;
|
||||
bool contestMode() const;
|
||||
|
|
|
|||
197
Configuration.ui
197
Configuration.ui
|
|
@ -2465,6 +2465,96 @@ Right click for insert and delete options.</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="groupBox_7">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>FT8 DXpedition mode</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>9</x>
|
||||
<y>10</y>
|
||||
<width>231</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_16">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbFox">
|
||||
<property name="toolTip">
|
||||
<string>Fox is the DXpedition station</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string> Fox</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbHound">
|
||||
<property name="toolTip">
|
||||
<string>Everybody else is a Hound</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Hound</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_8">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>FT8 and MSK144 message types</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>356</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbGenerate77">
|
||||
<property name="text">
|
||||
<string>Always generate 77-bit messages</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbDecode77">
|
||||
<property name="text">
|
||||
<string>Decode only 77-bit messages</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="groupBox_5">
|
||||
<property name="title">
|
||||
|
|
@ -2584,7 +2674,7 @@ Right click for insert and delete options.</string>
|
|||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<item row="4" column="0" colspan="2">
|
||||
<spacer name="verticalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
|
|
@ -2597,89 +2687,62 @@ Right click for insert and delete options.</string>
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="groupBox_7">
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_9">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
<height>100</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>FT8 DXpedition mode</string>
|
||||
<string>Special operating activity</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>9</x>
|
||||
<y>10</y>
|
||||
<width>231</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_16">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbFox">
|
||||
<property name="toolTip">
|
||||
<string>Fox is the DXpedition station</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string> Fox</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbHound">
|
||||
<property name="toolTip">
|
||||
<string>Everybody else is a Hound</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Hound</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="groupBox_8">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>FT8 and MSK144 message types</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget_2">
|
||||
<widget class="QWidget" name="gridLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>356</width>
|
||||
<height>31</height>
|
||||
<y>20</y>
|
||||
<width>341</width>
|
||||
<height>71</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbGenerate77">
|
||||
<layout class="QGridLayout" name="gridLayout_15">
|
||||
<item row="0" column="0">
|
||||
<widget class="QRadioButton" name="rbNone">
|
||||
<property name="text">
|
||||
<string>Always generate 77-bit messages</string>
|
||||
<string>None</string>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbDecode77">
|
||||
<item row="1" column="0">
|
||||
<widget class="QRadioButton" name="rbFieldDay">
|
||||
<property name="text">
|
||||
<string>Decode only 77-bit messages</string>
|
||||
<string>ARRL Field Day</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QRadioButton" name="rbRTTYroundup">
|
||||
<property name="text">
|
||||
<string>ARRL RTTY Roundup</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QRadioButton" name="rbNA_VHF_Contest">
|
||||
<property name="text">
|
||||
<string>NA VHF Contest</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QRadioButton" name="rbEU_VHF_Contest">
|
||||
<property name="text">
|
||||
<string>EU VHF Contest</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
|||
Loading…
Reference in New Issue