X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPCAPanel.java;h=122ad0f77bb32b7ee1496ad39a14a06a3abe9981;hb=3c8a25936a2d805e7e3d7ab82f83b13135406d18;hp=6ad36e85a7aa732fd90388ff6bda429dd459e9b4;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git
diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index 6ad36e8..122ad0f 100755
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -1,72 +1,72 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.jbgui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComboBox;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
public class GPCAPanel extends JInternalFrame
{
- JPanel jPanel2 = new JPanel();
-
- JLabel jLabel1 = new JLabel();
-
- JLabel jLabel2 = new JLabel();
-
- JLabel jLabel3 = new JLabel();
-
- protected JComboBox xCombobox = new JComboBox();
-
- protected JComboBox yCombobox = new JComboBox();
-
- protected JComboBox zCombobox = new JComboBox();
-
- FlowLayout flowLayout1 = new FlowLayout();
-
- BorderLayout borderLayout1 = new BorderLayout();
-
- JMenuBar jMenuBar1 = new JMenuBar();
-
- JMenu fileMenu = new JMenu();
+ private static final Font VERDANA_12 = new Font("Verdana", 0, 12);
- JMenu saveMenu = new JMenu();
+ protected JComboBox xCombobox = new JComboBox<>();
- JMenuItem eps = new JMenuItem();
+ protected JComboBox yCombobox = new JComboBox<>();
- JMenuItem png = new JMenuItem();
-
- JMenuItem print = new JMenuItem();
-
- JMenuItem outputValues = new JMenuItem();
+ protected JComboBox zCombobox = new JComboBox<>();
protected JMenu viewMenu = new JMenu();
protected JCheckBoxMenuItem showLabels = new JCheckBoxMenuItem();
- JMenuItem bgcolour = new JMenuItem();
+ protected JMenu associateViewsMenu = new JMenu();
+
+ protected JLabel statusBar = new JLabel();
- JMenuItem originalSeqData = new JMenuItem();
+ protected JPanel statusPanel = new JPanel();
- protected JMenu associateViewsMenu = new JMenu();
+ protected JMenuItem originalSeqData;
+ /**
+ * Constructor
+ */
public GPCAPanel()
{
try
@@ -83,134 +83,203 @@ public class GPCAPanel extends JInternalFrame
yCombobox.addItem("dim " + i);
zCombobox.addItem("dim " + i);
}
-
- setJMenuBar(jMenuBar1);
}
private void jbInit() throws Exception
{
- this.getContentPane().setLayout(borderLayout1);
- jPanel2.setLayout(flowLayout1);
- jLabel1.setFont(new java.awt.Font("Verdana", 0, 12));
+ this.getContentPane().setLayout(new BorderLayout());
+ JPanel jPanel2 = new JPanel();
+ jPanel2.setLayout(new FlowLayout());
+ JLabel jLabel1 = new JLabel();
+ jLabel1.setFont(VERDANA_12);
jLabel1.setText("x=");
- jLabel2.setFont(new java.awt.Font("Verdana", 0, 12));
+ JLabel jLabel2 = new JLabel();
+ jLabel2.setFont(VERDANA_12);
jLabel2.setText("y=");
- jLabel3.setFont(new java.awt.Font("Verdana", 0, 12));
+ JLabel jLabel3 = new JLabel();
+ jLabel3.setFont(VERDANA_12);
jLabel3.setText("z=");
jPanel2.setBackground(Color.white);
jPanel2.setBorder(null);
- zCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
- zCombobox.addActionListener(new java.awt.event.ActionListener()
+ zCombobox.setFont(VERDANA_12);
+ zCombobox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- zCombobox_actionPerformed(e);
+ doDimensionChange();
}
});
- yCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
- yCombobox.addActionListener(new java.awt.event.ActionListener()
+ yCombobox.setFont(VERDANA_12);
+ yCombobox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- yCombobox_actionPerformed(e);
+ doDimensionChange();
}
});
- xCombobox.setFont(new java.awt.Font("Verdana", 0, 12));
- xCombobox.addActionListener(new java.awt.event.ActionListener()
+ xCombobox.setFont(VERDANA_12);
+ xCombobox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- xCombobox_actionPerformed(e);
+ doDimensionChange();
}
});
- fileMenu.setText("File");
- saveMenu.setText("Save as");
- eps.setText("EPS");
+ JButton resetButton = new JButton();
+ resetButton.setFont(VERDANA_12);
+ resetButton.setText(MessageManager.getString("action.reset"));
+ resetButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ resetButton_actionPerformed();
+ }
+ });
+ JMenu fileMenu = new JMenu();
+ fileMenu.setText(MessageManager.getString("action.file"));
+ JMenu saveMenu = new JMenu();
+ saveMenu.setText(MessageManager.getString("action.save_as"));
+ JMenuItem eps = new JMenuItem("EPS");
eps.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- eps_actionPerformed(e);
+ eps_actionPerformed();
}
});
- png.setText("PNG");
+ JMenuItem png = new JMenuItem("PNG");
png.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- png_actionPerformed(e);
+ png_actionPerformed();
}
});
- outputValues.setText("Output Values...");
+ JMenuItem outputValues = new JMenuItem();
+ outputValues.setText(MessageManager.getString("label.output_values"));
outputValues.addActionListener(new ActionListener()
{
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ outputValues_actionPerformed();
+ }
+ });
+ JMenuItem outputPoints = new JMenuItem();
+ outputPoints.setText(MessageManager.getString("label.output_points"));
+ outputPoints.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ outputPoints_actionPerformed();
+ }
+ });
+ JMenuItem outputProjPoints = new JMenuItem();
+ outputProjPoints.setText(
+ MessageManager.getString("label.output_transformed_points"));
+ outputProjPoints.addActionListener(new ActionListener()
+ {
+ @Override
public void actionPerformed(ActionEvent e)
{
- outputValues_actionPerformed(e);
+ outputProjPoints_actionPerformed();
}
});
+ JMenuItem print = new JMenuItem();
+ print.setText(MessageManager.getString("action.print"));
print.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- print_actionPerformed(e);
+ print_actionPerformed();
}
});
- viewMenu.setText("View");
+ viewMenu.setText(MessageManager.getString("action.view"));
viewMenu.addMenuListener(new MenuListener()
{
+ @Override
public void menuSelected(MenuEvent e)
{
viewMenu_menuSelected();
}
+ @Override
public void menuDeselected(MenuEvent e)
{
}
+ @Override
public void menuCanceled(MenuEvent e)
{
}
});
- showLabels.setText("Show Labels");
+ showLabels.setText(MessageManager.getString("label.show_labels"));
showLabels.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- showLabels_actionPerformed(e);
+ showLabels_actionPerformed();
}
});
- print.setText("Print");
- bgcolour.setText("Background Colour...");
+ JMenuItem bgcolour = new JMenuItem();
+ bgcolour.setText(MessageManager.getString("action.background_colour"));
bgcolour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- bgcolour_actionPerformed(e);
+ bgcolour_actionPerformed();
}
});
- originalSeqData.setText("Input Data...");
+ originalSeqData = new JMenuItem();
+ originalSeqData.setText(MessageManager.getString("label.input_data"));
originalSeqData.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- originalSeqData_actionPerformed(e);
+ originalSeqData_actionPerformed();
}
});
- associateViewsMenu.setText("Associate Nodes With");
- this.getContentPane().add(jPanel2, BorderLayout.SOUTH);
+ associateViewsMenu.setText(
+ MessageManager.getString("label.associate_nodes_with"));
+
+ statusPanel.setLayout(new GridLayout());
+ statusBar.setFont(VERDANA_12);
+ // statusPanel.setBackground(Color.lightGray);
+ // statusBar.setBackground(Color.lightGray);
+ // statusPanel.add(statusBar, null);
+ JPanel panelBar = new JPanel(new BorderLayout());
+ panelBar.add(jPanel2, BorderLayout.NORTH);
+ panelBar.add(statusPanel, BorderLayout.SOUTH);
+ this.getContentPane().add(panelBar, BorderLayout.SOUTH);
jPanel2.add(jLabel1, null);
jPanel2.add(xCombobox, null);
jPanel2.add(jLabel2, null);
jPanel2.add(yCombobox, null);
jPanel2.add(jLabel3, null);
jPanel2.add(zCombobox, null);
+ jPanel2.add(resetButton, null);
+
+ JMenuBar jMenuBar1 = new JMenuBar();
jMenuBar1.add(fileMenu);
jMenuBar1.add(viewMenu);
+ setJMenuBar(jMenuBar1);
fileMenu.add(saveMenu);
fileMenu.add(outputValues);
fileMenu.add(print);
fileMenu.add(originalSeqData);
+ fileMenu.add(outputPoints);
+ fileMenu.add(outputProjPoints);
saveMenu.add(eps);
saveMenu.add(png);
viewMenu.add(showLabels);
@@ -218,55 +287,51 @@ public class GPCAPanel extends JInternalFrame
viewMenu.add(associateViewsMenu);
}
- protected void xCombobox_actionPerformed(ActionEvent e)
+ protected void resetButton_actionPerformed()
{
}
- protected void yCombobox_actionPerformed(ActionEvent e)
+ protected void outputPoints_actionPerformed()
{
}
- protected void zCombobox_actionPerformed(ActionEvent e)
+ protected void outputProjPoints_actionPerformed()
{
}
- public void eps_actionPerformed(ActionEvent e)
+ protected void eps_actionPerformed()
{
-
}
- public void png_actionPerformed(ActionEvent e)
+ protected void png_actionPerformed()
{
-
}
- public void outputValues_actionPerformed(ActionEvent e)
+ protected void outputValues_actionPerformed()
{
-
}
- public void print_actionPerformed(ActionEvent e)
+ protected void print_actionPerformed()
{
-
}
- public void showLabels_actionPerformed(ActionEvent e)
+ protected void showLabels_actionPerformed()
{
-
}
- public void bgcolour_actionPerformed(ActionEvent e)
+ protected void bgcolour_actionPerformed()
{
-
}
- public void originalSeqData_actionPerformed(ActionEvent e)
+ protected void originalSeqData_actionPerformed()
{
-
}
- public void viewMenu_menuSelected()
+ protected void viewMenu_menuSelected()
{
+ }
+ protected void doDimensionChange()
+ {
}
}