Bump to v1.1.0-ga

CMakeLists.txt

@@ -180,6 +180,7 @@ set (wsjt_qt_CXXSRCS
   NetworkMessage.cpp
   Message.cpp
   MessageClient.cpp
+  TCPClient.cpp
   LettersSpinBox.cpp
   HintedSpinBox.cpp
   RestrictedSpinBox.cpp
@@ -243,6 +244,7 @@ set (wsjtx_CXXSRCS
   messagereplydialog.cpp
   keyeater.cpp
   APRSISClient.cpp
+  SpotClient.cpp
   Inbox.cpp
   messagewindow.cpp
   mainwindow.cpp

COPYING

@@ -24,29 +24,29 @@ Finally, every program is threatened constantly by software patents. States shou
 
 The precise terms and conditions for copying, distribution and modification follow.
 
-TERMS AND CONDITIONS 0. Definitions. “This License” refers to version 3 of the GNU General Public License.
+TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License.
 
-“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
 
-“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations.
 
-To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work.
 
-A “covered work” means either the unmodified Program or a work based on the Program.
+A "covered work" means either the unmodified Program or a work based on the Program.
 
-To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
 
-To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
 
-An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
 
-1. Source Code. The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work.
 
-A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
 
-The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
 
-The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
 
 The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
 
@@ -68,15 +68,15 @@ You may charge any price or no price for each copy that you convey, and you may
 
 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
 
-a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
 
 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
 
 a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
 
-A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
 
-“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
 
 If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
 
@@ -84,13 +84,13 @@ The requirement to provide Installation Information does not include a requireme
 
 Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
 
-7. Additional Terms. “Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
 
 When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
 
 Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
 
-a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
 
 If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
 
@@ -108,23 +108,23 @@ Termination of your rights under this section does not terminate the licenses of
 
 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
 
-An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
 
 You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
 
-11. Patents. A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version".
 
-A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
 
 Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
 
-In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
 
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
 
 If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
 
-A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
 
 Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
 
@@ -134,13 +134,13 @@ Nothing in this License shall be construed as excluding or limiting any implied
 
 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
 
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
 
 If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
 
 Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
 
-15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 

Configuration.cpp

@@ -591,6 +591,7 @@ private:
   QStringList my_groups_;
   QStringList auto_whitelist_;
   QStringList auto_blacklist_;
+  QString eot_;
   QString my_info_;
   QString cq_;
   QString reply_;
@@ -628,6 +629,8 @@ private:
   qint32 RxBandwidth_;
   double degrade_;
   double txDelay_;
+  bool reset_activity_;
+  bool check_for_updates_;
   bool id_after_73_;
   bool tx_qsy_allowed_;
   bool spot_to_reporting_networks_;
@@ -646,6 +649,8 @@ private:
   bool ppfx_;
   bool clear_callsign_;
   bool miles_;
+  bool hold_ptt_;
+  bool avoid_forced_identify_;
   bool avoid_allcall_;
   bool spellcheck_;
   bool quick_call_;
@@ -670,13 +675,12 @@ private:
 
   QString udp_server_name_;
   port_type udp_server_port_;
-//  QString n1mm_server_name () const;
+  QString n3fjp_server_name_;
+  port_type n3fjp_server_port_;
+  bool broadcast_to_n3fjp_;
   QString n1mm_server_name_;
   port_type n1mm_server_port_;
   bool broadcast_to_n1mm_;
-//  port_type n1mm_server_port () const;
-//  bool valid_n1mm_info () const;
-//  bool broadcast_to_n1mm() const;
   bool accept_udp_requests_;
   bool udpWindowToFront_;
   bool udpWindowRestore_;
@@ -750,6 +754,8 @@ qint32 Configuration::aggressive() const {return m_->aggressive_;}
 double Configuration::degrade() const {return m_->degrade_;}
 double Configuration::txDelay() const {return m_->txDelay_;}
 qint32 Configuration::RxBandwidth() const {return m_->RxBandwidth_;}
+bool Configuration::reset_activity() const { return m_->reset_activity_;}
+bool Configuration::check_for_updates() const { return m_->check_for_updates_; }
 bool Configuration::id_after_73 () const {return m_->id_after_73_;}
 bool Configuration::tx_qsy_allowed () const {return m_->tx_qsy_allowed_;}
 bool Configuration::spot_to_reporting_networks () const
@@ -766,13 +772,19 @@ void Configuration::set_spot_to_reporting_networks (bool spot)
 }
 
 bool Configuration::transmit_directed() const { return m_->transmit_directed_; }
-bool Configuration::autoreply_off_at_startup () const {return m_->autoreply_off_at_startup_;}
+bool Configuration::autoreply_off_at_startup () const {
+    // auto-reply cannot be on at startup if the callsign or grid is empty
+    if(my_callsign().isEmpty() || my_grid().isEmpty()){
+        return true;
+    }
+    return m_->autoreply_off_at_startup_;
+}
 bool Configuration::heartbeat_anywhere() const { return m_->heartbeat_anywhere_;}
 bool Configuration::heartbeat_qso_pause() const { return m_->heartbeat_qso_pause_;}
 bool Configuration::relay_off() const { return m_->relay_disabled_; }
 bool Configuration::monitor_off_at_startup () const {return m_->monitor_off_at_startup_;}
 bool Configuration::monitor_last_used () const {return m_->rig_is_dummy_ || m_->monitor_last_used_;}
-bool Configuration::log_as_DATA () const {return m_->log_as_DATA_;}
+bool Configuration::log_as_DATA () const { return false; }
 bool Configuration::report_in_comments () const {return m_->report_in_comments_;}
 bool Configuration::prompt_to_log () const {return m_->prompt_to_log_;}
 bool Configuration::insert_blank () const {return m_->insert_blank_;}
@@ -780,6 +792,8 @@ bool Configuration::DXCC () const {return m_->DXCC_;}
 bool Configuration::ppfx() const {return m_->ppfx_;}
 bool Configuration::clear_callsign () const {return m_->clear_callsign_;}
 bool Configuration::miles () const {return m_->miles_;}
+bool Configuration::hold_ptt() const {return m_->hold_ptt_;}
+bool Configuration::avoid_forced_identify() const {return m_->avoid_forced_identify_;}
 bool Configuration::avoid_allcall () const {return m_->avoid_allcall_;}
 bool Configuration::set_avoid_allcall(bool avoid) {
     if(m_->avoid_allcall_ != avoid){
@@ -810,6 +824,9 @@ QString Configuration::aprs_passcode() const { return m_->aprs_passcode_; }
 QString Configuration::udp_server_name () const {return m_->udp_server_name_;}
 auto Configuration::udp_server_port () const -> port_type {return m_->udp_server_port_;}
 bool Configuration::accept_udp_requests () const {return m_->accept_udp_requests_;}
+QString Configuration::n3fjp_server_name () const {return m_->n3fjp_server_name_;}
+auto Configuration::n3fjp_server_port () const -> port_type {return m_->n3fjp_server_port_;}
+bool Configuration::broadcast_to_n3fjp () const {return m_->broadcast_to_n3fjp_;}
 QString Configuration::n1mm_server_name () const {return m_->n1mm_server_name_;}
 auto Configuration::n1mm_server_port () const -> port_type {return m_->n1mm_server_port_;}
 bool Configuration::broadcast_to_n1mm () const {return m_->broadcast_to_n1mm_;}
@@ -940,6 +957,15 @@ void Configuration::sync_transceiver (bool force_signal, bool enforce_mode_and_s
     }
 }
 
+bool Configuration::valid_n3fjp_info () const
+{
+  // do very rudimentary checking on the n3fjp server name and port number.
+  //
+  auto server_name = m_->n3fjp_server_name_;
+  auto port_number = m_->n3fjp_server_port_;
+  return(!(server_name.trimmed().isEmpty() || port_number == 0));
+}
+
 bool Configuration::valid_n1mm_info () const
 {
   // do very rudimentary checking on the n1mm server name and port number.
@@ -984,6 +1010,10 @@ QSet<QString> Configuration::auto_blacklist() const {
     return QSet<QString>::fromList(m_->auto_blacklist_);
 }
 
+QString Configuration::eot() const {
+    return m_->eot_;
+}
+
 QString Configuration::my_info() const
 {
     auto info = m_->my_info_;
@@ -996,7 +1026,7 @@ QString Configuration::my_info() const
 
 QString Configuration::cq_message() const
 {
-    return m_->cq_.trimmed();
+    return m_->cq_.trimmed().replace("CQCQCQ", "CQ CQ CQ"); // deprecate legacy
 }
 
 QString Configuration::reply_message() const
@@ -1183,10 +1213,13 @@ Configuration::impl::impl (Configuration * self, QDir const& temp_directory,
   setUppercase(ui_->groups_line_edit);
   setUppercase(ui_->auto_whitelist_line_edit);
 
-  ui_->udp_server_port_spin_box->setMinimum (1);
+  ui_->udp_server_port_spin_box->setMinimum (0);
   ui_->udp_server_port_spin_box->setMaximum (std::numeric_limits<port_type>::max ());
 
-  ui_->n1mm_server_port_spin_box->setMinimum (1);
+  ui_->n3fjp_server_port_spin_box->setMinimum (0);
+  ui_->n3fjp_server_port_spin_box->setMaximum (std::numeric_limits<port_type>::max ());
+
+  ui_->n1mm_server_port_spin_box->setMinimum (0);
   ui_->n1mm_server_port_spin_box->setMaximum (std::numeric_limits<port_type>::max ());
 
   //
@@ -1373,8 +1406,9 @@ void Configuration::impl::initialize_models ()
   ui_->groups_line_edit->setText(my_groups_.join(", "));
   ui_->auto_whitelist_line_edit->setText(auto_whitelist_.join(", "));
   ui_->auto_blacklist_line_edit->setText(auto_blacklist_.join(", "));
+  ui_->eot_line_edit->setText(eot_.trimmed().left(2));
   ui_->info_message_line_edit->setText (my_info_.toUpper());
-  ui_->cq_message_line_edit->setText(cq_.toUpper());
+  ui_->cq_message_line_edit->setText(cq_.toUpper().replace("CQCQCQ", "CQ CQ CQ"));
   ui_->reply_message_line_edit->setText (reply_.toUpper());
   ui_->use_dynamic_grid->setChecked(use_dynamic_info_);
 
@@ -1400,6 +1434,8 @@ void Configuration::impl::initialize_models ()
   ui_->sound_cq_path_display_label->setText(sound_cq_path_);
   ui_->sound_dm_path_display_label->setText(sound_dm_path_);
   ui_->sound_am_path_display_label->setText(sound_am_path_);
+  ui_->reset_activity_check_box->setChecked (reset_activity_);
+  ui_->checkForUpdates_checkBox->setChecked (check_for_updates_);
   ui_->CW_id_after_73_check_box->setChecked (id_after_73_);
   ui_->tx_qsy_check_box->setChecked (tx_qsy_allowed_);
   ui_->psk_reporter_check_box->setChecked (spot_to_reporting_networks_);
@@ -1416,7 +1452,9 @@ void Configuration::impl::initialize_models ()
   ui_->prompt_to_log_check_box->setChecked (prompt_to_log_);
   ui_->clear_callsign_check_box->setChecked (clear_callsign_);
   ui_->miles_check_box->setChecked (miles_);
-  ui_->avoid_allcall_checkbox->setChecked(avoid_allcall_);
+  ui_->hold_ptt_check_box->setChecked(hold_ptt_);
+  ui_->avoid_forced_identify_check_box->setChecked(avoid_forced_identify_);
+  ui_->avoid_allcall_check_box->setChecked(avoid_allcall_);
   ui_->spellcheck_check_box->setChecked(spellcheck_);
   ui_->quick_call_check_box->setChecked (quick_call_);
   ui_->disable_TX_on_73_check_box->setChecked (disable_TX_on_73_);
@@ -1466,6 +1504,9 @@ void Configuration::impl::initialize_models ()
   ui_->udp_server_line_edit->setText (udp_server_name_);
   ui_->udp_server_port_spin_box->setValue (udp_server_port_);
   ui_->accept_udp_requests_check_box->setChecked (accept_udp_requests_);
+  ui_->n3fjp_server_name_line_edit->setText (n3fjp_server_name_);
+  ui_->n3fjp_server_port_spin_box->setValue (n3fjp_server_port_);
+  ui_->enable_n3fjp_broadcast_check_box->setChecked (broadcast_to_n3fjp_);
   ui_->n1mm_server_name_line_edit->setText (n1mm_server_name_);
   ui_->n1mm_server_port_spin_box->setValue (n1mm_server_port_);
   ui_->enable_n1mm_broadcast_check_box->setChecked (broadcast_to_n1mm_);
@@ -1521,8 +1562,9 @@ void Configuration::impl::read_settings ()
   auto_blacklist_ = settings_->value("AutoBlacklist", QStringList{}).toStringList();
   callsign_aging_ = settings_->value ("CallsignAging", 0).toInt ();
   activity_aging_ = settings_->value ("ActivityAging", 2).toInt ();
+  eot_ = settings_->value("EOTCharacter", QString{"\u2662"}).toString().trimmed().left(2);
   my_info_ = settings_->value("MyInfo", QString {}).toString();
-  cq_ = settings_->value("CQMessage", QString {"CQCQCQ <MYGRID4>"}).toString();
+  cq_ = settings_->value("CQMessage", QString {"CQ CQ CQ <MYGRID4>"}).toString();
   reply_ = settings_->value("Reply", QString {"HW CPY?"}).toString();
   next_color_cq_ = color_cq_ = settings_->value("colorCQ","#66ff66").toString();
   next_color_mycall_ = color_mycall_ = settings_->value("colorMyCall","#ff6666").toString();
@@ -1677,6 +1719,8 @@ void Configuration::impl::read_settings ()
   monitor_off_at_startup_ = settings_->value ("MonitorOFF", false).toBool ();
   monitor_last_used_ = settings_->value ("MonitorLastUsed", false).toBool ();
   spot_to_reporting_networks_ = settings_->value ("PSKReporter", true).toBool ();
+  reset_activity_ = settings_->value("ResetActivity", false).toBool();
+  check_for_updates_ = settings_->value("CheckForUpdates", true).toBool();
   id_after_73_ = settings_->value ("After73", false).toBool ();
   tx_qsy_allowed_ = settings_->value ("TxQSYAllowed", false).toBool ();
   use_dynamic_info_ = settings_->value ("AutoGrid", false).toBool ();
@@ -1731,6 +1775,8 @@ void Configuration::impl::read_settings ()
   ppfx_ = settings_->value ("PrincipalPrefix", false).toBool ();
   clear_callsign_ = settings_->value ("ClearCallGrid", false).toBool ();
   miles_ = settings_->value ("Miles", false).toBool ();
+  hold_ptt_ = settings_->value ("HoldPTT", false).toBool();
+  avoid_forced_identify_ = settings_->value ("AvoidForcedIdentify", false).toBool ();
   avoid_allcall_ = settings_->value ("AvoidAllcall", false).toBool ();
   spellcheck_ = settings_->value ("Spellcheck", true).toBool();
   quick_call_ = settings_->value ("QuickCall", false).toBool ();
@@ -1758,6 +1804,9 @@ void Configuration::impl::read_settings ()
   aprs_passcode_ = settings_->value ("aprsPasscode", "").toString();
   udp_server_name_ = settings_->value ("UDPServer", "127.0.0.1").toString ();
   udp_server_port_ = settings_->value ("UDPServerPort", 2237).toUInt ();
+  n3fjp_server_name_ = settings_->value ("N3FJPServer", "127.0.0.1").toString ();
+  n3fjp_server_port_ = settings_->value ("N3FJPServerPort", 1100).toUInt ();
+  broadcast_to_n3fjp_ = settings_->value ("BroadcastToN3FJP", false).toBool ();
   n1mm_server_name_ = settings_->value ("N1MMServer", "127.0.0.1").toString ();
   n1mm_server_port_ = settings_->value ("N1MMServerPort", 2333).toUInt ();
   broadcast_to_n1mm_ = settings_->value ("BroadcastToN1MM", false).toBool ();
@@ -1781,6 +1830,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("MyGroups", my_groups_);
   settings_->setValue ("AutoWhitelist", auto_whitelist_);
   settings_->setValue ("AutoBlacklist", auto_blacklist_);
+  settings_->setValue ("EOTCharacter", eot_);
   settings_->setValue ("MyInfo", my_info_);
   settings_->setValue ("CQMessage", cq_);
   settings_->setValue ("Reply", reply_);
@@ -1849,6 +1899,8 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("MonitorOFF", monitor_off_at_startup_);
   settings_->setValue ("MonitorLastUsed", monitor_last_used_);
   settings_->setValue ("PSKReporter", spot_to_reporting_networks_);
+  settings_->setValue ("ResetActivity", reset_activity_);
+  settings_->setValue ("CheckForUpdates", check_for_updates_);
   settings_->setValue ("After73", id_after_73_);
   settings_->setValue ("TxQSYAllowed", tx_qsy_allowed_);
   settings_->setValue ("Macros", macros_.stringList ());
@@ -1871,6 +1923,8 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("PrincipalPrefix", ppfx_);
   settings_->setValue ("ClearCallGrid", clear_callsign_);
   settings_->setValue ("Miles", miles_);
+  settings_->setValue ("HoldPTT", hold_ptt_);
+  settings_->setValue ("AvoidForcedIdentify", avoid_forced_identify_);
   settings_->setValue ("AvoidAllcall", avoid_allcall_);
   settings_->setValue ("Spellcheck", spellcheck_);
   settings_->setValue ("QuickCall", quick_call_);
@@ -1900,6 +1954,9 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("aprsPasscode", aprs_passcode_);
   settings_->setValue ("UDPServer", udp_server_name_);
   settings_->setValue ("UDPServerPort", udp_server_port_);
+  settings_->setValue ("N3FJPServer", n3fjp_server_name_);
+  settings_->setValue ("N3FJPServerPort", n3fjp_server_port_);
+  settings_->setValue ("BroadcastToN3FJP", broadcast_to_n3fjp_);
   settings_->setValue ("N1MMServer", n1mm_server_name_);
   settings_->setValue ("N1MMServerPort", n1mm_server_port_);
   settings_->setValue ("BroadcastToN1MM", broadcast_to_n1mm_);
@@ -2084,6 +2141,11 @@ QStringList splitCalls(QString callsString){
 
 bool Configuration::impl::validate ()
 {
+  if(ui_->eot_line_edit->text().trimmed().left(2).isEmpty()){
+      MessageBox::critical_message (this, tr ("Please enter an end of transmission character"));
+      return false;
+  }
+
   auto callsign = ui_->callsign_line_edit->text().toUpper().trimmed();
   if(!Varicode::isValidCallsign(callsign, nullptr) || callsign.startsWith("@")){
       MessageBox::critical_message (this, tr ("The callsign format you provided is not supported"));
@@ -2364,13 +2426,14 @@ void Configuration::impl::accept ()
   Q_ASSERT (audio_output_channel_ <= AudioDevice::Both);
 
   auto_switch_bands_ = ui_->auto_switch_bands_check_box->isChecked();
-  my_callsign_ = ui_->callsign_line_edit->text ().toUpper();
-  my_grid_ = ui_->grid_line_edit->text ().toUpper();
+  my_callsign_ = ui_->callsign_line_edit->text ().toUpper().trimmed();
+  my_grid_ = ui_->grid_line_edit->text ().toUpper().trimmed();
   my_groups_ = splitGroups(ui_->groups_line_edit->text().toUpper().trimmed(), true);
   auto_whitelist_ = splitCalls(ui_->auto_whitelist_line_edit->text().toUpper().trimmed());
   auto_blacklist_ = splitCalls(ui_->auto_blacklist_line_edit->text().toUpper().trimmed());
   cq_ = ui_->cq_message_line_edit->text().toUpper();
   reply_ = ui_->reply_message_line_edit->text().toUpper();
+  eot_ = ui_->eot_line_edit->text().trimmed().left(2);
   my_info_ = ui_->info_message_line_edit->text().toUpper();
   callsign_aging_ = ui_->callsign_aging_spin_box->value();
   activity_aging_ = ui_->activity_aging_spin_box->value();
@@ -2381,6 +2444,8 @@ void Configuration::impl::accept ()
   aggressive_ = ui_->sbAggressive->value ();
   degrade_ = ui_->sbDegrade->value ();
   RxBandwidth_ = ui_->sbBandwidth->value ();
+  reset_activity_ = ui_->reset_activity_check_box->isChecked();
+  check_for_updates_ = ui_->checkForUpdates_checkBox->isChecked();
   id_after_73_ = ui_->CW_id_after_73_check_box->isChecked ();
   tx_qsy_allowed_ = ui_->tx_qsy_check_box->isChecked ();
   transmit_directed_ = ui_->transmit_directed_check_box->isChecked();
@@ -2396,7 +2461,9 @@ void Configuration::impl::accept ()
   prompt_to_log_ = ui_->prompt_to_log_check_box->isChecked ();
   clear_callsign_ = ui_->clear_callsign_check_box->isChecked ();
   miles_ = ui_->miles_check_box->isChecked ();
-  avoid_allcall_ = ui_->avoid_allcall_checkbox->isChecked();
+  hold_ptt_ = ui_->hold_ptt_check_box->isChecked();
+  avoid_forced_identify_ = ui_->avoid_forced_identify_check_box->isChecked();
+  avoid_allcall_ = ui_->avoid_allcall_check_box->isChecked();
   spellcheck_ = ui_->spellcheck_check_box->isChecked();
   quick_call_ = ui_->quick_call_check_box->isChecked ();
   disable_TX_on_73_ = ui_->disable_TX_on_73_check_box->isChecked ();
@@ -2444,6 +2511,12 @@ void Configuration::impl::accept ()
     }
 
   accept_udp_requests_ = ui_->accept_udp_requests_check_box->isChecked ();
+  auto new_n3fjp_server = ui_->n3fjp_server_name_line_edit->text ();
+  n3fjp_server_name_ = new_n3fjp_server;
+  auto new_n3fjp_port = ui_->n3fjp_server_port_spin_box->value ();
+  n3fjp_server_port_ = new_n3fjp_port;
+  broadcast_to_n3fjp_ = ui_->enable_n3fjp_broadcast_check_box->isChecked ();
+
   auto new_n1mm_server = ui_->n1mm_server_name_line_edit->text ();
   n1mm_server_name_ = new_n1mm_server;
   auto new_n1mm_port = ui_->n1mm_server_port_spin_box->value ();

Configuration.hpp

@@ -104,6 +104,7 @@ public:
   QSet<QString> auto_blacklist() const;
   int activity_aging() const;
   int callsign_aging() const;
+  QString eot() const;
   QString my_info () const;
   QString cq_message () const;
   QString reply_message () const;
@@ -118,6 +119,8 @@ public:
   qint32 RxBandwidth() const;
   double degrade() const;
   double txDelay() const;
+  bool reset_activity() const;
+  bool check_for_updates() const;
   bool id_after_73 () const;
   bool tx_qsy_allowed () const;
   bool spot_to_reporting_networks () const;
@@ -137,6 +140,8 @@ public:
   bool ppfx() const;
   bool clear_callsign () const;
   bool miles () const;
+  bool hold_ptt() const;
+  bool avoid_forced_identify() const;
   bool avoid_allcall () const;
   bool set_avoid_allcall (bool avoid);
   bool spellcheck() const;
@@ -172,6 +177,10 @@ public:
   port_type n1mm_server_port () const;
   bool valid_n1mm_info () const;
   bool broadcast_to_n1mm() const;
+  QString n3fjp_server_name () const;
+  port_type n3fjp_server_port () const;
+  bool valid_n3fjp_info () const;
+  bool broadcast_to_n3fjp() const;
   bool accept_udp_requests () const;
   bool udpWindowToFront () const;
   bool udpWindowRestore () const;

Configuration.ui

@@ -36,7 +36,7 @@
        <item>
         <widget class="QTabWidget" name="tabWidget_2">
          <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="stationTab">
           <attribute name="title">
@@ -88,6 +88,16 @@
                   <string>Station Details</string>
                  </property>
                  <layout class="QGridLayout" name="gridLayout_13">
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="callsign_label">
+                    <property name="text">
+                     <string>My Callsign:</string>
+                    </property>
+                    <property name="buddy">
+                     <cstring>callsign_line_edit</cstring>
+                    </property>
+                   </widget>
+                  </item>
                   <item row="1" column="0">
                    <widget class="QLabel" name="grid_label">
                     <property name="text">
@@ -121,16 +131,6 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="0" column="0">
-                   <widget class="QLabel" name="callsign_label">
-                    <property name="text">
-                     <string>My Callsign:</string>
-                    </property>
-                    <property name="buddy">
-                     <cstring>callsign_line_edit</cstring>
-                    </property>
-                   </widget>
-                  </item>
                   <item row="3" column="0">
                    <widget class="QLabel" name="groups_label">
                     <property name="text">
@@ -146,7 +146,7 @@
                    </widget>
                   </item>
                   <item row="4" column="1">
-                   <widget class="QCheckBox" name="avoid_allcall_checkbox">
+                   <widget class="QCheckBox" name="avoid_allcall_check_box">
                     <property name="text">
                      <string>Do not participate in the @ALLCALL group</string>
                     </property>
@@ -279,7 +279,7 @@
                 <x>0</x>
                 <y>0</y>
                 <width>724</width>
-                <height>646</height>
+                <height>808</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -367,9 +367,9 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QCheckBox" name="transmit_directed_check_box">
+                   <widget class="QCheckBox" name="avoid_forced_identify_check_box">
                     <property name="text">
-                     <string>Immediately transmit CQ, Reply, Info, Saved, and Directed messages from the menu</string>
+                     <string>Allow sending standard messages without callsign</string>
                     </property>
                    </widget>
                   </item>
@@ -387,6 +387,13 @@
                     </property>
                    </widget>
                   </item>
+                  <item>
+                   <widget class="QCheckBox" name="transmit_directed_check_box">
+                    <property name="text">
+                     <string>Immediately transmit CQ, Reply, Info, Saved, and Directed messages from the menu</string>
+                    </property>
+                   </widget>
+                  </item>
                   <item>
                    <widget class="QCheckBox" name="spellcheck_check_box">
                     <property name="text">
@@ -394,6 +401,20 @@
                     </property>
                    </widget>
                   </item>
+                  <item>
+                   <widget class="QCheckBox" name="reset_activity_check_box">
+                    <property name="text">
+                     <string>Reset the Band Activity, Call Activity, and RX history at startup</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="checkForUpdates_checkBox">
+                    <property name="text">
+                     <string>Check for software updates at startup</string>
+                    </property>
+                   </widget>
+                  </item>
                   <item>
                    <layout class="QHBoxLayout" name="horizontalLayout_9">
                     <item>
@@ -741,6 +762,32 @@ text message.</string>
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QGroupBox" name="groupBox_12">
+                 <property name="title">
+                  <string>Customization</string>
+                 </property>
+                 <layout class="QFormLayout" name="formLayout_2">
+                  <item row="0" column="0">
+                   <widget class="QLabel" name="label_24">
+                    <property name="text">
+                     <string>End of Transmission Character:</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="0" column="1">
+                   <widget class="QLineEdit" name="eot_line_edit">
+                    <property name="text">
+                     <string>♢</string>
+                    </property>
+                    <property name="maxLength">
+                     <number>2</number>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
                <item>
                 <spacer name="verticalSpacer_5">
                  <property name="orientation">
@@ -889,10 +936,68 @@ text message.</string>
          </item>
         </layout>
        </item>
+       <item row="3" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_11">
+         <item>
+          <widget class="QPushButton" name="test_CAT_push_button">
+           <property name="toolTip">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Attempt to connect to the radio with these settings.&lt;/p&gt;&lt;p&gt;The button will turn green if the connection is successful or red if there is a problem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+           <property name="text">
+            <string>Test CAT</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Preferred</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="test_PTT_push_button">
+           <property name="toolTip">
+            <string>Attempt to activate the transmitter.
+Click again to deactivate. Normally no power should be
+output since there is no audio being generated at this time.
+Check that any Tx indication on your radio and/or your
+radio interface behave as expected.</string>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">QPushButton:checked {
+	background-color: red;
+	border-style	: outset;
+	border-width: 1px;
+	border-radius: 5px;
+	border-color: black;
+	min-width: 5em;
+	padding: 3px;
+}</string>
+           </property>
+           <property name="text">
+            <string>Test PTT</string>
+           </property>
+           <property name="checkable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item row="1" column="0" rowspan="2">
         <widget class="QTabWidget" name="tabWidget_3">
          <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="catTab">
           <attribute name="title">
@@ -918,7 +1023,7 @@ text message.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>718</width>
+                <width>264</width>
                 <height>435</height>
                </rect>
               </property>
@@ -1339,8 +1444,8 @@ a few, particularly some Kenwood rigs, require it).</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>237</width>
-                <height>467</height>
+                <width>718</width>
+                <height>490</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1609,53 +1714,87 @@ this setting allows you to select which audio input will be used
                 </widget>
                </item>
                <item>
-                <widget class="QGroupBox" name="groupBox_11">
+                <widget class="QGroupBox" name="groupBox_14">
                  <property name="title">
                   <string>Advanced</string>
                  </property>
-                 <layout class="QFormLayout" name="formLayout_18">
-                  <item row="1" column="0">
-                   <widget class="QLabel" name="label_11">
+                 <layout class="QVBoxLayout" name="verticalLayout_33">
+                  <item>
+                   <widget class="QFrame" name="frame">
+                    <property name="frameShape">
+                     <enum>QFrame::NoFrame</enum>
+                    </property>
+                    <property name="frameShadow">
+                     <enum>QFrame::Plain</enum>
+                    </property>
+                    <property name="lineWidth">
+                     <number>0</number>
+                    </property>
+                    <layout class="QFormLayout" name="formLayout_3">
+                     <property name="leftMargin">
+                      <number>0</number>
+                     </property>
+                     <property name="topMargin">
+                      <number>0</number>
+                     </property>
+                     <property name="rightMargin">
+                      <number>0</number>
+                     </property>
+                     <property name="bottomMargin">
+                      <number>0</number>
+                     </property>
+                     <item row="1" column="0">
+                      <widget class="QLabel" name="label_11">
+                       <property name="text">
+                        <string>Tx delay:</string>
+                       </property>
+                       <property name="buddy">
+                        <cstring>sbTxDelay</cstring>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="1" column="1">
+                      <widget class="QDoubleSpinBox" name="sbTxDelay">
+                       <property name="toolTip">
+                        <string>Minimum delay between assertion of PTT and start of Tx audio.</string>
+                       </property>
+                       <property name="suffix">
+                        <string>  s</string>
+                       </property>
+                       <property name="decimals">
+                        <number>1</number>
+                       </property>
+                       <property name="minimum">
+                        <double>0.000000000000000</double>
+                       </property>
+                       <property name="maximum">
+                        <double>0.500000000000000</double>
+                       </property>
+                       <property name="singleStep">
+                        <double>0.100000000000000</double>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="0" column="0">
+                      <widget class="QLabel" name="label_12">
+                       <property name="text">
+                        <string>PTT command:</string>
+                       </property>
+                      </widget>
+                     </item>
+                     <item row="0" column="1">
+                      <widget class="QLineEdit" name="ptt_command_line_edit"/>
+                     </item>
+                    </layout>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QCheckBox" name="hold_ptt_check_box">
                     <property name="text">
-                     <string>Tx delay:</string>
-                    </property>
-                    <property name="buddy">
-                     <cstring>sbTxDelay</cstring>
+                     <string>Hold PTT between frames while there are more to be transmitted</string>
                     </property>
                    </widget>
                   </item>
-                  <item row="1" column="1">
-                   <widget class="QDoubleSpinBox" name="sbTxDelay">
-                    <property name="toolTip">
-                     <string>Minimum delay between assertion of PTT and start of Tx audio.</string>
-                    </property>
-                    <property name="suffix">
-                     <string>  s</string>
-                    </property>
-                    <property name="decimals">
-                     <number>1</number>
-                    </property>
-                    <property name="minimum">
-                     <double>0.000000000000000</double>
-                    </property>
-                    <property name="maximum">
-                     <double>0.500000000000000</double>
-                    </property>
-                    <property name="singleStep">
-                     <double>0.100000000000000</double>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="0">
-                   <widget class="QLabel" name="label_12">
-                    <property name="text">
-                     <string>PTT command:</string>
-                    </property>
-                   </widget>
-                  </item>
-                  <item row="2" column="1">
-                   <widget class="QLineEdit" name="ptt_command_line_edit"/>
-                  </item>
                  </layout>
                 </widget>
                </item>
@@ -1680,64 +1819,6 @@ this setting allows you to select which audio input will be used
          </widget>
         </widget>
        </item>
-       <item row="3" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_11">
-         <item>
-          <widget class="QPushButton" name="test_CAT_push_button">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Attempt to connect to the radio with these settings.&lt;/p&gt;&lt;p&gt;The button will turn green if the connection is successful or red if there is a problem.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="text">
-            <string>Test CAT</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QPushButton" name="test_PTT_push_button">
-           <property name="toolTip">
-            <string>Attempt to activate the transmitter.
-Click again to deactivate. Normally no power should be
-output since there is no audio being generated at this time.
-Check that any Tx indication on your radio and/or your
-radio interface behave as expected.</string>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">QPushButton:checked {
-	background-color: red;
-	border-style	: outset;
-	border-width: 1px;
-	border-radius: 5px;
-	border-color: black;
-	min-width: 5em;
-	padding: 3px;
-}</string>
-           </property>
-           <property name="text">
-            <string>Test PTT</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="audio_tab">
@@ -2081,7 +2162,7 @@ both here.</string>
             <x>0</x>
             <y>0</y>
             <width>746</width>
-            <height>525</height>
+            <height>663</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_30">
@@ -2105,62 +2186,6 @@ both here.</string>
              <layout class="QVBoxLayout" name="verticalLayout_7">
               <item>
                <layout class="QGridLayout" name="gridLayout_14">
-                <item row="0" column="3">
-                 <widget class="QLabel" name="label_13">
-                  <property name="text">
-                   <string>Op Call:</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="0">
-                 <widget class="QCheckBox" name="prompt_to_log_check_box">
-                  <property name="enabled">
-                   <bool>false</bool>
-                  </property>
-                  <property name="visible">
-                   <bool>false</bool>
-                  </property>
-                  <property name="toolTip">
-                   <string>The program will pop up a partially completed Log QSO dialog when you send a 73 or free text message.</string>
-                  </property>
-                  <property name="text">
-                   <string>Promp&amp;t me to log QSO</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="1" column="1">
-                 <widget class="QCheckBox" name="clear_callsign_check_box">
-                  <property name="enabled">
-                   <bool>true</bool>
-                  </property>
-                  <property name="visible">
-                   <bool>false</bool>
-                  </property>
-                  <property name="toolTip">
-                   <string>Check this option to force deselect callsign after logging.</string>
-                  </property>
-                  <property name="text">
-                   <string>Deselect callsign after logging</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="4">
-                 <widget class="QLineEdit" name="opCallEntry">
-                  <property name="toolTip">
-                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The callsign of the operator, if different from the station callsign.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
-                 </widget>
-                </item>
-                <item row="0" column="1">
-                 <widget class="QCheckBox" name="log_as_RTTY_check_box">
-                  <property name="toolTip">
-                   <string>Some logging programs will not accept JT-65 or JT9 as a recognized mode.</string>
-                  </property>
-                  <property name="text">
-                   <string>Con&amp;vert mode to DATA</string>
-                  </property>
-                 </widget>
-                </item>
                 <item row="2" column="1">
                  <widget class="QCheckBox" name="report_in_comments_check_box">
                   <property name="enabled">
@@ -2180,18 +2205,64 @@ comments field.</string>
                   </property>
                  </widget>
                 </item>
+                <item row="1" column="1">
+                 <widget class="QCheckBox" name="clear_callsign_check_box">
+                  <property name="enabled">
+                   <bool>true</bool>
+                  </property>
+                  <property name="visible">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>Check this option to force deselect callsign after logging.</string>
+                  </property>
+                  <property name="text">
+                   <string>Deselect callsign after logging</string>
+                  </property>
+                 </widget>
+                </item>
                 <item row="0" column="2">
-                 <spacer name="horizontalSpacer">
-                  <property name="orientation">
-                   <enum>Qt::Horizontal</enum>
+                 <widget class="QLabel" name="label_13">
+                  <property name="text">
+                   <string>Operator Callsign (if different than Station Callsign):</string>
                   </property>
-                  <property name="sizeHint" stdset="0">
-                   <size>
-                    <width>40</width>
-                    <height>20</height>
-                   </size>
+                 </widget>
+                </item>
+                <item row="0" column="0">
+                 <widget class="QCheckBox" name="prompt_to_log_check_box">
+                  <property name="enabled">
+                   <bool>false</bool>
                   </property>
-                 </spacer>
+                  <property name="visible">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>The program will pop up a partially completed Log QSO dialog when you send a 73 or free text message.</string>
+                  </property>
+                  <property name="text">
+                   <string>Promp&amp;t me to log QSO</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="3">
+                 <widget class="QLineEdit" name="opCallEntry">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The callsign of the operator, if different from the station callsign.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QCheckBox" name="log_as_RTTY_check_box">
+                  <property name="visible">
+                   <bool>false</bool>
+                  </property>
+                  <property name="toolTip">
+                   <string>Some logging programs will not accept JT-65 or JT9 as a recognized mode.</string>
+                  </property>
+                  <property name="text">
+                   <string>Con&amp;vert mode to DATA</string>
+                  </property>
+                 </widget>
                 </item>
                </layout>
               </item>
@@ -2329,8 +2400,8 @@ comments field.</string>
              <property name="title">
               <string>Network Services</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_14">
-              <item>
+             <layout class="QFormLayout" name="formLayout_5">
+              <item row="0" column="0">
                <widget class="QCheckBox" name="psk_reporter_check_box">
                 <property name="toolTip">
                  <string>The program can send your station details and all
@@ -2339,14 +2410,14 @@ This is used for reverse ping analysis which is very useful
 for assessing propagation and system performance.</string>
                 </property>
                 <property name="text">
-                 <string>Enable spotting to reporting networks (PSKReporter &amp;&amp; APRS-IS)</string>
+                 <string>Enable spotting to reporting networks (JS8NET, PSKReporter, APRS-IS, etc)</string>
                 </property>
                 <property name="checked">
                  <bool>true</bool>
                 </property>
                </widget>
               </item>
-              <item>
+              <item row="1" column="0">
                <layout class="QFormLayout" name="formLayout_17">
                 <property name="fieldGrowthPolicy">
                  <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
@@ -2424,10 +2495,58 @@ for assessing propagation and system performance.</string>
              </layout>
             </widget>
            </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_11">
+             <property name="title">
+              <string>N3FJP Logger</string>
+             </property>
+             <layout class="QFormLayout" name="formLayout_12">
+              <item row="0" column="0">
+               <widget class="QCheckBox" name="enable_n3fjp_broadcast_check_box">
+                <property name="text">
+                 <string>Enable sending logged contacts to N3FJP logging software</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <layout class="QFormLayout" name="formLayout_20">
+                <item row="0" column="0">
+                 <widget class="QLabel" name="n3fjp_server_name_label">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;N3FJP Server:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="0" column="1">
+                 <widget class="QLineEdit" name="n3fjp_server_name_line_edit">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Optional host name of N3FJP software to receive logged contacts. This is usually 'localhost' or ip address 127.0.0.1&lt;/p&gt;&lt;p&gt;Formats:&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;hostname&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;IPv4 address&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;IPv6 address&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;IPv4 multicast group address&lt;/li&gt;&lt;li style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;IPv6 multicast group address&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Clearing this field will disable broadcasting of ADIF information via UDP.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="0">
+                 <widget class="QLabel" name="n3fjp_server_port_label">
+                  <property name="text">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;N3FJP Server Port:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="1">
+                 <widget class="QSpinBox" name="n3fjp_server_port_spin_box">
+                  <property name="toolTip">
+                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter the port number that should be used for N3FJP log information. For N3FJP, this value should be 1100. If this is zero, no contacts will be sent.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
+           </item>
            <item>
             <widget class="QGroupBox" name="n1mm_group_box">
              <property name="title">
-              <string>N1MM Logger+  Broadcasts</string>
+              <string>N1MM Logger</string>
              </property>
              <layout class="QFormLayout" name="formLayout_15">
               <property name="fieldGrowthPolicy">
@@ -2439,7 +2558,7 @@ for assessing propagation and system performance.</string>
                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When checked, the app will broadcast a logged contact in ADIF format to the configured hostname and port. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="text">
-                 <string>Enable logged contact ADIF broadcast</string>
+                 <string>Enable sending logged contacts to N1MM logging software</string>
                 </property>
                </widget>
               </item>
@@ -3983,71 +4102,132 @@ soundcard changes</string>
  </widget>
  <tabstops>
   <tabstop>configuration_tabs</tabstop>
-  <tabstop>use_dynamic_grid</tabstop>
-  <tabstop>type_2_msg_gen_combo_box</tabstop>
-  <tabstop>monitor_last_used_check_box</tabstop>
-  <tabstop>quick_call_check_box</tabstop>
-  <tabstop>CW_id_after_73_check_box</tabstop>
-  <tabstop>enable_VHF_features_check_box</tabstop>
-  <tabstop>single_decode_check_box</tabstop>
-  <tabstop>decode_at_52s_check_box</tabstop>
-  <tabstop>CW_id_interval_spin_box</tabstop>
+  <tabstop>callsign_line_edit</tabstop>
+  <tabstop>grid_line_edit</tabstop>
+  <tabstop>groups_line_edit</tabstop>
+  <tabstop>avoid_allcall_check_box</tabstop>
+  <tabstop>cq_message_line_edit</tabstop>
+  <tabstop>reply_message_line_edit</tabstop>
+  <tabstop>info_message_line_edit</tabstop>
+  <tabstop>scrollArea_2</tabstop>
+  <tabstop>miles_check_box</tabstop>
+  <tabstop>monitor_off_check_box</tabstop>
+  <tabstop>tx_qsy_check_box</tabstop>
+  <tabstop>transmit_directed_check_box</tabstop>
+  <tabstop>spellcheck_check_box</tabstop>
+  <tabstop>autoreply_off_check_box</tabstop>
+  <tabstop>relay_disabled_check_box</tabstop>
+  <tabstop>auto_whitelist_line_edit</tabstop>
+  <tabstop>auto_blacklist_line_edit</tabstop>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>callsign_aging_spin_box</tabstop>
+  <tabstop>activity_aging_spin_box</tabstop>
+  <tabstop>tx_watchdog_spin_box</tabstop>
   <tabstop>rig_combo_box</tabstop>
   <tabstop>CAT_poll_interval_spin_box</tabstop>
+  <tabstop>tabWidget_3</tabstop>
+  <tabstop>scrollArea_3</tabstop>
   <tabstop>CAT_port_combo_box</tabstop>
+  <tabstop>CAT_serial_baud_combo_box</tabstop>
+  <tabstop>CAT_default_bit_radio_button</tabstop>
   <tabstop>CAT_7_bit_radio_button</tabstop>
   <tabstop>CAT_8_bit_radio_button</tabstop>
+  <tabstop>CAT_default_stop_bit_radio_button</tabstop>
   <tabstop>CAT_one_stop_bit_radio_button</tabstop>
   <tabstop>CAT_two_stop_bit_radio_button</tabstop>
+  <tabstop>CAT_handshake_default_radio_button</tabstop>
   <tabstop>CAT_handshake_none_radio_button</tabstop>
   <tabstop>CAT_handshake_xon_radio_button</tabstop>
   <tabstop>CAT_handshake_hardware_radio_button</tabstop>
   <tabstop>force_DTR_combo_box</tabstop>
   <tabstop>force_RTS_combo_box</tabstop>
+  <tabstop>scrollArea_4</tabstop>
   <tabstop>PTT_VOX_radio_button</tabstop>
-  <tabstop>PTT_CAT_radio_button</tabstop>
   <tabstop>PTT_DTR_radio_button</tabstop>
+  <tabstop>PTT_CAT_radio_button</tabstop>
   <tabstop>PTT_RTS_radio_button</tabstop>
   <tabstop>PTT_port_combo_box</tabstop>
+  <tabstop>mode_USB_radio_button</tabstop>
+  <tabstop>mode_none_radio_button</tabstop>
+  <tabstop>mode_data_radio_button</tabstop>
   <tabstop>TX_source_data_radio_button</tabstop>
   <tabstop>TX_source_mic_radio_button</tabstop>
-  <tabstop>mode_none_radio_button</tabstop>
-  <tabstop>mode_USB_radio_button</tabstop>
-  <tabstop>mode_data_radio_button</tabstop>
-  <tabstop>split_none_radio_button</tabstop>
-  <tabstop>split_rig_radio_button</tabstop>
   <tabstop>split_emulate_radio_button</tabstop>
+  <tabstop>split_rig_radio_button</tabstop>
+  <tabstop>split_none_radio_button</tabstop>
   <tabstop>test_CAT_push_button</tabstop>
   <tabstop>test_PTT_push_button</tabstop>
+  <tabstop>scrollArea_5</tabstop>
+  <tabstop>sound_output_combo_box</tabstop>
   <tabstop>sound_input_combo_box</tabstop>
   <tabstop>sound_input_channel_combo_box</tabstop>
-  <tabstop>sound_output_combo_box</tabstop>
   <tabstop>sound_output_channel_combo_box</tabstop>
   <tabstop>save_path_select_push_button</tabstop>
   <tabstop>azel_path_select_push_button</tabstop>
   <tabstop>checkBoxPwrBandTxMemory</tabstop>
   <tabstop>checkBoxPwrBandTuneMemory</tabstop>
-  <tabstop>add_macro_line_edit</tabstop>
-  <tabstop>add_macro_push_button</tabstop>
-  <tabstop>delete_macro_push_button</tabstop>
-  <tabstop>macros_list_view</tabstop>
-  <tabstop>prompt_to_log_check_box</tabstop>
+  <tabstop>scrollArea_6</tabstop>
+  <tabstop>opCallEntry</tabstop>
+  <tabstop>log_as_RTTY_check_box</tabstop>
   <tabstop>udp_server_line_edit</tabstop>
   <tabstop>udp_server_port_spin_box</tabstop>
+  <tabstop>udpEnable</tabstop>
   <tabstop>accept_udp_requests_check_box</tabstop>
-  <tabstop>udpWindowToFront</tabstop>
-  <tabstop>udpWindowRestore</tabstop>
+  <tabstop>use_dynamic_grid</tabstop>
+  <tabstop>psk_reporter_check_box</tabstop>
+  <tabstop>aprs_server_line_edit</tabstop>
+  <tabstop>aprs_server_port_spin_box</tabstop>
+  <tabstop>aprs_passcode_line_edit</tabstop>
+  <tabstop>enable_n1mm_broadcast_check_box</tabstop>
+  <tabstop>n1mm_server_name_line_edit</tabstop>
+  <tabstop>n1mm_server_port_spin_box</tabstop>
+  <tabstop>scrollArea_7</tabstop>
   <tabstop>calibration_slope_ppm_spin_box</tabstop>
   <tabstop>calibration_intercept_spin_box</tabstop>
   <tabstop>frequencies_table_view</tabstop>
+  <tabstop>auto_switch_bands_check_box</tabstop>
   <tabstop>stations_table_view</tabstop>
-  <tabstop>sbNtrials</tabstop>
-  <tabstop>sbAggressive</tabstop>
-  <tabstop>cbTwoPass</tabstop>
+  <tabstop>add_macro_push_button</tabstop>
+  <tabstop>add_macro_line_edit</tabstop>
+  <tabstop>delete_macro_push_button</tabstop>
+  <tabstop>macros_list_view</tabstop>
+  <tabstop>sound_am_path_test_push_button</tabstop>
+  <tabstop>sound_dm_path_reset_push_button</tabstop>
+  <tabstop>sound_am_path_reset_push_button</tabstop>
+  <tabstop>sound_dm_path_select_push_button</tabstop>
+  <tabstop>sound_am_path_select_push_button</tabstop>
+  <tabstop>sound_dm_path_test_push_button</tabstop>
+  <tabstop>sound_cq_path_select_push_button</tabstop>
+  <tabstop>sound_cq_path_test_push_button</tabstop>
+  <tabstop>sound_cq_path_reset_push_button</tabstop>
+  <tabstop>font_push_button</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>scrollArea_8</tabstop>
+  <tabstop>tableForegroundButton</tabstop>
+  <tabstop>pbCQmsg</tabstop>
+  <tabstop>tableFontButton</tabstop>
+  <tabstop>pbMyCall</tabstop>
+  <tabstop>tableSelectedRowBackgroundButton</tabstop>
+  <tabstop>tableBackgroundButton</tabstop>
+  <tabstop>scrollArea_9</tabstop>
+  <tabstop>txFontButton</tabstop>
+  <tabstop>rxFontButton</tabstop>
+  <tabstop>txForegroundButton</tabstop>
+  <tabstop>rxBackgroundButton</tabstop>
+  <tabstop>rxForegroundButton</tabstop>
+  <tabstop>scrollArea_10</tabstop>
+  <tabstop>composeBackgroundButton</tabstop>
+  <tabstop>composeForegroundButton</tabstop>
+  <tabstop>composeFontButton</tabstop>
   <tabstop>sbDegrade</tabstop>
   <tabstop>sbBandwidth</tabstop>
   <tabstop>cbx2ToneSpacing</tabstop>
   <tabstop>cbx4ToneSpacing</tabstop>
+  <tabstop>sbNtrials</tabstop>
+  <tabstop>sbAggressive</tabstop>
+  <tabstop>cbTwoPass</tabstop>
+  <tabstop>cbFox</tabstop>
+  <tabstop>cbHound</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -4117,12 +4297,12 @@ soundcard changes</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="CAT_data_bits_button_group"/>
-  <buttongroup name="TX_mode_button_group"/>
-  <buttongroup name="TX_audio_source_button_group"/>
-  <buttongroup name="CAT_stop_bits_button_group"/>
-  <buttongroup name="CAT_handshake_button_group"/>
-  <buttongroup name="split_mode_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
+  <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="CAT_handshake_button_group"/>
+  <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="TX_mode_button_group"/>
+  <buttongroup name="CAT_data_bits_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
  </buttongroups>
 </ui>

Darwin/Info.plist.in

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Allow access to audio input devices</string>
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>

Darwin/ReadMe.txt

@@ -1,108 +1,26 @@
+Some versions of Mac OS need special system settings to allow a shared memory
+segment to be created (this is how the application communicates with the decoder).
 
-                    Notes on JS8Call Installation for Mac OS X
-                  (replace all instances of WSJT-X with JS8Call)
+Included in this DMG is a sysctl.conf file that you can use to increase the 
+shared memory that the operating system allows to be allocated. You only have to do this process once. 
 
-                    Notes on WSJT-X Installation for Mac OS X
-                    -----------------------------------------
+To install:
 
-                               Updated 16 July 2017
-                               -------------------- 
+0) Caution! Read through these instructions completely before proceeding. 
+   If you are at all uncomfortable modifying your system, please feel free to 
+   email me and I will help you walk though steps: kn4crd@gmail.com
 
-If you have already downloaded a previous version of WSJT-X then I suggest 
-you change the name in the Applications folder from WSJT-X to WSJT-X_previous 
-before proceeding.  
+1) Copy the sysctl.conf file to your desktop
 
-If you have installed a previous version of WSJT-X before then there is no 
-need to change anything on your system so proceed to NEXT.  
+2) Open a Terminal window (Applications -> Utilities -> Terminal.app)
 
-BEGIN:
+3) Run these commands in the Terminal window to install the sysctl.conf
 
-There are some system matters you must deal with first.  Open a Terminal window
-by going to Applications->Utilities and clicking on Terminal.
+    sudo cp $HOME/Desktop/sysctl.conf /etc/sysctl.conf
+    sudo chown root:wheel /etc/sysctl.conf
+    sudo chmod 0664 /etc/sysctl.conf
 
-Along with this ReadMe file there is a file:   sysctl.conf.   Drag this file to your Desktop.
-
-WSJT-X makes use of a block of memory which is shared between different parts of
-the code.  The normal allocation of shared memory on a Mac is insufficient and this 
-has to be increased.   You should use a Mac editor to examine sysctl.conf.
-
-There are two important parameters that you need to consider.  shmmax determines the
-amount of shared memory that must be allocated for WSJT-X to operate.  This is 14680064 (14MB)
-and this is defined in the sysctl.conf file and should not be changed.  
-
-It is possible to run more than one instance of WSJT-X simultaneously.  See 
-"Section 14. Platform Dependencies" in the User Guide.  The second important parameter 
-shmall=17920 determines how many instances are permitted.  This is calculated as: 
-  (shmall x 4096/14680064) = 5.
-The sysctl.conf file is configured to permit up to 5 instances of wsjtx to run simultaneously.
-If this limitation is acceptable then you can continue to install the sysctl.conf file without making any
-alterations.  Otherwise you must edit the file to increase shmall according to this calculation.
-
-Now move this file into place for the system to use by typing: (Note this assumes that
-you really did drag this file to your Desktop as required earlier.)
-
-  sudo cp $HOME/Desktop/sysctl.conf /etc/
-  sudo chmod 664 /etc/sysctl.conf
-  sudo chown  root:wheel  /etc/sysctl.conf
-
-and then reboot your Mac.  This is necessary to install the changes.  After the
-reboot you should re-open the Terminal window as before and you can check that the
-change has been made by typing:
-
-  sysctl -a | grep sysv.shm
-
-If shmmax is not shown as 14680064 then contact me since WSJT-X will fail to load with
-an error message: "Unable to create shared memory segment".
-
-You are now finished with system changes.  You should make certain that NO error messages
-have been produced during these steps.   You can now close the Terminal window.  It will
-not be necessary to repeat this procedure again, even when you download an updated
-version of WSJT-X.
-
-NEXT:
-
-Drag the WSJT-X app to your preferred location, such as Applications.
-
-You need to configure your sound card.   Visit Applications > Utilities > Audio MIDI 
-Setup and select your sound card and then set Format to be "48000Hz 2ch-16bit" for 
-input and output.
-
-Now double-click on the WSJT-X app and two windows will appear.  Select Preferences 
-under the WSJT-X Menu and fill in various station details on the General panel.   
-I recommend checking the 4 boxes under the Display heading and the first 4 boxes under 
-the Behaviour heading.
-
-Next visit the Audio panel and select the Audio Codec you use to communicate between 
-WSJT-X and your rig.   There are so many audio interfaces available that it is not 
-possible to give detailed advice on selection.  If you have difficulties contact me.   
-Note the location of the Save Directory.  Decoded wave forms are located here.
-
-Look at the Reporting panel.  If you check the "Prompt me" box, a logging panel will appear 
-at the end of the QSO.  Two log files are provided in Library/Application Support/WSJT-X.
-These are a simple wsjtx.log file and wsjtx_log.adi which is formatted for use with 
-logging databases.    The "File" menu bar items include a button "Open log directory" 
-to open the log directory in Finder for you, ready for processing by any logging 
-application you use.
-
-Finally, visit the Radio panel.  WSJT-X is most effective when operated with CAT 
-control.  You will need to install the relevant Mac driver for your rig.   This must 
-be located in the device driver directory  /dev. You should install your driver 
-and then re-launch WSJT-X. Return to the the Radio panel in Preferences and in 
-the "Serial port" panel select your driver from the list that is presented.   If 
-for some reason your driver is not shown, then insert the full name 
-of your driver in the Serial Port panel.   Such as:  /dev/tty.PL2303-00002226 or 
-whatever driver you have.  The /dev/ prefix is mandatory.  Set the relevant 
-communication parameters as required by your transceiver and click "Test CAT" to
-check.
-
-WSJT-X needs the Mac clock to be accurate.  Visit System Preferences > Date & Time 
-and make sure that date and time are set automatically.  The drop-down menu will 
-normally offer you several time servers to choose from.
-
-On the Help menu, have a look at the new Online User's Guide for operational hints 
-and tips.
-
-Please email me if you have problems.
-
---- John G4KLA     (g4kla@rmnjmn.co.uk)
+4) Reboot your system. 
 
+If you run into any problems, feel free to reach out to me and I will help you
+walk through the steps: Jordan Sherer <kn4crd@gmail.com>

SpotClient.cpp

@@ -0,0 +1,124 @@
+#include "SpotClient.h"
+#include "Message.h"
+
+#include "moc_SpotClient.cpp"
+
+SpotClient::SpotClient(MessageClient *client, QObject *parent):
+    QObject(parent),
+    m_client { client }
+{
+    prepare();
+
+    connect(&m_timer, &QTimer::timeout, this, &SpotClient::processSpots);
+    m_timer.setInterval(60 * 1000);
+    m_timer.setSingleShot(false);
+    m_timer.start();
+}
+
+void SpotClient::prepare(){
+    QHostInfo::lookupHost("spot.js8call.com", this, SLOT(dnsLookupResult(QHostInfo)));
+}
+
+void SpotClient::dnsLookupResult(QHostInfo info){
+    if (info.addresses().isEmpty()) {
+        qDebug() << "SpotClient Error:" << info.errorString();
+        return;
+    }
+
+    m_address = info.addresses().at(0);
+    qDebug() << "SpotClient Resolve:" << m_address.toString();
+}
+
+void SpotClient::setLocalStation(QString callsign, QString grid, QString info, QString version){
+    bool changed = false;
+
+    if(m_call != callsign){
+        m_call = callsign;
+        changed = true;
+    }
+
+    if(m_grid != grid){
+        m_grid = grid;
+        changed = true;
+    }
+
+    if(m_info != info){
+        m_info = info;
+        changed = true;
+    }
+
+    if(m_version != version){
+        m_version = version;
+        changed = true;
+    }
+
+    // send local information to network on change, or once every 15 minutes
+    if(changed || m_seq % 15 == 0){
+        enqueueLocalSpot(callsign, grid, info, version);
+    }
+}
+
+void SpotClient::enqueueLocalSpot(QString callsign, QString grid, QString info, QString version){
+    auto m = Message("RX.LOCAL", "", {
+        {"CALLSIGN", QVariant(callsign)},
+        {"GRID", QVariant(grid)},
+        {"INFO", QVariant(info)},
+        {"VERSION", QVariant(version)},
+    });
+
+    m_queue.enqueue(m.toJson());
+}
+
+void SpotClient::enqueueSpot(QString callsign, QString grid, int frequency, int snr){
+    auto m = Message("RX.SPOT", "", {
+         {"BY", QVariant(QMap<QString, QVariant>{
+              {"CALLSIGN", QVariant(m_call)},
+              {"GRID", QVariant(m_grid)},
+         })},
+         {"CALLSIGN", QVariant(callsign)},
+         {"GRID", QVariant(grid)},
+         {"FREQ", QVariant(frequency)},
+         {"SNR", QVariant(snr)},
+    });
+
+    m_queue.enqueue(m.toJson());
+}
+
+void SpotClient::enqueueCmd(QString cmd, QString from, QString to, QString relayPath, QString text, QString grid, QString extra, int frequency, int snr){
+    auto m = Message("RX.DIRECTED", "", {
+         {"BY", QVariant(QMap<QString, QVariant>{
+              {"CALLSIGN", QVariant(m_call)},
+              {"GRID", QVariant(m_grid)},
+         })},
+         {"CMD", QVariant(cmd)},
+         {"FROM", QVariant(from)},
+         {"TO", QVariant(to)},
+         {"PATH", QVariant(relayPath)},
+         {"TEXT", QVariant(text)},
+         {"GRID", QVariant(grid)},
+         {"EXTRA", QVariant(extra)},
+         {"FREQ", QVariant(frequency)},
+         {"SNR", QVariant(snr)},
+    });
+
+    m_queue.enqueue(m.toJson());
+}
+
+void SpotClient::processSpots(){
+    if(m_address.isNull()){
+        prepare();
+        return;
+    }
+
+    while(!m_queue.isEmpty()){
+        sendRawSpot(m_queue.dequeue());
+    }
+
+    m_seq++;
+}
+
+void SpotClient::sendRawSpot(QByteArray payload){
+    if(!m_address.isNull()){
+        m_client->send_raw_datagram(payload, m_address, 50000);
+    }
+}

SpotClient.h

@@ -0,0 +1,41 @@
+#ifndef JS8SPOTCLIENT_H
+#define JS8SPOTCLIENT_H
+
+#include "MessageClient.hpp"
+
+#include <QObject>
+#include <QHostInfo>
+#include <QQueue>
+#include <QTimer>
+
+class SpotClient : public QObject
+{
+    Q_OBJECT
+public:
+    SpotClient(MessageClient *client, QObject *parent = nullptr);
+
+    void prepare();
+    void setLocalStation(QString callsign, QString grid, QString info, QString version);
+    void enqueueLocalSpot(QString callsign, QString grid, QString info, QString version);
+    void enqueueCmd(QString cmd, QString from, QString to, QString relayPath, QString text, QString grid, QString extra, int frequency, int snr);
+    void enqueueSpot(QString callsign, QString grid, int frequency, int snr);
+    void sendRawSpot(QByteArray payload);
+
+public slots:
+    void processSpots();
+    void dnsLookupResult(QHostInfo);
+
+private:
+    int m_seq;
+    QString m_call;
+    QString m_grid;
+    QString m_info;
+    QString m_version;
+
+    QHostAddress m_address;
+    MessageClient *m_client;
+    QTimer m_timer;
+    QQueue<QByteArray> m_queue;
+};
+
+#endif // JS8SPOTCLIENT_H

TCPClient.cpp

@@ -0,0 +1,78 @@
+#include "TCPClient.h"
+
+#include <QTcpSocket>
+#include <QDebug>
+
+#include "pimpl_impl.hpp"
+
+#include "moc_TCPClient.cpp"
+
+
+class TCPClient::impl
+  : public QTcpSocket
+{
+  Q_OBJECT
+
+public:
+  using port_type = quint16;
+
+  impl (TCPClient * self)
+    : self_ {self}
+  {
+  }
+
+  ~impl ()
+  {
+  }
+
+  bool isConnected(QString host, port_type port){
+      if(host_ != host || port_ != port){
+          disconnectFromHost();
+          return false;
+      }
+      return state() == QTcpSocket::ConnectedState ;
+  }
+
+  void connectToHost(QString host, port_type port){
+      host_ = host;
+      port_ = port;
+
+      QTcpSocket::connectToHost(host_, port_);
+  }
+
+  qint64 send(QByteArray const &message, bool crlf){
+      return write(message + (crlf ? "\r\f" : ""));
+  }
+
+  TCPClient * self_;
+  QString host_;
+  port_type port_;
+};
+
+#include "TCPClient.moc"
+
+TCPClient::TCPClient(QObject *parent) : QObject(parent)
+  , m_ {this}
+{
+}
+
+bool TCPClient::ensureConnected(QString host, port_type port, int msecs){
+    if(!m_->isConnected(host, port)){
+        m_->connectToHost(host, port);
+    }
+
+    return m_->waitForConnected(msecs);
+}
+
+bool TCPClient::sendNetworkMessage(QString host, port_type port, QByteArray const &message, bool crlf, int msecs){
+    if(!ensureConnected(host, port, msecs)){
+        return false;
+    }
+
+    qint64 n = m_->send(message, crlf);
+    if(n <= 0){
+        return false;
+    }
+
+    return m_->flush();
+}

TCPClient.h

@@ -0,0 +1,28 @@
+#ifndef TCPCLIENT_H
+#define TCPCLIENT_H
+
+#include <QObject>
+#include <QTcpSocket>
+
+#include "pimpl_h.hpp"
+
+class TCPClient : public QObject
+{
+    Q_OBJECT
+public:
+    using port_type = quint16;
+
+    explicit TCPClient(QObject *parent = nullptr);
+
+signals:
+
+public slots:
+    Q_SLOT bool ensureConnected(QString host, port_type port, int msecs = 5000);
+    Q_SLOT bool sendNetworkMessage(QString host, port_type port, QByteArray const &message, bool crlf=true, int msecs=5000);
+
+private:
+  class impl;
+  pimpl<impl> m_;
+};
+
+#endif // TCPCLIENT_H

Versions.cmake

@@ -1,6 +1,6 @@
 # Version number components
 set (WSJTX_VERSION_MAJOR 1)
-set (WSJTX_VERSION_MINOR 0)
+set (WSJTX_VERSION_MINOR 1)
 set (WSJTX_VERSION_PATCH 0)
-set (WSJTX_RC 1)		 # release candidate number, comment out or zero for development versions
-set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
+set (WSJTX_RC 0)		 # release candidate number, comment out or zero for development versions
+set (WSJTX_VERSION_IS_RELEASE 1) # set to 1 for final release build

about.cpp

@@ -23,7 +23,7 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
                          "development group. <br/>JS8Call is "
                          "licensed under and in accordance with the terms "
                          "of the <a href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3 license</a>.<br/>"
-                         "The source code modifications are public and can be found in <a href=\"https://bitbucket.org/widefido/wsjtx/\">this repository</a>.<br/><br/>"
+                         "The source code modifications are public and can be found in <a href=\"https://bitbucket.org/widefido/js8call/\">this repository</a>.<br/><br/>"
 
                          "JS8Call is heavily inspired by WSJT-X, Fldigi, "
                          "and FSQCall <br/>and would not exist without the hard work and "

artwork/icon_1024.svg

@@ -15,9 +15,9 @@
    viewBox="0 0 270.93333 270.93334"
    version="1.1"
    id="svg16"
-   inkscape:export-filename="/home/jordan/bitmap.png"
-   inkscape:export-xdpi="300.06662"
-   inkscape:export-ydpi="300.06662"
+   inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/js8call_icon.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="icon_1024.svg">
   <defs
@@ -38,11 +38,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.48333333"
-     inkscape:cx="1350"
-     inkscape:cy="512"
+     inkscape:zoom="0.82"
+     inkscape:cx="619.41789"
+     inkscape:cy="491.10861"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g5633"
      showgrid="false"
      inkscape:window-width="1920"
      inkscape:window-height="1053"
@@ -50,7 +50,8 @@
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      units="px"
-     inkscape:pagecheckerboard="true" />
+     inkscape:pagecheckerboard="true"
+     showguides="false" />
   <metadata
      id="metadata13">
     <rdf:RDF>
@@ -71,25 +72,91 @@
     <g
        id="g6030"
        transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)">
-      <circle
-         inkscape:export-ydpi="300.06662"
-         inkscape:export-xdpi="300.06662"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         r="81.642853"
-         cy="98.940475"
-         cx="105.07738"
-         id="path18" />
-      <text
-         id="text24"
-         y="152.33945"
-         x="52.539673"
-         style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
-           y="152.33945"
-           x="52.539673"
-           id="tspan22"
-           sodipodi:role="line">⌁</tspan></text>
+      <g
+         id="g4254">
+        <g
+           id="g5633">
+          <circle
+             inkscape:export-ydpi="300.06662"
+             inkscape:export-xdpi="300.06662"
+             style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             r="81.642853"
+             cy="98.940475"
+             cx="105.07738"
+             id="path18" />
+          <g
+             aria-label="J"
+             style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="text5787"
+             transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)">
+            <path
+               d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z"
+               style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               id="path5791"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cscaccscscc" />
+          </g>
+          <g
+             id="g5677"
+             transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)">
+            <g
+               aria-label="8"
+               style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+               id="text4763"
+               transform="translate(-162.89081,-6.63358)">
+              <path
+                 d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z"
+                 style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
+                 id="path4765"
+                 inkscape:connector-curvature="0" />
+            </g>
+            <g
+               id="g4796"
+               transform="translate(-163.22926,-6.63358)"
+               style="fill:#808080">
+              <g
+                 transform="translate(271.30057,21.863906)"
+                 id="text24-5"
+                 style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+                 aria-label="8">
+                <path
+                   sodipodi:nodetypes="csccscc"
+                   inkscape:connector-curvature="0"
+                   id="path4709"
+                   d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
+                   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445" />
+              </g>
+              <g
+                 transform="translate(0.12624987,0.06768044)"
+                 aria-label="8"
+                 style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+                 id="g4772">
+                <path
+                   sodipodi:nodetypes="ccscsccc"
+                   inkscape:connector-curvature="0"
+                   id="path4770"
+                   d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
+                   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0;stroke:#ffff00;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+                   transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)" />
+              </g>
+            </g>
+          </g>
+          <rect
+             style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="rect5817"
+             width="16.71962"
+             height="2.8891957"
+             x="129.76146"
+             y="62.946335" />
+          <rect
+             style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="rect5817-3"
+             width="16.71962"
+             height="2.8891957"
+             x="63.206753"
+             y="127.60851" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>

artwork/icon_128.svg

@@ -15,11 +15,11 @@
    viewBox="0 0 33.866666 33.866667"
    version="1.1"
    id="svg16"
-   inkscape:export-filename="/home/jordan/bitmap.png"
-   inkscape:export-xdpi="300.06662"
-   inkscape:export-ydpi="300.06662"
+   inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/js8call_icon.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="icon_1024.svg">
+   sodipodi:docname="icon_128.svg">
   <defs
      id="defs10">
     <linearGradient
@@ -38,11 +38,11 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.48333333"
-     inkscape:cx="1350"
-     inkscape:cy="512"
+     inkscape:zoom="0.82"
+     inkscape:cx="619.41789"
+     inkscape:cy="491.10861"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g5633"
      showgrid="false"
      inkscape:window-width="1920"
      inkscape:window-height="1053"
@@ -50,7 +50,8 @@
      inkscape:window-y="27"
      inkscape:window-maximized="1"
      units="px"
-     inkscape:pagecheckerboard="true" />
+     inkscape:pagecheckerboard="true"
+     showguides="false" />
   <metadata
      id="metadata13">
     <rdf:RDF>
@@ -70,26 +71,96 @@
      transform="translate(0,-263.13332)">
     <g
        id="g6030"
-       transform="matrix(0.19543832,0,0,0.19543832,-3.6028125,260.72988)">
-      <circle
-         inkscape:export-ydpi="300.06662"
-         inkscape:export-xdpi="300.06662"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         r="81.642853"
-         cy="98.940475"
-         cx="105.07738"
-         id="path18" />
-      <text
-         id="text24"
-         y="152.33945"
-         x="52.539673"
-         style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
-           y="152.33945"
-           x="52.539673"
-           id="tspan22"
-           sodipodi:role="line">⌁</tspan></text>
+       transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)">
+      <g
+         id="g4254">
+        <g
+           id="g5633">
+          <g
+             id="g5908"
+             transform="matrix(0.125,0,0,0.125,16.130209,162.38541)">
+            <circle
+               id="path18"
+               cx="105.07738"
+               cy="98.940475"
+               r="81.642853"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               inkscape:export-xdpi="300.06662"
+               inkscape:export-ydpi="300.06662" />
+            <g
+               transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)"
+               id="text5787"
+               style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               aria-label="J">
+              <path
+                 sodipodi:nodetypes="cscaccscscc"
+                 inkscape:connector-curvature="0"
+                 id="path5791"
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z" />
+            </g>
+            <g
+               transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)"
+               id="g5677">
+              <g
+                 transform="translate(-162.89081,-6.63358)"
+                 id="text4763"
+                 style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+                 aria-label="8">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path4765"
+                   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
+                   d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z" />
+              </g>
+              <g
+                 style="fill:#808080"
+                 transform="translate(-163.22926,-6.63358)"
+                 id="g4796">
+                <g
+                   aria-label="8"
+                   style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+                   id="text24-5"
+                   transform="translate(271.30057,21.863906)">
+                  <path
+                     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445"
+                     d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
+                     id="path4709"
+                     inkscape:connector-curvature="0"
+                     sodipodi:nodetypes="csccscc" />
+                </g>
+                <g
+                   id="g4772"
+                   style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   aria-label="8"
+                   transform="translate(0.12624987,0.06768044)">
+                  <path
+                     transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)"
+                     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
+                     id="path4770"
+                     inkscape:connector-curvature="0"
+                     sodipodi:nodetypes="ccscsccc" />
+                </g>
+              </g>
+            </g>
+            <rect
+               y="62.946335"
+               x="129.76146"
+               height="2.8891957"
+               width="16.71962"
+               id="rect5817"
+               style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+            <rect
+               y="127.60851"
+               x="63.206753"
+               height="2.8891957"
+               width="16.71962"
+               id="rect5817-3"
+               style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>

artwork/installer_logo.svg

@@ -16,7 +16,10 @@
    version="1.1"
    id="svg16"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="icon_1024.svg">
+   sodipodi:docname="installer_logo.svg"
+   inkscape:export-filename="/home/jordan/jtsdk/src/wsjtx/artwork/installer_logo.svg.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
      id="defs10">
     <linearGradient
@@ -36,8 +39,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.48333333"
-     inkscape:cx="1350"
-     inkscape:cy="512"
+     inkscape:cx="263.79309"
+     inkscape:cy="880.82504"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -65,28 +68,106 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-26.06665)">
+    <rect
+       style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect129"
+       width="714.375"
+       height="270.93332"
+       x="-1.5894572e-07"
+       y="26.06665" />
     <g
-       id="g6030"
-       transform="matrix(1.4906384,0,0,1.4906384,-20.910237,15.983062)">
-      <circle
-         inkscape:export-ydpi="300.06662"
-         inkscape:export-xdpi="300.06662"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         r="81.642853"
-         cy="98.940475"
-         cx="105.07738"
-         id="path18" />
-      <text
-         id="text24"
-         y="152.33945"
-         x="52.539673"
-         style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:176.3888855px;font-family:wasy10;-inkscape-font-specification:wasy10;fill:#000000;stroke-width:0.17748445"
-           y="152.33945"
-           x="52.539673"
-           id="tspan22"
-           sodipodi:role="line">⌁</tspan></text>
+       transform="matrix(0.97656252,0,0,0.97656252,7.9375003,3.2567706)"
+       id="layer1-7"
+       inkscape:label="Layer 1">
+      <g
+         transform="matrix(1.5635065,0,0,1.5635065,-28.822499,6.8392367)"
+         id="g6030">
+        <g
+           id="g4254">
+          <g
+             id="g5633">
+            <circle
+               id="path18"
+               cx="105.07738"
+               cy="98.940475"
+               r="81.642853"
+               style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               inkscape:export-xdpi="300.06662"
+               inkscape:export-ydpi="300.06662" />
+            <g
+               transform="matrix(1.1302083,0,0,1.1302083,-44.033339,14.076171)"
+               id="text5787"
+               style="font-style:normal;font-weight:normal;font-size:6.76897335px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.49728441;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               aria-label="J">
+              <path
+                 sodipodi:nodetypes="cscaccscscc"
+                 inkscape:connector-curvature="0"
+                 id="path5791"
+                 style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:67.68972778px;font-family:Inconsolata;-inkscape-font-specification:'Inconsolata Medium';fill:#000000;stroke:#000000;stroke-width:2.4164753;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 d="m 129.49154,20.211895 v 83.918925 c 0,4.1513 0.10921,9.06732 -2.40339,12.78165 -1.85716,2.73112 -5.39174,5.2316 -8.81448,5.26817 -3.95778,0.0423 -7.64506,-2.87946 -10.32017,-5.87252 -3.94648,-0.11707 -3.15405,2.04693 -4.89921,4.20943 4.04204,4.80676 9.83203,6.34006 15.8405,6.34006 6.44543,0 12.34465,-1.97028 15.51276,-7.86948 2.62187,-4.91602 2.62187,-10.05053 2.62187,-14.96655 V 20.211895 Z" />
+            </g>
+            <g
+               transform="matrix(0.79962948,0,0,0.79962948,21.054409,19.824756)"
+               id="g5677">
+              <g
+                 transform="translate(-162.89081,-6.63358)"
+                 id="text4763"
+                 style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+                 aria-label="8">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path4765"
+                   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#4d4d4d;stroke-width:0.17748445"
+                   d="m 243.16443,104.08489 c -16.24554,7.31049 -27.34665,23.82678 -27.34665,40.88459 0,20.30692 16.78705,46.57053 52.25647,46.57053 35.46941,0 52.25647,-26.26361 52.25647,-46.57053 0,-13.53794 -7.85201,-32.22031 -27.34665,-40.88459 16.78705,-9.205807 24.3683,-25.7221 24.3683,-40.072323 0,-24.368302 -21.38996,-44.404461 -49.27812,-44.404461 -27.88817,0 -49.27813,20.036159 -49.27813,44.404461 0,23.014508 17.05782,36.281693 24.36831,40.072323 z m 24.90982,-71.751115 c 16.51629,0 34.65714,10.559597 34.65714,31.949551 0,20.577677 -17.05781,33.574105 -34.65714,33.574105 -21.1192,0 -34.65714,-17.057811 -34.65714,-33.574105 0,-12.996428 9.47656,-31.949551 34.65714,-31.949551 z m 0,78.249325 c 24.63906,0 37.63548,18.14085 37.63548,34.38638 0,18.14085 -16.24553,33.84487 -37.63548,33.84487 -21.38996,0 -37.63549,-15.70402 -37.63549,-33.84487 0,-15.97477 12.45491,-34.38638 37.63549,-34.38638 z" />
+              </g>
+              <g
+                 style="fill:#808080"
+                 transform="translate(-163.22926,-6.63358)"
+                 id="g4796">
+                <g
+                   aria-label="8"
+                   style="font-style:normal;font-weight:normal;font-size:7.09937811px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.17748445"
+                   id="text24-5"
+                   transform="translate(271.30057,21.863906)">
+                  <path
+                     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke-width:0.17748445"
+                     d="m 31.577508,38.696619 c 0.1257,1.202533 0.192036,2.442881 0.192036,3.722935 0,20.313754 -16.62316,33.238021 -33.980381,33.566241 8.5005546,1.026719 16.405272,2.973663 24.232789,6.235189 16.787053,-9.205803 24.368303,-25.7219 24.368303,-40.072123 0,-1.161245 -0.04955,-2.31239 -0.145093,-3.452242 z"
+                     id="path4709"
+                     inkscape:connector-curvature="0"
+                     sodipodi:nodetypes="csccscc" />
+                </g>
+                <g
+                   id="g4772"
+                   style="font-style:normal;font-weight:normal;font-size:7.09937859px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#808080;fill-opacity:1;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                   aria-label="8"
+                   transform="translate(0.12624987,0.06768044)">
+                  <path
+                     transform="matrix(0.16922433,0,0,0.16922433,-91.899735,13.989866)"
+                     style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:270.75891113px;font-family:Courier;-inkscape-font-specification:Courier;fill:#808080;stroke:#ffff00;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="m 1979.2539,532 c 0.2424,0.12732 0.5072,0.2765 0.7461,0.40039 -96,43.2 -161.5996,140.79962 -161.5996,241.59961 v 0.01 c 4.6991,-1.2883 9.9036,-2.01 15.3945,-2.01 h 71.0293 C 1905.847,678.75347 1978.3944,572.381 2124,570.83789 2072.8628,564.05663 2024.3217,559.36095 1979.2539,532 Z"
+                     id="path4770"
+                     inkscape:connector-curvature="0"
+                     sodipodi:nodetypes="ccscsccc" />
+                </g>
+              </g>
+            </g>
+            <rect
+               y="62.946335"
+               x="129.76146"
+               height="2.8891957"
+               width="16.71962"
+               id="rect5817"
+               style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+            <rect
+               y="127.60851"
+               x="63.206753"
+               height="2.8891957"
+               width="16.71962"
+               id="rect5817-3"
+               style="opacity:1;fill:#ffffff;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>

commons.h

@@ -5,6 +5,19 @@
 #define NTMAX 300
 #define RX_SAMPLE_RATE 12000
 
+
+#ifndef TEST_FOX_WAVE_GEN
+#define TEST_FOX_WAVE_GEN 0
+#endif
+
+#ifndef TEST_FOX_WAVE_GEN_SLOTS
+#if TEST_FOX_WAVE_GEN
+    #define TEST_FOX_WAVE_GEN_SLOTS 2
+#else
+    #define TEST_FOX_WAVE_GEN_SLOTS 1
+#endif
+#endif
+
 #ifdef __cplusplus
 #include <cstdbool>
 extern "C" {

js8call.pro

@@ -81,7 +81,9 @@ SOURCES += \
     jsc_checker.cpp \
     Message.cpp \
     Inbox.cpp \
-    messagewindow.cpp
+    messagewindow.cpp \
+    SpotClient.cpp \
+    TCPClient.cpp
 
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
@@ -113,7 +115,10 @@ HEADERS  += qt_helpers.hpp \
     jsc_checker.h \
     Message.h \
     Inbox.h \
-    messagewindow.h
+    messagewindow.h \
+    SpotClient.h \
+    TCPClient.h \
+    logbook/n3fjp.h
 
 
 INCLUDEPATH += qmake_only

keyeater.cpp

@@ -42,3 +42,16 @@ bool MousePressEater::eventFilter(QObject *obj, QEvent *event){
     return QObject::eventFilter(obj, event);
 }
 
+bool MouseDoubleClickEater::eventFilter(QObject *obj, QEvent *event){
+    if (event->type() == QEvent::MouseButtonDblClick) {
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
+        bool processed = false;
+        emit this->mouseDoubleClicked(obj, mouseEvent, &processed);
+        if(processed){
+            return true;
+        }
+    }
+
+    // standard event processing
+    return QObject::eventFilter(obj, event);
+}

keyeater.h

@@ -44,7 +44,19 @@ public:
     Q_SIGNAL void mousePressed(QObject *obj, QMouseEvent *evt, bool *pProcessed);
 };
 
+class MouseDoubleClickEater : public QObject
+{
+    Q_OBJECT
+public:
+    MouseDoubleClickEater(){}
+    virtual ~MouseDoubleClickEater(){}
 
+protected:
+    bool eventFilter(QObject *obj, QEvent *event);
+
+public:
+    Q_SIGNAL void mouseDoubleClicked(QObject *obj, QMouseEvent *evt, bool *pProcessed);
+};
 
 
 

lib/extractmessage144.f90

@@ -15,7 +15,7 @@ subroutine extractmessage144(decoded,msgreceived,nhashflag,recent_calls,nrecent)
   do ibyte=1,10
       itmp=0
     do ibit=1,8
-      itmp=ishft(itmp,1)+iand(1,decoded((ibyte-1)*8+ibit))
+      itmp=ishft(itmp,1)+iand(1_1,decoded((ibyte-1)*8+ibit))
     enddo
     i1Dec8BitBytes(ibyte)=itmp
   enddo
@@ -31,7 +31,7 @@ subroutine extractmessage144(decoded,msgreceived,nhashflag,recent_calls,nrecent)
     do ibyte=1,12
       itmp=0
       do ibit=1,6
-        itmp=ishft(itmp,1)+iand(1,decoded((ibyte-1)*6+ibit))
+        itmp=ishft(itmp,1)+iand(1_1,decoded((ibyte-1)*6+ibit))
       enddo
       i4Dec6BitWords(ibyte)=itmp
     enddo

lib/ft8/chkcrc12a.f90

@@ -13,7 +13,7 @@ subroutine chkcrc12a(decoded,nbadcrc)
   read(cbits,1002) ncrc12                         !Received CRC12
 1002 format(75x,b12)
 
-  i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32)
+  i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32,0_1))
   i1Dec8BitBytes(11)=0
   icrc12=crc12(c_loc(i1Dec8BitBytes),11)          !CRC12 computed from 75 msg bits
   icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here

lib/ft8/extractmessage174.f90

@@ -19,7 +19,7 @@ subroutine extractmessage174(decoded,msgreceived,ncrcflag)
   read(cbits,1002) ncrc12                         !Received CRC12
 1002 format(75x,b12)
 
-  i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32)
+  i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32,0_1))
   i1Dec8BitBytes(11)=0
   icrc12=crc12(c_loc(i1Dec8BitBytes),11)          !CRC12 computed from 75 msg bits
   icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here
@@ -29,7 +29,7 @@ subroutine extractmessage174(decoded,msgreceived,ncrcflag)
     do ibyte=1,12
       itmp=0
       do ibit=1,6
-        itmp=ishft(itmp,1)+iand(1,decoded((ibyte-1)*6+ibit))
+        itmp=ishft(itmp,1)+iand(1_1,decoded((ibyte-1)*6+ibit))
       enddo
       i4Dec6BitWords(ibyte)=itmp
     enddo

lib/ft8/genft8.f90

@@ -35,7 +35,7 @@ subroutine genft8(msg,mygrid,bcontest,i3bit,msgsent,msgbits,itone)
 1000 format(12b6.6,b8.8)
   read(cbits,1001) i1Msg8BitBytes(1:10)
 1001 format(10b8)
-  i1Msg8BitBytes(10)=iand(i1Msg8BitBytes(10),128+64+32)
+  i1Msg8BitBytes(10)=iand(i1Msg8BitBytes(10),transfer(128+64+32,0_1))
   i1Msg8BitBytes(11)=0
   icrc12=crc12(c_loc(i1Msg8BitBytes),11)
   icrc12=xor(icrc12, 42) ! TODO: jsherer - could change the crc here

lib/ft8/ldpcsim174.f90

@@ -94,7 +94,7 @@ allocate ( rxdata(N), llr(N) )
   checksum = xor(checksum, 42) ! TODO: jsherer - could change the crc here
 ! For reference, the next 3 lines show how to check the CRC
   i1Msg8BitBytes(10)=checksum/256
-  i1Msg8BitBytes(11)=iand (checksum,255)
+  i1Msg8BitBytes(11)=iand(checksum,transfer(255,0_2))
   checksumok = crc12_check(c_loc (i1Msg8BitBytes), 11)
   if( checksumok ) write(*,*) 'Good checksum'
 

lib/ldpcsim40.f90

@@ -95,7 +95,7 @@ do idb = 0, 30
       nhashflag=0
       imsg=0
       do i=1,16
-        imsg=ishft(imsg,1)+iand(1,decoded(17-i))
+        imsg=ishft(imsg,1)+iand(1_1,decoded(17-i))
       enddo
       nrxrpt=iand(imsg,15)
       nrxhash=(imsg-nrxrpt)/16

lib/msk40decodeframe.f90

@@ -129,7 +129,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray,             &
 
     imsg=0
     do i=1,16
-      imsg=ishft(imsg,1)+iand(1,decoded(17-i))
+      imsg=ishft(imsg,1)+iand(1_1,decoded(17-i))
     enddo
     nrxrpt=iand(imsg,15)
     nrxhash=(imsg-nrxrpt)/16

logbook/adif.cpp

@@ -5,6 +5,163 @@
 #include <QDateTime>
 #include <QDebug>
 
+const QStringList ADIF_FIELDS = {
+    // ADIF 3.1.0 - pulled from http://www.adif.org/310/adx310.xsd on 2019-06-04
+    "APP",
+    "ADDRESS",
+    "ADDRESS_INTL",
+    "AGE",
+    "A_INDEX",
+    "ANT_AZ",
+    "ANT_EL",
+    "ANT_PATH",
+    "ARRL_SECT",
+    "AWARD_SUBMITTED",
+    "AWARD_GRANTED",
+    "BAND",
+    "BAND_RX",
+    "CALL",
+    "CHECK",
+    "CLASS",
+    "CLUBLOG_QSO_UPLOAD_DATE",
+    "CLUBLOG_QSO_UPLOAD_STATUS",
+    "CNTY",
+    "COMMENT",
+    "COMMENT_INTL",
+    "CONT",
+    "CONTACTED_OP",
+    "CONTEST_ID",
+    "COUNTRY",
+    "COUNTRY_INTL",
+    "CQZ",
+    "CREDIT_SUBMITTED",
+    "CREDIT_GRANTED",
+    "DARC_DOK",
+    "DISTANCE",
+    "DXCC",
+    "EMAIL",
+    "EQ_CALL",
+    "EQSL_QSLRDATE",
+    "EQSL_QSLSDATE",
+    "EQSL_QSL_RCVD",
+    "EQSL_QSL_SENT",
+    "FISTS",
+    "FISTS_CC",
+    "FORCE_INIT",
+    "FREQ",
+    "FREQ_RX",
+    "GRIDSQUARE",
+    "GUEST_OP",
+    "HRDLOG_QSO_UPLOAD_DATE",
+    "HRDLOG_QSO_UPLOAD_STATUS",
+    "IOTA",
+    "IOTA_ISLAND_ID",
+    "ITUZ",
+    "K_INDEX",
+    "LAT",
+    "LON",
+    "LOTW_QSLRDATE",
+    "LOTW_QSLSDATE",
+    "LOTW_QSL_RCVD",
+    "LOTW_QSL_SENT",
+    "MAX_BURSTS",
+    "MODE",
+    "MS_SHOWER",
+    "MY_ANTENNA",
+    "MY_ANTENNA_INTL",
+    "MY_CITY",
+    "MY_CITY_INTL",
+    "MY_CNTY",
+    "MY_COUNTRY",
+    "MY_COUNTRY_INTL",
+    "MY_CQ_ZONE",
+    "MY_DXCC",
+    "MY_FISTS",
+    "MY_GRIDSQUARE",
+    "MY_IOTA",
+    "MY_IOTA_ISLAND_ID",
+    "MY_ITU_ZONE",
+    "MY_LAT",
+    "MY_LON",
+    "MY_NAME",
+    "MY_NAME_INTL",
+    "MY_POSTAL_CODE",
+    "MY_POSTAL_CODE_INTL",
+    "MY_RIG",
+    "MY_RIG_INTL",
+    "MY_SIG",
+    "MY_SIG_INTL",
+    "MY_SIG_INFO",
+    "MY_SIG_INFO_INTL",
+    "MY_SOTA_REF",
+    "MY_STATE",
+    "MY_STREET",
+    "MY_STREET_INTL",
+    "MY_USACA_COUNTIES",
+    "MY_VUCC_GRIDS",
+    "NAME",
+    "NAME_INTL",
+    "NOTES",
+    "NOTES_INTL",
+    "NR_BURSTS",
+    "NR_PINGS",
+    "OPERATOR",
+    "OWNER_CALLSIGN",
+    "PFX",
+    "PRECEDENCE",
+    "PROP_MODE",
+    "PUBLIC_KEY",
+    "QRZCOM_QSO_UPLOAD_DATE",
+    "QRZCOM_QSO_UPLOAD_STATUS",
+    "QSLMSG",
+    "QSLMSG_INTL",
+    "QSLRDATE",
+    "QSLSDATE",
+    "QSL_RCVD",
+    "QSL_RCVD_VIA",
+    "QSL_SENT",
+    "QSL_SENT_VIA",
+    "QSL_VIA",
+    "QSO_COMPLETE",
+    "QSO_DATE",
+    "QSO_DATE_OFF",
+    "QSO_RANDOM",
+    "QTH",
+    "QTH_INTL",
+    "REGION",
+    "RIG",
+    "RIG_INTL",
+    "RST_RCVD",
+    "RST_SENT",
+    "RX_PWR",
+    "SAT_MODE",
+    "SAT_NAME",
+    "SFI",
+    "SIG",
+    "SIG_INTL",
+    "SIG_INFO",
+    "SIG_INFO_INTL",
+    "SILENT_KEY",
+    "SKCC",
+    "SOTA_REF",
+    "SRX",
+    "SRX_STRING",
+    "STATE",
+    "STATION_CALLSIGN",
+    "STX",
+    "STX_STRING",
+    "SUBMODE",
+    "SWL",
+    "TEN_TEN",
+    "TIME_OFF",
+    "TIME_ON",
+    "TX_PWR",
+    "UKSMG",
+    "USACA_COUNTIES",
+    "VUCC_GRIDS",
+    "WEB",
+};
+
 /*
 <CALL:4>W1XT<BAND:3>20m<FREQ:6>14.076<GRIDSQUARE:4>DM33<MODE:4>JT65<RST_RCVD:3>-21<RST_SENT:3>-14<QSO_DATE:8>20110422<TIME_ON:6>041712<TIME_OFF:6>042435<TX_PWR:1>4<COMMENT:34>1st JT65A QSO.   Him: mag loop 20W<STATION_CALLSIGN:6>VK3ACF<MY_GRIDSQUARE:6>qf22lb<eor>
 <CALL:6>IK1SOW<BAND:3>20m<FREQ:6>14.076<GRIDSQUARE:4>JN35<MODE:4>JT65<RST_RCVD:3>-19<RST_SENT:3>-11<QSO_DATE:8>20110422<TIME_ON:6>052501<TIME_OFF:6>053359<TX_PWR:1>3<STATION_CALLSIGN:6>VK3ACF<MY_GRIDSQUARE:6>qf22lb<eor>
@@ -101,21 +258,29 @@ void ADIF::load()
                , extractField (record, "BAND")
                , extractField (record, "MODE")
                , extractField (record, "SUBMODE")
-               , extractField (record, "QSO_DATE"));
+               , extractField (record, "GRIDSQUARE")
+               , extractField (record, "QSO_DATE")
+               , extractField (record, "NAME")
+               , extractField (record, "COMMENT")
+               );
         }
         inputFile.close ();
     }
 }
 
 
-void ADIF::add(QString const& call, QString const& band, QString const& mode, QString const& submode, QString const& date)
+void ADIF::add(QString const& call, QString const& band, QString const& mode, QString const& submode, QString const &grid, QString const& date, QString const& name, QString const& comment)
 {
     QSO q;
     q.call = call;
     q.band = band;
     q.mode = mode;
     q.submode = submode;
+    q.grid = grid;
     q.date = date;
+    q.name = name;
+    q.comment = comment;
+
     if (q.call.size ())
       {
         _data.insert(q.call,q);
@@ -135,13 +300,18 @@ bool ADIF::match(QString const& call, QString const& band) const
             if (     (band.compare(q.band,Qt::CaseInsensitive) == 0)
                   || (band=="")
                   || (q.band==""))
-            {
+            {   
                 return true;
             }
         }
     }
     return false;
-}    
+}
+
+QList<ADIF::QSO> ADIF::find(QString const& call) const
+{
+    return _data.values(call);
+}
 
 QList<QString> ADIF::getCallList() const
 {
@@ -154,8 +324,6 @@ QList<QString> ADIF::getCallList() const
      }
     return p;
 }
-
-
     
 int ADIF::getCount() const
 {
@@ -166,7 +334,7 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
                            , QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn
                            , QDateTime const& dateTimeOff, QString const& band, QString const& comments
                            , QString const& name, QString const& strDialFreq, QString const& m_myCall
-                           , QString const& m_myGrid, QString const& operator_call)
+                           , QString const& m_myGrid, QString const& operator_call, QMap<QString, QVariant> const &additionalFields)
 {
   QString t;
   t = "<call:" + QString::number(hisCall.length()) + ">" + hisCall;
@@ -196,6 +364,18 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri
   if (operator_call!="")
       t+=" <operator:" + QString::number(operator_call.length()) +
               ">" + operator_call;
+
+  foreach(auto key, additionalFields.keys()){
+      auto k = key.toUpper();
+      auto value = additionalFields[k].toString();
+
+      if(ADIF_FIELDS.contains(k)){
+        t += QString(" <%1:%2>%3").arg(k).arg(value.length()).arg(value);
+      } else {
+        t += QString(" <APP_JS8CALL_%1:%2>%3").arg(k).arg(value.length()).arg(value);
+      }
+  }
+
   return t.toLatin1 ();
 }
 

logbook/adif.h

@@ -11,39 +11,47 @@
 #if defined (QT5)
 #include <QList>
 #include <QString>
+#include <QStringList>
 #include <QMultiHash>
+#include <QVariant>
 #else
 #include <QtGui>
 #endif
 
 class QDateTime;
 
+extern const QStringList ADIF_FIELDS;
+
 class ADIF
 {
 	public:
+
+    struct QSO;
+
 	void init(QString const& filename);
 	void load();
-    void add(QString const& call, QString const& band, QString const& mode, const QString &submode, QString const& date);
+    void add(QString const& call, QString const& band, QString const& mode, const QString &submode, QString const& grid, QString const& date, const QString &name, const QString &comment);
     bool match(QString const& call, QString const& band) const;
+    QList<ADIF::QSO> find(QString const& call) const;
 	QList<QString> getCallList() const;
 	int getCount() const;
 		
         // open ADIF file and append the QSO details. Return true on success
 	bool addQSOToFile(QByteArray const& ADIF_record);
 
-  QByteArray QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode, QString const& submode, QString const& rptSent
+    QByteArray QSOToADIF(QString const& hisCall, QString const& hisGrid, QString const& mode, QString const& submode, QString const& rptSent
                                              , QString const& rptRcvd, QDateTime const& dateTimeOn, QDateTime const& dateTimeOff
                                              , QString const& band, QString const& comments, QString const& name
                                              , QString const& strDialFreq, QString const& m_myCall, QString const& m_myGrid
-                                             , QString const& operator_call);
+                                             , QString const& operator_call, const QMap<QString, QVariant> &additionalFields);
 
 
-private:
-		struct QSO
-		{
-          QString call,band,mode,submode,date;
-		};		  
+    struct QSO
+    {
+      QString call,band,mode,submode,grid,date,name,comment;
+    };
 
+    private:
 		QMultiHash<QString, QSO> _data;
 		QString _filename;
 		

logbook/logbook.cpp

@@ -59,25 +59,53 @@ void LogBook::match(/*in*/const QString call,
                     bool &callWorkedBefore,
                     bool &countryWorkedBefore) const
 {
-  if (call.length() > 0)
-    {
-      QString currentBand = "";  // match any band
-      callWorkedBefore = _log.match(call,currentBand);
-      countryName = _countries.find(call);
+    if(call.isEmpty()){
+        return;
+    }
 
-      if (countryName.length() > 0)  //  country was found
+    QString currentBand = "";  // match any band
+    callWorkedBefore = _log.match(call, currentBand);
+    countryName = _countries.find(call);
+
+    if (countryName.length() > 0){  //  country was found
         countryWorkedBefore = _worked.getHasWorked(countryName);
-      else
-        {
-          countryName = "where?"; //error: prefix not found
-          countryWorkedBefore = false;
-        }
+    } else {
+        countryName = "where?"; //error: prefix not found
+        countryWorkedBefore = false;
     }
 }
 
-void LogBook::addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString date)
+bool LogBook::findCallDetails(
+                    /*in*/
+                    const QString call,
+                    /*out*/
+                    QString &grid,
+                    QString &date,
+                    QString &name,
+                    QString &comment) const
 {
-  _log.add(call,band,mode,submode,date);
+    if(call.isEmpty()){
+        return false;
+    }
+
+    auto qsos = _log.find(call);
+    if(qsos.isEmpty()){
+        return false;
+    }
+
+    foreach(auto qso, qsos){
+        if(grid.isEmpty() && !qso.grid.isEmpty()) grid = qso.grid;
+        if(date.isEmpty() && !qso.date.isEmpty()) date = qso.date;
+        if(name.isEmpty() && !qso.name.isEmpty()) name = qso.name;
+        if(comment.isEmpty() && !qso.comment.isEmpty()) comment = qso.comment;
+    }
+
+    return true;
+}
+
+void LogBook::addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString grid, const QString date, const QString name, const QString comment)
+{
+  _log.add(call,band,mode,submode,grid,date,name,comment);
   QString countryName = _countries.find(call);
   if (countryName.length() > 0)
     _worked.setAsWorked(countryName);

logbook/logbook.h

@@ -13,6 +13,7 @@
 #include "countrydat.h"
 #include "countriesworked.h"
 #include "adif.h"
+#include "n3fjp.h"
 
 class QDir;
 
@@ -25,7 +26,14 @@ public:
               /*out*/ QString &countryName,
                       bool &callWorkedBefore,
                       bool &countryWorkedBefore) const;
-    void addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString date);
+    bool findCallDetails(/*in*/
+                        const QString call,
+                        /*out*/
+                        QString &grid,
+                        QString &date,
+                        QString &name,
+                        QString &comment) const;
+    void addAsWorked(const QString call, const QString band, const QString mode, const QString submode, const QString grid, const QString date, const QString name, const QString comment);
 
 private:
    CountryDat _countries;

logbook/n3fjp.h

@@ -0,0 +1,82 @@
+#ifndef N3FJP_H
+#define N3FJP_H
+
+
+// Mapping between ADIF field to N3FJP field
+static const QMap<QString, QString> N3FJP_ADIF_MAP = {
+    {"AGE", "fldAge"},
+    //{"", "fldARCI"},
+    {"BAND", "fldBand"},
+    {"CALL", "fldCall"},
+    //{"", "fldCategory"},
+    {"CHECK", "fldCheck"},
+    {"CLASS", "fldClass"},
+    {"COMMENT", "fldComments"},
+    {"COMMENT_INTL", "fldComments"},
+    //{"", "fldComputerName"},
+    {"CONTEST_ID", "fldContestID"},
+    {"CONT", "fldContinent"},
+    {"DXCC", "fldCountryDXCC"},
+    //{"", "fldCountryWorked"},
+    {"COUNTRY", "fldCountyR"},
+    {"COUNTRY_INTL", "fldCountyR"},
+    {"MY_COUNTRY", "fldCountyS"},
+    {"MY_COUNTRY_INTL", "fldCountyS"},
+    {"CQZ", "fldCQZone"},
+    {"QSO_DATE", "fldDateStr"},
+    {"FISTS", "fldFists"},
+    {"FISTS_CC", "fldFists"},
+    {"FREQ", "fldFrequency"},
+    //{"", "fldFuture1"},
+    //{"", "fldFuture2"},
+    {"GRIDSQUARE", "fldGridR"},
+    {"MY_GRIDSQUARE", "fldGridS"},
+    //{"", "fldIARUZone"},
+    //{"", "fldInitials"},
+    {"IOTA", "fldIOTA"},
+    {"ITUZ", "fldITUZone"},
+    //{"", "fldLightHouse"},
+    {"MODE", "fldMode"},
+    {"CONTEST_ID", "fldModeContest"},
+    {"NAME", "fldNameR"},
+    {"NAME_INTL", "fldNameR"},
+    {"MY_NAME", "fldNameS"},
+    {"MY_NAME_INTL", "fldNameS"},
+    {"OPERATOR", "fldOperator"},
+    {"*1", "fldOther1"},
+    {"*2", "fldOther2"},
+    {"*3", "fldOther3"},
+    {"*4", "fldOther4"},
+    {"*5", "fldOther5"},
+    {"*6", "fldOther6"},
+    {"*7", "fldOther7"},
+    {"*8", "fldOther8"},
+    //{"", "fldPoints"},
+    {"RX_PWR", "fldPower"},
+    {"TX_PWR", "fldPower"},
+    {"PRECEDENCE", "fldPrecedence"},
+    {"PFX", "fldPrefix"},
+    {"PROP_MODE", "fldPropMode"},
+    {"QSL_RCVD_VIA", "fldQSLConfByR"},
+    {"QSL_SENT_VIA", "fldQSLConfByS"},
+    {"QSL_RCVD", "fldQSLR"},
+    {"QSL_SENT", "fldQSLS"},
+    {"QTH", "fldQTHGroup"},
+    {"QTH_INTL", "fldQTHGroup"},
+    {"RST_RCVD", "fldRstR"},
+    {"RST_SENT", "fldRstS"},
+    {"SAT_NAME", "fldSatName"},
+    {"ARRL_SECT", "fldSection"},
+    {"SRX", "fldSerialNoR"},
+    {"STX", "fldSerialNoS"},
+    {"SRX_STRING", "fldSPC"},
+    {"SRX", "fldSPCNum"},
+    {"STATE", "fldState"},
+    {"STATION_CALLSIGN", "fldStation"},
+    {"TEN_TEN", "fldTenTen"},
+    {"TIME_OFF", "fldTimeOffStr"},
+    {"TIME_ON", "fldTimeOnStr"},
+    //{"", "fldTransmitterID"},
+};
+
+#endif // N3FJP_H

logqso.cpp

@@ -12,6 +12,7 @@
 #include "Configuration.hpp"
 #include "Bands.hpp"
 #include "MaidenheadLocatorValidator.hpp"
+#include "DriftingDateTime.h"
 
 #include "ui_logqso.h"
 #include "moc_logqso.cpp"
@@ -25,7 +26,6 @@ LogQSO::LogQSO(QString const& programTitle, QSettings * settings
 {
   ui->setupUi(this);
   setWindowTitle(programTitle + " - Log QSO");
-  loadSettings ();
   ui->grid->setValidator (new MaidenheadLocatorValidator {this});
 }
 
@@ -33,12 +33,142 @@ LogQSO::~LogQSO ()
 {
 }
 
+bool LogQSO::acceptText(QString text){
+    auto w = focusWidget();
+    if(!w){
+        return false;
+    }
+
+    auto name = QString(w->metaObject()->className());
+    if(name != "QLineEdit"){
+        return false;
+    }
+
+    auto l = static_cast<QLineEdit*>(w);
+    if(l->text().isEmpty()){
+        // set
+        l->setText(text);
+    } else {
+        // append
+        l->setText(QString("%1 %2").arg(l->text()).arg(text));
+    }
+
+    return true;
+}
+
+QString LogQSO::currentCall(){
+    return ui->call->text().trimmed();
+}
+
+void LogQSO::on_start_now_button_pressed(){
+  ui->start_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc());
+}
+
+void LogQSO::on_end_now_button_pressed(){
+  ui->end_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc());
+}
+
+void LogQSO::on_add_new_field_button_pressed(){
+    createAdditionalField();
+}
+
+void LogQSO::createAdditionalField(QString key, QString value){
+    QLineEdit * l = new QLineEdit(this);
+    if(!value.isEmpty()){
+        l->setText(value);
+    }
+
+    QComboBox * c = new QComboBox(this);
+    c->insertItems(0, ADIF_FIELDS);
+    c->insertItem(0, "");
+    c->setEditable(true);
+    c->setAutoCompletion(true);
+    c->setAutoCompletionCaseSensitivity(Qt::CaseInsensitive);
+    c->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    connect(c, &QComboBox::currentTextChanged, this, [this, l](const QString &text){
+       l->setProperty("fieldKey", QVariant(text));
+    });
+    c->setCurrentText(key);
+
+    auto layout = static_cast<QFormLayout*>(ui->additionalFields->layout());
+    layout->addRow(c, l);
+
+    // set tab ordering
+    if(m_additionalFieldsControls.isEmpty()){
+        setTabOrder(ui->cbComments, c);
+    } else {
+        setTabOrder(m_additionalFieldsControls.last(), c);
+    }
+    setTabOrder(c, l);
+    setTabOrder(l, ui->add_new_field_button);
+    c->setFocus();
+
+    m_additionalFieldsControls.append(l);
+    ui->additionalFields->setVisible(true);
+    ui->additionalFields->adjustSize();
+
+    // update the window layout
+    updateGeometry();
+}
+
+QMap<QString, QVariant> LogQSO::collectAdditionalFields(){
+    QMap<QString, QVariant> additionalFields;
+    foreach(auto field, m_additionalFieldsControls){
+        auto key = field->property("fieldKey").toString();
+        if(key.isEmpty()){
+            continue;
+        }
+        additionalFields[key] = QVariant(field->text());
+    }
+    return additionalFields;
+}
+
+void LogQSO::resetAdditionalFields(){
+    ui->additionalFields->setVisible(false);
+
+    if(!m_additionalFieldsControls.isEmpty()){
+        auto layout = static_cast<QFormLayout*>(ui->additionalFields->layout());
+
+#if QT_VERSION >= 0x050800
+        for(int i = 0, count = layout->rowCount(); i < count; i++){
+            layout->removeRow(0);
+        }
+#else
+        QLayoutItem *child;
+        while((child = layout->takeAt(0)) != 0){
+            delete child;
+        }
+#endif
+
+        m_additionalFieldsControls.clear();
+    }
+
+    setTabOrder(ui->cbComments, ui->add_new_field_button);
+    updateGeometry();
+}
+
 void LogQSO::loadSettings ()
 {
   m_settings->beginGroup ("LogQSO");
   restoreGeometry (m_settings->value ("geometry", saveGeometry ()).toByteArray ());
   ui->cbComments->setChecked (m_settings->value ("SaveComments", false).toBool ());
   m_comments = m_settings->value ("LogComments", "").toString();
+
+  resetAdditionalFields();
+  auto additionalFields = m_settings->value("AdditionalFields", {}).toStringList();
+  QSet<QString> additionalFieldsSet;
+  foreach(auto key, additionalFields){
+      if(key.isEmpty()){
+          continue;
+      }
+      if(additionalFieldsSet.contains(key)){
+          continue;
+      }
+
+      createAdditionalField(key);
+      additionalFieldsSet.insert(key);
+  }
+
   m_settings->endGroup ();
 }
 
@@ -48,6 +178,17 @@ void LogQSO::storeSettings () const
   m_settings->setValue ("geometry", saveGeometry ());
   m_settings->setValue ("SaveComments", ui->cbComments->isChecked ());
   m_settings->setValue ("LogComments", m_comments);
+
+  auto additionalFields = QStringList{};
+  foreach(auto field, m_additionalFieldsControls){
+      auto key = field->property("fieldKey").toString();
+      if(key.isEmpty()){
+          continue;
+      }
+      additionalFields.append(key);
+  }
+  m_settings->setValue ("AdditionalFields", additionalFields);
+
   m_settings->endGroup ();
 }
 
@@ -55,31 +196,46 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
                         QString const& rptSent, QString const& rptRcvd,
                         QDateTime const& dateTimeOn, QDateTime const& dateTimeOff,
                         Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid,
-                        bool toDATA, bool dBtoComments, bool bFox, QString const& opCall)
+                        bool toDATA, bool dBtoComments, bool bFox, QString const& opCall, QString const& comments)
 {
   if(!isHidden()) return;
+
+  loadSettings();
+
+  ui->call->setFocus();
   ui->call->setText(hisCall);
   ui->grid->setText(hisGrid);
   ui->name->setText("");
   ui->comments->setText("");
+
   if (ui->cbComments->isChecked ()) ui->comments->setText(m_comments);
+
   if(dBtoComments) {
     QString t=mode;
     if(rptSent!="") t+="  Sent: " + rptSent;
     if(rptRcvd!="") t+="  Rcvd: " + rptRcvd;
     ui->comments->setText(t);
   }
+
+  if(!comments.isEmpty()){
+    ui->comments->setText(comments);
+  }
+
   if(toDATA) mode="DATA";
+
   ui->mode->setText(mode);
   ui->sent->setText(rptSent);
   ui->rcvd->setText(rptRcvd);
   ui->start_date_time->setDateTime (dateTimeOn);
   ui->end_date_time->setDateTime (dateTimeOff);
+
   m_dialFreq=dialFreq;
   m_myCall=myCall;
   m_myGrid=myGrid;
+
   ui->band->setText (m_config->bands ()->find (dialFreq));
   ui->loggedOperator->setText(opCall);
+
   if(bFox) {
     accept();
   } else {
@@ -115,46 +271,55 @@ void LogQSO::accept()
   auto adifilePath = QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath (filename);
   adifile.init(adifilePath);
 
+  auto additionalFields = collectAdditionalFields();
+
   QByteArray ADIF {adifile.QSOToADIF (hisCall, hisGrid, mode, submode, rptSent, rptRcvd, m_dateTimeOn, m_dateTimeOff, band
-                                      , comments, name, strDialFreq, m_myCall, m_myGrid, operator_call)};
+                                      , comments, name, strDialFreq, m_myCall, m_myGrid, operator_call, additionalFields)};
+
   if (!adifile.addQSOToFile (ADIF))
   {
     MessageBox::warning_message (this, tr ("Log file error"),
                                  tr ("Cannot open \"%1\"").arg (adifilePath));
   }
 
-  // Log to N1MM Logger
-  if (m_config->broadcast_to_n1mm() && m_config->valid_n1mm_info())  {
-    const QHostAddress n1mmhost = QHostAddress(m_config->n1mm_server_name());
-    QUdpSocket _sock;
-    auto rzult = _sock.writeDatagram (ADIF + " <eor>", n1mmhost, quint16(m_config->n1mm_server_port()));
-    if (rzult == -1) {
-      MessageBox::warning_message (this, tr ("Error sending log to N1MM"),
-                                   tr ("Write returned \"%1\"").arg (rzult));
-    }
-  }
-
-//Log this QSO to file "js8call.log"
+  //Log this QSO to file "js8call.log"
   static QFile f {QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("js8call.log")};
   if(!f.open(QIODevice::Text | QIODevice::Append)) {
     MessageBox::warning_message (this, tr ("Log file error"),
                                  tr ("Cannot open \"%1\" for append").arg (f.fileName ()),
                                  tr ("Error: %1").arg (f.errorString ()));
   } else {
-    QString logEntry=m_dateTimeOn.date().toString("yyyy-MM-dd,") +
-      m_dateTimeOn.time().toString("hh:mm:ss,") +
-      m_dateTimeOff.date().toString("yyyy-MM-dd,") +
-      m_dateTimeOff.time().toString("hh:mm:ss,") + hisCall + "," +
-      hisGrid + "," + strDialFreq + "," + (mode == "MFSK" ? "JS8" : mode) +
-      "," + rptSent + "," + rptRcvd +
-      "," + comments + "," + name;
+    QStringList logEntryItems = {
+      m_dateTimeOn.date().toString("yyyy-MM-dd"),
+      m_dateTimeOn.time().toString("hh:mm:ss"),
+      m_dateTimeOff.date().toString("yyyy-MM-dd"),
+      m_dateTimeOff.time().toString("hh:mm:ss"),
+      hisCall,
+      hisGrid,
+      strDialFreq,
+      (mode == "MFSK" ? "JS8" : mode),
+      rptSent,
+      rptRcvd,
+      comments,
+      name
+    };
+
+    if(!additionalFields.isEmpty()){
+        foreach(auto value, additionalFields.values()){
+            logEntryItems.append(value.toString());
+        }
+    }
+
     QTextStream out(&f);
-    out << logEntry << endl;
+    out << logEntryItems.join(",") << endl;
     f.close();
   }
 
-//Clean up and finish logging
-  Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF);
+  //Clean up and finish logging
+  ui->call->clear();
+
+  Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF, additionalFields);
+
   QDialog::accept();
 }
 

logqso.h

@@ -33,10 +33,12 @@ public:
                   QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn,
                   QDateTime const& dateTimeOff,
                   Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid,
-                  bool toDATA, bool dBtoComments, bool bFox, QString const& opCall);
+                  bool toDATA, bool dBtoComments, bool bFox, QString const& opCall, const QString &comments);
 
 public slots:
   void accept();
+  bool acceptText(QString text);
+  QString currentCall();
 
 signals:
   void acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid
@@ -44,11 +46,19 @@ signals:
                   , QString const& rpt_sent, QString const& rpt_received
                   , QString const& comments
                   , QString const& name, QDateTime const& QSO_date_on,  QString const& operator_call
-                  , QString const& my_call, QString const& my_grid, QByteArray const& ADIF);
+                  , QString const& my_call, QString const& my_grid, QByteArray const& ADIF, QMap<QString, QVariant> const &additionalFields);
 
 protected:
   void hideEvent (QHideEvent *);
 
+private slots:
+  void createAdditionalField(QString key={}, QString value={});
+  void resetAdditionalFields();
+  QMap<QString, QVariant> collectAdditionalFields();
+  void on_add_new_field_button_pressed();
+  void on_start_now_button_pressed();
+  void on_end_now_button_pressed();
+
 private:
   void loadSettings ();
   void storeSettings () const;
@@ -62,6 +72,7 @@ private:
   QString m_myGrid;
   QDateTime m_dateTimeOn;
   QDateTime m_dateTimeOff;
+  QList<QLineEdit*> m_additionalFieldsControls;
 };
 
 #endif // LogQSO_H

logqso.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>285</height>
+    <height>450</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,404 +18,486 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>600</width>
+    <width>300</width>
     <height>0</height>
    </size>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_11">
    <item>
-    <widget class="QLabel" name="label">
-     <property name="font">
-      <font>
-       <pointsize>10</pointsize>
-      </font>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="text">
-      <string>Click OK to confirm the following QSO:</string>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
      </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>-53</y>
+        <width>568</width>
+        <height>485</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>9</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="lab1">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
+        <layout class="QFormLayout" name="formLayout">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
          </property>
-         <property name="text">
-          <string>Call</string>
+         <property name="topMargin">
+          <number>6</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
+         <property name="rightMargin">
+          <number>6</number>
          </property>
+         <property name="bottomMargin">
+          <number>6</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="operatorLabel">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Operator Callsign:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLineEdit" name="loggedOperator">
+           <property name="maximumSize">
+            <size>
+             <width>300</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="lab1">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Contact Callsign:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLineEdit" name="call">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>300</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="lab2">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Start:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <layout class="QGridLayout" name="gridLayout">
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <item row="0" column="1">
+            <widget class="QPushButton" name="start_now_button">
+             <property name="text">
+              <string>Now</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QDateTimeEdit" name="start_date_time">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="displayFormat">
+              <string>yyyy-MM-dd HH:mm:ss</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="lab2_3">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>End:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <layout class="QGridLayout" name="gridLayout_2">
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <item row="0" column="1">
+            <widget class="QPushButton" name="end_now_button">
+             <property name="text">
+              <string>Now</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="0">
+            <widget class="QDateTimeEdit" name="end_date_time">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="displayFormat">
+              <string>yyyy-MM-dd HH:mm:ss</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="2">
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="lab4">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Mode:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QLineEdit" name="mode">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="lab5">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Band:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
+          <widget class="QLineEdit" name="band">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <layout class="QGridLayout" name="gridLayout_4">
+           <property name="leftMargin">
+            <number>0</number>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+          </layout>
+         </item>
+         <item row="7" column="1">
+          <widget class="QLineEdit" name="sent">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QLabel" name="lab7">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Signal Report Received:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QLineEdit" name="rcvd">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="0">
+          <widget class="QLabel" name="lab8">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Grid:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="9" column="1">
+          <widget class="QLineEdit" name="grid">
+           <property name="maximumSize">
+            <size>
+             <width>75</width>
+             <height>16777215</height>
+            </size>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="0">
+          <widget class="QLabel" name="lab9">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Name:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="1">
+          <widget class="QLineEdit" name="name">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>300</width>
+             <height>16777215</height>
+            </size>
+           </property>
+          </widget>
+         </item>
+         <item row="11" column="0">
+          <widget class="QLabel" name="lab10">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Comments:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="11" column="1">
+          <widget class="QLineEdit" name="comments">
+           <property name="enabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="12" column="1">
+          <widget class="QCheckBox" name="cbComments">
+           <property name="text">
+            <string>Retain Comments</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
+          <widget class="QLabel" name="lab6">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Signal Report Sent:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="additionalFields">
+         <property name="title">
+          <string>Additional Fields</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_2"/>
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="call"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QLabel" name="lab2">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Start</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDateTimeEdit" name="start_date_time">
+        <widget class="QPushButton" name="add_new_field_button">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="displayFormat">
-          <string>dd/MM/yyyy HH:mm:ss</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QLabel" name="lab2_3">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
          <property name="text">
-          <string>End</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <string>Add New Field</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDateTimeEdit" name="end_date_time">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="displayFormat">
-          <string>dd/MM/yyyy HH:mm:ss</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_3">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QLabel" name="lab4">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Mode</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="mode">
-         <property name="maximumSize">
+         <property name="sizeHint" stdset="0">
           <size>
-           <width>70</width>
-           <height>16777215</height>
+           <width>20</width>
+           <height>40</height>
           </size>
          </property>
-         <property name="readOnly">
-          <bool>true</bool>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="field_button_layout" stretch="">
+         <property name="topMargin">
+          <number>0</number>
          </property>
-        </widget>
+        </layout>
        </item>
       </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <item>
-        <widget class="QLabel" name="lab5">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Band</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="band">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_7">
-       <item>
-        <widget class="QLabel" name="lab6">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Rpt Sent</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="sent">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_8">
-       <item>
-        <widget class="QLabel" name="lab7">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Rpt Rcvd</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="rcvd">
-         <property name="maximumSize">
-          <size>
-           <width>50</width>
-           <height>16777215</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_9">
-       <item>
-        <widget class="QLabel" name="lab8">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Grid</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="grid">
-         <property name="maximumSize">
-          <size>
-           <width>70</width>
-           <height>16777215</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QVBoxLayout" name="verticalLayout_10">
-       <item>
-        <widget class="QLabel" name="lab9">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Name</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="name">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="lab10">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>10</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Comments</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="comments">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="cbComments">
-       <property name="text">
-        <string>Retain</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_5">
-     <item>
-      <widget class="QLabel" name="operatorLabel">
-       <property name="font">
-        <font>
-         <pointsize>10</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Operator</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="loggedOperator">
-       <property name="maximumSize">
-        <size>
-         <width>300</width>
-         <height>16777215</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
+     </widget>
+    </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
@@ -423,7 +505,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
      </property>
     </widget>
    </item>
@@ -432,7 +514,9 @@
  <tabstops>
   <tabstop>call</tabstop>
   <tabstop>start_date_time</tabstop>
+  <tabstop>start_now_button</tabstop>
   <tabstop>end_date_time</tabstop>
+  <tabstop>end_now_button</tabstop>
   <tabstop>mode</tabstop>
   <tabstop>band</tabstop>
   <tabstop>sent</tabstop>
@@ -441,6 +525,9 @@
   <tabstop>name</tabstop>
   <tabstop>comments</tabstop>
   <tabstop>cbComments</tabstop>
+  <tabstop>add_new_field_button</tabstop>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>loggedOperator</tabstop>
  </tabstops>
  <resources/>
  <connections>

mainwindow.h

@@ -44,6 +44,8 @@
 #include "qpriorityqueue.h"
 #include "varicode.h"
 #include "MessageClient.hpp"
+#include "TCPClient.h"
+#include "SpotClient.h"
 #include "APRSISClient.h"
 #include "keyeater.h"
 
@@ -176,9 +178,13 @@ private slots:
   void on_tx5_currentTextChanged (QString const&);
   void on_tx6_editingFinished();
   void on_menuControl_aboutToShow();
+  void on_actionCheck_for_Updates_triggered();
   void on_actionEnable_Spotting_toggled(bool checked);
   void on_actionEnable_Auto_Reply_toggled(bool checked);
   void on_menuWindow_aboutToShow();
+  void on_actionFocus_Message_Reply_Area_triggered();
+  void on_actionFocus_Band_Activity_Table_triggered();
+  void on_actionFocus_Call_Activity_Table_triggered();
   void on_actionSetOffset_triggered();
   void on_actionShow_Fullscreen_triggered(bool checked);
   void on_actionShow_Statusbar_triggered(bool checked);
@@ -282,7 +288,7 @@ private slots:
   void buildFrequencyMenu(QMenu *menu);
   void buildHeartbeatMenu(QMenu *menu);
   void buildCQMenu(QMenu *menu);
-  void buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval);
+  void buildRepeatMenu(QMenu *menu, QPushButton * button, bool isLowInterval, int * interval);
   void sendHeartbeat();
   void sendHeartbeatAck(QString to, int snr, QString extra);
   void on_hbMacroButton_toggled(bool checked);
@@ -320,6 +326,7 @@ private slots:
   void on_tableWidgetCalls_cellDoubleClicked(int row, int col);
   void on_tableWidgetCalls_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
   void on_freeTextMsg_currentTextChanged (QString const&);
+  void on_textEditRX_mouseDoubleClicked();
   void on_nextFreeTextMsg_currentTextChanged (QString const&);
   void on_extFreeTextMsgEdit_currentTextChanged (QString const&);
   int currentFreqOffset();
@@ -345,7 +352,7 @@ private slots:
                   , QString const& rpt_sent, QString const& rpt_received
                   , QString const& comments
                   , QString const& name, QDateTime const& QSO_date_on, QString const& operator_call
-                  , QString const& my_call, QString const& my_grid, QByteArray const& ADIF);
+                  , QString const& my_call, QString const& my_grid, QByteArray const& ADIF, const QMap<QString, QVariant> &additionalFields);
   void on_bandComboBox_currentIndexChanged (int index);
   void on_bandComboBox_activated (int index);
   void on_readFreq_clicked();
@@ -383,6 +390,7 @@ private slots:
   void on_cbFirst_toggled(bool b);
   void on_cbAutoSeq_toggled(bool b);
   void emitPTT(bool on);
+  void emitTones();
   void networkMessage(Message const &message);
   void sendNetworkMessage(QString const &type, QString const &message);
   void sendNetworkMessage(QString const &type, QString const &message, const QMap<QString, QVariant> &params);
@@ -411,7 +419,7 @@ private slots:
   void on_cbCQTx_toggled(bool b);
   void splash_done (); 
   void on_measure_check_box_stateChanged (int);
-  void checkExpiryWarningMessage ();
+  void checkVersion(bool alertOnUpToDate);
   void checkStartupWarnings ();
   void clearCallsignSelected();
   void refreshTextDisplay();
@@ -443,6 +451,7 @@ private:
 private:
   void astroUpdate ();
   void writeAllTxt(QString message, int bits);
+  void writeMsgTxt(QString message, int snr);
   void hideMenus(bool b);
 
   NetworkAccessManager m_network_manager;
@@ -453,6 +462,7 @@ private:
   MultiSettings * m_multi_settings;
   QPushButton * m_configurations_button;
   QSettings * m_settings;
+  bool m_settings_read;
   QScopedPointer<Ui::MainWindow> ui;
 
   // other windows
@@ -712,6 +722,7 @@ private:
     QString through;
     QString grid;
     int freq;
+    QDateTime cqTimestamp;
     QDateTime ackTimestamp;
     QDateTime utcTimestamp;
     int snr;
@@ -759,6 +770,7 @@ private:
     QList<ActivityDetail> msgs;
   };
 
+  QString m_prevSelectedCallsign;
   int m_bandActivityWidth;
   int m_callActivityWidth;
   int m_textActivityWidth;
@@ -826,12 +838,15 @@ private:
 
   QMap<QString, int> m_rxInboxCountCache; // call -> count
 
-  QMap<QString, QMap<QString, CallDetail>> m_callActivityCache; // band -> call activity
-  QMap<QString, QMap<int, QList<ActivityDetail>>> m_bandActivityCache; // band -> band activity
-  QMap<QString, QString> m_rxTextCache; // band -> rx text
+  QMap<QString, QMap<QString, CallDetail>> m_callActivityBandCache; // band -> call activity
+  QMap<QString, QMap<int, QList<ActivityDetail>>> m_bandActivityBandCache; // band -> band activity
+  QMap<QString, QString> m_rxTextBandCache; // band -> rx text
+  QMap<QString, QMap<QString, QSet<QString>>> m_heardGraphOutgoingBandCache; // band -> heard in
+  QMap<QString, QMap<QString, QSet<QString>>> m_heardGraphIncomingBandCache; // band -> heard out
 
   JSCChecker * m_checker;
 
+  QMap<QString, QDateTime> m_callSelectedTime; // call -> timestamp when callsign was last selected
   QSet<QString> m_callSeenHeartbeat; // call
   int m_previousFreq;
   bool m_shouldRestoreFreq;
@@ -856,6 +871,7 @@ private:
   QQueue<QString> m_foxQSOinProgress;  //QSOs in progress: Fox has sent a report
   QQueue<qint64>  m_foxRateQueue;
 
+  bool m_hbAutoAck;
   bool m_hbHidden;
   int m_hbInterval;
   int m_cqInterval;
@@ -890,7 +906,9 @@ private:
   int m_firstDecode;
   QProgressDialog m_optimizingProgress;
   MessageClient * m_messageClient;
+  TCPClient * m_n3fjpClient;
   PSK_Reporter *psk_Reporter;
+  SpotClient *m_spotClient;
   APRSISClient * m_aprsClient;
   DisplayManual m_manual;
   QHash<QString, QVariant> m_pwrBandTxMemory; // Remembers power level by band
@@ -915,11 +933,15 @@ private:
   bool shortList(QString callsign);
   void transmit (double snr = 99.);
   void rigFailure (QString const& reason);
+  void spotSetLocal();
   void pskSetLocal ();
   void aprsSetLocal ();
+  void spotReport(int offset, int snr, QString callsign, QString grid);
+  void spotCmd(CommandDetail cmd);
   void pskLogReport(QString mode, int offset, int snr, QString callsign, QString grid);
   void aprsLogReport(int offset, int snr, QString callsign, QString grid);
   Radio::Frequency dialFrequency();
+  void updateCurrentBand();
   void displayDialFrequency ();
   void transmitDisplay (bool);
   void locationChange(QString const& location);
@@ -937,6 +959,7 @@ private:
   bool isAllCallIncluded(QString const &text);
   bool isGroupCallIncluded(const QString &text);
   QString callsignSelected(bool useInputText=false);
+  void callsignSelectedChanged(QString old, QString current);
   bool isRecentOffset(int offset);
   void markOffsetRecent(int offset);
   bool isDirectedOffset(int offset, bool *pIsAllCall);

mainwindow.ui

@@ -203,7 +203,7 @@
                  </size>
                 </property>
                 <property name="toolTip">
-                 <string>Current Frequency</string>
+                 <string>Set Current Frequency</string>
                 </property>
                 <property name="frameShape">
                  <enum>QFrame::NoFrame</enum>
@@ -297,7 +297,7 @@ QPushButton[oob=&quot;true&quot;] {
                  <bool>true</bool>
                 </property>
                 <property name="toolTip">
-                 <string>Current frequency offset</string>
+                 <string>Set Current Frequency Offset</string>
                 </property>
                 <property name="styleSheet">
                  <string notr="true">QLabel {
@@ -401,6 +401,12 @@ color : white;
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
+                <property name="mouseTracking">
+                 <bool>true</bool>
+                </property>
+                <property name="toolTip">
+                 <string>Set Callsign and Grid</string>
+                </property>
                 <property name="styleSheet">
                  <string notr="true">QLabel {
 font-family: MS Shell Dlg 2;
@@ -1242,14 +1248,6 @@ QTextEdit[transmitting=&quot;true&quot;] {
            <string>Callsigns</string>
           </property>
          </column>
-         <column>
-          <property name="text">
-           <string>✓</string>
-          </property>
-          <property name="textAlignment">
-           <set>AlignCenter</set>
-          </property>
-         </column>
          <column>
           <property name="text">
            <string>Age</string>
@@ -1280,6 +1278,24 @@ QTextEdit[transmitting=&quot;true&quot;] {
            <string>Distance</string>
           </property>
          </column>
+         <column>
+          <property name="text">
+           <string>✓</string>
+          </property>
+          <property name="toolTip">
+           <string>Worked Before</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Name</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Comment</string>
+          </property>
+         </column>
         </widget>
        </widget>
       </widget>
@@ -1972,6 +1988,9 @@ background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #2ecc71, stop:1 #00FF
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="visible">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>Avg Time Delta: 0 ms</string>
              </property>
@@ -4672,6 +4691,7 @@ list. The list can be maintained in Settings (F2).</string>
     <addaction name="actionShort_list_of_add_on_prefixes_and_suffixes"/>
     <addaction name="actionCopyright_Notice"/>
     <addaction name="separator"/>
+    <addaction name="actionCheck_for_Updates"/>
     <addaction name="actionAbout"/>
    </widget>
    <widget class="QMenu" name="menuMode">
@@ -4758,8 +4778,17 @@ list. The list can be maintained in Settings (F2).</string>
     <property name="title">
      <string>C&amp;ontrol</string>
     </property>
+    <widget class="QMenu" name="menuFocus">
+     <property name="title">
+      <string>Set Focus...</string>
+     </property>
+     <addaction name="actionFocus_Message_Reply_Area"/>
+     <addaction name="actionFocus_Band_Activity_Table"/>
+     <addaction name="actionFocus_Call_Activity_Table"/>
+    </widget>
     <addaction name="actionSetFrequency"/>
     <addaction name="actionSetOffset"/>
+    <addaction name="menuFocus"/>
     <addaction name="separator"/>
     <addaction name="actionEnable_Spotting"/>
     <addaction name="actionEnable_Auto_Reply"/>
@@ -5661,6 +5690,35 @@ list. The list can be maintained in Settings (F2).</string>
     <string>Show Message Inbox...</string>
    </property>
   </action>
+  <action name="actionCheck_for_Updates">
+   <property name="text">
+    <string>Check for Updates</string>
+   </property>
+  </action>
+  <action name="actionFocus_Message_Reply_Area">
+   <property name="text">
+    <string>Message Reply Area</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+M</string>
+   </property>
+  </action>
+  <action name="actionFocus_Band_Activity_Table">
+   <property name="text">
+    <string>Band Activity Table</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+B</string>
+   </property>
+  </action>
+  <action name="actionFocus_Call_Activity_Table">
+   <property name="text">
+    <string>Call Activity Table</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Alt+A</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

messagewindow.ui

@@ -53,7 +53,7 @@
        <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
       </property>
       <property name="autoScroll">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
       <property name="editTriggers">
        <set>QAbstractItemView::NoEditTriggers</set>
@@ -161,10 +161,10 @@
        </font>
       </property>
       <property name="visible">
-       <bool>false</bool>
+       <bool>true</bool>
       </property>
       <property name="styleSheet">
-       <string notr="true">QTextEdit { background-color:#ffeaa7; }</string>
+       <string notr="true">QTextEdit { /*background-color:#ffeaa7*/; }</string>
       </property>
      </widget>
      <widget class="QTextEdit" name="replytextEdit">

revision_utils.cpp

@@ -33,7 +33,7 @@ QString version (bool include_patch)
 
 QString program_title (QString const& revision)
 {
-  QString id {"%1 DE KN4CRD (v%2)"};
+  QString id {"%1 de KN4CRD (v%2)"};
   id = id.arg(QCoreApplication::applicationName());
   id = id.arg(QCoreApplication::applicationVersion ());
   return id;

varicode.cpp

@@ -50,8 +50,9 @@ QMap<QString, int> directed_cmds = {
     {" SNR?",          0  }, // query snr
     {"?",              0  }, // compat
 
-    //{" ",            1  }, // unused
-    //{" ",            2  }, // unused
+    {" DIT DIT",       1  }, // unused
+
+    {" NACK",          2  }, // negative acknowledge
 
     {" HEARING?",      3  }, // query station calls heard
 
@@ -104,7 +105,7 @@ QMap<QString, int> directed_cmds = {
 };
 
 // commands allowed to be processed
-QSet<int> allowed_cmds = {-1, 0, /*1,*/ /*2,*/ 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
+QSet<int> allowed_cmds = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
 
 // commands that result in an autoreply (which can be relayed)
 QSet<int> autoreply_cmds = {0, 3, 4, 6, 9, 10, 11, 12, 13, 16, 30};
@@ -129,17 +130,17 @@ QMap<int, int> checksum_cmds = {
 };
 
 QString callsign_pattern = QString("(?<callsign>[@]?[A-Z0-9/]+)");
-QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|MSG TO[:]|SNR[?]|INFO[?]|GRID[?]|STATUS[?]|QUERY MSGS[?]|HEARING[?]|(?:(?:STATUS|HEARING|QUERY CALL|QUERY MSGS|QUERY|CMD|MSG|ACK|73|YES|NO|SNR|QSL|RR|SK|FB|INFO|GRID)(?=[ ]|$))|[?> ]))?");
+QString optional_cmd_pattern = QString("(?<cmd>\\s?(?:AGN[?]|QSL[?]|HW CPY[?]|APRS[:]|MSG TO[:]|SNR[?]|INFO[?]|GRID[?]|STATUS[?]|QUERY MSGS[?]|HEARING[?]|(?:(?:STATUS|HEARING|QUERY CALL|QUERY MSGS|QUERY|CMD|MSG|NACK|ACK|73|YES|NO|SNR|QSL|RR|SK|FB|INFO|GRID|DIT DIT)(?=[ ]|$))|[?> ]))?");
 QString optional_grid_pattern = QString("(?<grid>\\s?[A-R]{2}[0-9]{2})?");
 QString optional_extended_grid_pattern = QString("^(?<grid>\\s?(?:[A-R]{2}[0-9]{2}(?:[A-X]{2}(?:[0-9]{2})?)*))?");
-QString optional_num_pattern = QString("(?<num>(?<=SNR|ACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");
+QString optional_num_pattern = QString("(?<num>(?<=SNR|\\bACK)\\s?[-+]?(?:3[01]|[0-2]?[0-9]))?");
 
 QRegularExpression directed_re("^"                    +
                                callsign_pattern       +
                                optional_cmd_pattern   +
                                optional_num_pattern);
 
-QRegularExpression heartbeat_re(R"(^\s*(?<type>CQCQCQ|CQ QRP|CQ FIELD|CQ DX|CQ CONTEST|CQ( CQ){0,2}|HB( AUTO)?( RELAY)?( SPOT)?)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
+QRegularExpression heartbeat_re(R"(^\s*(?<type>CQ CQ CQ|CQ DX|CQ QRP|CQ CONTEST|CQ FIELD|CQ FD|CQ CQ|CQ|HB( AUTO)?( RELAY)?( SPOT)?)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
 
 QRegularExpression compound_re("^\\s*[`]"              +
                                callsign_pattern        +
@@ -244,14 +245,14 @@ QMap<QString, quint32> basecalls = {
 };
 
 QMap<quint32, QString> cqs = {
-    { 0, "CQCQCQ" },
+    { 0, "CQ CQ CQ" },
     { 1, "CQ DX"  },
     { 2, "CQ QRP" },
     { 3, "CQ CONTEST" },
     { 4, "CQ FIELD" },
-    { 5, "CQ"},
+    { 5, "CQ FD"},
     { 6, "CQ CQ"},
-    { 7, "CQ CQ CQ"},
+    { 7, "CQ"},
 };
 
 QMap<quint32, QString> hbs = {
@@ -1545,8 +1546,8 @@ QStringList Varicode::unpackDirectedMessage(const QString &text, quint8 *pType){
     quint32 packed_to = Varicode::bitsToInt(bits.mid(31, 28));
     quint8 packed_cmd = Varicode::bitsToInt(bits.mid(59, 5));
 
-    bool portable_from = (extra >> 7) & 1 == 1;
-    bool portable_to = (extra >> 6) & 1 == 1;
+    bool portable_from = ((extra >> 7) & 1) == 1;
+    bool portable_to = ((extra >> 6) & 1) == 1;
     extra = extra % 64;
 
     QString from = Varicode::unpackCallsign(packed_from, portable_from);
@@ -1732,19 +1733,23 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
     QString const& mycall,
     QString const& mygrid,
     QString const& selectedCall,
-    QString const& text
+    QString const& text,
+    bool forceIdentify
 ){
     #define ALLOW_SEND_COMPOUND 1
     #define ALLOW_SEND_COMPOUND_DIRECTED 1
     #define AUTO_PREPEND_DIRECTED 1
     #define AUTO_REMOVE_MYCALL 1
     #define AUTO_PREPEND_DIRECTED_ALLOW_TEXT_CALLSIGNS 1
+    #define ALLOW_FORCE_IDENTIFY 1
 
     bool mycallCompound = Varicode::isCompoundCallsign(mycall);
 
-    QList<QPair<QString, int>> frames;
+    QList<QPair<QString, int>> allFrames;
 
     foreach(QString line, text.split(QRegExp("[\\r\\n]"), QString::SkipEmptyParts)){
+        QList<QPair<QString, int>> lineFrames;
+
         // once we find a directed call, data encode the rest of the line.
         bool hasDirected = false;
 
@@ -1823,6 +1828,13 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
               qDebug() << "directed message to field is compound" << dirTo;
           }
 
+#if ALLOW_FORCE_IDENTIFY
+          // if we're sending a data message, then ensure our callsign is included automatically
+          bool isLikelyDataFrame = lineFrames.isEmpty() && selectedCall.isEmpty() && dirTo.isEmpty() && l == 0 && o == 0;
+          if(forceIdentify && isLikelyDataFrame && !line.contains(mycall)){
+              line = QString("%1: %2").arg(mycall).arg(line);
+          }
+#endif
           int m = 0;
           QString datFrame = Varicode::packDataMessage(line, &m);
 
@@ -1856,13 +1868,13 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
           }
 
           if(useBcn){
-              frames.append({ frame, Varicode::JS8Call });
+              lineFrames.append({ frame, Varicode::JS8Call });
               line = line.mid(l);
           }
 
 #if ALLOW_SEND_COMPOUND
           if(useCmp){
-              frames.append({ frame, Varicode::JS8Call });
+              lineFrames.append({ frame, Varicode::JS8Call });
               line = line.mid(o);
           }
 #endif
@@ -1896,14 +1908,14 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
                   QString deCompoundMessage = QString("`%1 %2").arg(mycall).arg(mygrid);
                   QString deCompoundFrame = Varicode::packCompoundMessage(deCompoundMessage, nullptr);
                   if(!deCompoundFrame.isEmpty()){
-                      frames.append({ deCompoundFrame, Varicode::JS8Call });
+                      lineFrames.append({ deCompoundFrame, Varicode::JS8Call });
                   }
 
                   // Followed, by a standard OR compound directed message...
                   QString dirCompoundMessage = QString("`%1%2%3").arg(dirTo).arg(dirCmd).arg(dirNum);
                   QString dirCompoundFrame = Varicode::packCompoundMessage(dirCompoundMessage, nullptr);
                   if(!dirCompoundFrame.isEmpty()){
-                      frames.append({ dirCompoundFrame, Varicode::JS8Call });
+                      lineFrames.append({ dirCompoundFrame, Varicode::JS8Call });
                   }
                   shouldUseStandardFrame = false;
               }
@@ -1911,7 +1923,7 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
 
               if(shouldUseStandardFrame) {
                   // otherwise, just send the standard directed frame
-                  frames.append({ frame, Varicode::JS8Call });
+                  lineFrames.append({ frame, Varicode::JS8Call });
               }
 
               line = line.mid(n);
@@ -1939,30 +1951,34 @@ QList<QPair<QString, int>> Varicode::buildMessageFrames(
           }
 
           if(useDat){
-              frames.append({ frame, Varicode::JS8Call });
+              lineFrames.append({ frame, Varicode::JS8Call });
               line = line.mid(m);
           }
         }
+
+        if(!lineFrames.isEmpty()){
+            lineFrames.first().second |= Varicode::JS8CallFirst;
+            lineFrames.last().second |= Varicode::JS8CallLast;
+        }
+
+        allFrames.append(lineFrames);
     }
 
-    if(!frames.isEmpty()){
-        frames.first().second |= Varicode::JS8CallFirst;
-        frames.last().second |= Varicode::JS8CallLast;
-    }
-
-    return frames;
+    return allFrames;
 }
 
-BuildMessageFramesThread::BuildMessageFramesThread(
-    const QString &mycall,
+BuildMessageFramesThread::BuildMessageFramesThread(const QString &mycall,
     const QString &mygrid,
     const QString &selectedCall,
-    const QString &text, QObject *parent):
+    const QString &text,
+    bool forceIdentify,
+    QObject *parent):
     QThread(parent),
     m_mycall{mycall},
     m_mygrid{mygrid},
     m_selectedCall{selectedCall},
-    m_text{text}
+    m_text{text},
+    m_forceIdentify{forceIdentify}
 {
 }
 
@@ -1971,7 +1987,8 @@ void BuildMessageFramesThread::run(){
         m_mycall,
         m_mygrid,
         m_selectedCall,
-        m_text
+        m_text,
+        m_forceIdentify
     );
 
     // TODO: jsherer - we wouldn't normally use decodedtext.h here... but it's useful for computing the actual frames transmitted.

varicode.h

@@ -156,12 +156,11 @@ public:
     static QString packDataMessage(QString const& text, int *n);
     static QString unpackDataMessage(QString const& text);
 
-    static QList<QPair<QString, int>> buildMessageFrames(
-        QString const& mycall,
+    static QList<QPair<QString, int>> buildMessageFrames(QString const& mycall,
         QString const& mygrid,
         QString const& selectedCall,
-        QString const& text
-    );
+        QString const& text,
+        bool forceIdentify);
 };
 
 
@@ -173,6 +172,7 @@ public:
                              QString const& mygrid,
                              QString const& selectedCall,
                              QString const& text,
+                             bool forceIdentify,
                              QObject *parent=nullptr);
     void run() override;
 signals:
@@ -183,6 +183,7 @@ private:
     QString m_mygrid;
     QString m_selectedCall;
     QString m_text;
+    bool m_forceIdentify;
 };
 
 #endif // VARICODE_H

widegraph.ui

@@ -209,6 +209,9 @@
         </item>
         <item>
          <widget class="QCheckBox" name="cbRef">
+          <property name="visible">
+            <bool>false</bool>
+          </property>
           <property name="toolTip">
            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Compute and save a reference spectrum.  (Not yet fully implemented.)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>