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
JAL-3032 use small example Ensembl gene for JalviewJS
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
e66214f
..
315c2f7
100755
(executable)
--- a/
src/jalview/jbgui/GDesktop.java
+++ b/
src/jalview/jbgui/GDesktop.java
@@
-21,7
+21,6
@@
package jalview.jbgui;
import jalview.api.AlignmentViewPanel;
package jalview.jbgui;
import jalview.api.AlignmentViewPanel;
-import jalview.bin.Jalview;
import jalview.io.FileFormatException;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.io.FileFormatException;
import jalview.util.MessageManager;
import jalview.util.Platform;
@@
-43,6
+42,7
@@
import javax.swing.JMenuItem;
* @author $author$
* @version $Revision$
*/
* @author $author$
* @version $Revision$
*/
+@SuppressWarnings("serial")
public class GDesktop extends JFrame
{
public class GDesktop extends JFrame
{
@@
-94,6
+94,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();
@@
-143,11
+145,13
@@
public class GDesktop extends JFrame
e.printStackTrace();
}
e.printStackTrace();
}
- if (!Platform.isAMac())
+ if (Platform.allowMnemonics())
{
{
+ //BH was !Platform.isAMacAndNotJS()) i.e. "JS or not Mac"
+ // but here we want just not a Mac, period, right?
FileMenu.setMnemonic('F');
inputLocalFileMenuItem.setMnemonic('L');
FileMenu.setMnemonic('F');
inputLocalFileMenuItem.setMnemonic('L');
- VamsasMenu.setMnemonic('V');
+ VamsasMenu.setMnemonic('V');
inputURLMenuItem.setMnemonic('U');
inputTextboxMenuItem.setMnemonic('C');
quit.setMnemonic('Q');
inputURLMenuItem.setMnemonic('U');
inputTextboxMenuItem.setMnemonic('C');
quit.setMnemonic('Q');
@@
-165,7
+169,7
@@
public class GDesktop extends JFrame
*/
private void jbInit() throws Exception
{
*/
private void jbInit() throws Exception
{
-
+ setName("jalview-desktop");
FileMenu.setText(MessageManager.getString("action.file"));
HelpMenu.setText(MessageManager.getString("action.help"));
VamsasMenu.setText("Vamsas");
FileMenu.setText(MessageManager.getString("action.file"));
HelpMenu.setText(MessageManager.getString("action.help"));
VamsasMenu.setText("Vamsas");
@@
-267,6
+271,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()
{
@@
-441,10
+454,11
@@
public class GDesktop extends JFrame
desktopMenubar.add(windowMenu);
FileMenu.add(inputMenu);
FileMenu.add(inputSequence);
desktopMenubar.add(windowMenu);
FileMenu.add(inputMenu);
FileMenu.add(inputSequence);
- FileMenu.addSeparator();
- FileMenu.add(saveState);
- FileMenu.add(loadState);
- FileMenu.addSeparator();
+ FileMenu.addSeparator();
+ FileMenu.add(saveState);
+ FileMenu.add(saveAsState);
+ FileMenu.add(loadState);
+ FileMenu.addSeparator();
FileMenu.add(quit);
HelpMenu.add(aboutMenuItem);
HelpMenu.add(documentationMenuItem);
FileMenu.add(quit);
HelpMenu.add(aboutMenuItem);
HelpMenu.add(documentationMenuItem);
@@
-455,12
+469,12
@@
public class GDesktop extends JFrame
VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
toolsMenu.add(preferences);
VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
toolsMenu.add(preferences);
- if (!Jalview.isJS())
+ if (!Platform.isJS())
{
toolsMenu.add(showMemusage);
toolsMenu.add(showConsole);
}
{
toolsMenu.add(showMemusage);
toolsMenu.add(showConsole);
}
- if (!Jalview.isJS())
+ if (!Platform.isJS())
{
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
{
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
@@
-585,7
+599,7
@@
public class GDesktop extends JFrame
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- public void SaveState_actionPerformed(ActionEvent e)
+ protected void preferences_actionPerformed(ActionEvent e)
{
}
{
}
@@
-595,18
+609,34
@@
public class GDesktop extends JFrame
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- protected void preferences_actionPerformed(ActionEvent e)
+ public void saveState_actionPerformed()
{
}
{
}
- public void saveState_actionPerformed()
+ public void saveAsState_actionPerformed(ActionEvent e)
{
}
{
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
public void loadState_actionPerformed()
{
}
public void loadState_actionPerformed()
{
}
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
+ public void loadJalviewAlign_actionPerformed(ActionEvent e)
+ {
+ }
+
public void vamsasStart_actionPerformed(ActionEvent e)
{
public void vamsasStart_actionPerformed(ActionEvent e)
{