Skip to content

Commit 624b542

Browse files
VK2ETAVK2ETA
committed
Version jPskmail-3.1.8.6 Cave version
 - Added option in preferences to show a simplified UI with only the RadioMsg tab and the relevant drop-down menus - Fixed deprecated declarations
1 parent bed80b1 commit 624b542

8 files changed

Lines changed: 134 additions & 45 deletions

File tree

‎src/javapskmail/MainPskmailUi.form‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@
10231023
</AuxValues>
10241024
<Constraints>
10251025
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1026-
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.4"/>
1026+
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
10271027
</Constraint>
10281028
</Constraints>
10291029

‎src/javapskmail/MainPskmailUi.java‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,11 @@ public MainPskmailUi() {
171171
initComponents();
172172
//Preset default visibilities
173173
resetAllMenus();
174+
//Preset requested visibilities
175+
String uiOption = Main.configuration.getPreference("UIOPTION", "Default");
176+
if (uiOption.equals("RadioMsg")) {
177+
setRadioMsgUi();
178+
}
174179
//ButtonGroup RB = new ButtonGroup();
175180
//myarq = new arq();
176181
//String path = Main.HomePath + Main.Dirprefix;
@@ -1558,6 +1563,30 @@ public void resetAllMenus() {
15581563
jMenu1.setVisible(false);
15591564
PrefSaveMenu.setVisible(false);
15601565
}
1566+
1567+
//Hides the non RadioMsg relevant UI components
1568+
private void setRadioMsgUi() {
1569+
mnuMbox2.setVisible(false);
1570+
jMenu1.setVisible(false);
1571+
mnuIACcodes.setVisible(false);
1572+
mnuLink.setVisible(false);
1573+
mnuFqHelp.setVisible(false);
1574+
mnuMailAPRS2.setVisible(false);
1575+
mnuMailScanning.setVisible(false);
1576+
mnuMonitor.setVisible(false);
1577+
mnuModeQSY2.setVisible(false);
1578+
mnuConnection.setVisible(false);
1579+
mnuClear2.setVisible(false);
1580+
mnuFileList.setVisible(false);
1581+
jRadioButtonAccept.setVisible(false);
1582+
jRadioButtonReject.setVisible(false);
1583+
jRadioButtonDelete.setVisible(false);
1584+
for (int i = 0; i < 7; i++) {
1585+
tabMain.removeTabAt(0);
1586+
}
1587+
//Remove modem text
1588+
jScrollPane3.setVisible(false);
1589+
}
15611590

15621591
public void disableMonitor() {
15631592
if (Main.monitorMode) {
@@ -3423,10 +3452,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
34233452

34243453
tabMain.addTab(mainpskmailui.getString("MainPskmailUi.tabRadioMsg.TabConstraints.tabTitle"), tabRadioMsg); // NOI18N
34253454

3426-
gridBagConstraints = new java.awt.GridBagConstraints();
3427-
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
3428-
gridBagConstraints.weighty = 1.4;
3429-
getContentPane().add(tabMain, gridBagConstraints);
3455+
getContentPane().add(tabMain, new java.awt.GridBagConstraints());
34303456
tabMain.setEnabledAt(7, true);
34313457

34323458
pnlStatus.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));

‎src/javapskmail/NmeaParser.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,15 @@ private void digest(){
230230
private String ConvertLatitude(String inlat, String hemi){
231231
Double mydouble; // Work with this
232232
Double result; // Put the finished one here
233-
String myLatitude="";
233+
String myLatitude="0.0";
234234

235235
try {
236236
// Get the degrees
237-
result = new Double(inlat.substring(0, 2)).doubleValue();
237+
//Deprecated result = new Double(inlat.substring(0, 2)).doubleValue();
238+
result = Double.parseDouble(inlat.substring(0, 2));
238239
// Get only the minutes
239-
mydouble = new Double(inlat.substring(2)).doubleValue();
240+
//Deprecated mydouble = new Double(inlat.substring(2)).doubleValue();
241+
mydouble = Double.parseDouble(inlat.substring(2));
240242
// Convert to decimal fraction of degrees
241243
mydouble = mydouble / 60;
242244
// Put it back together
@@ -267,13 +269,15 @@ private String ConvertLatitude(String inlat, String hemi){
267269
private String ConvertLongitude(String inlon, String hemi){
268270
Double mydouble; // Work with this
269271
Double result; // Put the finished one here
270-
String myLongitude="";
272+
String myLongitude="0.0";
271273

272274
try {
273275
// Get the degrees
274-
result = new Double(inlon.substring(0, 3)).doubleValue();
276+
//Deprecated result = new Double(inlon.substring(0, 3)).doubleValue();
277+
result = Double.parseDouble(inlon.substring(0, 3));
275278
// Get only the minutes
276-
mydouble = new Double(inlon.substring(3)).doubleValue();
279+
//Deprecated mydouble = new Double(inlon.substring(3)).doubleValue();
280+
mydouble = Double.parseDouble(inlon.substring(3));
277281
// Convert to decimal fraction of degrees
278282
mydouble = mydouble / 60;
279283
// Put it back together

‎src/javapskmail/OptionsDialog.form‎

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@
14821482
</Properties>
14831483
<Constraints>
14841484
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1485-
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1485+
<GridBagConstraints gridX="-1" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
14861486
</Constraint>
14871487
</Constraints>
14881488
</Component>
@@ -1501,7 +1501,7 @@
15011501
</Events>
15021502
<Constraints>
15031503
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1504-
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
1504+
<GridBagConstraints gridX="-1" gridY="1" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
15051505
</Constraint>
15061506
</Constraints>
15071507
</Component>
@@ -1513,7 +1513,7 @@
15131513
</Properties>
15141514
<Constraints>
15151515
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1516-
<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1516+
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
15171517
</Constraint>
15181518
</Constraints>
15191519
</Component>
@@ -1525,7 +1525,7 @@
15251525
</Properties>
15261526
<Constraints>
15271527
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1528-
<GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1528+
<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
15291529
</Constraint>
15301530
</Constraints>
15311531
</Component>
@@ -1537,7 +1537,7 @@
15371537
</Properties>
15381538
<Constraints>
15391539
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1540-
<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1540+
<GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
15411541
</Constraint>
15421542
</Constraints>
15431543
</Component>
@@ -1550,7 +1550,7 @@
15501550
</Properties>
15511551
<Constraints>
15521552
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1553-
<GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1553+
<GridBagConstraints gridX="0" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
15541554
</Constraint>
15551555
</Constraints>
15561556
</Component>
@@ -1571,7 +1571,7 @@
15711571
</AuxValues>
15721572
<Constraints>
15731573
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1574-
<GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1574+
<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
15751575
</Constraint>
15761576
</Constraints>
15771577
</Component>
@@ -1596,7 +1596,7 @@
15961596
</AuxValues>
15971597
<Constraints>
15981598
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1599-
<GridBagConstraints gridX="1" gridY="2" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1599+
<GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
16001600
</Constraint>
16011601
</Constraints>
16021602
</Component>
@@ -1623,7 +1623,7 @@
16231623
</AuxValues>
16241624
<Constraints>
16251625
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1626-
<GridBagConstraints gridX="1" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1626+
<GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
16271627
</Constraint>
16281628
</Constraints>
16291629
</Component>
@@ -1635,7 +1635,7 @@
16351635
</Properties>
16361636
<Constraints>
16371637
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1638-
<GridBagConstraints gridX="2" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="5" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1638+
<GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="5" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
16391639
</Constraint>
16401640
</Constraints>
16411641
</Component>
@@ -1654,7 +1654,7 @@
16541654
</AuxValues>
16551655
<Constraints>
16561656
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1657-
<GridBagConstraints gridX="1" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1657+
<GridBagConstraints gridX="1" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
16581658
</Constraint>
16591659
</Constraints>
16601660
</Component>
@@ -1680,7 +1680,7 @@
16801680
</AuxValues>
16811681
<Constraints>
16821682
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1683-
<GridBagConstraints gridX="3" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1683+
<GridBagConstraints gridX="3" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
16841684
</Constraint>
16851685
</Constraints>
16861686
</Component>
@@ -1705,7 +1705,7 @@
17051705
</AuxValues>
17061706
<Constraints>
17071707
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1708-
<GridBagConstraints gridX="3" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
1708+
<GridBagConstraints gridX="3" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
17091709
</Constraint>
17101710
</Constraints>
17111711
</Component>
@@ -1717,7 +1717,7 @@
17171717
</Properties>
17181718
<Constraints>
17191719
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1720-
<GridBagConstraints gridX="2" gridY="4" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1720+
<GridBagConstraints gridX="2" gridY="5" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
17211721
</Constraint>
17221722
</Constraints>
17231723
</Component>
@@ -1761,6 +1761,36 @@
17611761
</Constraint>
17621762
</Constraints>
17631763
</Component>
1764+
<Component class="javax.swing.JLabel" name="jLabel8">
1765+
<Properties>
1766+
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
1767+
<ResourceString bundle="javapskmail/optionsdialog.properties" key="USER INTERFACE" replaceFormat="optionsdialog.getString(&quot;{key}&quot;)"/>
1768+
</Property>
1769+
</Properties>
1770+
<Constraints>
1771+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1772+
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="10" insetsRight="5" anchor="13" weightX="0.0" weightY="0.0"/>
1773+
</Constraint>
1774+
</Constraints>
1775+
</Component>
1776+
<Component class="javax.swing.JSpinner" name="spinUiOption">
1777+
<Properties>
1778+
<Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor">
1779+
<SpinnerModel type="list">
1780+
<ListItem value="Default"/>
1781+
<ListItem value="RadioMsg"/>
1782+
</SpinnerModel>
1783+
</Property>
1784+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
1785+
<Dimension value="[90, 25]"/>
1786+
</Property>
1787+
</Properties>
1788+
<Constraints>
1789+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
1790+
<GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="10" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
1791+
</Constraint>
1792+
</Constraints>
1793+
</Component>
17641794
</SubComponents>
17651795
</Container>
17661796
<Container class="javax.swing.JPanel" name="pnlGPS">

0 commit comments

Comments
 (0)