Skip to content

Commit 7ebd77a

Browse files
VK2ETAVK2ETA
committed
Version jPskmail-3.3.0.1
- Added exchanges with the Home Assistant platform for accessing data and controlling of IOT devices. - Improved UTF-8 character set handling. - Added option to acknowledge receipt of messages using a dedicated RSID. Also indicates when a message has been received at the other end. Added dedicated password for IOT exchanges. Requires a change in Fldigi code, details supplied. - Added option to only show the RadioMsg tab - Bug Fix: ensure the reported GPS coordinates are always using a dot as the decimal separator. - Other minor improvements and bug fixes.
1 parent 356dbfd commit 7ebd77a

25 files changed

Lines changed: 4470 additions & 478 deletions

‎json-simple-4.0.2.jar‎

33.2 KB
Binary file not shown.

‎nbproject/project.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ application.splash=src/Images/logo.gif
22
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
33
file.reference.javax.activation-1.2.0.jar=javax.activation-1.2.0.jar
44
file.reference.javax.mail-1.6.2.jar=javax.mail-1.6.2.jar
5+
file.reference.json-simple-4.0.2.jar=json-simple-4.0.2.jar
56
file.reference.jsoup-1.15.3.jar=jsoup-1.15.3.jar
67
file.reference.libphonenumber-8.10.22.jar=libphonenumber-8.10.22.jar
7-
file.reference.org.eclipse.paho.mqttv5.client-1.2.5.jar=org.eclipse.paho.mqttv5.client-1.2.5.jar
88
file.reference.RXTXcomm.jar=RXTXcomm.jar
99
file.reference.ws-commons-util-1.0.2.jar=ws-commons-util-1.0.2.jar
1010
file.reference.xmlrpc-client-3.1.2.jar=xmlrpc-client-3.1.2.jar
@@ -84,7 +84,7 @@ javac.classpath=\
8484
${file.reference.javax.mail-1.6.2.jar}:\
8585
${file.reference.libphonenumber-8.10.22.jar}:\
8686
${libs.absolutelayout.classpath}:\
87-
${file.reference.org.eclipse.paho.mqttv5.client-1.2.5.jar}
87+
${file.reference.json-simple-4.0.2.jar}
8888
mkdist.disabled=false
8989
run.test.modulepath=\
9090
${javac.test.modulepath}

‎org.eclipse.paho.mqttv5.client-1.2.5.jar‎

-258 KB
Binary file not shown.

‎src/javapskmail/AboutForm.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<Font name="DejaVu Sans" size="12" style="0"/>
121121
</Property>
122122
<Property name="rows" type="int" value="5"/>
123-
<Property name="text" type="java.lang.String" value="Welcome to JPSKmail Server and Client application, &#xa;&#xa;Java PSKmail Server V3.0,0,0&#xa;&#xa;This is the cross-platforms Client and Server for PSKmail developed in java.&#xa;To find out more about PSKmail please visit http://pskmail.wikidot.com/.&#xa;&#xa;(c) Copyright 2018-2021 John Douyere (VK2ETA), based &#xa;on jPskmail client 1.7 by P&#xe4;r Crusefalk and Rein Couperus&#xa;&#xa;Distributed under the GNU General Public License version 3 or later.&#xa;This is free software: you are free to change and redistribute it.&#xa;There is NO WARRANTY, to the extent permitted by law.&#xa;"/>
123+
<Property name="text" type="java.lang.String" value="Welcome to JPSKmail Server and Client application, &#xa;&#xa;Java PSKmail Server V3.3.x.x&#xa;&#xa;This is the cross-platforms Client and Server for PSKmail developed in java.&#xa;To find out more about PSKmail please visit http://pskmail.wikidot.com/.&#xa;&#xa;(c) Copyright 2018-2021 John Douyere (VK2ETA), based &#xa;on jPskmail client 1.7 by P&#xe4;r Crusefalk and Rein Couperus&#xa;&#xa;Distributed under the GNU General Public License version 3 or later.&#xa;This is free software: you are free to change and redistribute it.&#xa;There is NO WARRANTY, to the extent permitted by law.&#xa;"/>
124124
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
125125
<Dimension value="[1024, 768]"/>
126126
</Property>

‎src/javapskmail/AboutForm.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
7777
jTextArea1.setColumns(20);
7878
jTextArea1.setFont(new java.awt.Font("DejaVu Sans", 0, 12)); // NOI18N
7979
jTextArea1.setRows(5);
80-
jTextArea1.setText("Welcome to JPSKmail Server and Client application, \n\nJava PSKmail Server V3.0,0,0\n\nThis is the cross-platforms Client and Server for PSKmail developed in java.\nTo find out more about PSKmail please visit http://pskmail.wikidot.com/.\n\n(c) Copyright 2018-2021 John Douyere (VK2ETA), based \non jPskmail client 1.7 by Pär Crusefalk and Rein Couperus\n\nDistributed under the GNU General Public License version 3 or later.\nThis is free software: you are free to change and redistribute it.\nThere is NO WARRANTY, to the extent permitted by law.\n");
80+
jTextArea1.setText("Welcome to JPSKmail Server and Client application, \n\nJava PSKmail Server V3.3.x.x\n\nThis is the cross-platforms Client and Server for PSKmail developed in java.\nTo find out more about PSKmail please visit http://pskmail.wikidot.com/.\n\n(c) Copyright 2018-2021 John Douyere (VK2ETA), based \non jPskmail client 1.7 by Pär Crusefalk and Rein Couperus\n\nDistributed under the GNU General Public License version 3 or later.\nThis is free software: you are free to change and redistribute it.\nThere is NO WARRANTY, to the extent permitted by law.\n");
8181
jTextArea1.setMaximumSize(new java.awt.Dimension(1024, 768));
8282
jTextArea1.setMinimumSize(new java.awt.Dimension(450, 100));
8383
jTextArea1.setPreferredSize(new java.awt.Dimension(450, 150));

‎src/javapskmail/AddressBook.form‎

Lines changed: 133 additions & 59 deletions
Large diffs are not rendered by default.

‎src/javapskmail/AddressBook.java‎

Lines changed: 111 additions & 59 deletions
Large diffs are not rendered by default.

‎src/javapskmail/AddressEdit.form‎

Lines changed: 83 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,25 @@
2727
<DimensionLayout dim="0">
2828
<Group type="103" groupAlignment="0" attributes="0">
2929
<Group type="102" attributes="0">
30-
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
31-
<Component id="pMain" min="-2" max="-2" attributes="0"/>
32-
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
33-
<Component id="RMsgPanel" min="-2" max="-2" attributes="0"/>
30+
<Group type="103" groupAlignment="0" attributes="0">
31+
<Group type="102" attributes="0">
32+
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
33+
<Component id="pMain" min="-2" max="-2" attributes="0"/>
34+
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
35+
<Component id="RMsgPanel" min="-2" max="-2" attributes="0"/>
36+
</Group>
37+
<Component id="pBottom" min="-2" pref="496" max="-2" attributes="0"/>
38+
</Group>
39+
<EmptySpace max="32767" attributes="0"/>
3440
</Group>
35-
<Component id="pBottom" min="-2" pref="496" max="-2" attributes="0"/>
3641
</Group>
3742
</DimensionLayout>
3843
<DimensionLayout dim="1">
3944
<Group type="103" groupAlignment="0" attributes="0">
4045
<Group type="102" attributes="0">
4146
<Group type="103" groupAlignment="0" attributes="0">
4247
<Group type="102" attributes="0">
43-
<EmptySpace min="-2" pref="50" max="-2" attributes="0"/>
48+
<EmptySpace min="-2" pref="55" max="-2" attributes="0"/>
4449
<Component id="pMain" min="-2" max="-2" attributes="0"/>
4550
</Group>
4651
<Group type="102" alignment="0" attributes="0">
@@ -106,7 +111,7 @@
106111
</Property>
107112
<Property name="name" type="java.lang.String" value="" noResource="true"/>
108113
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
109-
<Dimension value="[463, 250]"/>
114+
<Dimension value="[443, 250]"/>
110115
</Property>
111116
</Properties>
112117

@@ -446,7 +451,7 @@
446451
</Property>
447452
<Property name="name" type="java.lang.String" value="" noResource="true"/>
448453
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
449-
<Dimension value="[140, 250]"/>
454+
<Dimension value="[180, 250]"/>
450455
</Property>
451456
</Properties>
452457

@@ -455,71 +460,77 @@
455460
<Group type="103" groupAlignment="0" attributes="0">
456461
<Group type="102" attributes="0">
457462
<Group type="103" groupAlignment="0" attributes="0">
458-
<Group type="102" attributes="0">
463+
<Group type="102" alignment="0" attributes="0">
459464
<Group type="103" groupAlignment="0" attributes="0">
460-
<Component id="checkToCallsign" alignment="0" min="-2" max="-2" attributes="0"/>
461-
<Component id="checkVia" alignment="0" min="-2" pref="21" max="-2" attributes="0"/>
465+
<Component id="checkToMobile" alignment="0" min="-2" pref="20" max="-2" attributes="0"/>
466+
<Component id="checkToEmail" alignment="0" min="-2" pref="20" max="-2" attributes="0"/>
462467
</Group>
463-
<EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
464-
<Group type="103" groupAlignment="0" attributes="0">
465-
<Component id="passwordLabel" max="32767" attributes="0"/>
466-
<Component id="textPassword" max="32767" attributes="0"/>
468+
<EmptySpace max="-2" attributes="0"/>
469+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
470+
<Group type="102" attributes="0">
471+
<EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
472+
<Component id="jLabel10" min="-2" pref="101" max="-2" attributes="0"/>
473+
</Group>
474+
<Component id="textMobileAlias" alignment="0" min="-2" pref="107" max="-2" attributes="0"/>
475+
<Component id="textEmailAlias" max="32767" attributes="0"/>
467476
</Group>
477+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
468478
</Group>
469-
<Group type="102" attributes="0">
479+
<Group type="102" alignment="0" attributes="0">
480+
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
470481
<Group type="103" groupAlignment="0" attributes="0">
471-
<Group type="102" alignment="0" attributes="0">
472-
<EmptySpace min="-2" pref="21" max="-2" attributes="0"/>
473-
<Group type="103" groupAlignment="1" attributes="0">
482+
<Component id="checkVia" alignment="0" min="-2" pref="21" max="-2" attributes="0"/>
483+
<Component id="checkToCallsign" alignment="0" min="-2" max="-2" attributes="0"/>
484+
</Group>
485+
<EmptySpace max="-2" attributes="0"/>
486+
<Group type="103" groupAlignment="0" attributes="0">
487+
<Component id="passwordLabel" max="32767" attributes="0"/>
488+
<Group type="102" attributes="0">
489+
<Group type="103" groupAlignment="0" attributes="0">
474490
<Component id="showInViaLabel" min="-2" max="-2" attributes="0"/>
475-
<Component id="showInToLabel" min="-2" max="-2" attributes="0"/>
491+
<Component id="showInToLabel" alignment="0" min="-2" max="-2" attributes="0"/>
476492
</Group>
493+
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
477494
</Group>
478-
<Group type="102" alignment="0" attributes="0">
479-
<Group type="103" groupAlignment="0" attributes="0">
480-
<Component id="checkToMobile" alignment="0" min="-2" pref="20" max="-2" attributes="0"/>
481-
<Component id="checkToEmail" alignment="0" min="-2" pref="20" max="-2" attributes="0"/>
482-
</Group>
483-
<EmptySpace max="-2" attributes="0"/>
484-
<Group type="103" groupAlignment="0" attributes="0">
485-
<Group type="103" groupAlignment="1" attributes="0">
486-
<Component id="jLabel10" min="-2" pref="101" max="-2" attributes="0"/>
487-
<Component id="textEmailAlias" min="-2" pref="107" max="-2" attributes="0"/>
488-
</Group>
489-
<Component id="textMobileAlias" alignment="0" min="-2" pref="107" max="-2" attributes="0"/>
490-
</Group>
495+
<Component id="textRelayingPassword" alignment="0" max="32767" attributes="0"/>
496+
<Component id="textIotPassword" alignment="0" max="32767" attributes="0"/>
497+
<Group type="102" attributes="0">
498+
<EmptySpace min="12" pref="12" max="-2" attributes="0"/>
499+
<Component id="passwordLabel1" max="32767" attributes="0"/>
491500
</Group>
492501
</Group>
493-
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
494502
</Group>
495503
</Group>
496-
<EmptySpace min="-2" pref="1" max="-2" attributes="0"/>
504+
<EmptySpace min="1" pref="1" max="-2" attributes="0"/>
497505
</Group>
498506
</Group>
499507
</DimensionLayout>
500508
<DimensionLayout dim="1">
501509
<Group type="103" groupAlignment="0" attributes="0">
502510
<Group type="102" alignment="0" attributes="0">
503511
<Component id="showInViaLabel" min="-2" max="-2" attributes="0"/>
504-
<Group type="103" groupAlignment="0" attributes="0">
512+
<EmptySpace max="-2" attributes="0"/>
513+
<Component id="passwordLabel" min="-2" max="-2" attributes="0"/>
514+
<EmptySpace max="-2" attributes="0"/>
515+
<Group type="103" groupAlignment="1" attributes="0">
505516
<Group type="102" attributes="0">
506-
<EmptySpace min="-2" pref="31" max="-2" attributes="0"/>
507-
<Component id="checkVia" min="-2" max="-2" attributes="0"/>
517+
<Component id="textRelayingPassword" min="-2" pref="28" max="-2" attributes="0"/>
508518
<EmptySpace max="-2" attributes="0"/>
509-
<Component id="checkToCallsign" min="-2" pref="19" max="-2" attributes="0"/>
519+
<Component id="passwordLabel1" min="-2" max="-2" attributes="0"/>
510520
</Group>
511-
<Group type="102" alignment="1" attributes="0">
512-
<EmptySpace max="-2" attributes="0"/>
513-
<Component id="passwordLabel" min="-2" max="-2" attributes="0"/>
521+
<Group type="102" attributes="0">
522+
<Component id="checkVia" min="-2" max="-2" attributes="0"/>
514523
<EmptySpace max="-2" attributes="0"/>
515-
<Component id="textPassword" min="-2" pref="28" max="-2" attributes="0"/>
524+
<Component id="checkToCallsign" min="-2" pref="19" max="-2" attributes="0"/>
516525
</Group>
517526
</Group>
518-
<EmptySpace type="separate" max="-2" attributes="0"/>
527+
<EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
528+
<Component id="textIotPassword" min="-2" pref="28" max="-2" attributes="0"/>
529+
<EmptySpace max="32767" attributes="0"/>
519530
<Component id="showInToLabel" min="-2" max="-2" attributes="0"/>
520-
<EmptySpace pref="22" max="32767" attributes="0"/>
521-
<Component id="jLabel10" min="-2" max="-2" attributes="0"/>
522531
<EmptySpace max="-2" attributes="0"/>
532+
<Component id="jLabel10" min="-2" max="-2" attributes="0"/>
533+
<EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
523534
<Group type="103" groupAlignment="1" attributes="0">
524535
<Group type="102" attributes="0">
525536
<Component id="textEmailAlias" min="-2" pref="28" max="-2" attributes="0"/>
@@ -653,14 +664,14 @@
653664
<Component class="javax.swing.JLabel" name="passwordLabel">
654665
<Properties>
655666
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
656-
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressEdit.passwordLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
667+
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressBook.passwordLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
657668
</Property>
658669
</Properties>
659670
</Component>
660-
<Component class="javax.swing.JTextField" name="textPassword">
671+
<Component class="javax.swing.JTextField" name="textRelayingPassword">
661672
<Properties>
662673
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
663-
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressEdit.textPassword.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
674+
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressEdit.textRelayingPassword.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
664675
</Property>
665676
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
666677
<Dimension value="[90, 28]"/>
@@ -680,6 +691,29 @@
680691
</Property>
681692
</Properties>
682693
</Component>
694+
<Component class="javax.swing.JLabel" name="passwordLabel1">
695+
<Properties>
696+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
697+
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressBook.IotpasswordLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
698+
</Property>
699+
</Properties>
700+
</Component>
701+
<Component class="javax.swing.JTextField" name="textIotPassword">
702+
<Properties>
703+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
704+
<ResourceString bundle="javapskmail/Bundle.properties" key="AddressEdit.textIotPassword.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
705+
</Property>
706+
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
707+
<Dimension value="[90, 28]"/>
708+
</Property>
709+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
710+
<Dimension value="[90, 28]"/>
711+
</Property>
712+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
713+
<Dimension value="[90, 28]"/>
714+
</Property>
715+
</Properties>
716+
</Component>
683717
</SubComponents>
684718
</Container>
685719
</SubComponents>

0 commit comments

Comments
 (0)