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

GTK: Add configurable initial background.

This commit is contained in:
Brandon Wright 2019-04-13 15:47:01 -05:00
parent e170bf66ca
commit c3bc6fff87
2 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/src/gtk_preferences.cpp
View File

@ -667,6 +667,7 @@ Snes9xPreferences::move_settings_to_dialog ()
set_spin ("rewind_buffer_size", config->rewind_buffer_size);
set_spin ("rewind_granularity", config->rewind_granularity);
set_spin ("superfx_multiplier", Settings.SuperFXClockMultiplier);
set_combo ("splash_background", config->splash_image);
int num_sound_drivers = 0;
#ifdef USE_PORTAUDIO
@ -786,6 +787,18 @@ Snes9xPreferences::get_settings_from_dialog ()
config->change_display_resolution = get_check ("change_display_resolution");
if (config->splash_image != get_combo ("splash_background"))
{
config->splash_image = get_combo ("splash_background");
if (!config->rom_loaded)
{
top_level->last_width = top_level->last_height = -1;
top_level->expose();
}
}
config->splash_image = get_combo ("splash_background");
if (config->multithreading != get_check ("multithreading"))
gfx_needs_restart = true;
@ -857,7 +870,7 @@ Snes9xPreferences::get_settings_from_dialog ()
}
Settings.SeparateEchoBuffer = get_check ("echo_buffer_hack");
Settings.InterpolationMethod = get_check ("sound_filter");
Settings.InterpolationMethod = get_combo ("sound_filter");
#endif
config->joystick_threshold = get_spin ("joystick_threshold");

69
gtk/src/snes9x.ui
View File

@ -802,6 +802,29 @@
<property name="stock">gtk-media-stop</property>
<property name="icon-size">1</property>
</object>
<object class="GtkListStore" id="liststorebackgrounds">
<columns>
<!-- column-name item -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Black</col>
</row>
<row>
<col id="0" translatable="yes">Color bars</col>
</row>
<row>
<col id="0" translatable="yes">Pixel art patterns</col>
</row>
<row>
<col id="0" translatable="yes">Dithered gradient</col>
</row>
<row>
<col id="0" translatable="yes">Color bars and patterns</col>
</row>
</data>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item -->
@ -9092,6 +9115,48 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hboxsplashbackground">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="labelsplashbackground">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Initial background:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="splash_background">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">liststorebackgrounds</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertextsplashbackground"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
@ -9100,7 +9165,7 @@
<object class="GtkLabel" id="label123">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Window Switching&lt;/b&gt;</property>
<property name="label" translatable="yes">&lt;b&gt;Window Behavior&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
@ -9171,7 +9236,7 @@
<object class="GtkImage" id="imageuitab">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">input-keyboard</property>
<property name="icon_name">preferences-system-windows</property>
<property name="pixel_size">24</property>
</object>
<packing>