diff --git a/gtk/src/gtk_control.cpp b/gtk/src/gtk_control.cpp index 37987b49..3b859080 100644 --- a/gtk/src/gtk_control.cpp +++ b/gtk/src/gtk_control.cpp @@ -65,6 +65,7 @@ const BindingLink b_links[] = { "b_save_6", "QuickSave006" }, { "b_save_7", "QuickSave007" }, { "b_save_8", "QuickSave008" }, + { "b_save_9", "QuickSave009" }, { "b_load_0", "QuickLoad000" }, { "b_load_1", "QuickLoad001" }, { "b_load_2", "QuickLoad002" }, @@ -74,6 +75,7 @@ const BindingLink b_links[] = { "b_load_6", "QuickLoad006" }, { "b_load_7", "QuickLoad007" }, { "b_load_8", "QuickLoad008" }, + { "b_load_9", "QuickLoad009" }, { "b_sound_channel_0", "SoundChannel0" }, { "b_sound_channel_1", "SoundChannel1" }, { "b_sound_channel_2", "SoundChannel2" }, @@ -101,9 +103,9 @@ const int b_breaks[] = 24, /* End of turbo/sticky buttons */ 35, /* End of base emulator buttons */ 43, /* End of Graphic options */ - 61, /* End of save/load states */ - 70, /* End of sound buttons */ - 77, /* End of miscellaneous buttons */ + 63, /* End of save/load states */ + 72, /* End of sound buttons */ + 79, /* End of miscellaneous buttons */ -1 }; diff --git a/gtk/src/gtk_control.h b/gtk/src/gtk_control.h index 5ed09ac2..6feacb38 100644 --- a/gtk/src/gtk_control.h +++ b/gtk/src/gtk_control.h @@ -38,7 +38,7 @@ typedef struct BindingLink extern const BindingLink b_links[]; extern const int b_breaks[]; #define NUM_JOYPAD_LINKS 24 -#define NUM_EMU_LINKS 53 +#define NUM_EMU_LINKS 55 typedef struct JoypadBinding { diff --git a/gtk/src/gtk_s9xwindow.cpp b/gtk/src/gtk_s9xwindow.cpp index 04a0ae16..a389dc32 100644 --- a/gtk/src/gtk_s9xwindow.cpp +++ b/gtk/src/gtk_s9xwindow.cpp @@ -1009,6 +1009,7 @@ Snes9xWindow::load_state_dialog () gtk_file_filter_add_pattern (filter, "*.006"); gtk_file_filter_add_pattern (filter, "*.007"); gtk_file_filter_add_pattern (filter, "*.008"); + gtk_file_filter_add_pattern (filter, "*.009"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); @@ -1132,6 +1133,7 @@ Snes9xWindow::save_state_dialog () gtk_file_filter_add_pattern (filter, "*.006"); gtk_file_filter_add_pattern (filter, "*.007"); gtk_file_filter_add_pattern (filter, "*.008"); + gtk_file_filter_add_pattern (filter, "*.009"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); @@ -1907,6 +1909,7 @@ Snes9xWindow::update_accels (void) set_menu_item_accel_to_binding ("save_state_6", "QuickSave006"); set_menu_item_accel_to_binding ("save_state_7", "QuickSave007"); set_menu_item_accel_to_binding ("save_state_8", "QuickSave008"); + set_menu_item_accel_to_binding ("save_state_9", "QuickSave009"); set_menu_item_accel_to_binding ("load_state_0", "QuickLoad000"); set_menu_item_accel_to_binding ("load_state_1", "QuickLoad001"); set_menu_item_accel_to_binding ("load_state_2", "QuickLoad002"); @@ -1916,6 +1919,7 @@ Snes9xWindow::update_accels (void) set_menu_item_accel_to_binding ("load_state_6", "QuickLoad006"); set_menu_item_accel_to_binding ("load_state_7", "QuickLoad007"); set_menu_item_accel_to_binding ("load_state_8", "QuickLoad008"); + set_menu_item_accel_to_binding ("load_state_9", "QuickLoad009"); set_menu_item_accel_to_binding ("pause_item", "GTK_pause"); set_menu_item_accel_to_binding ("save_spc_item", "GTK_save_spc"); set_menu_item_accel_to_binding ("open_rom_item", "GTK_open_rom"); diff --git a/gtk/src/snes9x.ui b/gtk/src/snes9x.ui index 9ab6da0e..c2f295e9 100644 --- a/gtk/src/snes9x.ui +++ b/gtk/src/snes9x.ui @@ -1198,6 +1198,15 @@ + + + True + False + Slot _9 + True + + + True @@ -1308,6 +1317,15 @@ + + + True + False + Slot _9 + True + + + True @@ -7144,7 +7162,7 @@ True False 10 - 10 + 11 4 10 5 @@ -7178,20 +7196,6 @@ - - - True - False - 0 - Slot 1 - - - 2 - 3 - - - - True @@ -7206,6 +7210,20 @@ + + + True + False + 0 + Slot 1 + + + 2 + 3 + + + + True @@ -7290,6 +7308,34 @@ + + + True + False + 0 + Slot 8 + + + 9 + 10 + + + + + + + True + False + 0 + Slot 9 + + + 10 + 11 + + + + True @@ -7435,15 +7481,17 @@ - + True False 0 - Slot 8 + Slot 9 - 9 - 10 + 2 + 3 + 10 + 11 @@ -7619,6 +7667,25 @@ GTK_FILL + + + 50 + True + True + False + False + False + True + True + + + 1 + 2 + 10 + 11 + GTK_FILL + + 50 @@ -7638,25 +7705,6 @@ GTK_FILL - - - 50 - True - True - False - False - False - True - True - - - 3 - 4 - 3 - 4 - GTK_FILL - - 50 @@ -7676,6 +7724,25 @@ GTK_FILL + + + 50 + True + True + False + False + False + True + True + + + 3 + 4 + 3 + 4 + GTK_FILL + + 50 @@ -7715,7 +7782,7 @@ - + 50 True True @@ -7728,8 +7795,8 @@ 3 4 - 9 - 10 + 6 + 7 GTK_FILL @@ -7752,25 +7819,6 @@ GTK_FILL - - - 50 - True - True - False - False - False - True - True - - - 3 - 4 - 6 - 7 - GTK_FILL - - 50 @@ -7790,6 +7838,44 @@ GTK_FILL + + + 50 + True + True + False + False + False + True + True + + + 3 + 4 + 9 + 10 + GTK_FILL + + + + + 50 + True + True + False + False + False + True + True + + + 3 + 4 + 10 + 11 + GTK_FILL + +