From 58951a21cd7f706e1438c10efb2f6ae406325fcc Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 20 Aug 2018 10:57:09 +0100 Subject: [PATCH] JAL-3084 force EPS output to "Text" for JalviewJS --- src/jalview/gui/Preferences.java | 8 ++++++-- src/jalview/jbgui/GPreferences.java | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) 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); -- 1.7.10.2