GUI changes
authoramwaterhouse <Andrew Waterhouse>
Thu, 28 Apr 2005 15:35:30 +0000 (15:35 +0000)
committeramwaterhouse <Andrew Waterhouse>
Thu, 28 Apr 2005 15:35:30 +0000 (15:35 +0000)
src/jalview/jbgui/GDesktop.java
src/jalview/jbgui/GFontChooser.java
src/jalview/jbgui/GPreferences.java [new file with mode: 0755]
src/jalview/jbgui/GUserDefinedColours.java

index 2ef7ad6..040113f 100755 (executable)
-/********************
- * 2004 Jalview Reengineered
- * Barton Group
- * Dundee University
- *
- * AM Waterhouse
- *******************/
-
-package jalview.jbgui;
-
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.*;
-
-
-public class GDesktop extends JFrame
-{
-  JMenuBar DesktopMenubar = new JMenuBar();
-  JMenu FileMenu = new JMenu();
-  JMenu HelpMenu = new JMenu();
-  JMenuItem inputLocalFileMenuItem = new JMenuItem();
-  JMenuItem inputURLMenuItem = new JMenuItem();
-  JMenuItem inputTextboxMenuItem = new JMenuItem();
-  JMenuItem quit = new JMenuItem();
-  JMenuItem aboutMenuItem = new JMenuItem();
-  JMenuItem documentationMenuItem = new JMenuItem();
-  FlowLayout flowLayout1 = new FlowLayout();
-  protected static JMenu windowMenu = new JMenu();
-  public GDesktop()
-  {
-    try
-    {
-      jbInit();
-      this.setJMenuBar(DesktopMenubar);
-    }
-    catch(Exception e)
-    {
-      e.printStackTrace();
-    }
-
-  }
-  private void jbInit() throws Exception
-  {
-    FileMenu.setMnemonic('F');
-    FileMenu.setText("File");
-    HelpMenu.setText("Help");
-    inputLocalFileMenuItem.setMnemonic('L');
-    inputLocalFileMenuItem.setText("Input Alignment From Local File");
-    inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        inputLocalFileMenuItem_actionPerformed(e);
-      }
-    });
-    inputURLMenuItem.setMnemonic('U');
-    inputURLMenuItem.setText("Input Alignment From URL");
-    inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        inputURLMenuItem_actionPerformed(e);
-      }
-    });
-    inputTextboxMenuItem.setMnemonic('T');
-    inputTextboxMenuItem.setText("Input Alignment via Textbox");
-    inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        inputTextboxMenuItem_actionPerformed(e);
-      }
-    });
-    quit.setMnemonic('Q');
-    quit.setText("Quit");
-    quit.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        quit_actionPerformed(e);
-      }
-    });
-    aboutMenuItem.setText("About");
-    aboutMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        aboutMenuItem_actionPerformed(e);
-      }
-    });
-    documentationMenuItem.setText("Documentation");
-    documentationMenuItem.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        documentationMenuItem_actionPerformed(e);
-      }
-    });
-    this.getContentPane().setLayout(flowLayout1);
-    windowMenu.setText("Window");
-    DesktopMenubar.add(FileMenu);
-    DesktopMenubar.add(HelpMenu);
-    DesktopMenubar.add(windowMenu);
-    FileMenu.add(inputLocalFileMenuItem);
-    FileMenu.add(inputURLMenuItem);
-    FileMenu.add(inputTextboxMenuItem);
-    FileMenu.addSeparator();
-    FileMenu.add(quit);
-    HelpMenu.add(aboutMenuItem);
-    HelpMenu.add(documentationMenuItem);
-  }
-
-  protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e)
-  { }
-
-  protected void inputURLMenuItem_actionPerformed(ActionEvent e)
-  {  }
-
-  protected void inputTextboxMenuItem_actionPerformed(ActionEvent e)
-  { }
-
-  protected void quit_actionPerformed(ActionEvent e)
-  {  }
-
-  protected void aboutMenuItem_actionPerformed(ActionEvent e)
-  { }
-
-  protected void documentationMenuItem_actionPerformed(ActionEvent e)
-  {  }
-
-}
+/********************\r
+ * 2004 Jalview Reengineered\r
+ * Barton Group\r
+ * Dundee University\r
+ *\r
+ * AM Waterhouse\r
+ *******************/\r
+\r
+package jalview.jbgui;\r
+\r
+import javax.swing.*;\r
+import java.awt.event.*;\r
+import java.awt.*;\r
+\r
+\r
+public class GDesktop extends JFrame\r
+{\r
+  JMenuBar DesktopMenubar = new JMenuBar();\r
+  JMenu FileMenu = new JMenu();\r
+  JMenu HelpMenu = new JMenu();\r
+  JMenuItem inputLocalFileMenuItem = new JMenuItem();\r
+  JMenuItem inputURLMenuItem = new JMenuItem();\r
+  JMenuItem inputTextboxMenuItem = new JMenuItem();\r
+  JMenuItem quit = new JMenuItem();\r
+  JMenuItem aboutMenuItem = new JMenuItem();\r
+  JMenuItem documentationMenuItem = new JMenuItem();\r
+  FlowLayout flowLayout1 = new FlowLayout();\r
+  protected static JMenu windowMenu = new JMenu();\r
+  public GDesktop()\r
+  {\r
+    try\r
+    {\r
+      jbInit();\r
+      this.setJMenuBar(DesktopMenubar);\r
+    }\r
+    catch(Exception e)\r
+    {\r
+      e.printStackTrace();\r
+    }\r
+\r
+  }\r
+  private void jbInit() throws Exception\r
+  {\r
+    FileMenu.setMnemonic('F');\r
+    FileMenu.setText("File");\r
+    HelpMenu.setText("Help");\r
+    inputLocalFileMenuItem.setMnemonic('L');\r
+    inputLocalFileMenuItem.setText("Input Alignment From Local File");\r
+    inputLocalFileMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        inputLocalFileMenuItem_actionPerformed(e);\r
+      }\r
+    });\r
+    inputURLMenuItem.setMnemonic('U');\r
+    inputURLMenuItem.setText("Input Alignment From URL");\r
+    inputURLMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        inputURLMenuItem_actionPerformed(e);\r
+      }\r
+    });\r
+    inputTextboxMenuItem.setMnemonic('T');\r
+    inputTextboxMenuItem.setText("Input Alignment via Textbox");\r
+    inputTextboxMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        inputTextboxMenuItem_actionPerformed(e);\r
+      }\r
+    });\r
+    quit.setMnemonic('Q');\r
+    quit.setText("Quit");\r
+    quit.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        quit_actionPerformed(e);\r
+      }\r
+    });\r
+    aboutMenuItem.setText("About");\r
+    aboutMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        aboutMenuItem_actionPerformed(e);\r
+      }\r
+    });\r
+    documentationMenuItem.setText("Documentation");\r
+    documentationMenuItem.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        documentationMenuItem_actionPerformed(e);\r
+      }\r
+    });\r
+    this.getContentPane().setLayout(flowLayout1);\r
+    windowMenu.setText("Window");\r
+    DesktopMenubar.add(FileMenu);\r
+    DesktopMenubar.add(HelpMenu);\r
+    DesktopMenubar.add(windowMenu);\r
+    FileMenu.addSeparator();\r
+    FileMenu.add(inputLocalFileMenuItem);\r
+    FileMenu.add(inputURLMenuItem);\r
+    FileMenu.add(inputTextboxMenuItem);\r
+    FileMenu.addSeparator();\r
+    FileMenu.add(quit);\r
+    HelpMenu.add(aboutMenuItem);\r
+    HelpMenu.add(documentationMenuItem);\r
+  }\r
+\r
+  protected void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
+  { }\r
+\r
+  protected void inputURLMenuItem_actionPerformed(ActionEvent e)\r
+  {  }\r
+\r
+  protected void inputTextboxMenuItem_actionPerformed(ActionEvent e)\r
+  { }\r
+\r
+  protected void quit_actionPerformed(ActionEvent e)\r
+  {  }\r
+\r
+  protected void aboutMenuItem_actionPerformed(ActionEvent e)\r
+  { }\r
+\r
+  protected void documentationMenuItem_actionPerformed(ActionEvent e)\r
+  {  }\r
+\r
+  public void SaveState_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+}\r
index f93911a..ab0b080 100755 (executable)
-package jalview.jbgui;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-
-
-public class GFontChooser extends JPanel
-{
-  JLabel jLabel1 = new JLabel();
-  protected JComboBox fontSize = new JComboBox();
-  protected JComboBox fontStyle = new JComboBox();
-  JLabel jLabel2 = new JLabel();
-  JLabel jLabel3 = new JLabel();
-  protected JComboBox fontName = new JComboBox();
-  JButton ok = new JButton();
-  JButton cancel = new JButton();
-  JPanel jPanel1 = new JPanel();
-  JPanel jPanel2 = new JPanel();
-  JPanel jPanel3 = new JPanel();
-  BorderLayout borderLayout1 = new BorderLayout();
-  BorderLayout borderLayout2 = new BorderLayout();
-  BorderLayout borderLayout3 = new BorderLayout();
-  FlowLayout flowLayout1 = new FlowLayout();
-
-  public GFontChooser()
-  {
-    try
-    {
-      jbInit();
-    }
-    catch(Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  private void jbInit() throws Exception
-  {
-    jLabel1.setFont(new java.awt.Font("Verdana", 0, 11));
-    jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);
-    jLabel1.setText("Font: ");
-    jLabel1.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);
-    this.setLayout(flowLayout1);
-    fontSize.setFont(new java.awt.Font("Verdana", 0, 11));
-    fontSize.setOpaque(false);
-    fontSize.setPreferredSize(new Dimension(50, 21));
-    fontSize.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        fontSize_actionPerformed(e);
-      }
-    });
-    fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));
-    fontStyle.setOpaque(false);
-    fontStyle.setPreferredSize(new Dimension(90, 21));
-    fontStyle.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        fontStyle_actionPerformed(e);
-      }
-    });
-    jLabel2.setFont(new java.awt.Font("Verdana", 0, 11));
-    jLabel2.setHorizontalAlignment(SwingConstants.RIGHT);
-    jLabel2.setText("Size: ");
-    jLabel2.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);
-    jLabel3.setFont(new java.awt.Font("Verdana", 0, 11));
-    jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);
-    jLabel3.setText("Style: ");
-    jLabel3.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);
-    fontName.setFont(new java.awt.Font("Verdana", 0, 11));
-    fontName.setMaximumSize(new Dimension(32767, 32767));
-    fontName.setMinimumSize(new Dimension(300, 21));
-    fontName.setOpaque(false);
-    fontName.setPreferredSize(new Dimension(180, 21));
-    fontName.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        fontName_actionPerformed(e);
-      }
-    });
-    ok.setFont(new java.awt.Font("Verdana", 0, 11));
-    ok.setText("OK");
-    ok.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        ok_actionPerformed(e);
-      }
-    });
-    cancel.setFont(new java.awt.Font("Verdana", 0, 11));
-    cancel.setText("Cancel");
-    cancel.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        cancel_actionPerformed(e);
-      }
-    });
-    this.setBackground(Color.white);
-    jPanel1.setOpaque(false);
-    jPanel1.setLayout(borderLayout1);
-    jPanel2.setOpaque(false);
-    jPanel2.setLayout(borderLayout3);
-    jPanel3.setOpaque(false);
-    jPanel3.setLayout(borderLayout2);
-    flowLayout1.setAlignment(FlowLayout.CENTER);
-    flowLayout1.setVgap(5);
-    this.add(jPanel1, null);
-    jPanel1.add(jLabel1, BorderLayout.WEST);
-    jPanel1.add(fontName, BorderLayout.CENTER);
-    this.add(jPanel3, null);
-    this.add(jPanel2, null);
-    jPanel2.add(jLabel3,  BorderLayout.WEST);
-    jPanel2.add(fontStyle,  BorderLayout.CENTER);
-    jPanel3.add(jLabel2, BorderLayout.WEST);
-    jPanel3.add(fontSize, BorderLayout.CENTER);
-    this.add(ok, null);
-    this.add(cancel, null);
-  }
-
-  protected void ok_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void cancel_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void fontName_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void fontSize_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void fontStyle_actionPerformed(ActionEvent e)
-  {
-
-  }
-}
+package jalview.jbgui;\r
+\r
+import javax.swing.*;\r
+import java.awt.*;\r
+import java.awt.event.*;\r
+\r
+\r
+public class GFontChooser extends JPanel\r
+{\r
+  JLabel jLabel1 = new JLabel();\r
+  protected JComboBox fontSize = new JComboBox();\r
+  protected JComboBox fontStyle = new JComboBox();\r
+  JLabel jLabel2 = new JLabel();\r
+  JLabel jLabel3 = new JLabel();\r
+  protected JComboBox fontName = new JComboBox();\r
+  JButton ok = new JButton();\r
+  JButton cancel = new JButton();\r
+  JPanel jPanel1 = new JPanel();\r
+  JPanel jPanel2 = new JPanel();\r
+  JPanel jPanel3 = new JPanel();\r
+  BorderLayout borderLayout1 = new BorderLayout();\r
+  BorderLayout borderLayout2 = new BorderLayout();\r
+  BorderLayout borderLayout3 = new BorderLayout();\r
+  FlowLayout flowLayout1 = new FlowLayout();\r
+  JButton defaultButton = new JButton();\r
+\r
+  public GFontChooser()\r
+  {\r
+    try\r
+    {\r
+      jbInit();\r
+    }\r
+    catch(Exception e)\r
+    {\r
+      e.printStackTrace();\r
+    }\r
+  }\r
+  private void jbInit() throws Exception\r
+  {\r
+    jLabel1.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel1.setText("Font: ");\r
+    jLabel1.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);\r
+    this.setLayout(flowLayout1);\r
+    fontSize.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontSize.setOpaque(false);\r
+    fontSize.setPreferredSize(new Dimension(50, 21));\r
+    fontSize.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        fontSize_actionPerformed(e);\r
+      }\r
+    });\r
+    fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontStyle.setOpaque(false);\r
+    fontStyle.setPreferredSize(new Dimension(90, 21));\r
+    fontStyle.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        fontStyle_actionPerformed(e);\r
+      }\r
+    });\r
+    jLabel2.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    jLabel2.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel2.setText("Size: ");\r
+    jLabel2.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);\r
+    jLabel3.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel3.setText("Style: ");\r
+    jLabel3.setVerticalTextPosition(javax.swing.SwingConstants.CENTER);\r
+    fontName.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    fontName.setMaximumSize(new Dimension(32767, 32767));\r
+    fontName.setMinimumSize(new Dimension(300, 21));\r
+    fontName.setOpaque(false);\r
+    fontName.setPreferredSize(new Dimension(180, 21));\r
+    fontName.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        fontName_actionPerformed(e);\r
+      }\r
+    });\r
+    ok.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    ok.setText("OK");\r
+    ok.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        ok_actionPerformed(e);\r
+      }\r
+    });\r
+    cancel.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    cancel.setText("Cancel");\r
+    cancel.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        cancel_actionPerformed(e);\r
+      }\r
+    });\r
+    this.setBackground(Color.white);\r
+    jPanel1.setOpaque(false);\r
+    jPanel1.setLayout(borderLayout1);\r
+    jPanel2.setOpaque(false);\r
+    jPanel2.setLayout(borderLayout3);\r
+    jPanel3.setOpaque(false);\r
+    jPanel3.setLayout(borderLayout2);\r
+    flowLayout1.setAlignment(FlowLayout.CENTER);\r
+    flowLayout1.setVgap(5);\r
+    defaultButton.setText("Set as Default");\r
+    defaultButton.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        defaultButton_actionPerformed(e);\r
+      }\r
+    });\r
+    this.add(jPanel1, null);\r
+    jPanel1.add(jLabel1, BorderLayout.WEST);\r
+    jPanel1.add(fontName, BorderLayout.CENTER);\r
+    this.add(jPanel3, null);\r
+    this.add(jPanel2, null);\r
+    jPanel2.add(jLabel3,  BorderLayout.WEST);\r
+    jPanel2.add(fontStyle,  BorderLayout.CENTER);\r
+    jPanel3.add(jLabel2, BorderLayout.WEST);\r
+    jPanel3.add(fontSize, BorderLayout.CENTER);\r
+    this.add(ok, null);\r
+    this.add(cancel, null);\r
+    this.add(defaultButton);\r
+  }\r
+\r
+  protected void ok_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void cancel_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void fontName_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void fontSize_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void fontStyle_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void defaultButton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+}\r
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
new file mode 100755 (executable)
index 0000000..06dc81a
--- /dev/null
@@ -0,0 +1,177 @@
+package jalview.jbgui;\r
+\r
+import javax.swing.*;\r
+import java.awt.*;\r
+import java.awt.event.ActionListener;\r
+import java.awt.event.ActionEvent;\r
+import javax.swing.border.TitledBorder;\r
+\r
+public class GPreferences\r
+    extends JPanel\r
+{\r
+  public GPreferences()\r
+  {\r
+    try\r
+    {\r
+      jbInit();\r
+    }\r
+    catch (Exception ex)\r
+    {\r
+      ex.printStackTrace();\r
+    }\r
+  }\r
+\r
+  private void jbInit()\r
+      throws Exception\r
+  {\r
+    this.setLayout(borderLayout1);\r
+    ok.setText("OK");\r
+    ok.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        ok_actionPerformed(e);\r
+      }\r
+    });\r
+    cancel.setText("Cancel");\r
+    cancel.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        cancel_actionPerformed(e);\r
+      }\r
+    });\r
+    visual.setLayout(null);\r
+    quality.setEnabled(false);\r
+    quality.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    quality.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    quality.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    quality.setSelected(true);\r
+    quality.setText("Quality");\r
+    quality.setBounds(new Rectangle(248, 53, 81, 23));\r
+    jPanel2.setBorder(titledBorder1);\r
+    jPanel2.setBounds(new Rectangle(9, 20, 442, 206));\r
+    jPanel2.setLayout(null);\r
+    fullID.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fullID.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    fullID.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    fullID.setText("Full Sequence ID");\r
+    fullID.setBounds(new Rectangle(9, 78, 129, 23));\r
+    fullScreen.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    fullScreen.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    fullScreen.setText("Full Screen");\r
+    fullScreen.setBounds(new Rectangle(31, 28, 107, 23));\r
+    conservation.setEnabled(false);\r
+    conservation.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    conservation.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    conservation.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    conservation.setSelected(true);\r
+    conservation.setText("Conservation");\r
+    conservation.setBounds(new Rectangle(137, 53, 113, 23));\r
+    identity.setEnabled(false);\r
+    identity.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    identity.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    identity.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    identity.setSelected(true);\r
+    identity.setText("% Identity");\r
+    identity.setBounds(new Rectangle(326, 53, 99, 23));\r
+    annotations.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    annotations.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    annotations.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    annotations.setSelected(true);\r
+    annotations.setText("Show Annotations");\r
+    annotations.setBounds(new Rectangle(10, 53, 128, 23));\r
+    annotations.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        annotations_actionPerformed(e);\r
+      }\r
+    });\r
+    jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    jLabel1.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel1.setText("Gap Symbol");\r
+    jLabel1.setBounds(new Rectangle(41, 142, 76, 15));\r
+    colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    colour.setBounds(new Rectangle(121, 168, 154, 21));\r
+    jLabel2.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    jLabel2.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel2.setText("Colour");\r
+    jLabel2.setBounds(new Rectangle(60, 172, 58, 15));\r
+    jLabel3.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    jLabel3.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    jLabel3.setText("Font");\r
+    jLabel3.setBounds(new Rectangle(83, 114, 34, 15));\r
+    fontSize.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontSize.setBounds(new Rectangle(304, 109, 49, 21));\r
+    fontStyle.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontStyle.setBounds(new Rectangle(353, 109, 80, 21));\r
+    fontName.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    fontName.setBounds(new Rectangle(121, 109, 183, 21));\r
+    gapSymbol.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    gapSymbol.setBounds(new Rectangle(121, 140, 67, 21));\r
+    jPanel2.add(annotations);\r
+    jPanel2.add(fullScreen);\r
+    jPanel2.add(conservation);\r
+    jPanel2.add(quality);\r
+    jPanel2.add(fullID);\r
+    jPanel2.add(gapSymbol);\r
+    jPanel2.add(jLabel1);\r
+    jPanel2.add(fontName);\r
+    jPanel2.add(jLabel2);\r
+    jPanel2.add(jLabel3);\r
+    jPanel2.add(colour);\r
+    jPanel2.add(fontSize);\r
+    jPanel2.add(fontStyle);\r
+    jPanel2.add(identity);\r
+    jPanel1.add(ok);\r
+    jPanel1.add(cancel);\r
+    this.add(visaulTab, java.awt.BorderLayout.CENTER);\r
+    visaulTab.add(visual, "visual");\r
+    visual.add(jPanel2);\r
+    this.add(jPanel1, java.awt.BorderLayout.SOUTH);\r
+\r
+    DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
+    dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER);\r
+    gapSymbol.setRenderer(dlcr);\r
+\r
+  }\r
+\r
+  JTabbedPane visaulTab = new JTabbedPane();\r
+  JPanel visual = new JPanel();\r
+  JButton ok = new JButton();\r
+  JButton cancel = new JButton();\r
+  JPanel jPanel1 = new JPanel();\r
+  BorderLayout borderLayout1 = new BorderLayout();\r
+  protected JCheckBox quality = new JCheckBox();\r
+  JPanel jPanel2 = new JPanel();\r
+  TitledBorder titledBorder1 = new TitledBorder("Open new alignment");\r
+  protected JCheckBox fullID = new JCheckBox();\r
+  protected JCheckBox fullScreen = new JCheckBox();\r
+  protected JCheckBox conservation = new JCheckBox();\r
+  protected JCheckBox identity = new JCheckBox();\r
+  protected JCheckBox annotations = new JCheckBox();\r
+  JLabel jLabel1 = new JLabel();\r
+  protected JComboBox colour = new JComboBox();\r
+  JLabel jLabel2 = new JLabel();\r
+  JLabel jLabel3 = new JLabel();\r
+  protected JComboBox fontSize = new JComboBox();\r
+  protected JComboBox fontStyle = new JComboBox();\r
+  protected JComboBox fontName = new JComboBox();\r
+  protected JComboBox gapSymbol = new JComboBox();\r
+  public void ok_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void cancel_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  public void annotations_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+}\r
index 9086c39..dc4f291 100755 (executable)
-package jalview.jbgui;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-
-
-public class GUserDefinedColours extends JPanel
-{
-  protected JColorChooser colorChooser = new JColorChooser();
-  protected JPanel buttonPanel = new JPanel();
-  protected GridLayout gridLayout = new GridLayout();
-  JPanel jPanel2 = new JPanel();
-  protected JButton okButton = new JButton();
-  protected JButton applyButton = new JButton();
-  protected JButton loadbutton = new JButton();
-  protected JButton savebutton = new JButton();
-  protected JButton cancelButton = new JButton();
-  FlowLayout flowLayout1 = new FlowLayout();
-
-  public GUserDefinedColours()
-  {
-    try
-    {
-      jbInit();
-    }
-    catch(Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-  private void jbInit() throws Exception
-  {
-    this.setLayout(flowLayout1);
-    buttonPanel.setLayout(gridLayout);
-    gridLayout.setColumns(6);
-    gridLayout.setRows(4);
-    okButton.setFont(new java.awt.Font("Verdana", 0, 11));
-    okButton.setText("OK");
-    okButton.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        okButton_actionPerformed(e);
-      }
-    });
-    applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
-    applyButton.setText("Apply");
-    applyButton.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        applyButton_actionPerformed(e);
-      }
-    });
-    loadbutton.setFont(new java.awt.Font("Verdana", 0, 11));
-    loadbutton.setText("Load scheme");
-    loadbutton.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        loadbutton_actionPerformed(e);
-      }
-    });
-    savebutton.setFont(new java.awt.Font("Verdana", 0, 11));
-    savebutton.setText("Save scheme");
-    savebutton.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        savebutton_actionPerformed(e);
-      }
-    });
-    cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));
-    cancelButton.setText("Cancel");
-    cancelButton.addActionListener(new java.awt.event.ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        cancelButton_actionPerformed(e);
-      }
-    });
-    this.setBackground(new Color(212, 208, 223));
-    jPanel2.setOpaque(false);
-    colorChooser.setOpaque(false);
-    this.add(colorChooser, null);
-    this.add(buttonPanel, null);
-     this.add(jPanel2, null);
-    jPanel2.add(okButton, null);
-    jPanel2.add(applyButton, null);
-    jPanel2.add(loadbutton, null);
-    jPanel2.add(savebutton, null);
-    jPanel2.add(cancelButton, null);
-  }
-
-
-  protected void okButton_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void applyButton_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void loadbutton_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void savebutton_actionPerformed(ActionEvent e)
-  {
-
-  }
-
-  protected void cancelButton_actionPerformed(ActionEvent e)
-  {
-
-  }
-}
+package jalview.jbgui;\r
+\r
+import javax.swing.*;\r
+import java.awt.*;\r
+import java.awt.event.*;\r
+\r
+\r
+public class GUserDefinedColours extends JPanel\r
+{\r
+  protected JColorChooser colorChooser = new JColorChooser();\r
+  protected JPanel buttonPanel = new JPanel();\r
+  protected GridLayout gridLayout = new GridLayout();\r
+  JPanel jPanel2 = new JPanel();\r
+  protected JButton okButton = new JButton();\r
+  protected JButton applyButton = new JButton();\r
+  protected JButton loadbutton = new JButton();\r
+  protected JButton savebutton = new JButton();\r
+  protected JButton cancelButton = new JButton();\r
+  FlowLayout flowLayout1 = new FlowLayout();\r
+\r
+  public GUserDefinedColours()\r
+  {\r
+    try\r
+    {\r
+      jbInit();\r
+    }\r
+    catch(Exception e)\r
+    {\r
+      e.printStackTrace();\r
+    }\r
+  }\r
+  private void jbInit() throws Exception\r
+  {\r
+    this.setLayout(flowLayout1);\r
+    buttonPanel.setLayout(gridLayout);\r
+    gridLayout.setColumns(6);\r
+    gridLayout.setRows(4);\r
+    okButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    okButton.setText("OK");\r
+    okButton.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        okButton_actionPerformed(e);\r
+      }\r
+    });\r
+    applyButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    applyButton.setText("Apply");\r
+    applyButton.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        applyButton_actionPerformed(e);\r
+      }\r
+    });\r
+    loadbutton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    loadbutton.setText("Load scheme");\r
+    loadbutton.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        loadbutton_actionPerformed(e);\r
+      }\r
+    });\r
+    savebutton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    savebutton.setText("Save scheme");\r
+    savebutton.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        savebutton_actionPerformed(e);\r
+      }\r
+    });\r
+    cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));\r
+    cancelButton.setText("Cancel");\r
+    cancelButton.addActionListener(new java.awt.event.ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        cancelButton_actionPerformed(e);\r
+      }\r
+    });\r
+    this.setBackground(new Color(212, 208, 223));\r
+    jPanel2.setOpaque(false);\r
+    colorChooser.setOpaque(false);\r
+    this.add(colorChooser, null);\r
+    this.add(buttonPanel, null);\r
+     this.add(jPanel2, null);\r
+    jPanel2.add(okButton, null);\r
+    jPanel2.add(applyButton, null);\r
+    jPanel2.add(loadbutton, null);\r
+    jPanel2.add(savebutton, null);\r
+    jPanel2.add(cancelButton, null);\r
+  }\r
+\r
+\r
+  protected void okButton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void applyButton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void loadbutton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void savebutton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+  protected void cancelButton_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+}\r