From daf6c507ba294c13c83a9d6a5000c6d56daa3530 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 1 Aug 2013 14:38:35 +0000 Subject: [PATCH] Updates to User's Guide and credits. Locale-aware communication with Commander (needs testing). git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- about.cpp | 2 +- mainwindow.cpp | 2 -- rigclass.cpp | 4 ++++ wsjtx.iss | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/about.cpp b/about.cpp index 482a4b2fb..515fa712d 100644 --- a/about.cpp +++ b/about.cpp @@ -14,7 +14,7 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) : m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT -- with grateful
"; m_Str += "acknowledgment for contributions from AC6SL, AE4JY,
"; m_Str += "G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, PY2SDR, VK3ACF,
"; - m_Str += "and VK4BDJ.
"; + m_Str += "VK4BDJ, and W4TV.
"; ui->labelTxt->setText(m_Str); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 036471627..11eae45d3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -203,8 +203,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QString *thekey, \ signalMeter = new SignalMeter(ui->meterFrame); signalMeter->resize(50, 160); -// qDebug() << signalMeter->size(); - ui->labAz->setStyleSheet("border: 0px;"); ui->labDist->setStyleSheet("border: 0px;"); diff --git a/rigclass.cpp b/rigclass.cpp index 4c7df4f31..b17f2000d 100644 --- a/rigclass.cpp +++ b/rigclass.cpp @@ -168,6 +168,8 @@ int Rig::setFreq(freq_t freq, vfo_t vfo) { QString t; double f=0.001*freq; t.sprintf("CmdSetFreq%10.3f",f); + QLocale locale; + t.replace(".",locale.decimalPoint()); QByteArray ba = t.toLocal8Bit(); const char* buf=ba.data(); commanderSocket->write(buf); @@ -216,6 +218,8 @@ int Rig::setSplitFreq(freq_t tx_freq, vfo_t vfo) { QString t; double f=0.001*tx_freq; t.sprintf("CmdSetTxFreq%10.3f",f); + QLocale locale; + t.replace(".",locale.decimalPoint()); QByteArray ba = t.toLocal8Bit(); const char* buf=ba.data(); commanderSocket->write(buf); diff --git a/wsjtx.iss b/wsjtx.iss index bfaf5dd75..6c1aaeb48 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 1.1.0 r3496 +AppVerName=wsjtx Version 1.1.1 r3518 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx2 DefaultGroupName=wsjtx2 @@ -13,7 +13,7 @@ Source: "c:\Users\joe\wsjt\wsjtx_install\wsjt.ico"; DestDir Source: "c:\Users\joe\wsjt\wsjtx_install\CALL3.TXT"; DestDir: "{app}"; Flags: onlyifdoesntexist Source: "c:\Users\joe\wsjt\wsjtx\shortcuts.txt"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx\mouse_commands.txt"; DestDir: "{app}" -Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide_v1.1.pdf"; DestDir: "{app}" +Source: "c:\Users\joe\wsjt\wsjtx\WSJT-X_Users_Guide_v1.1.1.pdf"; DestDir: "{app}" Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130418_1742.wav"; DestDir: "{app}\save\Samples"; Source: "c:\Users\joe\wsjt\wsjtx_install\save\Samples\130610_2343.wav"; DestDir: "{app}\save\Samples";