X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=e8ee82be3ffca470a52b5863fb40a93ab73df6d8;hb=85cb8c77b20b4bcca29ea106aaa20f252a969d34;hp=a8d73eea5ffe63a972c2004ca393a1b0ff6e52ed;hpb=4c3a5f9eeaa18f67dc35f31b18325f73199325f7;p=jalview.git diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index a8d73ee..e8ee82b 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -75,6 +75,7 @@ import java.awt.BorderLayout; import java.awt.Canvas; import java.awt.CheckboxMenuItem; import java.awt.Color; +import java.awt.FlowLayout; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Frame; @@ -83,6 +84,7 @@ import java.awt.Label; import java.awt.Menu; import java.awt.MenuBar; import java.awt.MenuItem; +import java.awt.Panel; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -105,8 +107,6 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; -import javax.swing.JOptionPane; - import org.jmol.viewer.Viewer; public class AlignFrame extends EmbmenuFrame implements ActionListener, @@ -2070,19 +2070,25 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, /* * If the cut affects all sequences, warn, remove highlighted columns - */if (sg.getSize() == viewport.getAlignment().getHeight()) + */ + if (sg.getSize() == viewport.getAlignment().getHeight()) { boolean isEntireAlignWidth = (((sg.getEndRes() - sg.getStartRes()) + 1) == viewport .getAlignment().getWidth()) ? true : false; if (isEntireAlignWidth) { - int confirm = JOptionPane.showConfirmDialog(this, - MessageManager.getString("warn.delete_all"), // $NON-NLS-1$ - MessageManager.getString("label.delete_all"), // $NON-NLS-1$ - JOptionPane.OK_CANCEL_OPTION); - if (confirm == JOptionPane.CANCEL_OPTION - || confirm == JOptionPane.CLOSED_OPTION) + String title = MessageManager.getString("label.delete_all"); + Panel mp = new Panel(); + mp.setLayout(new FlowLayout()); + mp.add(new Label(MessageManager.getString("warn.delete_all"))); + + final JVDialog dialog = new JVDialog(this, title, true, 400, + 200); + dialog.setMainPanel(mp); + dialog.setVisible(true); + + if (!dialog.accept) { return; }