Merge branch 'Jalview-JS/develop' into merge_js_develop

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

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index b354acb..26c37d0 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -1444,20 +1444,23 @@ public class GPreferences extends JPanel
     viewerLabel.setBounds(new Rectangle(10, ypos, 200, height));
     structureTab.add(viewerLabel);
 
-    structViewer.setFont(LABEL_FONT);
-    structViewer.setBounds(new Rectangle(160, ypos, 120, height));
-    structViewer.addItem(ViewerType.JMOL.name());
-    structViewer.addItem(ViewerType.CHIMERA.name());
-    structViewer.addActionListener(new ActionListener()
+    if (!Platform.isJS())
     {
-      @Override
-      public void actionPerformed(ActionEvent e)
+      structViewer.setFont(LABEL_FONT);
+      structViewer.setBounds(new Rectangle(160, ypos, 120, height));
+      structViewer.addItem(ViewerType.JMOL.name());
+      structViewer.addItem(ViewerType.CHIMERA.name());
+      structViewer.addActionListener(new ActionListener()
       {
-        structureViewer_actionPerformed(
-                (String) structViewer.getSelectedItem());
-      }
-    });
-    structureTab.add(structViewer);
+        @Override
+        public void actionPerformed(ActionEvent e)
+        {
+          structureViewer_actionPerformed(
+                  (String) structViewer.getSelectedItem());
+        }
+      });
+      structureTab.add(structViewer);
+    }
 
     ypos += lineSpacing;
     JLabel pathLabel = new JLabel();
@@ -1520,14 +1523,14 @@ public class GPreferences extends JPanel
     /*
      * hide Chimera options in JalviewJS
      */
-    if (Platform.isJS()) 
+    if (Platform.isJS())
     {
       pathLabel.setVisible(false);
       chimeraPath.setVisible(false);
       viewerLabel.setVisible(false);
       structViewer.setVisible(false);
     }
-    
+
     return structureTab;
   }
 
@@ -2405,7 +2408,7 @@ public class GPreferences extends JPanel
     boolean ret = false;
     String warningMessage = MessageManager
             .getString("label.warning_confirm_change_reverse");
-    int confirm = JvOptionPane.showConfirmDialog(Desktop.desktop,
+    int confirm = JvOptionPane.showConfirmDialog(Desktop.getDesktopPane(),
             warningMessage,
             MessageManager.getString("label.change_increment_decrement"),
             JvOptionPane.YES_NO_OPTION, JvOptionPane.WARNING_MESSAGE);