X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPreferences.java;h=69c0f4d77a7b9dd9ef12f1edb4c8cb1d32715331;hb=15a605b8a12026b453e252477b416b2c82b6344a;hp=61b2f24f4ae36b19eee8028cd73bd78eda8db363;hpb=f4b18ae31d37e694b59875f26e0863179de248f1;p=jalview.git diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java index 61b2f24..69c0f4d 100755 --- a/src/jalview/jbgui/GPreferences.java +++ b/src/jalview/jbgui/GPreferences.java @@ -45,8 +45,6 @@ import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.BoxLayout; import javax.swing.ButtonGroup; -import javax.swing.ComboBoxModel; -import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -93,7 +91,6 @@ import jalview.io.BackupFilenameParts; import jalview.io.BackupFiles; import jalview.io.BackupFilesPresetEntry; import jalview.io.IntKeyStringValueEntry; -import jalview.util.BrowserLauncher; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.util.StringUtils; @@ -272,8 +269,6 @@ public class GPreferences extends JPanel protected JPasswordField proxyAuthPasswordPB = new JPasswordField(); - protected JComboBox defaultBrowser = new JComboBox(); - protected ButtonGroup proxyType = new ButtonGroup(); protected JRadioButton noProxy = new JRadioButton(); @@ -743,53 +738,9 @@ public class GPreferences extends JPanel connectTab = new JPanel(); connectTab.setLayout(new GridBagLayout()); - // Label for browser text box - JLabel browserLabel = new JLabel(); - browserLabel.setFont(LABEL_FONT); - browserLabel.setHorizontalAlignment(SwingConstants.TRAILING); - browserLabel.setText( - MessageManager.getString("label.default_browser_unix_windows")); - defaultBrowser.setFont(LABEL_FONT); - final String tooltip = JvSwingUtils.wrapTooltip(true, - MessageManager.getString("label.double_click_to_browse")); - defaultBrowser.setToolTipText(tooltip); - /* - defaultBrowser.addMouseListener(new MouseAdapter() - { - @Override - public void mouseClicked(MouseEvent e) - { - if (e.getClickCount() > 1) - { - defaultBrowser_mouseClicked(e); - } - } - }); - */ - JPanel proxyPanel = initConnTabProxyPanel(); initConnTabCheckboxes(); - // Add default Browser text box - connectTab.add(browserLabel, - new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0, - GridBagConstraints.WEST, GridBagConstraints.NONE, - new Insets(10, 0, 5, 5), 5, 1)); - defaultBrowser.setFont(LABEL_FONT); - - ComboBoxModel cbModel = new DefaultComboBoxModel( - BrowserLauncher.getInstance().getBrowserList().toArray()); - String browserPref = Cache.getProperty("DEFAULT_BROWSER"); - if (browserPref != null) - { - cbModel.setSelectedItem(browserPref); - } - defaultBrowser.setModel(cbModel); - - connectTab.add(defaultBrowser, new GridBagConstraints(1, 0, 1, 1, 1.0, - 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, - new Insets(10, 0, 5, 10), 30, 1)); - // Add proxy server panel connectTab.add(proxyPanel, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, @@ -3547,11 +3498,6 @@ public class GPreferences extends JPanel } - public void defaultBrowser_mouseClicked(MouseEvent e) - { - - } - public void linkURLList_keyTyped(KeyEvent e) {