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 'features/JAL-1759jmolUpdate' into develop
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
0b9d779
..
7bb688c
100755
(executable)
--- a/
src/jalview/jbgui/GDesktop.java
+++ b/
src/jalview/jbgui/GDesktop.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-22,10
+22,16
@@
package jalview.jbgui;
import jalview.util.MessageManager;
import jalview.util.MessageManager;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
-import javax.swing.*;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-68,7
+74,7
@@
public class GDesktop extends JFrame
JMenuItem saveState = new JMenuItem();
JMenuItem loadState = new JMenuItem();
JMenuItem saveState = new JMenuItem();
JMenuItem loadState = new JMenuItem();
-
+
JMenu inputMenu = new JMenu();
protected JMenuItem vamsasStart = new JMenuItem();
JMenu inputMenu = new JMenu();
protected JMenuItem vamsasStart = new JMenuItem();
@@
-94,7
+100,8
@@
public class GDesktop extends JFrame
protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem();
protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
-
+
+ protected JMenuItem snapShotWindow = new JMenuItem();
/**
* Creates a new GDesktop object.
*/
/**
* Creates a new GDesktop object.
*/
@@
-338,6
+345,15
@@
public class GDesktop extends JFrame
showNews_actionPerformed(e);
}
});
showNews_actionPerformed(e);
}
});
+ snapShotWindow.setText(MessageManager.getString("label.take_snapshot"));
+ snapShotWindow.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ snapShotWindow_actionPerformed(e);
+ }
+ });
+
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
@@
-364,6
+380,7
@@
public class GDesktop extends JFrame
toolsMenu.add(showConsole);
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
toolsMenu.add(showConsole);
toolsMenu.add(showNews);
toolsMenu.add(garbageCollect);
+ // toolsMenu.add(snapShotWindow);
inputMenu.add(inputLocalFileMenuItem);
inputMenu.add(inputURLMenuItem);
inputMenu.add(inputTextboxMenuItem);
inputMenu.add(inputLocalFileMenuItem);
inputMenu.add(inputURLMenuItem);
inputMenu.add(inputTextboxMenuItem);
@@
-374,6
+391,12
@@
public class GDesktop extends JFrame
// inputMenu.add(vamsasLoad);
}
// inputMenu.add(vamsasLoad);
}
+ protected void snapShotWindow_actionPerformed(ActionEvent e)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
protected void showConsole_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
protected void showConsole_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub