w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-12 13:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk:

Browse Source 
------------------------------------------------------------------------
r7848 | bsomervi | 2017-07-11 02:59:19 +0100 (Tue, 11 Jul 2017) | 4 lines

Use model row to express region rather than name string

For some  unknown reason on some  machines the string version  of the
name does not match the model IARURegions names.
------------------------------------------------------------------------



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7899 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2017-07-16 15:01:02 +00:00
parent fd2d94cc7e
commit a66e644cba
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Configuration.cpp
+3 -3
View File
@@ -237,7 +237,7 @@ public:
{
return {frequency_line_edit_.frequency ()
, Modes::value (mode_combo_box_.currentText ())
, IARURegions::value (region_combo_box_.currentText ())};
, IARURegions::value (region_combo_box_.currentIndex ())};
}
private:
@@ -1143,7 +1143,7 @@ void Configuration::impl::initialize_models ()
ui_->PTT_port_combo_box->setCurrentText (rig_params_.ptt_port);
}
ui_->region_combo_box->setCurrentText (regions_.name (region_));
ui_->region_combo_box->setCurrentIndex (region_);
next_macros_.setStringList (macros_.stringList ());
next_frequencies_.frequency_list (frequencies_.frequency_list ());
@@ -1848,7 +1848,7 @@ void Configuration::impl::accept ()
macros_.setStringList (next_macros_.stringList ());
}
region_ = regions_.value (ui_->region_combo_box->currentText ());
region_ = IARURegions::value (ui_->region_combo_box->currentIndex ());
if (frequencies_.frequency_list () != next_frequencies_.frequency_list ())
{