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-2089 release notes and new known defects
[jalview.git]
/
src
/
jalview
/
jbgui
/
GDesktop.java
diff --git
a/src/jalview/jbgui/GDesktop.java
b/src/jalview/jbgui/GDesktop.java
index
97ec9fe
..
d22fd88
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.
*
@@
-20,6
+20,7
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
+import jalview.api.AlignmentViewPanel;
import jalview.util.MessageManager;
import java.awt.FlowLayout;
import jalview.util.MessageManager;
import java.awt.FlowLayout;
@@
-74,7
+75,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();
@@
-100,8
+101,9
@@
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();
protected JMenuItem snapShotWindow = new JMenuItem();
+
/**
* Creates a new GDesktop object.
*/
/**
* Creates a new GDesktop object.
*/
@@
-208,8
+210,7
@@
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)
@@
-236,7
+237,7
@@
public class GDesktop extends JFrame
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
vamsasStart.setText(MessageManager
});
inputMenu.setText(MessageManager.getString("label.input_alignment"));
vamsasStart.setText(MessageManager
- .getString("label.new_vamsas_session") + "...");
+ .getString("label.new_vamsas_session"));
vamsasStart.setVisible(false);
vamsasStart.addActionListener(new ActionListener()
{
vamsasStart.setVisible(false);
vamsasStart.addActionListener(new ActionListener()
{
@@
-246,7
+247,7
@@
public class GDesktop extends JFrame
}
});
vamsasImport.setText(MessageManager
}
});
vamsasImport.setText(MessageManager
- .getString("label.load_vamsas_session") + "...");
+ .getString("action.load_vamsas_session"));
vamsasImport.setVisible(false);
vamsasImport.addActionListener(new ActionListener()
{
vamsasImport.setVisible(false);
vamsasImport.addActionListener(new ActionListener()
{
@@
-256,7
+257,7
@@
public class GDesktop extends JFrame
}
});
vamsasSave.setText(MessageManager
}
});
vamsasSave.setText(MessageManager
- .getString("label.save_vamsas_session") + "...");
+ .getString("action.save_vamsas_session"));
vamsasSave.setVisible(false);
vamsasSave.addActionListener(new ActionListener()
{
vamsasSave.setVisible(false);
vamsasSave.addActionListener(new ActionListener()
{
@@
-265,8
+266,8
@@
public class GDesktop extends JFrame
vamsasSave_actionPerformed(e);
}
});
vamsasSave_actionPerformed(e);
}
});
- inputSequence.setText(MessageManager.getString("label.fetch_sequences")
- + "...");
+ inputSequence.setText(MessageManager
+ .getString("action.fetch_sequences"));
inputSequence.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
inputSequence.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-353,7
+354,7
@@
public class GDesktop extends JFrame
snapShotWindow_actionPerformed(e);
}
});
snapShotWindow_actionPerformed(e);
}
});
-
+
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
desktopMenubar.add(FileMenu);
desktopMenubar.add(toolsMenu);
VamsasMenu.setVisible(false);
@@
-394,7
+395,7
@@
public class GDesktop extends JFrame
protected void snapShotWindow_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
protected void snapShotWindow_actionPerformed(ActionEvent e)
{
// TODO Auto-generated method stub
-
+
}
protected void showConsole_actionPerformed(ActionEvent e)
}
protected void showConsole_actionPerformed(ActionEvent e)
@@
-457,8
+458,7
@@
public class GDesktop extends JFrame
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- protected void inputTextboxMenuItem_actionPerformed(
- jalview.gui.AlignViewport av)
+ protected void inputTextboxMenuItem_actionPerformed(AlignmentViewPanel avp)
{
}
{
}