/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
* 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
*/
package jalview.gui;
+import jalview.util.MessageManager;
+
import java.awt.*;
import javax.swing.*;
{
JTextField id, description;
- JButton ok = new JButton("Accept");
+ JButton ok = new JButton(MessageManager.getString("action.accept"));
- JButton cancel = new JButton("Cancel");
+ JButton cancel = new JButton(MessageManager.getString("action.cancel"));
boolean accept = false;
}
public EditNameDialog(String name, String desc, String label1,
- String label2, String title)
+ String label2, String title, JComponent parent)
{
JLabel idlabel = new JLabel(label1);
JLabel desclabel = new JLabel(label2);
panel2.add(description, BorderLayout.CENTER);
panel.add(panel2, BorderLayout.SOUTH);
}
-
- int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- panel, title, JOptionPane.OK_CANCEL_OPTION);
-
+ int reply = JOptionPane.showInternalConfirmDialog(parent, panel, title,
+ JOptionPane.OK_CANCEL_OPTION);
+ if (!parent.requestFocusInWindow())
+ {
+ System.err.println("Bad focus for dialog!");
+ }
if (reply == JOptionPane.OK_OPTION)
{
accept = true;