From b20a0f7e7757968edb4afee7ae64171f42058444 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Mon, 20 May 2013 16:12:25 +0000 Subject: [PATCH] error_popop: added a button for Exiting the program altogether git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@657 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/gui/MainWindow.java | 15 ++++++++++++++- strings/GuiStrings.properties | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java index 80ba794..3c56e25 100644 --- a/src/micropolisj/gui/MainWindow.java +++ b/src/micropolisj/gui/MainWindow.java @@ -1208,7 +1208,8 @@ public class MainWindow extends JFrame null, new String[] { strings.getString("main.error_show_stacktrace"), - strings.getString("main.error_close") + strings.getString("main.error_close"), + strings.getString("main.error_shutdown") }, 1 ); @@ -1218,6 +1219,18 @@ public class MainWindow extends JFrame strings.getString("main.error_unexpected"), JOptionPane.ERROR_MESSAGE); } + if (rv == 2) + { + rv = JOptionPane.showConfirmDialog( + this, + strings.getString("error.shutdown_query"), + strings.getString("main.error_unexpected"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); + if (rv == JOptionPane.OK_OPTION) { + System.exit(1); + } + } } class EarthquakeStepper diff --git a/strings/GuiStrings.properties b/strings/GuiStrings.properties index 3bfa1e0..202f960 100644 --- a/strings/GuiStrings.properties +++ b/strings/GuiStrings.properties @@ -17,7 +17,9 @@ main.population_label = Population: main.error_caption = Error main.error_unexpected = An unexpected error occurred main.error_show_stacktrace = Show Details -main.error_close = Close +main.error_close = Dismiss +main.error_shutdown = Exit Program +error.shutdown_query = Do you really want to exit the program? Your city will not be saved. main.tools_caption = Tools main.about_caption = About MicropolisJ main.version_string = Version {0} (Java %java.version%, %java.vendor%)