ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from YamashitaRen/master 

GTK: Add a 10th save slot (Slot 9).
This commit is contained in:
bearoso 2017-05-06 18:47:54 -05:00 committed by GitHub
parent 93b5f11641 6d814fc209
commit 1188fa2a1e
4 changed files with 156 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/src/gtk_control.cpp
View File

@ -65,6 +65,7 @@ const BindingLink b_links[] =
{ "b_save_6", "QuickSave006" }, { "b_save_6", "QuickSave006" },
{ "b_save_7", "QuickSave007" }, { "b_save_7", "QuickSave007" },
{ "b_save_8", "QuickSave008" }, { "b_save_8", "QuickSave008" },
{ "b_save_9", "QuickSave009" },
{ "b_load_0", "QuickLoad000" }, { "b_load_0", "QuickLoad000" },
{ "b_load_1", "QuickLoad001" }, { "b_load_1", "QuickLoad001" },
{ "b_load_2", "QuickLoad002" }, { "b_load_2", "QuickLoad002" },
@ -74,6 +75,7 @@ const BindingLink b_links[] =
{ "b_load_6", "QuickLoad006" }, { "b_load_6", "QuickLoad006" },
{ "b_load_7", "QuickLoad007" }, { "b_load_7", "QuickLoad007" },
{ "b_load_8", "QuickLoad008" }, { "b_load_8", "QuickLoad008" },
{ "b_load_9", "QuickLoad009" },
{ "b_sound_channel_0", "SoundChannel0" }, { "b_sound_channel_0", "SoundChannel0" },
{ "b_sound_channel_1", "SoundChannel1" }, { "b_sound_channel_1", "SoundChannel1" },
{ "b_sound_channel_2", "SoundChannel2" }, { "b_sound_channel_2", "SoundChannel2" },
@ -101,9 +103,9 @@ const int b_breaks[] =
24, /* End of turbo/sticky buttons */ 24, /* End of turbo/sticky buttons */
35, /* End of base emulator buttons */ 35, /* End of base emulator buttons */
43, /* End of Graphic options */ 43, /* End of Graphic options */
61, /* End of save/load states */ 63, /* End of save/load states */
70, /* End of sound buttons */ 72, /* End of sound buttons */
77, /* End of miscellaneous buttons */ 79, /* End of miscellaneous buttons */
-1 -1
}; };

2
gtk/src/gtk_control.h
View File

@ -38,7 +38,7 @@ typedef struct BindingLink
extern const BindingLink b_links[]; extern const BindingLink b_links[];
extern const int b_breaks[]; extern const int b_breaks[];
#define NUM_JOYPAD_LINKS 24 #define NUM_JOYPAD_LINKS 24
#define NUM_EMU_LINKS 53 #define NUM_EMU_LINKS 55
typedef struct JoypadBinding typedef struct JoypadBinding
{ {

4
gtk/src/gtk_s9xwindow.cpp
View File

@ -1009,6 +1009,7 @@ Snes9xWindow::load_state_dialog ()
gtk_file_filter_add_pattern (filter, "*.006"); gtk_file_filter_add_pattern (filter, "*.006");
gtk_file_filter_add_pattern (filter, "*.007"); gtk_file_filter_add_pattern (filter, "*.007");
gtk_file_filter_add_pattern (filter, "*.008"); gtk_file_filter_add_pattern (filter, "*.008");
gtk_file_filter_add_pattern (filter, "*.009");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new (); 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, "*.006");
gtk_file_filter_add_pattern (filter, "*.007"); gtk_file_filter_add_pattern (filter, "*.007");
gtk_file_filter_add_pattern (filter, "*.008"); gtk_file_filter_add_pattern (filter, "*.008");
gtk_file_filter_add_pattern (filter, "*.009");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new (); 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_6", "QuickSave006");
set_menu_item_accel_to_binding ("save_state_7", "QuickSave007"); 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_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_0", "QuickLoad000");
set_menu_item_accel_to_binding ("load_state_1", "QuickLoad001"); set_menu_item_accel_to_binding ("load_state_1", "QuickLoad001");
set_menu_item_accel_to_binding ("load_state_2", "QuickLoad002"); 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_6", "QuickLoad006");
set_menu_item_accel_to_binding ("load_state_7", "QuickLoad007"); 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_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 ("pause_item", "GTK_pause");
set_menu_item_accel_to_binding ("save_spc_item", "GTK_save_spc"); set_menu_item_accel_to_binding ("save_spc_item", "GTK_save_spc");
set_menu_item_accel_to_binding ("open_rom_item", "GTK_open_rom"); set_menu_item_accel_to_binding ("open_rom_item", "GTK_open_rom");

206
gtk/src/snes9x.ui
View File

@ -1198,6 +1198,15 @@
<signal name="activate" handler="load_save_state" swapped="no"/> <signal name="activate" handler="load_save_state" swapped="no"/>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuItem" id="load_state_9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Slot _9</property>
<property name="use_underline">True</property>
<signal name="activate" handler="load_save_state" swapped="no"/>
</object>
</child>
<child> <child>
<object class="GtkSeparatorMenuItem" id="separator7"> <object class="GtkSeparatorMenuItem" id="separator7">
<property name="visible">True</property> <property name="visible">True</property>
@ -1308,6 +1317,15 @@
<signal name="activate" handler="save_save_state" swapped="no"/> <signal name="activate" handler="save_save_state" swapped="no"/>
</object> </object>
</child> </child>
<child>
<object class="GtkMenuItem" id="save_state_9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Slot _9</property>
<property name="use_underline">True</property>
<signal name="activate" handler="save_save_state" swapped="no"/>
</object>
</child>
<child> <child>
<object class="GtkSeparatorMenuItem" id="separator8"> <object class="GtkSeparatorMenuItem" id="separator8">
<property name="visible">True</property> <property name="visible">True</property>
@ -7144,7 +7162,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="border_width">10</property> <property name="border_width">10</property>
<property name="n_rows">10</property> <property name="n_rows">11</property>
<property name="n_columns">4</property> <property name="n_columns">4</property>
<property name="column_spacing">10</property> <property name="column_spacing">10</property>
<property name="row_spacing">5</property> <property name="row_spacing">5</property>
@ -7178,20 +7196,6 @@
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Slot 1</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label74"> <object class="GtkLabel" id="label74">
<property name="visible">True</property> <property name="visible">True</property>
@ -7206,6 +7210,20 @@
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label75">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Slot 1</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label76"> <object class="GtkLabel" id="label76">
<property name="visible">True</property> <property name="visible">True</property>
@ -7290,6 +7308,34 @@
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="label102">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Slot 8</property>
</object>
<packing>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label152">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Slot 9</property>
</object>
<packing>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options"/>
<property name="y_options"/>
</packing>
</child>
<child> <child>
<object class="GtkLabel" id="label82"> <object class="GtkLabel" id="label82">
<property name="visible">True</property> <property name="visible">True</property>
@ -7435,15 +7481,17 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label102"> <object class="GtkLabel" id="label158">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Slot 8</property> <property name="label" translatable="yes">Slot 9</property>
</object> </object>
<packing> <packing>
<property name="top_attach">9</property> <property name="left_attach">2</property>
<property name="bottom_attach">10</property> <property name="right_attach">3</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options"/> <property name="x_options"/>
<property name="y_options"/> <property name="y_options"/>
</packing> </packing>
@ -7619,6 +7667,25 @@
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="b_save_9">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child> <child>
<object class="GtkEntry" id="b_load_0"> <object class="GtkEntry" id="b_load_0">
<property name="width_request">50</property> <property name="width_request">50</property>
@ -7638,25 +7705,6 @@
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="b_load_2">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child> <child>
<object class="GtkEntry" id="b_load_1"> <object class="GtkEntry" id="b_load_1">
<property name="width_request">50</property> <property name="width_request">50</property>
@ -7676,6 +7724,25 @@
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="b_load_2">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child> <child>
<object class="GtkEntry" id="b_load_3"> <object class="GtkEntry" id="b_load_3">
<property name="width_request">50</property> <property name="width_request">50</property>
@ -7715,7 +7782,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkEntry" id="b_load_8"> <object class="GtkEntry" id="b_load_5">
<property name="width_request">50</property> <property name="width_request">50</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -7728,8 +7795,8 @@
<packing> <packing>
<property name="left_attach">3</property> <property name="left_attach">3</property>
<property name="right_attach">4</property> <property name="right_attach">4</property>
<property name="top_attach">9</property> <property name="top_attach">6</property>
<property name="bottom_attach">10</property> <property name="bottom_attach">7</property>
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
@ -7752,25 +7819,6 @@
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="b_load_5">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child> <child>
<object class="GtkEntry" id="b_load_7"> <object class="GtkEntry" id="b_load_7">
<property name="width_request">50</property> <property name="width_request">50</property>
@ -7790,6 +7838,44 @@
<property name="y_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkEntry" id="b_load_8">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="b_load_9">
<property name="width_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
</object> </object>
</child> </child>
</object> </object>