diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am index 5220d27bf..216d54e0c 100644 --- a/desmume/src/gtk-glade/Makefile.am +++ b/desmume/src/gtk-glade/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = desmume-glade desmume_glade_SOURCES = \ callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h \ globals.h keyval_names.c main.c printscreen.c \ - dTools/callbacks_1_ioregs.c dTools/callbacks_dtools.h \ + dTools/callbacks_1_ioregs.c dTools/callbacks_2_memview.c dTools/callbacks_dtools.h \ ../sndsdl.h ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(LIBGLADE_LIBS) desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS) diff --git a/desmume/src/gtk-glade/callbacks.c b/desmume/src/gtk-glade/callbacks.c index 111905305..5ebcdb9c6 100755 --- a/desmume/src/gtk-glade/callbacks.c +++ b/desmume/src/gtk-glade/callbacks.c @@ -242,6 +242,14 @@ void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data) gtk_widget_show(dlg); } +void on_menu_memview_activate (GtkMenuItem *menuitem, gpointer user_data) { + GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_2_MemView"); + gtk_widget_show(dlg); +} + + + + /* MENU ? ***** ***** ***** ***** */ void on_menu_apropos_activate (GtkMenuItem *menuitem, gpointer user_data) { diff --git a/desmume/src/gtk-glade/callbacks.h b/desmume/src/gtk-glade/callbacks.h index 4bb297bfc..0dd808d51 100755 --- a/desmume/src/gtk-glade/callbacks.h +++ b/desmume/src/gtk-glade/callbacks.h @@ -57,6 +57,8 @@ void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data); void on_menu_rotatescreen_activate (GtkMenuItem *menuitem, gpointer user_data); /* MENU TOOLS */ void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data); +void on_menu_memview_activate (GtkMenuItem *menuitem, gpointer user_data); + /* MENU ? */ void on_menu_apropos_activate (GtkMenuItem *menuitem, gpointer user_data); diff --git a/desmume/src/gtk-glade/glade/DeSmuMe.glade b/desmume/src/gtk-glade/glade/DeSmuMe.glade index 1082e1abf..4368df4ba 100755 --- a/desmume/src/gtk-glade/glade/DeSmuMe.glade +++ b/desmume/src/gtk-glade/glade/DeSmuMe.glade @@ -117,7 +117,7 @@ - + True gtk-refresh 1 @@ -164,7 +164,7 @@ True 1 True - False + True fs0 @@ -175,7 +175,7 @@ True 2 True - False + True fs0 @@ -186,7 +186,7 @@ True 3 True - False + True fs0 @@ -197,7 +197,7 @@ True 4 True - False + True fs0 @@ -208,7 +208,7 @@ True 5 True - False + True fs0 @@ -219,7 +219,7 @@ True 6 True - False + True fs0 @@ -230,7 +230,7 @@ True 7 True - False + True fs0 @@ -241,7 +241,7 @@ True 8 True - False + True fs0 @@ -252,7 +252,7 @@ True 9 True - False + True fs0 @@ -286,7 +286,7 @@ True 2x True - False + True size1x @@ -297,7 +297,7 @@ True 3x True - False + True size1x @@ -328,7 +328,7 @@ - + True gtk-preferences 1 @@ -402,7 +402,7 @@ - + True gtk-properties 1 @@ -414,6 +414,15 @@ + + + + True + View Memory + True + + + diff --git a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade b/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade index 5d538e5bc..d705d83cf 100755 --- a/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade +++ b/desmume/src/gtk-glade/glade/DeSmuMe_Dtools.glade @@ -798,9 +798,16 @@ cpu : ARM9 - + True - + GTK_SHADOW_IN + + + + True + + +