diff --git a/logqso.ui b/logqso.ui
index a7e3b74..4be53da 100644
--- a/logqso.ui
+++ b/logqso.ui
@@ -7,7 +7,7 @@
0
0
600
- 285
+ 535
@@ -24,59 +24,97 @@
-
-
-
-
- 10
-
+
+
+ QFormLayout::AllNonFixedFieldsGrow
-
- Click OK to confirm the following QSO:
+
+ 6
-
-
- -
-
-
-
-
-
-
-
-
-
- 10
-
-
-
- Call
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
+
+ 6
+
+ -
+
+
+
+ 10
+
+
+
+ Operator Callsign:
+
+
- -
-
-
-
-
-
-
- 10
-
-
+
-
+
+
+
+ 300
+ 16777215
+
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ Mode:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 70
+ 16777215
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ Start:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ 0
+
+
+ 0
+
+
-
+
- Start
-
-
- Qt::AlignCenter
+ Now
- -
+
-
@@ -85,30 +123,53 @@
- dd/MM/yyyy HH:mm:ss
+ yyyy-MM-dd HH:mm:ss
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
- -
-
-
-
-
-
-
- 10
-
-
+
-
+
+
+
+ 10
+
+
+
+ End:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ 0
+
+
-
+
- End
-
-
- Qt::AlignCenter
+ Now
- -
+
-
@@ -117,224 +178,188 @@
- dd/MM/yyyy HH:mm:ss
+ yyyy-MM-dd HH:mm:ss
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
- 10
-
+
-
+
+
+ Qt::Horizontal
-
- Mode
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
+
- 70
- 16777215
+ 40
+ 20
-
- true
-
-
+
- -
-
-
-
-
-
-
- 10
-
-
-
- Band
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
-
-
+ -
+
+
+
+ 10
+
+
+
+ Callsign:
+
+
+ Qt::AlignCenter
+
+
- -
-
-
-
-
-
-
- 10
-
-
-
- Rpt Sent
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
-
-
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 300
+ 16777215
+
+
+
- -
-
-
-
-
-
-
- 10
-
-
-
- Rpt Rcvd
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
-
-
+ -
+
+
+
+ 10
+
+
+
+ Band:
+
+
+ Qt::AlignCenter
+
+
- -
-
-
-
-
-
-
- 10
-
-
-
- Grid
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 70
- 16777215
-
-
-
-
-
+ -
+
+
+
+ 50
+ 16777215
+
+
+
- -
-
-
-
-
-
- true
-
-
-
- 10
-
-
-
- Name
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- true
-
-
-
-
+ -
+
+
+
+ 10
+
+
+
+ Signal Report Sent:
+
+
+ Qt::AlignCenter
+
+
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
+
-
+
+
+
+ 50
+ 16777215
+
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ Signal Report Rcvd:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ Grid:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 70
+ 16777215
+
+
+
+
+ -
+
+
+ true
+
+
+
+ 10
+
+
+
+ Name:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ true
+
+
+
+ 300
+ 16777215
+
+
+
+
+ -
true
@@ -345,58 +370,32 @@
- Comments
+ Comments:
- -
+
-
true
- -
+
-
- Retain
+ Retain Comments
-
-
- -
-
-
-
-
-
-
- 10
-
-
-
- Operator
-
-
-
- -
-
-
-
- 300
- 16777215
-
-
-
-
- -
-
+
-
+
- Qt::Horizontal
+ Qt::Vertical
- 40
+ 20
20
@@ -430,10 +429,13 @@
- call
- start_date_time
- end_date_time
+ loggedOperator
mode
+ start_date_time
+ pushButton
+ end_date_time
+ pushButton_2
+ call
band
sent
rcvd
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 11188b5..b75ebff 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6588,13 +6588,17 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
if(m_callActivity.contains(call)){
grid = m_callActivity[call].grid;
}
+ QString opCall=m_opCall;
+ if(opCall.isEmpty()){
+ opCall = m_config.my_callsign();
+ }
QString comments = ui->textEditRX->textCursor().selectedText();
m_logDlg->initLogQSO (call.trimmed(), grid.trimmed(), m_modeTx == "FT8" ? "JS8" : m_modeTx, m_rptSent, m_rptRcvd,
m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + ui->TxFreqSpinBox->value(),
m_config.my_callsign(), m_config.my_grid(),
m_config.log_as_DATA(), m_config.report_in_comments(),
- m_config.bFox(), m_opCall, comments);
+ m_config.bFox(), opCall, comments);
}
void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid
@@ -6661,6 +6665,7 @@ void MainWindow::acceptQSO (QDateTime const& QSO_date_off, QString const& call,
QTimer::singleShot(1000, this, [this, host, port](){
m_n3fjpClient->sendNetworkMessage(host, port, "");
+ m_n3fjpClient->sendNetworkMessage(host, port, "\r\n");
});
}