Commit Graph

1592 Commits

Author SHA1 Message Date
Bill Somerville
0a5facb331 Support for the Yaesu FTdx3000 and similar rigs via HRD
There  is an  outstanding  issue with  the FTdx3000  via  HRD in  that
setting  the  "other" VFO  mode  doesn't  work.   This appears  to  be
insoluable and the  only current option is to set  "Mode" to "None" in
WSJT-X leaving mode  setting to the user. As it  happens the best mode
combo on this rig  is probably DATA-U on Tx and USB  on Rx which would
require "Mode" as "None" anyway.

This change is quite large  including several general strategy changes
in an attempt to make the HRD interface more generic and more robust.

Also cleaned up  trace output removing stuff that is  working and just
clutters output.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4524 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-17 10:07:45 +00:00
Bill Somerville
507a6c9b39 Use non localized get frequency commands with Commander
Commander sends invalid  UTF-8 strings for numbers  that contain group
separators,  e.g. non-break  space  U+00A0 in  French regional  number
formats.

Revert to  old undocumented frequency  query commands that  always use
'.' and ',' for number punctuation.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4519 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-16 22:57:55 +00:00
Bill Somerville
69b2eac75a Clean up HRD information file format
Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4514 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-13 10:53:15 +00:00
Bill Somerville
9cee2342a2 Unjustify project description
The justified  text in  the project  description caused  many unwanted
hard line breaks when viewed in Debian package install tools.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4512 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-11 19:01:12 +00:00
Bill Somerville
db60373bde Fix up shadow manpages when a2x generates invalid one
On Ubuntu a2x  generates invalid shadow manpages. A sed  edit has been
added to teh build script to rectify this.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4510 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-11 16:20:49 +00:00
Bill Somerville
6a1a0c4686 Fix warning in build script
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4506 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-11 00:40:46 +00:00
Bill Somerville
0b01920726 Only do package generation if appropriate tools are available
Debian packages are  only build if dpkg-buildpackage  is available and
RPM package generation is only done if rpmbuild is available.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4504 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-09 19:04:26 +00:00
Bill Somerville
4083407d74 Clear manpage build warnings and errors
The manpage  directory build was using  an invalid a2x option  and was
liable to errors  in parallel builds due to gzip  on a wildcard having
no input files.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4500 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-09 04:15:01 +00:00
Bill Somerville
d68bf7926a Make default Linux Release builds FOSS compliant
The  kavasd binary  is  not  open source  so  cannot be  automatically
bundled with WSJT-X on Linux.

The CMake option  WSJT_INCLUDE_KVASD has been added with  a default of
OFF in Linux Release configuration builds.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4498 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-09 03:03:25 +00:00
Joe Taylor
f5e4533935 Correct the "Grid" message on Tab 2 for Type 1 compound callsigns.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4486 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-07 17:43:30 +00:00
Joe Taylor
8a4bf4108c Correct the "dB" message on Tab 2 when MyCall is a compound callsign.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4485 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-07 16:44:29 +00:00
Bill Somerville
449605f694 Increase Settings dialog default size
On some systems or font combinations  this window starts too small for
the layout to render all the widgets on the Radio tab.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4482 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-06 23:38:01 +00:00
Bill Somerville
6b7a3e0475 Optional trace file located in temp directory
The  existing  trace  file  location created  when  the  CMake  option
WSJT_QDEBUG_TO_FILE is ON is not usable with a Linux package installed
in /usr.

Moved location to the temporary directory as <APPNAME>_trace.log

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4475 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-04 19:34:20 +00:00
Bill Somerville
94ab875ea9 Do one automatic retry on CAT errors
To allow for intermittant CAT failures  one retry before bringing up a
message box should allow many setups to be more reliable.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4473 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-04 14:45:09 +00:00
Bill Somerville
e2b39b6b8a Menu action to open the log directory
Since the log files have moved to  a hidden directory a menu action to
open the logs directory in a suitable system applicaiton is needed.

Added "Open log directory" to File manu bar pop up menu.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4471 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-04 11:47:03 +00:00
Bill Somerville
ca4ed77474 Trim spaces from network server query
Spaces  left in  the  CAT network  server  cause incorrect  servername
lookups, particularly just spaces which override the default values.

Merged from wsjtx-1.4.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4469 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-04 01:13:26 +00:00
Bill Somerville
4075f5dbb7 Disallow multiple instances without a unique rig name
Because of confilicts using the  shared memory to communicate with jt9
only one instance of WSJT-X may run with each unique key (rig name).

Added a QLockFile for each unique  key in the temp directory and logic
to deal with stale locks and retries.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-03 16:07:43 +00:00
Joe Taylor
4980d0cdc9 Rationalize Wide Graph freq labels.
Labels should always be multiples of the major tick interval.
When Start freq is nonzero, labels need to be moved.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4464 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-03 15:08:40 +00:00
Bill Somerville
81a9df2ed7 Use message boxes for command line parser
The error and information output from command line parsing needs to be
graphical  on  Windows   since  the  application  is   not  a  console
application.

Made the output graphical on all platforms.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-03 10:58:11 +00:00
Bill Somerville
950a816314 Increase web download timeouts to 2 minutes
User manual and kvasd downloads are occasionally timing out with a 10s
timeout.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4458 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-02 20:46:57 +00:00
Bill Somerville
4e5c1713f2 Allow for rigs with neither get VFO nor toggle VFO CAT commands
Some    rigs    always    receive     on    the    same    VFO,    the
HamlibTransceiver::init_rig()  method was  not allowing  for this.  It
needs  to simply  do  nothing  and assume  VFO  MAIN/A  is current  at
startup.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4450 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-02 14:46:32 +00:00
Bill Somerville
aa6ece2262 Only poll split frequency if in split mode
Because PowerSDR for the FlexRadio rigs doesn't implement split or VFO
B,  querying the  TX VFO  in transceiver  polls causes  an error  with
them. This query is unecessary. Removing  it will cause a delay of one
poll period  after split is set  for the Tx frequency  to appear. This
should be  harmless, if not  then there  is a possibility  of querying
split before  the Tx frequency. This  seems obvious but I  believe the
order matters with some rigs so it needs more investigation.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4435 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-02 01:21:56 +00:00
Bill Somerville
394b86d2ae Use correct svn revision in program name text
The latest revision rather than the revision of the last change to the
current working set was being used in the program name text as seen in
the "About" window and reported to PSKReporter.

Also removed a redundant old file.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4424 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-01 17:11:28 +00:00
Bill Somerville
d6b90b7f55 Better version identification.
An  ambiguity  existed  between  release  candidates  and  development
versions  as there  was no  definitive identification  for development
versions.

Added a  new version number  suffix of  '-devel' which appears  if the
release candidate number is missing  or zero in Versions.cmake and the
revision is not marked as a release version, also in Versions.cmake.

Also re-factored setting of version number suffiexes to a single place
in in CMake/VersionCompute.cmake.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4422 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-01 15:57:43 +00:00
Bill Somerville
067f85de43 Remove r4420 from wsjtx-1.4 -> wsjtx merge eligiblily.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4421 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-10-01 14:11:47 +00:00
Bill Somerville
7d1d23c04e Revert "Gen msg" line edit to read/write status.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4415 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-30 20:59:21 +00:00
Bill Somerville
867bf36def Do not generate a binary tarball package on Linux.
This  was generated  in error  by selecting  one of  the source  CPack
generators as a default.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4408 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-30 01:18:30 +00:00
Bill Somerville
fa2137849c Add missing separators in help NSIS help menu links.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4401 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-29 15:27:33 +00:00
Bill Somerville
670ca23f42 Merge r4393 from branches/wsjtx-1.4 to branches/wsjtx.
Add Qt assistive technology support to release builds.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4394 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 22:54:37 +00:00
Bill Somerville
1ab70990e2 Yet another mergeinfo cleanup.
Looks like  git-svn svn:pushmergeinfo is  broken when trying  to merge
between different branches. So back to plain old svn for merging :(



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4392 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 19:59:59 +00:00
Bill Somerville
c8ca528022 Back out Debian manpage compliance because it breaks RPM.
The Debian packaging rule bad-so-link-within-manual-page is a PITA, it
is apparently  suprerflous because  our alias  manpages with  links as
generated by a2x work just fine as they are. Trying to get rid of this
Lintian error  unfortunately breaks manpage  lookup of alias  pages on
RPM systems.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4390 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 19:38:21 +00:00
Bill Somerville
5ecabf4b6f Fix mergeinfo.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4389 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 15:54:16 +00:00
Bill Somerville
2da92d8ead Include Mac install instructions in package root
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4388 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 15:48:22 +00:00
Bill Somerville
5225fc921b Another update of mergeinfo - still not getting git-svn to update
mergeinfo in svn.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4386 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 00:56:33 +00:00
Bill Somerville
488a937902 Add some RPM package generator variables.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4385 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-27 00:41:28 +00:00
Bill Somerville
c3a91ab9b4 Fix svn::mergeinfo property after a braindead git-svn merge.
Also I have  recorded a "fake" merge  of the update to RC2  so that it
never gets merged back to the main line.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4383 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-26 15:16:55 +00:00
Bill Somerville
32fb2e6c1b Fix package file naming on Linux to include architecture.
The *nix package generators do  not include the target architecture in
the package file names.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4382 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-26 14:41:42 +00:00
Joe Taylor
e2ec2ed750 Merging change from r4376 in branches/wsjtx-1.4 into branches/wsjtx.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4380 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-26 12:19:17 +00:00
Bill Somerville
38b0d0083a Moving WSJT-X "trunk" on to v1.5.
If built with  qmake the version string will now  be "Not for Release"
since some  many features essential  to making a complete  package are
currently only build when using CMake.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4372 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 19:17:19 +00:00
Bill Somerville
119eb1b1bd Define supported o/s versions on Mac.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4369 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 16:12:19 +00:00
Bill Somerville
0354dae27d Make forced include of config file work with clang.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4368 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 16:12:11 +00:00
Bill Somerville
4e4142f5fd Fix local user manual on Mac.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4367 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 16:12:03 +00:00
Bill Somerville
fcc0563391 Get local user manual working on Linux systems.
The  location  of  documentation   files  on  Linux  distributions  is
controlled  to a  certain extent.  Using the  QStandardPaths::locate()
method helps us with this.

Work round the  misbehaviour of QCoreApplication::applicationDirPath()
when  the  CWD has  been  changed  by  working out  the  documentation
location before changing  the CWD to a temporary  directory. This path
is now provided by the Configuration settings class which also manages
other run time paths.

Updated  Debian packaging  to move  a little  nearer a  conforming DEB
file.

Added a basic manpage for rigctld-wsjtx.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4364 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 14:45:36 +00:00
Bill Somerville
87da310279 Removed temporary debugging print.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 12:53:46 +00:00
Bill Somerville
cb27e2c4b0 Add validation to message entry fields.
All message  entry fields on the  mainscreen and in the  macro editing
facilities are now restricted to valid characters in the JT65/JT9 free
text message alphabet.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4362 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 11:36:01 +00:00
Bill Somerville
fbc744e066 Fix several issues with shortcut keys.
Do not drop  through shortcut key handling so  that spurious responses
are avoided.

The keyPressEvent handlers must call the super class implementation if
the event os not handled.

Correct a typo in the shortcut help display.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4361 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 11:35:50 +00:00
Bill Somerville
e64037c61e Fix online manual URL.
Fix manpage destination.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4360 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-25 00:06:07 +00:00
Bill Somerville
7fad459036 Add local HTML help file to help menu.
So that a manual can be viewed without an Internet connection a second
manual action has been added to  the WSJT_X help menu. This shells out
to the default web browser with a local file target.

The build has been enhanced to install and package the current version
of the  HTML user manual  as downloaded from  the project web  site at
build time

The package  file locations have  been adjusted to be  compatible with
the QStandardPaths  class so that  its locate()  method can be  used to
portably access resources like this local help file

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4359 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-24 23:46:32 +00:00
Bill Somerville
d91bdf9201 Don't set sections options on Apple LLVM toolchain.
The  Apple  clang  LLVM  compilers  do not  support  the  gcc  options
data-sections, function-sections  and, gc-sections so we  must not add
them on Mac builds.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4356 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-24 17:26:38 +00:00
Bill Somerville
23bbac629e Remove unecessary property set.
The -mwindows  linker option  is not explicitly  required since  it is
added automatically to WIN32 executables by CMake.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4355 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2014-09-24 17:26:29 +00:00