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-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
5768509
..
ac2202c
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-23,14
+23,17
@@
package jalview.jbgui;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.util.MessageManager;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.util.MessageManager;
+import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.ButtonGroup;
import javax.swing.JInternalFrame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.ButtonGroup;
import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
public abstract class GStructureViewer extends JInternalFrame implements
import javax.swing.JRadioButtonMenuItem;
public abstract class GStructureViewer extends JInternalFrame implements
@@
-48,6
+51,8
@@
public abstract class GStructureViewer extends JInternalFrame implements
protected JMenuItem alignStructs = new JMenuItem();
protected JMenuItem alignStructs = new JMenuItem();
+ protected JMenuItem fitToWindow = new JMenuItem();
+
protected JRadioButtonMenuItem seqColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem chainColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem seqColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem chainColour = new JRadioButtonMenuItem();
@@
-76,6
+81,10
@@
public abstract class GStructureViewer extends JInternalFrame implements
protected JMenuItem helpItem = new JMenuItem();
protected JMenuItem helpItem = new JMenuItem();
+ protected JLabel statusBar = new JLabel();
+
+ protected JPanel statusPanel = new JPanel();
+
/**
* Constructor
*/
/**
* Constructor
*/
@@
-141,14
+150,24
@@
public abstract class GStructureViewer extends JInternalFrame implements
}
});
viewMenu.setText(MessageManager.getString("action.view"));
}
});
viewMenu.setText(MessageManager.getString("action.view"));
+
chainMenu.setText(MessageManager.getString("action.show_chain"));
chainMenu.setText(MessageManager.getString("action.show_chain"));
+ fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
+ fitToWindow.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent actionEvent)
+ {
+ fitToWindow_actionPerformed();
+ }
+ });
+
JMenu colourMenu = new JMenu();
colourMenu.setText(MessageManager.getString("label.colours"));
JMenuItem backGround = new JMenuItem();
JMenu colourMenu = new JMenu();
colourMenu.setText(MessageManager.getString("label.colours"));
JMenuItem backGround = new JMenuItem();
- backGround.setText(MessageManager.getString("label.background_colour")
- + "...");
+ backGround
+ .setText(MessageManager.getString("action.background_colour"));
backGround.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent actionEvent)
backGround.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent actionEvent)
@@
-329,11
+348,20
@@
public abstract class GStructureViewer extends JInternalFrame implements
colourButtons.add(strandColour);
colourButtons.add(turnColour);
colourButtons.add(buriedColour);
colourButtons.add(strandColour);
colourButtons.add(turnColour);
colourButtons.add(buriedColour);
+ colourButtons.add(purinePyrimidineColour);
colourButtons.add(userColour);
colourButtons.add(viewerColour);
helpMenu.add(helpItem);
viewerActionMenu.add(alignStructs);
colourButtons.add(userColour);
colourButtons.add(viewerColour);
helpMenu.add(helpItem);
viewerActionMenu.add(alignStructs);
+
+ statusPanel.setLayout(new GridLayout());
+ this.getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
+ statusPanel.add(statusBar, null);
+ }
+
+ protected void fitToWindow_actionPerformed()
+ {
}
protected void viewerColour_actionPerformed(ActionEvent actionEvent)
}
protected void viewerColour_actionPerformed(ActionEvent actionEvent)