chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ft8call-reorg' of https://bitbucket.org/widefido/wsjtx into ft8call-reorg

Browse Source
This commit is contained in:
Jordan Sherer 2018-07-16 11:59:06 +00:00
commit 82c3b23e44
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeCPackOptions.cmake.in
View File

@ -21,6 +21,7 @@ set (CPACK_STRIP_FILES TRUE)
#set (CPACK_COMPONENT_RUNTIME_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@") #set (CPACK_COMPONENT_RUNTIME_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@")
if (CPACK_GENERATOR MATCHES "NSIS") if (CPACK_GENERATOR MATCHES "NSIS")
set (CPACK_SET_DESTDIR FALSE)
set (CPACK_STRIP_FILES FALSE) # breaks Qt packaging on Windows set (CPACK_STRIP_FILES FALSE) # breaks Qt packaging on Windows
set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call") set (CPACK_NSIS_INSTALL_ROOT "C:\\FT8Call")

8
Configuration.ui
View File

@ -23,7 +23,7 @@
<string>Select tab to change configuration parameters.</string> <string>Select tab to change configuration parameters.</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>6</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="general_tab"> <widget class="QWidget" name="general_tab">
<attribute name="title"> <attribute name="title">
@ -2894,11 +2894,11 @@ soundcard changes</string>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_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="CAT_handshake_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

9
mainwindow.cpp
View File

@ -433,7 +433,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
this}}, this}},
psk_Reporter {new PSK_Reporter {m_messageClient, this}}, psk_Reporter {new PSK_Reporter {m_messageClient, this}},
m_manual {&m_network_manager}, m_manual {&m_network_manager},
m_i3bit {0} m_i3bit {0},
m_txFrameCount {0}
{ {
ui->setupUi(this); ui->setupUi(this);
createStatusBar(); createStatusBar();
@ -7854,8 +7855,6 @@ void MainWindow::postDecode (bool is_new, QString const& message)
} }
void MainWindow::displayTransmit(){ void MainWindow::displayTransmit(){
updateButtonDisplay(); updateButtonDisplay();
} }
@ -8131,12 +8130,12 @@ void MainWindow::displayActivity(bool force){
// use the last frequency // use the last frequency
f = d.freq; f = d.freq;
// if we're responding via allcall, pick a different frequency. // if we're responding via allcall, pick a different frequency and mark it in the cache.
if(d.to == "ALLCALL"){ if(d.to == "ALLCALL"){
f = findFreeFreqOffset(qMax(0, f-100), qMin(f+100, 2500), 50); f = findFreeFreqOffset(qMax(0, f-100), qMin(f+100, 2500), 50);
m_txAllcallCommandCache.insert(d.from, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
} }
m_txAllcallCommandCache.insert(d.from, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
processed = true; processed = true;
} }

6
mainwindow.ui
View File

@ -296,10 +296,10 @@ color : white;
}</string> }</string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Plain</enum>
</property> </property>
<property name="lineWidth"> <property name="lineWidth">
<number>2</number> <number>2</number>
@ -4002,7 +4002,7 @@ list. The list can be maintained in Settings (F2).</string>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>960</width> <width>960</width>
<height>22</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">