X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FJVDialog.java;h=dc6ad8b7c42a94a44e5a333287081fe6d65769ac;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=4125f1b17da484d2e05cf98051303bf249db924e;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/appletgui/JVDialog.java b/src/jalview/appletgui/JVDialog.java index 4125f1b..dc6ad8b 100644 --- a/src/jalview/appletgui/JVDialog.java +++ b/src/jalview/appletgui/JVDialog.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -20,8 +20,16 @@ */ package jalview.appletgui; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Dialog; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.Panel; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; public class JVDialog extends Dialog implements ActionListener { @@ -50,6 +58,20 @@ public class JVDialog extends Dialog implements ActionListener width, height); } + public JVDialog(Frame owner, Panel mainPanel, String title, + boolean modal, int width, int height) + { + super(owner, title, modal); + this.owner = owner; + + height += owner.getInsets().top + getInsets().bottom; + + setBounds(owner.getBounds().x + (owner.getSize().width - width) / 2, + owner.getBounds().y + (owner.getSize().height - height) / 2, + width, height); + setMainPanel(mainPanel); + } + void setMainPanel(Panel panel) { add(panel, BorderLayout.NORTH); @@ -60,9 +82,17 @@ public class JVDialog extends Dialog implements ActionListener buttonPanel.add(cancel); ok.addActionListener(this); cancel.addActionListener(this); - add(buttonPanel, BorderLayout.SOUTH); + addWindowListener(new WindowAdapter() + { + public void windowClosing(WindowEvent ev) + { + setVisible(false); + dispose(); + } + }); + pack(); } @@ -75,6 +105,7 @@ public class JVDialog extends Dialog implements ActionListener } setVisible(false); + dispose(); } }