diff --git a/about.cpp b/about.cpp index 923c304ff..f23486116 100644 --- a/about.cpp +++ b/about.cpp @@ -11,10 +11,10 @@ CAboutDlg::CAboutDlg(QWidget *parent, QString Revision) : m_Str = "

" + m_Revision + "

\n\n"; m_Str += "WSJT-X implements digital modes JT9 and JT65 for
"; m_Str += "Amateur Radio communication.

"; - m_Str += "Copyright 2001-2013 by Joe Taylor, K1JT -- with grateful
"; + m_Str += "Copyright 2001-2014 by Joe Taylor, K1JT, with grateful
"; m_Str += "acknowledgment for contributions from AC6SL, AE4JY,
"; - m_Str += "DJ0OT, G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, KK1D,
"; - m_Str += "PY2SDR, VK3ACF, VK4BDJ, and W4TV.
"; + m_Str += "DJ0OT, G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, KB1ZMX,
"; + m_Str += "KK1D, PY2SDR, VK3ACF, VK4BDJ, W4TI, and W4TV.
"; ui->labelTxt->setText(m_Str); } diff --git a/doc/build-doc.sh b/doc/build-doc.sh index 98e2d8b43..0eb136698 100755 --- a/doc/build-doc.sh +++ b/doc/build-doc.sh @@ -24,7 +24,7 @@ base_dir=$(pwd) src_dir="$base_dir/source" c_asciidoc="asciidoc -b xhtml11 -a max-width=1024px" script_name=$(basename $0) -doc_version="1.2.2" +doc_version="1.3" # build functions function build_no_toc() { # no toc diff --git a/doc/go b/doc/go deleted file mode 100755 index 54630816d..000000000 --- a/doc/go +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env bash -# Title : build-doc.sh -# Description : WSJT-X Documentation build script -# Author : KI7MT -# Email : ki7mt@yahoo.com -# Date : JAN-24-2014 -# Version : 0.3 -# Usage : ./build-doc.sh [ option ] -# Notes : requires asciidoc, source-highlight -#============================================================================== - -# exit on error -set -e - -#add some color -red='\033[01;31m' -green='\033[01;32m' -yellow='\033[01;33m' -cyan='\033[01;36m' -no_col='\033[01;37m' - -# misc var's -base_dir=$(pwd) -src_dir="$base_dir/source" -c_asciidoc="python /c/users/joe/asciidoc-8.6.9/asciidoc.py -b xhtml11 -a max-width=1024px" - -script_name=$(basename $0) -doc_version="1.2.2" - -# build functions -function build_no_toc() { # no toc - echo -e ${yellow}'Building Main With No TOC'${no_col} - $c_asciidoc -o wsjtx-main.html $src_dir/wsjtx-main.adoc - echo -e ${green}'.. wsjtx-main.html'${no_col} -} - -function build_toc1() { # top toc - echo -e ${yellow}'Building Main with Top TOC'${no_col} - $c_asciidoc -a toc -o wsjtx-main-toc1.html $src_dir/wsjtx-main.adoc - echo -e ${green}'.. wsjtx-main-toc1.html'${no_col} -} - -function build_toc2() { # left toc - echo -e ${yellow}'Building Main with Left TOC'${no_col} - $c_asciidoc -a toc2 -o wsjtx-main-toc2.html $src_dir/wsjtx-main.adoc - echo -e ${green}'.. wsjtx-main-toc2.html'${no_col} -} - -function build_support_pages() { # build all remaining pages - echo - echo -e ${yellow}'Building Support Pages'${no_col} - $c_asciidoc -o rig-config-main.html $src_dir/rig-config-main.adoc - echo -e ${green}'.. rig-config-main.html'${no_col} - - # setup rig file array - declare -a subpage=('adat' 'alinco' 'aor' 'drake' 'electro' 'flexrad' 'icom' \ -'kenwood' 'softrock' 'tentec' 'yaesu') - - # loop through rig-config pages - for rig in "${subpage[@]}" - do - $c_asciidoc -a toc2 -o rig-config-$rig.html $src_dir/rig-config-$rig.adoc - echo -e ${green}".. rig-config-$rig.html"${no_col} - done - - $c_asciidoc -o rig-config-template.html $src_dir/rig-config-template.adoc - echo -e ${green}'.. rig-config-template.html'${no_col} - - $c_asciidoc -a toc2 -o quick-reference.html $src_dir/quick-reference.adoc - echo -e ${green}'.. quick-reference.html'${no_col} -} - -# start the main script -clear -echo -e ${yellow}"*** Building WSJT-X User Guide for:" ${cyan}$doc_version\ -${no_col}${yellow}" ***\n" ${no_col} - -# without TOC -if [[ $1 = "" ]] - then - build_no_toc - build_support_pages - -# top TOC -elif [[ $1 = "toc1" ]] - then - build_toc1 - build_support_pages - -# left TOC -elif [[ $1 = "toc2" ]] - then - build_toc2 - build_support_pages - -# all toc versions -elif [[ $1 = "all" ]] - then - build_no_toc - build_toc1 - build_toc2 - build_support_pages - -# Usage: if something other than "", toc1, toc2 or all is entered as $1 display usage -# message and exit. -# -# To-Do: this should be re-written to redirect the user to select -# 1 of 4 proper options v.s. exiting. Future version should provide -# a terminal GUI, Whiptail, Dialog, Zenity etc. -else - clear - echo -e ${red}" * INPUT ERROR *\n"${no_col} - echo 'Script Usage: build-doc.sh [ option ]' - echo - echo 'For with No TOC: ' ./$script_name - echo 'For with Top TOC: './$script_name 'toc1' - echo 'For with Left TOC: './$script_name 'toc2' - echo 'For All Versions: ' ./$script_name 'all' - echo - echo Please re-enter using the examples above. - echo - exit 1 -fi - echo - echo -e ${yellow}'All HTML files have been saved to:'${no_col}${cyan} "$base_dir" ${no_col} - echo - -exit 0 - diff --git a/doc/source/acknowledgements.adoc b/doc/source/acknowledgements.adoc index 3aa9795ec..2c3db07fe 100644 --- a/doc/source/acknowledgements.adoc +++ b/doc/source/acknowledgements.adoc @@ -1,17 +1,17 @@ // Status=review -Many users of WSJT, too numerous to mention here individually, have -contributed suggestions and advice that have greatly aided the -development of _WSJT-X_ and its sister programs. Since 2005 the -overall project (including WSJT, MAP65, WSPR, _WSJT-X_, and WSPR-X) has -been “open source”, with all code licensed under the GNU Public -License (GPL). +Since 2005 the _WSJT_ project (including programs _WSJT_, _MAP65_, +_WSPR_, _WSJT-X_, and _WSPR-X_) has been ``open source'', with all +code licensed under the GNU Public License (GPL). Many users of these +programs, too numerous to mention here individually, have contributed +suggestions and advice that have greatly aided the development of +_WSJT_ and its sister programs. For _WSJT-X_ in particular, we acknowledge contributions from *AC6SL, -AE4JY, DJ0OT, G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, KI7MT, KK1D, PY2SDR, -VK3ACF, VK4BDJ, and W4TV*. Each of these amateurs has helped to bring -the program’s design, code, and documentation to its present -state. +AE4JY, DJ0OT, G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, KB1ZMX, KI7MT, KK1D, +PY2SDR, VK3ACF, VK4BDJ, W4TI, and W4TV*. Each of these amateurs has +helped to bring the program’s design, code, and documentation to its +present state. Most of the color palettes for the _WSJT-X_ waterfall were copied from the excellent, well documented, open-source program _fldigi_, by *W1HKJ* diff --git a/doc/source/tutorial-example1.adoc b/doc/source/tutorial-example1.adoc index 67b6540ef..4a1ccffe9 100644 --- a/doc/source/tutorial-example1.adoc +++ b/doc/source/tutorial-example1.adoc @@ -21,14 +21,14 @@ screen. The program then finds and decodes all signals in the selected mode(s) over the displayed frequency range. The [red]*RED* marker indicates your Tx frequency. -At least eight JT9 signals are present in the example file; all but -one of them are decodable. When this file was recorded KF4RWA was -finishing a QSO with K1JT. Since the green marker was placed at his -audio frequency, 1224 Hz, his message ``K1JT KF4RWA 73'' is decoded -first and appears in the *Rx Frequency* window. The *Band Activity* -window shows this message plus all decodes at other frequencies. -Lines containing CQ are highlighted in [green]*GREEN*, and lines -with *My Call* (in this case K1JT) in [red]*RED*. +Seven JT9 signals are present in the example file, all decodable. +When this file was recorded KF4RWA was finishing a QSO with K1JT. +Since the green marker was placed at his audio frequency, 1224 Hz, his +message ``K1JT KF4RWA 73'' is decoded first and appears in the *Rx +Frequency* window. The *Band Activity* window shows this message plus +all decodes at other frequencies. Lines containing CQ are highlighted +in [green]*GREEN*, and lines with *My Call* (in this case K1JT) in +[red]*RED*. TIP: For this step and the next, you may want to pretend you are K1JT by entering that callsign temporarily as *My Call* on the <setText("Tx-Enable Armed"); + } else { + lab3->setText("Tx-Enable Disarmed"); + } } void MainWindow::on_rptSpinBox_valueChanged(int n) diff --git a/mainwindow.ui b/mainwindow.ui index 24def4376..70b0cd389 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2602,6 +2602,9 @@ p, li { white-space: pre-wrap; } Double-click on call sets Tx Enable + + F7 + diff --git a/wsjtx.iss b/wsjtx.iss index adbff82c3..1e3ef4dc1 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,6 +1,6 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 1.2.2 r3659 +AppVerName=wsjtx Version 1.2.2 r3669 AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx1.2 DefaultGroupName=wsjtx1.2