From be05f73b977ff636571ce1a5f9d801ea56d89bbc Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Sat, 19 Mar 2011 19:51:46 +0000
Subject: [PATCH] gtk: added hard reset option (closes rom/re-opens rom) gtk:
 renamed reset to soft reset (resetNes()) gtk: added seperators to emulator
 menu

---
 changelog.txt           |  1 +
 src/drivers/sdl/gui.cpp | 35 ++++++++++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index f9b1644d..7d1daa82 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,4 @@
+19-mar-2011 - prg318 - gtk - added hard reset option (renamed reset->soft reset)
 18-mar-2011 - prg318 - sdl - removed GTK_LITE; --nogui made it obsolete
 12-feb-2010 - mart0258 - Fix input selection for Famicom Expansion port
 25-jan-2010 - prg318 - gtk - filechooser now remembers last file opened
diff --git a/src/drivers/sdl/gui.cpp b/src/drivers/sdl/gui.cpp
index 26aa7caa..8cc8918d 100644
--- a/src/drivers/sdl/gui.cpp
+++ b/src/drivers/sdl/gui.cpp
@@ -30,7 +30,7 @@
 
 void toggleSound(GtkWidget* check, gpointer data);
 void loadGame ();
-
+void closeGame();
 extern Config *g_config;
 
 GtkWidget* MainWindow = NULL;
@@ -1119,6 +1119,26 @@ void emuReset ()
 		ResetNES();
 }
 
+void hardReset ()
+{
+	if(isloaded)
+	{
+		closeGame();
+		const char* lastFile;
+		g_config->getOption("SDL.LastOpenFile", &lastFile);
+		if(LoadGame(lastFile) == 0)
+		{
+			GtkWidget* d;
+			d = gtk_message_dialog_new(GTK_WINDOW(MainWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
+				"Error opening the ROM file.");
+			gtk_dialog_run(GTK_DIALOG(d));
+			gtk_widget_destroy(d);
+		}
+		resizeGtkWindow();
+	}
+}
+		
+
 void enableFullscreen ()
 {
 	if(isloaded)
@@ -1857,15 +1877,19 @@ static char* menuXml =
 	"    <menu action='EmulatorMenuAction'>"
 	"      <menuitem action='PowerAction' />"
 	"      <menuitem action='ResetAction' />"
+	"      <menuitem action='SoftResetAction' />"
 	"      <menuitem action='PauseToggleAction' />"
+	"      <separator />"
+	"      <menuitem action='GameGenieToggleAction' />"
+	"      <menuitem action='LoadGameGenieAction' />"
+	"      <separator />"
+	"      <menuitem action='InsertCoinAction' />"
+	"      <separator />"
 	"      <menu action='FdsMenuAction'>"
 	"        <menuitem action='SwitchDiskAction' />"
 	"        <menuitem action='EjectDiskAction' />"
 	"        <menuitem action='LoadBiosAction' />"
 	"      </menu>"
-	"      <menuitem action='LoadGameGenieAction' />"
-	"      <menuitem action='GameGenieToggleAction' />"
-	"      <menuitem action='InsertCoinAction' />"
 	"    </menu>"
 	"    <menu action='MovieMenuAction'>"
 	"      <menuitem action='OpenMovieAction' />"
@@ -1905,7 +1929,8 @@ static GtkActionEntry normal_entries[] = {
 	
 	{"EmulatorMenuAction", NULL, "_Emulator"},
 	{"PowerAction", NULL, "P_ower", NULL, NULL, G_CALLBACK(FCEUI_PowerNES)},
-	{"ResetAction", GTK_STOCK_REFRESH, "_Reset", NULL, NULL, G_CALLBACK(emuReset)},
+	{"SoftResetAction", GTK_STOCK_REFRESH, "_Soft Reset", NULL, NULL, G_CALLBACK(emuReset)},
+	{"ResetAction", GTK_STOCK_REFRESH, "_Reset", NULL, NULL, G_CALLBACK(hardReset)},
 	{"PauseToggleAction", GTK_STOCK_MEDIA_PAUSE, "_Pause", "Pause", NULL, G_CALLBACK(togglePause)},
 	{"FdsMenuAction", GTK_STOCK_FLOPPY, "_FDS"},
 	{"SwitchDiskAction", "go-jump", "_Switch Disk", NULL, NULL, G_CALLBACK(FCEU_FDSSelect)},