From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 20 Aug 2018 09:57:09 +0000 (+0100)
Subject: JAL-3084 force EPS output to "Text" for JalviewJS
X-Git-Tag: Release_2_11_4_0~45^2~18^2~481^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=58951a21cd7f706e1438c10efb2f6ae406325fcc;p=jalview.git

JAL-3084 force EPS output to "Text" for JalviewJS
---

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 6271ba9..92dde1f 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -551,8 +551,12 @@ public class Preferences extends GPreferences
     comboBox.addItem(promptEachTimeOpt);
     comboBox.addItem(lineArtOpt);
     comboBox.addItem(textOpt);
-    String defaultOption = Cache.getDefault(propertyKey,
-            "Prompt each time");
+    
+    /*
+     * JalviewJS doesn't support Lineart so force it to Text
+     */
+    String defaultOption = Jalview.isJS() ? "Text"
+            : Cache.getDefault(propertyKey, "Prompt each time");
     if (defaultOption.equalsIgnoreCase("Text"))
     {
       comboBox.setSelectedItem(textOpt);
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 351a030..9fc0398 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -516,12 +516,12 @@ public class GPreferences extends JPanel
     outputTab.add(modellerOutput);
     if (!Jalview.isJS())
     {
+      /*
+       * JalviewJS doesn't support Lineart option or SVG output
+       */
       outputTab.add(embbedBioJSON);
-    }
-    outputTab.add(epsLabel);
-    outputTab.add(epsRendering);
-    if (!Jalview.isJS())
-    {
+      outputTab.add(epsLabel);
+      outputTab.add(epsRendering);
       outputTab.add(htmlLabel);
       outputTab.add(htmlRendering);
       outputTab.add(svgLabel);