X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=03538ef458f324e261f18891c22fb8586c2ba3a4;hb=51909770452369f94b4a0070482ab0acdd96fada;hp=2c6eb324cb56e185a769e273e8df1a6ea30ae6c1;hpb=2d9d76a0d2350007aa5cdac2a7720ca2a37cfcfe;p=jalview.git

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 2c6eb32..03538ef 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -39,6 +39,7 @@ import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 
 import javax.swing.AbstractCellEditor;
@@ -77,6 +78,7 @@ import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.bin.MemorySetting;
 import jalview.fts.core.FTSDataColumnPreferences;
 import jalview.fts.core.FTSDataColumnPreferences.PreferenceSource;
@@ -179,8 +181,6 @@ public class GPreferences extends JPanel
 
   protected JCheckBox structFromPdb = new JCheckBox();
 
-  protected JCheckBox useRnaView = new JCheckBox();
-
   protected JCheckBox addSecondaryStructure = new JCheckBox();
 
   protected JCheckBox addTempFactor = new JCheckBox();
@@ -270,8 +270,6 @@ public class GPreferences extends JPanel
 
   protected JPasswordField proxyAuthPasswordPB = new JPasswordField();
 
-  protected JTextField defaultBrowser = new JTextField();
-
   protected ButtonGroup proxyType = new ButtonGroup();
 
   protected JRadioButton noProxy = new JRadioButton();
@@ -541,9 +539,12 @@ public class GPreferences extends JPanel
     }
   }
 
-  public final static int CONNECTIONS_TAB = 5;
+  public static enum TabRef
+  {
+    CONNECTIONS_TAB, STRUCTURE_TAB
+  };
 
-  public void selectTab(int selectTab)
+  public void selectTab(TabRef selectTab)
   {
     // select a given tab - currently only for Connections
     switch (selectTab)
@@ -551,6 +552,9 @@ public class GPreferences extends JPanel
     case CONNECTIONS_TAB:
       tabbedPane.setSelectedComponent(connectTab);
       break;
+    case STRUCTURE_TAB:
+      tabbedPane.setSelectedComponent(structureTab);
+      break;
     default:
     }
   }
@@ -735,44 +739,9 @@ public class GPreferences extends JPanel
     connectTab = new JPanel();
     connectTab.setLayout(new GridBagLayout());
 
-    // Label for browser text box
-    JLabel browserLabel = new JLabel();
-    browserLabel.setFont(LABEL_FONT);
-    browserLabel.setHorizontalAlignment(SwingConstants.TRAILING);
-    browserLabel.setText(
-            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
-      public void mouseClicked(MouseEvent e)
-      {
-        if (e.getClickCount() > 1)
-        {
-          defaultBrowser_mouseClicked(e);
-        }
-      }
-    });
-
     JPanel proxyPanel = initConnTabProxyPanel();
     initConnTabCheckboxes();
 
-    // Add default Browser text box
-    connectTab.add(browserLabel,
-            new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                    GridBagConstraints.WEST, GridBagConstraints.NONE,
-                    new Insets(10, 0, 5, 5), 5, 1));
-    defaultBrowser.setFont(LABEL_FONT);
-    defaultBrowser.setText("");
-
-    connectTab.add(defaultBrowser, new GridBagConstraints(1, 0, 1, 1, 1.0,
-            0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
-            new Insets(10, 0, 5, 10), 30, 1));
-
     // Add proxy server panel
     connectTab.add(proxyPanel, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0,
             GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
@@ -1677,7 +1646,6 @@ public class GPreferences extends JPanel
       {
         boolean selected = structFromPdb.isSelected();
         // enable other options only when the first is checked
-        useRnaView.setEnabled(selected);
         addSecondaryStructure.setEnabled(selected);
         addTempFactor.setEnabled(selected);
       }
@@ -1686,12 +1654,6 @@ public class GPreferences extends JPanel
 
     // indent checkboxes that are conditional on the first one
     ypos += lineSpacing;
-    useRnaView.setFont(LABEL_FONT);
-    useRnaView.setText(MessageManager.getString("label.use_rnaview"));
-    useRnaView.setBounds(new Rectangle(25, ypos, width, height));
-    structureTab.add(useRnaView);
-
-    ypos += lineSpacing;
     addSecondaryStructure.setFont(LABEL_FONT);
     addSecondaryStructure
             .setText(MessageManager.getString("label.autoadd_secstr"));
@@ -1718,10 +1680,16 @@ public class GPreferences extends JPanel
      */
     structViewer.setFont(LABEL_FONT);
     structViewer.setBounds(new Rectangle(190, ypos, 120, height));
+    for (ViewerType v : EnumSet.allOf(ViewerType.class))
+    {
+      structViewer.addItem(v.name());
+    }
+    /*
     structViewer.addItem(ViewerType.JMOL.name());
     structViewer.addItem(ViewerType.CHIMERA.name());
     structViewer.addItem(ViewerType.CHIMERAX.name());
     structViewer.addItem(ViewerType.PYMOL.name());
+    */
     structViewer.addActionListener(new ActionListener()
     {
       @Override
@@ -2796,7 +2764,7 @@ public class GPreferences extends JPanel
     }
     else
     {
-      Cache.log.error(
+      Console.error(
               "Preset '" + value + "' [key:" + key + "] not implemented");
     }
 
@@ -2816,7 +2784,7 @@ public class GPreferences extends JPanel
               .getSelectedItem();
     } catch (Exception ex)
     {
-      Cache.log.error(
+      Console.error(
               "Problem casting Combo entry to IntKeyStringValueEntry.");
       e = null;
     }
@@ -2834,7 +2802,7 @@ public class GPreferences extends JPanel
         e = (IntKeyStringValueEntry) backupfilesPresetsCombo2.getItemAt(i);
       } catch (Exception ex)
       {
-        Cache.log.error(
+        Console.error(
                 "Problem casting Combo entry to IntKeyStringValueEntry. Skipping item. ");
         continue;
       }
@@ -3282,7 +3250,7 @@ public class GPreferences extends JPanel
         i = ((Integer) s.getValue()).intValue();
       } catch (Exception e)
       {
-        Cache.log.error(
+        Console.error(
                 "Exception casting the initial value of s.getValue()");
       }
     }
@@ -3318,7 +3286,7 @@ public class GPreferences extends JPanel
       i = (Integer) s.getValue();
     } catch (Exception e)
     {
-      Cache.log.error("Failed casting (Integer) JSpinner s.getValue()");
+      Console.error("Failed casting (Integer) JSpinner s.getValue()");
     }
     return i;
   }
@@ -3537,11 +3505,6 @@ public class GPreferences extends JPanel
 
   }
 
-  public void defaultBrowser_mouseClicked(MouseEvent e)
-  {
-
-  }
-
   public void linkURLList_keyTyped(KeyEvent e)
   {