JAL-629 Add --renderer arg/subval for vector output and fixed annotation renderer...

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index fe0aea1..35fdf6a 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -27,7 +27,6 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,7 +34,6 @@ import java.util.concurrent.CompletableFuture;
 
 import javax.help.HelpSetException;
 import javax.swing.JComboBox;
-import javax.swing.JFileChooser;
 import javax.swing.JInternalFrame;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
@@ -74,7 +72,6 @@ import jalview.urls.UrlLinkTableModel;
 import jalview.urls.api.UrlProviderFactoryI;
 import jalview.urls.api.UrlProviderI;
 import jalview.urls.desktop.DesktopUrlProviderFactory;
-import jalview.util.BrowserLauncher;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.util.UrlConstants;
@@ -191,7 +188,7 @@ public class Preferences extends GPreferences
 
   private OptionsParam promptEachTimeOpt = new OptionsParam(
           MessageManager.getString("label.prompt_each_time"),
-          "Prompt each time");
+          LineartOptions.PROMPT_EACH_TIME);
 
   private OptionsParam lineArtOpt = new OptionsParam(
           MessageManager.getString("label.lineart"), "Lineart");
@@ -252,6 +249,7 @@ public class Preferences extends GPreferences
   {
     super();
     frame = new JInternalFrame();
+    frame.setFrameIcon(null);
     frame.setContentPane(this);
     if (!Platform.isJS())
     /**
@@ -388,9 +386,9 @@ public class Preferences extends GPreferences
      * Set overview panel defaults
      */
     gapColour.setBackground(Cache.getDefaultColour(GAP_COLOUR,
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP));
+            OverviewCanvas.OVERVIEW_DEFAULT_GAP));
     hiddenColour.setBackground(Cache.getDefaultColour(HIDDEN_COLOUR,
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN));
+            OverviewCanvas.OVERVIEW_DEFAULT_HIDDEN));
     useLegacyGap.setSelected(Cache.getDefault(USE_LEGACY_GAP, false));
     gapLabel.setEnabled(!useLegacyGap.isSelected());
     gapColour.setEnabled(!useLegacyGap.isSelected());
@@ -641,12 +639,6 @@ public class Preferences extends GPreferences
     setCustomProxyEnabled();
     applyProxyButtonEnabled(false);
 
-    String browserPref = Cache.getDefault("DEFAULT_BROWSER", "");
-    if (browserPref != null)
-    {
-      defaultBrowser.getModel().setSelectedItem(browserPref);
-    }
-
     usagestats.setSelected(Cache.getDefault("USAGESTATS", false));
     // note antisense here: default is true
     questionnaire
@@ -893,10 +885,6 @@ public class Preferences extends GPreferences
      */
     // Proxy settings set first (to catch web services)
 
-    Cache.setOrRemove("DEFAULT_BROWSER",
-            (String) defaultBrowser.getSelectedItem());
-    BrowserLauncher.resetBrowser(true);
-
     // save user-defined and selected links
     String menuLinks = sequenceUrlLinks.writeUrlsAsString(true);
     if (menuLinks.isEmpty())
@@ -1261,31 +1249,6 @@ public class Preferences extends GPreferences
     ((UrlLinkTableModel) linkUrlTable.getModel()).removeRow(modelIndex);
   }
 
-  @Override
-  public void defaultBrowser_mouseClicked(MouseEvent e)
-  {
-    // TODO: JAL-3048 not needed for j2s
-    if (!Platform.isJS()) // BH 2019
-    /**
-     * Java only
-     * 
-     * @j2sIgnore
-     */
-    {
-      JFileChooser chooser = new JFileChooser(".");
-      chooser.setDialogTitle(
-              MessageManager.getString("label.select_default_browser"));
-
-      int value = chooser.showOpenDialog(this);
-
-      if (value == JFileChooser.APPROVE_OPTION)
-      {
-        defaultBrowser.getModel().setSelectedItem(
-                chooser.getSelectedFile().getAbsolutePath());
-      }
-    }
-  }
-
   /*
    * (non-Javadoc)
    * 
@@ -1344,13 +1307,11 @@ public class Preferences extends GPreferences
     boolean enabled = useLegacyGap.isSelected();
     if (enabled)
     {
-      gapColour.setBackground(
-              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_LEGACY_GAP);
+      gapColour.setBackground(OverviewCanvas.OVERVIEW_DEFAULT_LEGACY_GAP);
     }
     else
     {
-      gapColour.setBackground(
-              jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_GAP);
+      gapColour.setBackground(OverviewCanvas.OVERVIEW_DEFAULT_GAP);
     }
     gapColour.setEnabled(!enabled);
     gapLabel.setEnabled(!enabled);
@@ -1362,8 +1323,7 @@ public class Preferences extends GPreferences
     useLegacyGap.setSelected(false);
     useLegacyGaps_actionPerformed(null);
     showHiddenAtStart.setSelected(false);
-    hiddenColour.setBackground(
-            jalview.renderer.OverviewResColourFinder.OVERVIEW_DEFAULT_HIDDEN);
+    hiddenColour.setBackground(OverviewCanvas.OVERVIEW_DEFAULT_HIDDEN);
   }
 
   @Override