X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=e6efed6337959a2edf8090ecd4f60ce942646cb9;hb=5571d7868cad5493b52c9fc421c88c025e7c2d35;hp=5af94e42b7a11bdd4b3ab2d7fc4786bc64ffa17b;hpb=f7791271668cdcf6e87b638f0e6475ccdea6a3f9;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 5af94e4..e6efed6 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -510,9 +510,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) @@ -520,6 +523,9 @@ public class GPreferences extends JPanel case CONNECTIONS_TAB: tabbedPane.setSelectedComponent(connectTab); break; + case STRUCTURE_TAB: + tabbedPane.setSelectedComponent(structureTab); + break; default: } } @@ -1789,8 +1795,8 @@ public class GPreferences extends JPanel } /** - * Show a dialog for the user to choose a file. Returns the chosen path, or - * null on Cancel. + * Show a dialog for the user to choose a file. Returns the chosen path, or null + * on Cancel. * * @return */ @@ -1799,6 +1805,14 @@ public class GPreferences extends JPanel String choice = null; JFileChooser chooser = new JFileChooser(); + // Enable appBundleIsTraversable in macOS FileChooser to allow selecting + // hidden executables within .app dirs + if (Platform.isMac()) + { + chooser.putClientProperty("JFileChooser.appBundleIsTraversable", + true); + } + // chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle( MessageManager.getString("label.open_local_file")); @@ -3158,7 +3172,7 @@ public class GPreferences extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void ok_actionPerformed(ActionEvent e) { @@ -3168,7 +3182,7 @@ public class GPreferences extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void cancel_actionPerformed(ActionEvent e) { @@ -3178,7 +3192,7 @@ public class GPreferences extends JPanel * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void annotations_actionPerformed(ActionEvent e) {