w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-16 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat-dropped-frames

Browse Source
This commit is contained in:
Bill Somerville 2020-08-08 21:26:51 +01:00
commit ecf0a146f1
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
widgets/mainwindow.cpp
View File

@ -5756,7 +5756,7 @@ void MainWindow::on_tx6_editingFinished() //tx6 edited
void MainWindow::on_RoundRobin_currentTextChanged(QString text) void MainWindow::on_RoundRobin_currentTextChanged(QString text)
{ {
ui->sbTxPercent->setEnabled(text=="Random"); ui->sbTxPercent->setEnabled (text == tr ("Random"));
m_WSPR_tx_next = false; // cancel any pending Tx to avoid m_WSPR_tx_next = false; // cancel any pending Tx to avoid
// undesirable consecutive Tx periods // undesirable consecutive Tx periods
} }
@ -6657,7 +6657,7 @@ void MainWindow::WSPR_config(bool b)
ui->label_7->setVisible(!b and ui->cbMenus->isChecked()); ui->label_7->setVisible(!b and ui->cbMenus->isChecked());
ui->logQSOButton->setVisible(!b); ui->logQSOButton->setVisible(!b);
ui->DecodeButton->setEnabled(!b); ui->DecodeButton->setEnabled(!b);
ui->sbTxPercent->setEnabled (m_mode != "FST4W" || "Random" == ui->RoundRobin->currentText ()); ui->sbTxPercent->setEnabled (m_mode != "FST4W" || tr ("Random") == ui->RoundRobin->currentText ());
ui->band_hopping_group_box->setVisible(true); ui->band_hopping_group_box->setVisible(true);
ui->RoundRobin->setVisible(m_mode=="FST4W"); ui->RoundRobin->setVisible(m_mode=="FST4W");
ui->RoundRobin->lineEdit()->setAlignment(Qt::AlignCenter); ui->RoundRobin->lineEdit()->setAlignment(Qt::AlignCenter);
@ -8156,7 +8156,7 @@ void MainWindow::on_pbTxNext_clicked(bool b)
void MainWindow::WSPR_scheduling () void MainWindow::WSPR_scheduling ()
{ {
QString t=ui->RoundRobin->currentText(); QString t=ui->RoundRobin->currentText();
if(m_mode=="FST4W" and t!="Random") { if(m_mode=="FST4W" and t != tr ("Random")) {
bool ok; bool ok;
int i=t.left (1).toInt (&ok) - 1; int i=t.left (1).toInt (&ok) - 1;
if (!ok) return; if (!ok) return;