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

gtk: cleanup

This commit is contained in:
punkrockguy318 2016-04-23 00:37:08 +00:00
parent 56e90340b1
commit d9d6581e52
1 changed files with 21 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
trunk/src/drivers/sdl/gui.cpp
View File

@ -926,6 +926,16 @@ void setDoubleBuffering(GtkWidget* w, gpointer p)
} }
#endif #endif
void setCheckboxFromConfig(GtkWidget* w, const char* configName)
{
int buf;
g_config->getOption(configName, &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), 0);
}
void openVideoConfig() void openVideoConfig()
{ {
GtkWidget* win; GtkWidget* win;
@ -992,38 +1002,17 @@ void openVideoConfig()
// openGL check // openGL check
glChk = gtk_check_button_new_with_label("Enable OpenGL"); glChk = gtk_check_button_new_with_label("Enable OpenGL");
g_signal_connect(glChk, "clicked", G_CALLBACK(setGl), NULL); g_signal_connect(glChk, "clicked", G_CALLBACK(setGl), NULL);
loadCheckboxFromConfig(glChk, "SDL.OpenGL");
// sync with config
buf = 0;
g_config->getOption("SDL.OpenGL", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glChk), 0);
// openGL linear filter check // openGL linear filter check
linearChk = gtk_check_button_new_with_label("Enable OpenGL linear filter"); linearChk = gtk_check_button_new_with_label("Enable OpenGL linear filter");
g_signal_connect(linearChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.OpenGLip"); g_signal_connect(linearChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.OpenGLip");
loadCheckboxFromConfig(linearChk, "SDL.OpenGLip")
// sync with config
buf = 0;
g_config->getOption("SDL.OpenGLip", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linearChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linearChk), 0);
// DoubleBuffering check // DoubleBuffering check
dbChk = gtk_check_button_new_with_label("Enable double buffering"); dbChk = gtk_check_button_new_with_label("Enable double buffering");
g_signal_connect(dbChk, "clicked", G_CALLBACK(setDoubleBuffering), NULL); g_signal_connect(dbChk, "clicked", G_CALLBACK(setDoubleBuffering), NULL);
loadCheckboxFromConfig(dbChk, "SDL.DoubleBuffering");
// sync with config
buf = 0;
g_config->getOption("SDL.DoubleBuffering", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dbChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dbChk), 0);
#endif #endif
// Region (NTSC/PAL/Dendy) // Region (NTSC/PAL/Dendy)
@ -1036,7 +1025,6 @@ void openVideoConfig()
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(palCombo), "Dendy"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(palCombo), "Dendy");
// sync with cfg // sync with cfg
buf = 0;
g_config->getOption("SDL.PAL", &buf); g_config->getOption("SDL.PAL", &buf);
gtk_combo_box_set_active(GTK_COMBO_BOX(palCombo), buf); gtk_combo_box_set_active(GTK_COMBO_BOX(palCombo), buf);
@ -1047,51 +1035,22 @@ void openVideoConfig()
// New PPU check // New PPU check
ppuChk = gtk_check_button_new_with_label("Enable new PPU"); ppuChk = gtk_check_button_new_with_label("Enable new PPU");
g_signal_connect(ppuChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NewPPU"); g_signal_connect(ppuChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.NewPPU");
setCheckboxFromConfig(ppuChk, "SDL.NewPPU");
// sync with config
buf = 0;
g_config->getOption("SDL.NewPPU", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ppuChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ppuChk), 0);
// "disable 8 sprite limit" check // "disable 8 sprite limit" check
spriteLimitChk = gtk_check_button_new_with_label("Disable sprite limit"); spriteLimitChk = gtk_check_button_new_with_label("Disable sprite limit");
g_signal_connect(spriteLimitChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.DisableSpriteLimit"); g_signal_connect(spriteLimitChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.DisableSpriteLimit");
setCheckboxFromConfig(spriteLimitChk, "SDL.DisableSpriteLimit");
// sync with config
buf = 0;
g_config->getOption("SDL.DisableSpriteLimit", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spriteLimitChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(spriteLimitChk), 0);
// frameskip check // frameskip check
frameskipChk = gtk_check_button_new_with_label("Enable frameskip"); frameskipChk = gtk_check_button_new_with_label("Enable frameskip");
g_signal_connect(frameskipChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.Frameskip"); g_signal_connect(frameskipChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.Frameskip");
setCheckboxFromConfig(frameskipChk, "SDL.Frameskip");
// sync with config
buf = 0;
g_config->getOption("SDL.Frameskip", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(frameskipChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(frameskipChk), 0);
// clip sides check // clip sides check
clipSidesChk = gtk_check_button_new_with_label("Clip sides"); clipSidesChk = gtk_check_button_new_with_label("Clip sides");
g_signal_connect(clipSidesChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ClipSides"); g_signal_connect(clipSidesChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ClipSides");
setCheckboxFromConfig(clipSidesChk, "SDL.ClipSides");
// sync with config
buf = 0;
g_config->getOption("SDL.ClipSides", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clipSidesChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clipSidesChk), 0);
// xscale / yscale // xscale / yscale
xscaleHbox = gtk_hbox_new(FALSE, 5); xscaleHbox = gtk_hbox_new(FALSE, 5);
@ -1119,16 +1078,7 @@ void openVideoConfig()
// show FPS check // show FPS check
showFpsChk = gtk_check_button_new_with_label("Show FPS"); showFpsChk = gtk_check_button_new_with_label("Show FPS");
g_signal_connect(showFpsChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ShowFPS"); g_signal_connect(showFpsChk, "clicked", G_CALLBACK(toggleOption), (gpointer)"SDL.ShowFPS");
setCheckboxFromConfig(showFpsChk, "SDL.ShowFPS");
// sync with config
buf = 0;
g_config->getOption("SDL.ShowFPS", &buf);
if(buf)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showFpsChk), 1);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(showFpsChk), 0);
gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 5);