X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewDialog.java;h=35844867547fd0ff86c3d570ad29a05356896a6f;hb=b59839dfda0a767318fc3c89d9604c39ff298d83;hp=7340a86457babd2761423d6d25a1a721ba3b9be8;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/gui/JalviewDialog.java b/src/jalview/gui/JalviewDialog.java index 7340a86..3584486 100644 --- a/src/jalview/gui/JalviewDialog.java +++ b/src/jalview/gui/JalviewDialog.java @@ -1,19 +1,21 @@ /* - * 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-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * 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. + * 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 * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -21,6 +23,7 @@ package jalview.gui; import jalview.util.MessageManager; import java.awt.Container; +import java.awt.Dimension; import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -50,6 +53,10 @@ public abstract class JalviewDialog extends JPanel boolean block = false; + private int DEFAULT_MIN_WIDTH = 300; + + private int DEFAULT_MIN_HEIGHT = 250; + public void waitForInput() { if (!block) @@ -57,6 +64,7 @@ public abstract class JalviewDialog extends JPanel new Thread(new Runnable() { + @Override public void run() { frame.setVisible(true); @@ -86,6 +94,9 @@ public abstract class JalviewDialog extends JPanel { frame.setSize(width, height); } + int minWidth = width - 100; + int minHeight = height - 100; + frame.setMinimumSize(new Dimension(minWidth, minHeight)); frame.setContentPane(content); this.block = block; @@ -93,6 +104,7 @@ public abstract class JalviewDialog extends JPanel ok.setText(MessageManager.getString("action.ok")); ok.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { okPressed(); @@ -103,6 +115,7 @@ public abstract class JalviewDialog extends JPanel cancel.setText(MessageManager.getString("action.cancel")); cancel.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { cancelPressed();