X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgtk%2Fviewmenu.c;h=b4ce153c82caf50a27ba9d3b4c84011048b42c82;hb=5e7b849e7d9263ea7e4b06ea95e989fbff251b97;hp=166ab88c31e303e8dab8672bf4dc8a7b1d2763ea;hpb=702da8f53198200be75f7b78011c3ffb1f4936a8;p=emu8051.git

diff --git a/src/gtk/viewmenu.c b/src/gtk/viewmenu.c
index 166ab88..b4ce153 100644
--- a/src/gtk/viewmenu.c
+++ b/src/gtk/viewmenu.c
@@ -42,20 +42,25 @@ void toggle_layout(GtkWidget *widget, gpointer data)
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		log_info("  Switching to layout %d", id);
 		cfg->layout = id;
-		emugtk_restart_gui();
+
+		ShowMessage("Notice",
+			    "You must restart for the changes to take effect",
+			    GTK_JUSTIFY_LEFT, MESSAGE_DIALOG_NORMAL_FONT);
 	}
 }
 
-void toggle_bits_per_row(GtkWidget *widget, gpointer data)
+void toggle_bytes_per_row(GtkWidget *widget, gpointer data)
 {
-	int bits_per_row;
+	int bytes_per_row;
 
-        bits_per_row = GPOINTER_TO_UINT(data);
+        bytes_per_row = GPOINTER_TO_UINT(data);
 
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
-		log_info("  Bits per row = %d", bits_per_row);
-		cfg->bits_per_row = bits_per_row;
-		emugtk_restart_gui();
+		log_info("  Bytes per row = %d", bytes_per_row);
+		cfg->bytes_per_row = bytes_per_row;
+		emugtk_destroy_int_memory_paned();
+		emugtk_destroy_ext_memory_paned();
+		emugtk_recreate_memory_paned();
 	}
 }
 
@@ -66,25 +71,11 @@ void toggle_int_memory(GtkWidget *widget, gpointer data)
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		log_info("  View internal memory");
 		cfg->view_int_memory = 1;
+		emugtk_create_int_memory_paned();
 	} else {
 		cfg->view_int_memory = 0;
+		emugtk_destroy_int_memory_paned();
 	}
-
-	emugtk_restart_gui();
-}
-
-void toggle_sfr_memory(GtkWidget *widget, gpointer data)
-{
-	(void) data; /* Remove compiler warning about unused variables. */
-
-	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
-		log_info("  View SFR memory");
-		cfg->view_sfr_memory = 1;
-	} else {
-		cfg->view_sfr_memory = 0;
-	}
-
-	emugtk_restart_gui();
 }
 
 void toggle_ext_memory(GtkWidget *widget, gpointer data)
@@ -94,11 +85,11 @@ void toggle_ext_memory(GtkWidget *widget, gpointer data)
 	if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) {
 		log_info("  View external memory");
 		cfg->view_ext_memory = 1;
+		emugtk_create_ext_memory_paned();
 	} else {
 		cfg->view_ext_memory = 0;
+		emugtk_destroy_ext_memory_paned();
 	}
-
-	emugtk_restart_gui();
 }
 
 void
@@ -135,7 +126,7 @@ view_add_layout_submenu(GtkWidget *parent)
 }
 
 void
-view_add_bits_per_row_submenu(GtkWidget *parent)
+view_add_bytes_per_row_submenu(GtkWidget *parent)
 {
 	GtkWidget *submenu;
 	GtkWidget *item;
@@ -145,21 +136,21 @@ view_add_bits_per_row_submenu(GtkWidget *parent)
 
 	submenu = gtk_menu_new();
 
-	item  = gtk_menu_item_new_with_label("Bits per row");
+	item  = gtk_menu_item_new_with_label("Bytes per row");
 
 	item1 = gtk_radio_menu_item_new_with_label(group, "8");
 	group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item1));
 	item2 = gtk_radio_menu_item_new_with_label(group, "16");
 
-	if (cfg->bits_per_row == 8)
+	if (cfg->bytes_per_row == 8)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item1), TRUE);
 	else
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item2), TRUE);
 
 	g_signal_connect(G_OBJECT(item1), "activate",
-			 G_CALLBACK(toggle_bits_per_row), (gpointer) 8);
+			 G_CALLBACK(toggle_bytes_per_row), (gpointer) 8);
 	g_signal_connect(G_OBJECT(item2), "activate",
-			 G_CALLBACK(toggle_bits_per_row), (gpointer) 16);
+			 G_CALLBACK(toggle_bytes_per_row), (gpointer) 16);
 
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 	gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item1);
@@ -185,13 +176,6 @@ ViewAddMenu(GtkWidget *menu_bar)
 	g_signal_connect(G_OBJECT(item), "activate",
 			 G_CALLBACK(toggle_int_memory), NULL);
 
-	item = gtk_check_menu_item_new_with_label("SFR Memory");
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
-				       cfg->view_sfr_memory);
-	g_signal_connect(G_OBJECT(item), "activate",
-			 G_CALLBACK(toggle_sfr_memory), NULL);
-
 	item = gtk_check_menu_item_new_with_label("External Memory");
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
@@ -206,8 +190,8 @@ ViewAddMenu(GtkWidget *menu_bar)
 
 	AddMenuSeparator(menu);
 
-	/* Add bits per row submenu */
-	view_add_bits_per_row_submenu(menu);
+	/* Add bytes per row submenu */
+	view_add_bytes_per_row_submenu(menu);
 
 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(view), menu);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu_bar), view);