Merge branch 'releases/Release_2_10_4_Branch'

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index f8fd47b..26e0919 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -183,8 +183,6 @@ public class GPreferences extends JPanel
   /*
    * Overview tab components
    */
-  protected JPanel overviewTab;
-
   protected JPanel gapColour = new JPanel();
 
   protected JPanel hiddenColour = new JPanel();
@@ -526,7 +524,9 @@ public class GPreferences extends JPanel
             MessageManager.getString("label.default_browser_unix"));
     defaultBrowser.setFont(LABEL_FONT);
     defaultBrowser.setText("");
-
+    final String tooltip = JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.double_click_to_browse"));
+    defaultBrowser.setToolTipText(tooltip);
     defaultBrowser.addMouseListener(new MouseAdapter()
     {
       @Override
@@ -1023,18 +1023,22 @@ public class GPreferences extends JPanel
             MessageManager.getString("label.ov_legacy_gap"));
     useLegacyGap.setFont(LABEL_FONT);
     useLegacyGap.setHorizontalAlignment(SwingConstants.LEFT);
+    useLegacyGap.setVerticalTextPosition(SwingConstants.TOP);
     gapLabel = new JLabel(
             MessageManager.getString("label.gap_colour"));
     gapLabel.setFont(LABEL_FONT);
     gapLabel.setHorizontalAlignment(SwingConstants.LEFT);
+    gapLabel.setVerticalTextPosition(SwingConstants.TOP);
     showHiddenAtStart = new JCheckBox(
             MessageManager.getString("label.ov_show_hide_default"));
     showHiddenAtStart.setFont(LABEL_FONT);
     showHiddenAtStart.setHorizontalAlignment(SwingConstants.LEFT);
+    showHiddenAtStart.setVerticalTextPosition(SwingConstants.TOP);
     JLabel hiddenLabel = new JLabel(
             MessageManager.getString("label.hidden_colour"));
     hiddenLabel.setFont(LABEL_FONT);
     hiddenLabel.setHorizontalAlignment(SwingConstants.LEFT);
+    hiddenLabel.setVerticalTextPosition(SwingConstants.TOP);
 
     useLegacyGap.addActionListener(new ActionListener()
     {
@@ -1091,10 +1095,30 @@ public class GPreferences extends JPanel
     c6.insets = new Insets(0, 0, 0, 15);
     overviewPanel.add(hiddenColour, c6);
 
+    JButton resetButton = new JButton(
+            MessageManager.getString("label.reset_to_defaults"));
+
+    resetButton.addActionListener(new ActionListener()
+    {
+      @Override
+      public void actionPerformed(ActionEvent e)
+      {
+        resetOvDefaults_actionPerformed(e);
+      }
+    });
+
+    GridBagConstraints c7 = new GridBagConstraints();
+    c7.fill = GridBagConstraints.NONE;
+    c7.gridx = 0;
+    c7.gridy = 2;
+    c7.insets = new Insets(10, 0, 0, 0);
+    c7.anchor = GridBagConstraints.WEST;
+    overviewPanel.add(resetButton, c7);
+
     // Add padding so the panel doesn't look ridiculous
     JPanel spacePanel = new JPanel();
     overviewPanel.add(spacePanel,
-            new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0,
+            new GridBagConstraints(0, 3, 1, 1, 1.0, 1.0,
                     GridBagConstraints.WEST, GridBagConstraints.BOTH,
                     new Insets(0, 0, 0, 5), 0, 0));
 
@@ -1184,14 +1208,14 @@ public class GPreferences extends JPanel
     pathLabel.setFont(new java.awt.Font("SansSerif", 0, 11));
     pathLabel.setHorizontalAlignment(SwingConstants.LEFT);
     pathLabel.setText(MessageManager.getString("label.chimera_path"));
-    final String tooltip = JvSwingUtils.wrapTooltip(true,
-            MessageManager.getString("label.chimera_path_tip"));
-    pathLabel.setToolTipText(tooltip);
     pathLabel.setBounds(new Rectangle(10, ypos, 140, height));
     structureTab.add(pathLabel);
 
     chimeraPath.setFont(LABEL_FONT);
     chimeraPath.setText("");
+    final String tooltip = JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.chimera_path_tip"));
+    chimeraPath.setToolTipText(tooltip);
     chimeraPath.setBounds(new Rectangle(160, ypos, 300, height));
     chimeraPath.addMouseListener(new MouseAdapter()
     {
@@ -1490,6 +1514,9 @@ public class GPreferences extends JPanel
     startupCheckbox.setSelected(true);
     startupFileTextfield.setFont(LABEL_FONT);
     startupFileTextfield.setBounds(new Rectangle(172, 310, 330, 20));
+    final String tooltip = JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.double_click_to_browse"));
+    startupFileTextfield.setToolTipText(tooltip);
     startupFileTextfield.addMouseListener(new MouseAdapter()
     {
       @Override
@@ -1649,13 +1676,10 @@ public class GPreferences extends JPanel
 
   protected void useLegacyGaps_actionPerformed(ActionEvent e)
   {
-    boolean enabled = useLegacyGap.isSelected();
-    if (enabled)
-    {
-      gapColour.setBackground(Color.WHITE);
-    }
-    gapColour.setEnabled(!enabled);
-    gapLabel.setEnabled(!enabled);
+  }
+
+  protected void resetOvDefaults_actionPerformed(ActionEvent e)
+  {
   }
 
   /**