Make getdown much more friendly to quit

This commit is contained in:
Elizabeth Fong
2006-02-17 07:12:10 +00:00
parent 5c9bcd2c95
commit 94e5090219
3 changed files with 116 additions and 2 deletions
@@ -0,0 +1,99 @@
//
// $Id: ProxyPanel.java 60 2004-07-30 21:45:28Z mdb $
package com.threerings.getdown.launcher;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import javax.swing.BorderFactory;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import com.samskivert.swing.GroupLayout;
import com.samskivert.swing.Spacer;
import com.samskivert.swing.VGroupLayout;
import com.samskivert.text.MessageUtil;
import com.threerings.getdown.Log;
/**
* Displays a confirmation that the user wants to abort installation.
*/
public class AbortPanel extends JFrame
implements ActionListener
{
public AbortPanel (Getdown getdown, ResourceBundle msgs)
{
_getdown = getdown;
_msgs = msgs;
setLayout(new VGroupLayout());
setResizable(false);
setTitle(get("m.abort_title"));
JLabel message = new JLabel(get("m.abort_confirm"));
message.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
add(message);
add(new Spacer(5, 5));
JPanel row = GroupLayout.makeButtonBox(GroupLayout.CENTER);
JButton button;
row.add(button = new JButton(get("m.abort_ok")));
button.setActionCommand("ok");
button.addActionListener(this);
row.add(button = new JButton(get("m.abort_cancel")));
button.setActionCommand("cancel");
button.addActionListener(this);
getRootPane().setDefaultButton(button);
add(row);
}
// documentation inherited
public Dimension getPreferredSize ()
{
// this is annoyingly hardcoded, but we can't just force the width
// or the JLabel will claim a bogus height thinking it can lay its
// text out all on one line which will booch the whole UI's
// preferred size
return new Dimension(300, 200);
}
// documentation inherited from interface
public void actionPerformed (ActionEvent e)
{
String cmd = e.getActionCommand();
if (cmd.equals("ok")) {
System.exit(0);
} else {
setVisible(false);
}
}
/** Used to look up localized messages. */
protected String get (String key)
{
// if this string is tainted, we don't translate it, instead we
// simply remove the taint character and return it to the caller
if (key.startsWith(MessageUtil.TAINT_CHAR)) {
return key.substring(1);
}
try {
return _msgs.getString(key);
} catch (MissingResourceException mre) {
Log.warning("Missing translation message '" + key + "'.");
return key;
}
}
protected Getdown _getdown;
protected ResourceBundle _msgs;
}
@@ -10,6 +10,7 @@ import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import javax.swing.JDialog;
import javax.swing.JFrame;
import java.io.BufferedOutputStream;
@@ -531,10 +532,17 @@ public class Getdown extends Thread
_frame = new JFrame(title);
_frame.addWindowListener(new WindowAdapter() {
public void windowClosing (WindowEvent evt) {
if (_dead || _frame.getState() == JFrame.ICONIFIED) {
if (_dead) {
System.exit(0);
} else {
_frame.setState(JFrame.ICONIFIED);
if (_abort == null) {
_abort = new AbortPanel(Getdown.this, _msgs);
}
_abort.pack();
SwingUtil.centerWindow(_abort);
_abort.setVisible(true);
_abort.setState(JFrame.NORMAL);
_abort.requestFocus();
}
}
});
@@ -649,6 +657,7 @@ public class Getdown extends Thread
protected ResourceBundle _msgs;
protected JFrame _frame;
protected StatusPanel _status;
protected AbortPanel _abort;
protected boolean _dead;
protected long _startup;
@@ -3,6 +3,12 @@
#
# Getdown translation messages
m.abort_title = Abort installation?
m.abort_confirm = <html>Are you sure you want to stop installation? \
You can resume at a later time by running the application again.</html>
m.abort_ok = Quit
m.abort_cancel = Continue installation
m.detecting_proxy = Trying to auto-detect proxy settings...
m.configure_proxy = <html>We were unable to connect to our servers to \