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;
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;
protected JPasswordField proxyAuthPasswordPB = new JPasswordField();
- protected JTextField defaultBrowser = new JTextField();
+ protected JComboBox defaultBrowser = new JComboBox<String>();
protected ButtonGroup proxyType = new ButtonGroup();
browserLabel.setFont(LABEL_FONT);
browserLabel.setHorizontalAlignment(SwingConstants.TRAILING);
browserLabel.setText(
- MessageManager.getString("label.default_browser_unix"));
+ MessageManager.getString("label.default_browser_unix_windows"));
defaultBrowser.setFont(LABEL_FONT);
- defaultBrowser.setText("");
final String tooltip = JvSwingUtils.wrapTooltip(true,
MessageManager.getString("label.double_click_to_browse"));
defaultBrowser.setToolTipText(tooltip);
+ /*
defaultBrowser.addMouseListener(new MouseAdapter()
{
@Override
}
}
});
+ */
JPanel proxyPanel = initConnTabProxyPanel();
initConnTabCheckboxes();
GridBagConstraints.WEST, GridBagConstraints.NONE,
new Insets(10, 0, 5, 5), 5, 1));
defaultBrowser.setFont(LABEL_FONT);
- defaultBrowser.setText("");
+
+ ComboBoxModel<String> 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,
}
/**
- * Show a dialog for the user to choose a file. Returns the chosen path, or null
- * on Cancel.
+ * Show a dialog for the user to choose a file. Returns the chosen path, or
+ * null on Cancel.
*
* @return
*/
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void ok_actionPerformed(ActionEvent e)
{
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void cancel_actionPerformed(ActionEvent e)
{
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void annotations_actionPerformed(ActionEvent e)
{