reconciled with applet

[jalview.git] / src / jalview / jbgui / GPreferences.java

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 6de3888..a59d62f 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -180,6 +180,8 @@ public class GPreferences extends JPanel
 
   protected JComboBox<String> structViewer = new JComboBox<>();
 
+  protected JTextField structureDimensions = new JTextField();
+
   protected JTextField chimeraPath = new JTextField();
 
   protected ButtonGroup mappingMethod = new ButtonGroup();
@@ -1289,6 +1291,7 @@ public class GPreferences extends JPanel
     structViewer.addItem(ViewerType.JMOL.name());
     structViewer.addItem(ViewerType.CHIMERA.name());
     structViewer.addActionListener(new ActionListener()
+
     {
       @Override
       public void actionPerformed(ActionEvent e)
@@ -1299,6 +1302,20 @@ public class GPreferences extends JPanel
     });
     structureTab.add(structViewer);
 
+    // BH 2019.07.12
+    ypos += lineSpacing;
+    JLabel dimLabel = new JLabel();
+    dimLabel.setFont(new java.awt.Font("SansSerif", 0, 11));
+    dimLabel.setHorizontalAlignment(SwingConstants.LEFT);
+    dimLabel.setText(
+            MessageManager.getString("label.structure_dimensions"));
+    dimLabel.setBounds(new Rectangle(10, ypos, 140, height));
+    structureTab.add(dimLabel);
+
+    structureDimensions.setFont(LABEL_FONT);
+    structureDimensions.setBounds(new Rectangle(160, ypos, 120, height));
+    structureTab.add(structureDimensions);
+
     ypos += lineSpacing;
     JLabel pathLabel = new JLabel();
     pathLabel.setFont(new java.awt.Font("SansSerif", 0, 11));
@@ -1603,11 +1620,17 @@ public class GPreferences extends JPanel
     fontLabel.setHorizontalAlignment(SwingConstants.RIGHT);
     fontLabel.setText(MessageManager.getString("label.font"));
     fontSizeCB.setFont(LABEL_FONT);
-    fontSizeCB.setBounds(new Rectangle(320, 112, 65, 23));
+    fontSizeCB.setBounds(new Rectangle(320, 115, 65, 23)); // BH 2019.09.24 y
+                                                           // added 3 pixels for
+                                                           // Java/Windows
     fontStyleCB.setFont(LABEL_FONT);
-    fontStyleCB.setBounds(new Rectangle(382, 112, 80, 23));
+    fontStyleCB.setBounds(new Rectangle(382, 115, 80, 23)); // BH 2019.09.24 y
+                                                            // added 3 pixels
+                                                            // for Java/Windows
     fontNameCB.setFont(LABEL_FONT);
-    fontNameCB.setBounds(new Rectangle(172, 112, 147, 23));
+    fontNameCB.setBounds(new Rectangle(172, 115, 147, 23)); // BH 2019.09.24 y
+                                                            // added 3 pixels
+                                                            // for Java/Windows
     gapSymbolCB.setFont(LABEL_FONT);
     gapSymbolCB.setBounds(new Rectangle(172, 215, 69, 23));
     DefaultListCellRenderer dlcr = new DefaultListCellRenderer();
@@ -1652,7 +1675,18 @@ public class GPreferences extends JPanel
     sortAutocalc.setBounds(new Rectangle(290, 285, 165, 21));
 
     JPanel annsettingsPanel = new JPanel();
-    annsettingsPanel.setBounds(new Rectangle(173, 13, 320, 96));
+    annsettingsPanel.setBounds(new Rectangle(173, 13, 330, 100)); // BH
+                                                                 // 2019.09.24
+                                                                 // SwingJS
+                                                                 // needs a few
+                                                                  // more
+                                                                  // pixels.
+                                                                  // Java needs
+                                                                  // a bit more
+                                                                  // in height
+                                                                  // on Windows
+                                                                  // OS
+                                                                 // Was 320, 96
     annsettingsPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
     annsettingsPanel.setBorder(new EtchedBorder());
     visualTab.add(annsettingsPanel);
@@ -2056,12 +2090,12 @@ public class GPreferences extends JPanel
       backupsSetOptions(
               BackupFilesPresetEntry.backupfilesPresetEntriesValues
                       .get(key));
-    }
-    else
-    {
+      }
+      else
+      {
       Cache.log.error(
               "Preset '" + value + "' [key:" + key + "] not implemented");
-    }
+      }
 
     // Custom options will now be enabled when the customiseCheckbox is checked
     // (performed above)
@@ -2078,7 +2112,7 @@ public class GPreferences extends JPanel
       e = (IntKeyStringValueEntry) backupfilesPresetsCombo2
               .getSelectedItem();
     } catch (Exception ex)
-    {
+  {
       Cache.log.error(
               "Problem casting Combo entry to IntKeyStringValueEntry.");
       e = null;
@@ -2097,7 +2131,7 @@ public class GPreferences extends JPanel
       {
         e = (IntKeyStringValueEntry) backupfilesPresetsCombo2.getItemAt(i);
       } catch (Exception ex)
-      {
+    {
         Cache.log.error(
                 "Problem casting Combo entry to IntKeyStringValueEntry. Skipping item. ");
         continue;
@@ -2256,7 +2290,7 @@ public class GPreferences extends JPanel
     boolean ret = false;
     String warningMessage = MessageManager
             .getString("label.warning_confirm_change_reverse");
-    int confirm = JvOptionPane.showConfirmDialog(Desktop.desktop,
+    int confirm = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
             warningMessage,
             MessageManager.getString("label.change_increment_decrement"),
             JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE);