git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-3224_getdown_changed_to_unpack_tgz_resources
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
028378f
..
fe85043
100755
(executable)
--- a/
src/jalview/jbgui/GDesktop.java
+++ b/
src/jalview/jbgui/GDesktop.java
@@
-26,7
+26,6
@@
import jalview.util.MessageManager;
import jalview.util.Platform;
import java.awt.FlowLayout;
import jalview.util.Platform;
import java.awt.FlowLayout;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@
-76,6
+75,8
@@
public class GDesktop extends JFrame
JMenuItem saveState = new JMenuItem();
JMenuItem saveState = new JMenuItem();
+ JMenuItem saveAsState = new JMenuItem();
+
JMenuItem loadState = new JMenuItem();
JMenu inputMenu = new JMenu();
JMenuItem loadState = new JMenuItem();
JMenu inputMenu = new JMenu();
@@
-159,7
+160,7
@@
public class GDesktop extends JFrame
.setText(MessageManager.getString("label.load_tree_from_file"));
inputLocalFileMenuItem.setAccelerator(
javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O,
.setText(MessageManager.getString("label.load_tree_from_file"));
inputLocalFileMenuItem.setAccelerator(
javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O,
- Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(),
+ jalview.util.ShortcutKeyMaskExWrapper.getMenuShortcutKeyMaskEx(),
false));
inputLocalFileMenuItem
.addActionListener(new java.awt.event.ActionListener()
false));
inputLocalFileMenuItem
.addActionListener(new java.awt.event.ActionListener()
@@
-248,6
+249,15
@@
public class GDesktop extends JFrame
saveState_actionPerformed();
}
});
saveState_actionPerformed();
}
});
+ saveAsState.setText(MessageManager.getString("action.save_project_as"));
+ saveAsState.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ saveAsState_actionPerformed(e);
+ }
+ });
loadState.setText(MessageManager.getString("action.load_project"));
loadState.addActionListener(new ActionListener()
{
loadState.setText(MessageManager.getString("action.load_project"));
loadState.addActionListener(new ActionListener()
{
@@
-414,6
+424,8
@@
public class GDesktop extends JFrame
}
});
}
});
+ Float specversion = Float.parseFloat(System.getProperty("java.specification.version"));
+
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
@@
-424,6
+436,7
@@
public class GDesktop extends JFrame
FileMenu.add(inputSequence);
FileMenu.addSeparator();
FileMenu.add(saveState);
FileMenu.add(inputSequence);
FileMenu.addSeparator();
FileMenu.add(saveState);
+ FileMenu.add(saveAsState);
FileMenu.add(loadState);
FileMenu.addSeparator();
FileMenu.add(quit);
FileMenu.add(loadState);
FileMenu.addSeparator();
FileMenu.add(quit);
@@
-435,7
+448,10
@@
public class GDesktop extends JFrame
VamsasMenu.add(vamsasImport);
VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
VamsasMenu.add(vamsasImport);
VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
- toolsMenu.add(preferences);
+ if (!Platform.isAMac() || specversion < 11)
+ {
+ toolsMenu.add(preferences);
+ }
toolsMenu.add(showMemusage);
toolsMenu.add(showConsole);
toolsMenu.add(showNews);
toolsMenu.add(showMemusage);
toolsMenu.add(showConsole);
toolsMenu.add(showNews);
@@
-538,6
+554,7
@@
public class GDesktop extends JFrame
*/
protected void quit()
{
*/
protected void quit()
{
+ //System.out.println("********** GDesktop.quit()");
}
/**
}
/**
@@
-580,6
+597,16
@@
public class GDesktop extends JFrame
{
}
{
}
+ public void saveAsState_actionPerformed(ActionEvent e)
+ {
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
public void loadState_actionPerformed()
{
}
public void loadState_actionPerformed()
{
}