Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f979e3c4a7 | |||
| 2d7ff1367e | |||
| a829516a33 | |||
| 86d47c83b4 | |||
| 735acb000e | |||
| 62042cfa33 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
# Version number components
|
||||
set (WSJTX_VERSION_MAJOR 0)
|
||||
set (WSJTX_VERSION_MINOR 6)
|
||||
set (WSJTX_VERSION_PATCH 1)
|
||||
set (WSJTX_VERSION_PATCH 2)
|
||||
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
|
||||
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
|
||||
|
||||
+10
-20
@@ -1256,9 +1256,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
||||
}
|
||||
|
||||
if(selectedOffset != -1){
|
||||
auto qsyAction = menu->addAction(QString("Jump to %1Hz").arg(selectedOffset));
|
||||
auto qsyAction = menu->addAction(QString("Jump to %1Hz...").arg(selectedOffset));
|
||||
connect(qsyAction, &QAction::triggered, this, [this, selectedOffset](){
|
||||
setFreqOffsetForRestore(selectedOffset, true);
|
||||
setFreqOffsetForRestore(selectedOffset, false);
|
||||
});
|
||||
menu->addSeparator();
|
||||
}
|
||||
@@ -1331,7 +1331,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
|
||||
if(selectedOffset != -1){
|
||||
auto qsyAction = menu->addAction(QString("Jump to %1Hz...").arg(selectedOffset));
|
||||
connect(qsyAction, &QAction::triggered, this, [this, selectedOffset](){
|
||||
setFreqOffsetForRestore(selectedOffset, true);
|
||||
setFreqOffsetForRestore(selectedOffset, false);
|
||||
});
|
||||
menu->addSeparator();
|
||||
}
|
||||
@@ -1466,7 +1466,7 @@ void MainWindow::initializeDummyData(){
|
||||
cd.freq = 500 + 100*i;
|
||||
cd.snr = i == 3 ? -100 : i;
|
||||
cd.utcTimestamp = dt;
|
||||
cd.grid = i == 5 ? "J042" : i == 6 ? "FN42" : "";
|
||||
cd.grid = i == 5 ? "J042" : i == 6 ? "FN42FN42FN" : "";
|
||||
logCallActivity(cd, false);
|
||||
|
||||
ActivityDetail ad = {};
|
||||
@@ -7667,20 +7667,6 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
|
||||
if(m_config.transmit_directed()) toggleTx(true);
|
||||
});
|
||||
|
||||
auto stationPowerQueryAction = menu->addAction(QString("%1% - What is your station power?").arg(call).trimmed());
|
||||
stationPowerQueryAction->setDisabled(isAllCall);
|
||||
connect(stationPowerQueryAction, &QAction::triggered, this, [this](){
|
||||
|
||||
QString selectedCall = callsignSelected();
|
||||
if(selectedCall.isEmpty()){
|
||||
return;
|
||||
}
|
||||
|
||||
addMessageText(QString("%1%").arg(selectedCall), true);
|
||||
|
||||
if(m_config.transmit_directed()) toggleTx(true);
|
||||
});
|
||||
|
||||
auto heardQueryAction = menu->addAction(QString("%1$ - What are the stations are you hearing? (Top 4 ranked by strongest SNR)").arg(call).trimmed());
|
||||
heardQueryAction->setDisabled(isAllCall);
|
||||
connect(heardQueryAction, &QAction::triggered, this, [this](){
|
||||
@@ -9081,11 +9067,13 @@ QString MainWindow::callsignSelected(){
|
||||
}
|
||||
}
|
||||
|
||||
#if SELECT_CALLSIGN_FOR_INPUT_TEXT
|
||||
auto text = ui->extFreeTextMsgEdit->toPlainText().left(11); // Maximum callsign is 6 + / + 4 = 11 characters
|
||||
auto calls = Varicode::parseCallsigns(text);
|
||||
if(!calls.isEmpty() && text.startsWith(calls.first()) && calls.first() != m_config.my_callsign()){
|
||||
return calls.first();
|
||||
}
|
||||
#endif
|
||||
|
||||
return QString();
|
||||
}
|
||||
@@ -9553,7 +9541,7 @@ void MainWindow::processCommandActivity() {
|
||||
// do not respond to allcall ? if:
|
||||
// 1. we recently responded to one
|
||||
// 2. or, we are in a directed qso...(i.e., we have a callsign selected)
|
||||
if(!callsignSelected().isEmpty()){
|
||||
if(isAllCall && !callsignSelected().isEmpty()){
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -10262,7 +10250,9 @@ void MainWindow::displayCallActivity() {
|
||||
ui->tableWidgetCalls->setItem(row, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp))));
|
||||
ui->tableWidgetCalls->setItem(row, 2, new QTableWidgetItem(QString("%1").arg(d.freq)));
|
||||
ui->tableWidgetCalls->setItem(row, 3, new QTableWidgetItem(QString("%1").arg(Varicode::formatSNR(d.snr))));
|
||||
ui->tableWidgetCalls->setItem(row, 4, new QTableWidgetItem(QString("%1").arg(d.grid)));
|
||||
auto gridItem = new QTableWidgetItem(QString("%1").arg(d.grid.left(4)));
|
||||
gridItem->setToolTip(d.grid);
|
||||
ui->tableWidgetCalls->setItem(row, 4, gridItem);
|
||||
|
||||
auto distanceItem = new QTableWidgetItem(calculateDistance(d.grid));
|
||||
distanceItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
|
||||
|
||||
Reference in New Issue
Block a user