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-1683 replace year/version strings with tokens in source
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
a7f3e95
..
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.
*/
@@
-131,14
+138,17
@@
public class GDesktop extends JFrame
*/
private void jbInit() throws Exception
{
*/
private void jbInit() throws Exception
{
-
+
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");
- VamsasMenu.setToolTipText(MessageManager.getString("label.share_data_vamsas_applications"));
+ VamsasMenu.setToolTipText(MessageManager
+ .getString("label.share_data_vamsas_applications"));
VamsasStMenu.setText(MessageManager.getString("label.connect_to"));
VamsasStMenu.setText(MessageManager.getString("label.connect_to"));
- VamsasStMenu.setToolTipText(MessageManager.getString("label.join_existing_vamsas_session"));
- inputLocalFileMenuItem.setText(MessageManager.getString("label.load_tree_from_file"));
+ VamsasStMenu.setToolTipText(MessageManager
+ .getString("label.join_existing_vamsas_session"));
+ inputLocalFileMenuItem.setText(MessageManager
+ .getString("label.load_tree_from_file"));
inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke
.getKeyStroke(java.awt.event.KeyEvent.VK_O, Toolkit
.getDefaultToolkit().getMenuShortcutKeyMask(), false));
inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke
.getKeyStroke(java.awt.event.KeyEvent.VK_O, Toolkit
.getDefaultToolkit().getMenuShortcutKeyMask(), false));
@@
-158,7
+168,8
@@
public class GDesktop extends JFrame
inputURLMenuItem_actionPerformed(null);
}
});
inputURLMenuItem_actionPerformed(null);
}
});
- inputTextboxMenuItem.setText(MessageManager.getString("label.from_textbox"));
+ inputTextboxMenuItem.setText(MessageManager
+ .getString("label.from_textbox"));
inputTextboxMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
inputTextboxMenuItem
.addActionListener(new java.awt.event.ActionListener()
{
@@
-183,7
+194,8
@@
public class GDesktop extends JFrame
aboutMenuItem_actionPerformed(e);
}
});
aboutMenuItem_actionPerformed(e);
}
});
- documentationMenuItem.setText(MessageManager.getString("label.documentation"));
+ documentationMenuItem.setText(MessageManager
+ .getString("label.documentation"));
documentationMenuItem.setAccelerator(javax.swing.KeyStroke
.getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0, false));
documentationMenuItem
documentationMenuItem.setAccelerator(javax.swing.KeyStroke
.getKeyStroke(java.awt.event.KeyEvent.VK_F1, 0, false));
documentationMenuItem
@@
-196,7
+208,8
@@
public class GDesktop extends JFrame
});
this.getContentPane().setLayout(flowLayout1);
windowMenu.setText(MessageManager.getString("label.window"));
});
this.getContentPane().setLayout(flowLayout1);
windowMenu.setText(MessageManager.getString("label.window"));
- preferences.setText(MessageManager.getString("label.preferences") + "...");
+ preferences.setText(MessageManager.getString("label.preferences")
+ + "...");
preferences.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
preferences.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-222,7
+235,8
@@
public class GDesktop extends JFrame
}
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
}
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
- vamsasStart.setText(MessageManager.getString("label.new_vamsas_session") + "...");
+ vamsasStart.setText(MessageManager
+ .getString("label.new_vamsas_session") + "...");
vamsasStart.setVisible(false);
vamsasStart.addActionListener(new ActionListener()
{
vamsasStart.setVisible(false);
vamsasStart.addActionListener(new ActionListener()
{
@@
-231,7
+245,8
@@
public class GDesktop extends JFrame
vamsasStart_actionPerformed(e);
}
});
vamsasStart_actionPerformed(e);
}
});
- vamsasImport.setText(MessageManager.getString("label.load_vamsas_session") + "...");
+ vamsasImport.setText(MessageManager
+ .getString("label.load_vamsas_session") + "...");
vamsasImport.setVisible(false);
vamsasImport.addActionListener(new ActionListener()
{
vamsasImport.setVisible(false);
vamsasImport.addActionListener(new ActionListener()
{
@@
-240,7
+255,8
@@
public class GDesktop extends JFrame
vamsasImport_actionPerformed(e);
}
});
vamsasImport_actionPerformed(e);
}
});
- vamsasSave.setText(MessageManager.getString("label.save_vamsas_session") + "...");
+ vamsasSave.setText(MessageManager
+ .getString("label.save_vamsas_session") + "...");
vamsasSave.setVisible(false);
vamsasSave.addActionListener(new ActionListener()
{
vamsasSave.setVisible(false);
vamsasSave.addActionListener(new ActionListener()
{
@@
-249,7
+265,8
@@
public class GDesktop extends JFrame
vamsasSave_actionPerformed(e);
}
});
vamsasSave_actionPerformed(e);
}
});
- inputSequence.setText(MessageManager.getString("label.fetch_sequences") + "...");
+ inputSequence.setText(MessageManager.getString("label.fetch_sequences")
+ + "...");
inputSequence.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
inputSequence.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-257,7
+274,8
@@
public class GDesktop extends JFrame
inputSequence_actionPerformed(e);
}
});
inputSequence_actionPerformed(e);
}
});
- vamsasStop.setText(MessageManager.getString("label.stop_vamsas_session"));
+ vamsasStop.setText(MessageManager
+ .getString("label.stop_vamsas_session"));
vamsasStop.setVisible(false);
vamsasStop.addActionListener(new ActionListener()
{
vamsasStop.setVisible(false);
vamsasStop.addActionListener(new ActionListener()
{
@@
-274,7
+292,8
@@
public class GDesktop extends JFrame
closeAll_actionPerformed(e);
}
});
closeAll_actionPerformed(e);
}
});
- raiseRelated.setText(MessageManager.getString("action.raise_associated_windows"));
+ raiseRelated.setText(MessageManager
+ .getString("action.raise_associated_windows"));
raiseRelated.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
raiseRelated.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-282,7
+301,8
@@
public class GDesktop extends JFrame
raiseRelated_actionPerformed(e);
}
});
raiseRelated_actionPerformed(e);
}
});
- minimizeAssociated.setText(MessageManager.getString("action.minimize_associated_windows"));
+ minimizeAssociated.setText(MessageManager
+ .getString("action.minimize_associated_windows"));
minimizeAssociated.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
minimizeAssociated.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-290,7
+310,8
@@
public class GDesktop extends JFrame
minimizeAssociated_actionPerformed(e);
}
});
minimizeAssociated_actionPerformed(e);
}
});
- garbageCollect.setText(MessageManager.getString("label.collect_garbage"));
+ garbageCollect.setText(MessageManager
+ .getString("label.collect_garbage"));
garbageCollect.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
garbageCollect.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-298,7
+319,8
@@
public class GDesktop extends JFrame
garbageCollect_actionPerformed(e);
}
});
garbageCollect_actionPerformed(e);
}
});
- showMemusage.setText(MessageManager.getString("label.show_memory_usage"));
+ showMemusage.setText(MessageManager
+ .getString("label.show_memory_usage"));
showMemusage.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
showMemusage.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-306,7
+328,8
@@
public class GDesktop extends JFrame
showMemusage_actionPerformed(e);
}
});
showMemusage_actionPerformed(e);
}
});
- showConsole.setText(MessageManager.getString("label.show_java_console"));
+ showConsole
+ .setText(MessageManager.getString("label.show_java_console"));
showConsole.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
showConsole.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-322,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);
@@
-348,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);
@@
-358,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