This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/apps/qsodatadialog.cpp b/apps/qsodatadialog.cpp | |
index 4a86bff..20ab673 100644 | |
--- a/apps/qsodatadialog.cpp | |
+++ b/apps/qsodatadialog.cpp | |
@@ -27,6 +27,7 @@ | |
#include "tqslexcept.h" | |
#include "tqsltrace.h" | |
#include "wxutil.h" | |
+#include "tqslbuild.h" | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx | |
index c8117555..6af8f07a 100644 | |
--- a/src/dialogs/confdialog.cxx | |
+++ b/src/dialogs/confdialog.cxx | |
@@ -2447,6 +2447,35 @@ progdefaults.NagMe=o->value(); | |
progdefaults.changed = true; | |
} | |
+Fl_Check_Button *btnEnCloudlog=(Fl_Check_Button *)0; | |
+ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Configuration.ui b/Configuration.ui | |
index 845e252..e15810d 100755 | |
--- a/Configuration.ui | |
+++ b/Configuration.ui | |
@@ -3222,7 +3222,7 @@ Right click for insert and delete options.</string> | |
<item row="2" column="1"> | |
<widget class="QSpinBox" name="sbCloudlogStationID"> | |
<property name="enabled"> | |
- <bool>false</bool> | |
+ <bool>true</bool> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index c1ed7a8..3f9b556 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -220,6 +220,7 @@ set (wsjt_qt_CXXSRCS | |
widgets/DoubleClickablePushButton.cpp | |
widgets/DoubleClickableRadioButton.cpp | |
Network/LotWUsers.cpp | |
+ Network/Cloudlog.cpp | |
models/DecodeHighlightingModel.cpp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -purN qsstv_9.5.8.orig/dispatch/dispatcher.cpp qsstv_9.5.8/dispatch/dispatcher.cpp | |
--- qsstv_9.5.8.orig/dispatch/dispatcher.cpp 2021-08-02 11:40:15.000000000 +0200 | |
+++ qsstv_9.5.8/dispatch/dispatcher.cpp 2021-09-02 21:59:01.634762963 +0200 | |
@@ -382,7 +382,7 @@ void dispatcher::startDRMTxBinary() | |
-void dispatcher::logSSTV(QString call,bool fromFSKID) | |
+void dispatcher::logSSTV(QString call,QString name, bool fromFSKID) | |
{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- repeaterinfo.php.orig 2021-03-05 11:54:29.596645089 +0000 | |
+++ repeaterinfo.php 2021-03-05 11:56:40.116473466 +0000 | |
@@ -234,7 +234,7 @@ if (getEnabled("DMR Network", $mmdvmconf | |
//$xlxMasterHost1 = exec('grep \'XLX, Linking\|Unlinking\' /var/log/pi-star/DMRGateway-'.gmdate("Y-m-d").'.log | tail -1 | awk \'{print $5 " " $8 " " $9}\''); | |
if ( strpos($xlxMasterHost1, 'Linking') !== false ) { $xlxMasterHost1 = str_replace('Linking ', '', $xlxMasterHost1); } | |
else if ( strpos($xlxMasterHost1, 'Unlinking') !== false ) { $xlxMasterHost1 = "XLX Not Linked"; } | |
- echo "<tr><td style=\"background: #ffffff;\" colspan=\"2\">".$xlxMasterHost1."</td></tr>\n"; | |
+ echo "<tr><td style=\"background: #ffffff;\" colspan=\"2\">".str_replace("XLX", "XLX ", $xlxMasterHost1)."</td></tr>\n"; | |
} | |
if ($configdmrgateway['DMR Network 1']['Enabled'] == 1) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -purN wsjtx.orig/logbook/logbook.cpp wsjtx/logbook/logbook.cpp | |
--- wsjtx.orig/logbook/logbook.cpp 2020-06-22 00:57:58.000000000 +0200 | |
+++ wsjtx/logbook/logbook.cpp 2020-06-25 15:38:28.000000000 +0200 | |
@@ -74,7 +74,7 @@ QByteArray LogBook::QSOToADIF (QString c | |
QDateTime const& dateTimeOff, QString const& band, QString const& comments, | |
QString const& name, QString const& strDialFreq, QString const& myCall, | |
QString const& myGrid, QString const& txPower, QString const& operator_call, | |
- QString const& xSent, QString const& xRcvd) | |
+ QString const& xSent, QString const& xRcvd, QString const& propmode) | |
{ |