From: amwaterhouse Date: Tue, 9 Aug 2005 16:53:16 +0000 (+0000) Subject: Proxy server, default browser, multiple links added X-Git-Tag: Release_2_03~58 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=97c00be1121a6758439b73ded035c4edbacfa2bc;p=jalview.git Proxy server, default browser, multiple links added --- diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 8a3c372..8a2650b 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -31,6 +31,10 @@ import java.awt.event.*; import javax.swing.*; +import java.util.*; + +import jalview.bin.Cache; + /** * DOCUMENT ME! @@ -40,86 +44,42 @@ import javax.swing.*; */ public class Preferences extends GPreferences { - static boolean preferencesLoaded = false; - - /** DOCUMENT ME!! */ - public static boolean showFullscreen = false; - - /** DOCUMENT ME!! */ - public static boolean showFullId = true; - - /** DOCUMENT ME!! */ - public static boolean showAnnotation = true; - - /** DOCUMENT ME!! */ - public static boolean showConservation = true; - - /** DOCUMENT ME!! */ - public static boolean showQuality = true; - - /** DOCUMENT ME!! */ - public static boolean showIdentity = true; + /** Holds name and link separated with | character. Sequence ID must be $SEQUENCE_ID$ */ + public static Vector sequenceURLLinks = new Vector(); + Vector nameLinks, urlLinks; - /** DOCUMENT ME!! */ - public static String fontName = "SansSerif"; - - /** DOCUMENT ME!! */ - public static String fontSize = "10"; - - /** DOCUMENT ME!! */ - public static String fontStyle = Font.PLAIN + ""; - - /** DOCUMENT ME!! */ - public static char gapSymbol = '-'; - - /** DOCUMENT ME!! */ - public static String defaultColour = null; - - /** DOCUMENT ME!! */ - public static boolean showStartupFile = true; - - /** DOCUMENT ME!! */ - public static String startupFile = "http://www.jalview.org/examples/exampleFile.jar"; JInternalFrame frame; + /** * Creates a new Preferences object. */ public Preferences() { - initPreferences(); frame = new JInternalFrame(); frame.setContentPane(this); Desktop.addInternalFrame(frame, "Preferences", 480, 390); + frame.setMinimumSize(new Dimension(480,390)); - fullID.setSelected(showFullId); + fullID.setSelected( Cache.getDefault("SHOW_FULL_ID", true)); + fullScreen.setSelected( Cache.getDefault("SHOW_FULLSCREEN", false)); + annotations.setSelected( Cache.getDefault("SHOW_FULL_ID", true)); + conservation.setEnabled( Cache.getDefault("SHOW_ANNOTATIONS", true)); - String string = Cache.getProperty("SHOW_FULLSCREEN"); - boolean value = false; + quality.setEnabled(Cache.getDefault("SHOW_ANNOTATIONS", true)); + identity.setEnabled(Cache.getDefault("SHOW_ANNOTATIONS", true)); - if (string != null) - { - value = Boolean.valueOf(string).booleanValue(); - } - - fullScreen.setSelected(value); - annotations.setSelected(showAnnotation); - - conservation.setEnabled(showAnnotation); - quality.setEnabled(showAnnotation); - identity.setEnabled(showAnnotation); - - conservation.setSelected(showConservation); - quality.setSelected(showQuality); - identity.setSelected(showIdentity); + conservation.setSelected(Cache.getDefault("SHOW_CONSERVATION", true)); + quality.setSelected(Cache.getDefault("SHOW_QUALITY", true)); + identity.setSelected(Cache.getDefault("SHOW_IDENTITY", true)); for (int i = 0; i < 12; i++) { colour.addItem(ColourSchemeProperty.getColourName(i)); } - string = Cache.getProperty("DEFAULT_COLOUR"); + String string = Cache.getProperty("DEFAULT_COLOUR"); if (string != null) { @@ -147,165 +107,122 @@ public class Preferences extends GPreferences fontStyleCB.addItem("bold"); fontStyleCB.addItem("italic"); - fontNameCB.setSelectedItem(fontName); - fontSizeCB.setSelectedItem(fontSize); - fontStyleCB.setSelectedItem(fontStyle); + fontNameCB.setSelectedItem(Cache.getDefault("FONT_NAME", "SansSerif")); + fontSizeCB.setSelectedItem(Cache.getDefault("FONT_SIZE", "10")); + fontStyleCB.setSelectedItem(Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ); gapSymbolCB.addItem("-"); gapSymbolCB.addItem("."); - gapSymbolCB.setSelectedItem(gapSymbol + ""); + gapSymbolCB.setSelectedItem( Cache.getDefault("GAP_SYMBOL", "-")); - startupCheckbox.setSelected(showStartupFile); - startupFileTextfield.setText(startupFile); - } + startupCheckbox.setSelected( Cache.getDefault("SHOW_STARTUP_FILE", true) ); + startupFileTextfield.setText(Cache.getDefault("STARTUP_FILE", + "http://www.jalview.org/examples/exampleFile.jar")); - /** - * DOCUMENT ME! - */ - public static void initPreferences() - { - String string = Cache.getProperty("SHOW_FULL_ID"); + /**************************************************** + * Set up Connections + */ - if (string != null) - { - showFullId = Boolean.valueOf(string).booleanValue(); - } + string = Cache.getDefault("SEQUENCE_LINKS", + "SRS|http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[uniprot-all:$SEQUENCE_ID$]+-vn+2"); + sequenceURLLinks = new Vector(); - string = Cache.getProperty("SHOW_FULLSCREEN"); + try{ + StringTokenizer st = new StringTokenizer(string, "|"); + while (st.hasMoreElements()) + { + sequenceURLLinks.addElement(st.nextToken() + "|" + st.nextToken()); + } + }catch(Exception ex) + {System.out.println(ex+"\nError parsing sequence links");} - if (string != null) - { - showFullscreen = Boolean.valueOf(string).booleanValue(); - } - - string = Cache.getProperty("SHOW_ANNOTATIONS"); - - if (string != null) - { - showAnnotation = Boolean.valueOf(string).booleanValue(); - } - - string = Cache.getProperty("SHOW_CONSERVATION"); - - if (string != null) - { - showConservation = Boolean.valueOf(string).booleanValue(); - } - - string = Cache.getProperty("SHOW_QUALITY"); - - if (string != null) - { - showQuality = Boolean.valueOf(string).booleanValue(); - } - - string = Cache.getProperty("SHOW_IDENTITY"); - - if (string != null) + nameLinks = new Vector(); + urlLinks = new Vector(); + for(int i=0; i0) { - startupFile = string; + StringBuffer links = new StringBuffer(); + sequenceURLLinks = new Vector(); + for (int i = 0; i < nameLinks.size(); i++) + { + sequenceURLLinks.addElement(nameLinks.elementAt(i)+"|"+urlLinks.elementAt(i)); + links.append(sequenceURLLinks.elementAt(i).toString()); + links.append("|"); + } + // remove last "|" + links.setLength( links.length()-1 ); + Cache.applicationProperties.setProperty("SEQUENCE_LINKS", links.toString()); } - string = Cache.getProperty("SHOW_STARTUP_FILE"); + Cache.applicationProperties.setProperty("USE_PROXY", Boolean.toString(useProxy.isSelected())); + Cache.applicationProperties.setProperty("PROXY_SERVER",proxyServerTB.getText()); + Cache.applicationProperties.setProperty("PROXY_PORT", proxyPortTB.getText()); - if (string != null) + if(useProxy.isSelected()) { - showStartupFile = Boolean.valueOf(string).booleanValue(); + System.setProperty("http.proxyHost", proxyServerTB.getText()); + System.setProperty("http.proxyPort", proxyPortTB.getText()); } - preferencesLoaded = true; - } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void ok_actionPerformed(ActionEvent e) - { - showFullId = fullID.isSelected(); - showFullscreen = fullScreen.isSelected(); - showAnnotation = annotations.isSelected(); - showConservation = conservation.isSelected(); - showQuality = quality.isSelected(); - showIdentity = identity.isSelected(); - defaultColour = colour.getSelectedItem().toString(); - gapSymbol = gapSymbolCB.getSelectedItem().toString().charAt(0); - fontName = fontNameCB.getSelectedItem().toString(); - fontSize = fontSizeCB.getSelectedItem().toString(); - fontStyle = fontStyleCB.getSelectedItem().toString(); - startupFile = startupFileTextfield.getText(); - showStartupFile = startupCheckbox.isSelected(); - - Cache.setProperty("SHOW_FULL_ID", Boolean.toString(showFullId)); - Cache.setProperty("SHOW_FULLSCREEN", Boolean.toString(showFullscreen)); - - Cache.setProperty("SHOW_ANNOTATIONS", Boolean.toString(showAnnotation)); - Cache.setProperty("SHOW_CONSERVATION", - Boolean.toString(showConservation)); - Cache.setProperty("SHOW_QUALITY", Boolean.toString(showQuality)); - Cache.setProperty("SHOW_IDENTITY", Boolean.toString(showIdentity)); - - Cache.setProperty("DEFAULT_COLOUR", defaultColour); - Cache.setProperty("GAP_SYMBOL", gapSymbol + ""); - - Cache.setProperty("FONT_NAME", fontName); - Cache.setProperty("FONT_STYLE", fontStyle); - Cache.setProperty("FONT_SIZE", fontSize); - - Cache.setProperty("STARTUP_FILE", startupFile); - Cache.setProperty("SHOW_STARTUP_FILE", Boolean.toString(showStartupFile)); + Cache.saveProperties(); try { frame.setClosed(true); @@ -338,7 +255,7 @@ public class Preferences extends GPreferences if (value == JalviewFileChooser.APPROVE_OPTION) { - jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", + jalview.bin.Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT", chooser.getSelectedFormat()); startupFileTextfield.setText(chooser.getSelectedFile() .getAbsolutePath()); @@ -372,4 +289,106 @@ public class Preferences extends GPreferences quality.setEnabled(annotations.isSelected()); identity.setEnabled(annotations.isSelected()); } + + + public void newLink_actionPerformed(ActionEvent e) { + + GSequenceLink link = new GSequenceLink(); + boolean valid = false; + while( !valid ) + { + if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link, + "New sequence URL link", + JOptionPane.OK_CANCEL_OPTION + ,-1, null) + == JOptionPane.OK_OPTION) + { + if (link.checkValid()) + { + nameLinks.addElement(link.getName()); + urlLinks.addElement(link.getURL()); + updateLinkData(); + valid = true; + } + } + else + break; + } + } + + public void editLink_actionPerformed(ActionEvent e) { + GSequenceLink link = new GSequenceLink(); + + int index = linkNameList.getSelectedIndex(); + if(index==-1) + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, "No link selected!" + ,"No link selected", JOptionPane.WARNING_MESSAGE); + return; + } + + link.setName( nameLinks.elementAt(index).toString() ); + link.setURL( urlLinks.elementAt(index).toString() ); + + boolean valid = false; + while (!valid) + { + + if (JOptionPane.showInternalConfirmDialog(Desktop.desktop, link, + "New sequence URL link", + JOptionPane.OK_CANCEL_OPTION + ,-1, null) + == JOptionPane.OK_OPTION) + { + if (link.checkValid()) + { + nameLinks.setElementAt(link.getName(), index); + urlLinks.setElementAt(link.getURL(), index); + updateLinkData(); + valid = true; + } + } + + else + break; + } + } + + public void deleteLink_actionPerformed(ActionEvent e) { + int index = linkNameList.getSelectedIndex(); + if(index==-1) + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, "No link selected!" + ,"No link selected", JOptionPane.WARNING_MESSAGE); + return; + } + nameLinks.removeElementAt(index); + urlLinks.removeElementAt(index); + updateLinkData(); + } + + void updateLinkData() + { + linkNameList.setListData(nameLinks); + linkURLList.setListData(urlLinks); + } + + public void defaultBrowser_mouseClicked(MouseEvent e) + { + JFileChooser chooser = new JFileChooser("."); + chooser.setDialogTitle("Select default web browser"); + + int value = chooser.showOpenDialog(this); + + if (value == JFileChooser.APPROVE_OPTION) + { + defaultBrowser.setText(chooser.getSelectedFile().getAbsolutePath()); + } + + } + + private void jbInit() + throws Exception + { + } } diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index fd61014..7826ce4 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -19,13 +19,11 @@ package jalview.jbgui; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; import javax.swing.*; import javax.swing.border.TitledBorder; +import java.awt.event.*; +import javax.swing.event.*; /** @@ -36,32 +34,55 @@ import javax.swing.border.TitledBorder; */ public class GPreferences extends JPanel { - JTabbedPane visaulTab = new JTabbedPane(); - JPanel visual = new JPanel(); + JTabbedPane tabbedPane = new JTabbedPane(); + JButton ok = new JButton(); JButton cancel = new JButton(); - JPanel jPanel1 = new JPanel(); + JPanel okCancelPanel = new JPanel(); BorderLayout borderLayout1 = new BorderLayout(); protected JCheckBox quality = new JCheckBox(); - JPanel jPanel2 = new JPanel(); - TitledBorder titledBorder1 = new TitledBorder("Open new alignment"); + JPanel visualTab = new JPanel(); protected JCheckBox fullID = new JCheckBox(); protected JCheckBox fullScreen = new JCheckBox(); protected JCheckBox conservation = new JCheckBox(); protected JCheckBox identity = new JCheckBox(); protected JCheckBox annotations = new JCheckBox(); - JLabel jLabel1 = new JLabel(); + JLabel gapLabel = new JLabel(); protected JComboBox colour = new JComboBox(); - JLabel jLabel2 = new JLabel(); - JLabel jLabel3 = new JLabel(); + JLabel colourLabel = new JLabel(); + JLabel fontLabel = new JLabel(); protected JComboBox fontSizeCB = new JComboBox(); protected JComboBox fontStyleCB = new JComboBox(); protected JComboBox fontNameCB = new JComboBox(); protected JComboBox gapSymbolCB = new JComboBox(); protected JCheckBox startupCheckbox = new JCheckBox(); protected JTextField startupFileTextfield = new JTextField(); - - /** + JPanel connectTab = new JPanel(); + JLabel serverLabel = new JLabel(); + protected JList linkURLList = new JList(); + protected JTextField proxyServerTB = new JTextField(); + protected JTextField proxyPortTB = new JTextField(); + JLabel portLabel = new JLabel(); + JLabel browserLabel = new JLabel(); + protected JTextField defaultBrowser = new JTextField(); + JButton newLink = new JButton(); + JButton editLink = new JButton(); + JButton deleteLink = new JButton(); + JScrollPane linkScrollPane = new JScrollPane(); + JPanel linkPanel = new JPanel(); + BorderLayout borderLayout2 = new BorderLayout(); + JPanel editLinkButtons = new JPanel(); + GridLayout gridLayout1 = new GridLayout(); + protected JList linkNameList = new JList(); + JPanel linkPanel2 = new JPanel(); + BorderLayout borderLayout3 = new BorderLayout(); + protected JCheckBox useProxy = new JCheckBox(); + JPanel jPanel1 = new JPanel(); + TitledBorder titledBorder1 = new TitledBorder("Proxy Server"); + GridBagLayout gridBagLayout2 = new GridBagLayout(); + GridBagLayout gridBagLayout1 = new GridBagLayout(); + GridBagLayout gridBagLayout3 = new GridBagLayout(); + /** * Creates a new GPreferences object. */ public GPreferences() @@ -100,7 +121,6 @@ public class GPreferences extends JPanel cancel_actionPerformed(e); } }); - visual.setLayout(null); quality.setEnabled(false); quality.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); quality.setHorizontalAlignment(SwingConstants.RIGHT); @@ -108,9 +128,9 @@ public class GPreferences extends JPanel quality.setSelected(true); quality.setText("Quality"); quality.setBounds(new Rectangle(248, 53, 81, 23)); - jPanel2.setBorder(titledBorder1); - jPanel2.setBounds(new Rectangle(9, 20, 442, 241)); - jPanel2.setLayout(null); + visualTab.setBorder(new TitledBorder("Open new alignment")); + visualTab.setBounds(new Rectangle(9, 20, 442, 241)); + visualTab.setLayout(null); fullID.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fullID.setHorizontalAlignment(SwingConstants.RIGHT); fullID.setHorizontalTextPosition(SwingConstants.LEFT); @@ -148,20 +168,20 @@ public class GPreferences extends JPanel annotations_actionPerformed(e); } }); - jLabel1.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - jLabel1.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel1.setText("Gap Symbol"); - jLabel1.setBounds(new Rectangle(41, 142, 76, 15)); + gapLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + gapLabel.setHorizontalAlignment(SwingConstants.RIGHT); + gapLabel.setText("Gap Symbol"); + gapLabel.setBounds(new Rectangle(41, 142, 76, 15)); colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); colour.setBounds(new Rectangle(121, 168, 154, 21)); - jLabel2.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - jLabel2.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel2.setText("Colour"); - jLabel2.setBounds(new Rectangle(60, 172, 58, 15)); - jLabel3.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); - jLabel3.setHorizontalAlignment(SwingConstants.RIGHT); - jLabel3.setText("Font"); - jLabel3.setBounds(new Rectangle(83, 114, 34, 15)); + colourLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + colourLabel.setHorizontalAlignment(SwingConstants.RIGHT); + colourLabel.setText("Colour"); + colourLabel.setBounds(new Rectangle(60, 172, 58, 15)); + fontLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + fontLabel.setHorizontalAlignment(SwingConstants.RIGHT); + fontLabel.setText("Font"); + fontLabel.setBounds(new Rectangle(83, 114, 34, 15)); fontSizeCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); fontSizeCB.setBounds(new Rectangle(304, 109, 49, 21)); fontStyleCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); @@ -172,13 +192,6 @@ public class GPreferences extends JPanel gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21)); startupCheckbox.setText("Open file"); startupCheckbox.setBounds(new Rectangle(4, 200, 115, 23)); - startupCheckbox.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - jCheckBox1_actionPerformed(e); - } - }); startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT); startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT); @@ -196,30 +209,155 @@ public class GPreferences extends JPanel } }); - jPanel2.add(annotations); - jPanel2.add(conservation); - jPanel2.add(quality); - jPanel2.add(fullID); - jPanel2.add(gapSymbolCB); - jPanel2.add(jLabel1); - jPanel2.add(fontNameCB); - jPanel2.add(jLabel2); - jPanel2.add(jLabel3); - jPanel2.add(colour); - jPanel2.add(fontSizeCB); - jPanel2.add(fontStyleCB); - jPanel2.add(identity); - jPanel2.add(fullScreen); - jPanel2.add(startupCheckbox); - jPanel2.add(startupFileTextfield); - jPanel1.add(ok); - jPanel1.add(cancel); - this.add(visaulTab, java.awt.BorderLayout.CENTER); - visaulTab.add(visual, "visual"); - visual.add(jPanel2); - this.add(jPanel1, java.awt.BorderLayout.SOUTH); + connectTab.setLayout(gridBagLayout3); + serverLabel.setText("Address"); + serverLabel.setHorizontalAlignment(SwingConstants.RIGHT); + serverLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + proxyServerTB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + proxyPortTB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + portLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + portLabel.setHorizontalAlignment(SwingConstants.RIGHT); + portLabel.setText("Port"); + browserLabel.setFont(new java.awt.Font("SansSerif", 0, 11)); + browserLabel.setHorizontalAlignment(SwingConstants.TRAILING); + browserLabel.setText("Default Browser (Unix)"); + defaultBrowser.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + defaultBrowser.setText(""); + newLink.setText("New"); + newLink.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(ActionEvent e) { + newLink_actionPerformed(e); + } + }); + editLink.setText("Edit"); + editLink.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(ActionEvent e) { + editLink_actionPerformed(e); + } + }); + deleteLink.setText("Delete"); + deleteLink.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(ActionEvent e) { + deleteLink_actionPerformed(e); + } + }); + + linkURLList.addListSelectionListener(new ListSelectionListener() + { + public void valueChanged(ListSelectionEvent e) + { + int index = linkURLList.getSelectedIndex(); + linkNameList.setSelectedIndex(index); + } + }); + + linkNameList.addListSelectionListener(new ListSelectionListener() + { + public void valueChanged(ListSelectionEvent e) + { + int index = linkNameList.getSelectedIndex(); + linkURLList.setSelectedIndex(index); + } + }); + + linkScrollPane.setBorder(null); + linkPanel.setBorder(new TitledBorder("URL link from Sequence ID")); + linkPanel.setLayout(borderLayout2); + editLinkButtons.setLayout(gridLayout1); + gridLayout1.setRows(3); + linkNameList.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11)); + linkNameList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + linkPanel2.setLayout(borderLayout3); + linkURLList.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + linkURLList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + + defaultBrowser.addMouseListener(new MouseAdapter() + { + public void mouseClicked(MouseEvent e) + { + if (e.getClickCount() > 1) + { + defaultBrowser_mouseClicked(e); + } + } + }); + useProxy.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + useProxy.setHorizontalAlignment(SwingConstants.RIGHT); + useProxy.setHorizontalTextPosition(SwingConstants.LEADING); + useProxy.setText("Use a proxy server"); + useProxy.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + useProxy_actionPerformed(); + } + }); + jPanel1.setBorder(titledBorder1); + jPanel1.setLayout(gridBagLayout1); + visualTab.add(annotations); + visualTab.add(conservation); + visualTab.add(quality); + visualTab.add(fullID); + visualTab.add(gapSymbolCB); + visualTab.add(fontLabel); + visualTab.add(fontNameCB); + visualTab.add(colourLabel); + visualTab.add(gapLabel); + visualTab.add(colour); + visualTab.add(fontSizeCB); + visualTab.add(fontStyleCB); + visualTab.add(identity); + visualTab.add(fullScreen); + visualTab.add(startupCheckbox); + visualTab.add(startupFileTextfield); + + tabbedPane.add(visualTab, "Visual"); + tabbedPane.add(connectTab, "Connections"); + + linkPanel.add(editLinkButtons, BorderLayout.EAST); + editLinkButtons.add(newLink, null); + editLinkButtons.add(editLink, null); + editLinkButtons.add(deleteLink, null); + linkPanel.add(linkScrollPane, BorderLayout.CENTER); + linkScrollPane.getViewport().add(linkPanel2, null); + linkPanel2.add(linkURLList, BorderLayout.CENTER); + linkPanel2.add(linkNameList, BorderLayout.WEST); + okCancelPanel.add(ok); + okCancelPanel.add(cancel); + this.add(tabbedPane, java.awt.BorderLayout.CENTER); - DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); + this.add(okCancelPanel, java.awt.BorderLayout.SOUTH); + jPanel1.add(serverLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 + , GridBagConstraints.WEST, GridBagConstraints.NONE, + new Insets(0, 2, 4, 0), 5, 0)); + jPanel1.add(portLabel, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0 + , GridBagConstraints.WEST, + GridBagConstraints.NONE, + new Insets(0, 0, 4, 0), 11, 6)); + connectTab.add(linkPanel, new GridBagConstraints(0, 0, 2, 1, 1.0, 1.0 + , GridBagConstraints.CENTER, GridBagConstraints.BOTH, + new Insets(16, 0, 0, 12), 359, -17)); + connectTab.add(jPanel1, new GridBagConstraints(0, 2, 2, 1, 1.0, 1.0 + , GridBagConstraints.CENTER, GridBagConstraints.BOTH, + new Insets(21, 0, 35, 12), 4, 6)); + connectTab.add(browserLabel, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0 + , GridBagConstraints.WEST, GridBagConstraints.NONE, + new Insets(16, 0, 0, 0), 5, 1)); + jPanel1.add(proxyPortTB, new GridBagConstraints(3, 1, 1, 1, 1.0, 0.0 + , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, + new Insets(0, 2, 4, 2), 54, 1)); + jPanel1.add(proxyServerTB, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0 + , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, + new Insets(0, 2, 4, 0), 263, 1)); + connectTab.add(defaultBrowser, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0 + , GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, + new Insets(15, 0, 0, 15), 307, 1)); + jPanel1.add(useProxy, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0 + , GridBagConstraints.WEST, + GridBagConstraints.NONE, + new Insets(0, 2, 5, 185), 2, + -4)); + DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER); gapSymbolCB.setRenderer(dlcr); } @@ -251,14 +389,6 @@ public class GPreferences extends JPanel { } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void jCheckBox1_actionPerformed(ActionEvent e) - { - } /** * DOCUMENT ME! @@ -266,4 +396,33 @@ public class GPreferences extends JPanel public void startupFileTextfield_mouseClicked() { } + + + public void newLink_actionPerformed(ActionEvent e) { + + } + + public void editLink_actionPerformed(ActionEvent e) { + + } + + public void deleteLink_actionPerformed(ActionEvent e) { + + } + + public void defaultBrowser_mouseClicked(MouseEvent e) + { + + } + + public void linkURLList_keyTyped(KeyEvent e) + { + + } + + public void useProxy_actionPerformed() + { + proxyServerTB.setEnabled(useProxy.isSelected()); + proxyPortTB.setEnabled(useProxy.isSelected()); + } }