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

cleaned some code 

moved sound checkbox to main window (pointless to have a pref window really; main window is pref window)
TODO:  Hotkey config / Input config
This commit is contained in:
punkrockguy318 2009-12-22 06:40:33 +00:00
parent 5011579ba1
commit eb504adb19
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/drivers/sdl/gui.cpp
View File

@ -98,34 +98,27 @@ void openPrefs(void)
GtkWidget* vbox; GtkWidget* vbox;
GtkWidget* hbox; GtkWidget* hbox;
GtkWidget* soundLabel; GtkWidget* someLabel;
GtkWidget* soundCheck; GtkWidget* someCheck;
GtkWidget* closeButton; GtkWidget* closeButton;
prefsWin = gtk_window_new(GTK_WINDOW_TOPLEVEL); prefsWin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(prefsWin), "Preferences"); gtk_window_set_title(GTK_WINDOW(prefsWin), "Preferences");
vbox = gtk_vbox_new(TRUE, 5); vbox = gtk_vbox_new(TRUE, 5);
hbox = gtk_hbox_new(TRUE, 5); hbox = gtk_hbox_new(TRUE, 5);
soundLabel = gtk_label_new("Enable sound: "); someLabel = gtk_label_new("Enable something: ");
soundCheck = gtk_check_button_new(); someCheck = gtk_check_button_new();
closeButton = gtk_button_new_from_stock(GTK_STOCK_CLOSE); closeButton = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
int s;
g_config->getOption("SDL.Sound", &s);
if(s)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundCheck), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundCheck), FALSE);
gtk_container_add(GTK_CONTAINER(prefsWin), vbox); gtk_container_add(GTK_CONTAINER(prefsWin), vbox);
gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
gtk_box_pack_start(GTK_BOX(hbox), soundLabel, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(hbox), someLabel, TRUE, TRUE, 5);
gtk_box_pack_start(GTK_BOX(hbox), soundCheck, TRUE, TRUE, 5); gtk_box_pack_start(GTK_BOX(hbox), someCheck, TRUE, TRUE, 5);
gtk_box_pack_end(GTK_BOX(vbox), closeButton, TRUE, TRUE, 5); gtk_box_pack_end(GTK_BOX(vbox), closeButton, TRUE, TRUE, 5);
gtk_widget_show_all(prefsWin); gtk_widget_show_all(prefsWin);
gtk_signal_connect(GTK_OBJECT(soundCheck), "clicked", G_CALLBACK(toggleSound), NULL); gtk_signal_connect(GTK_OBJECT(prefsWin), "delete-event", G_CALLBACK(closePrefs), NULL);
gtk_signal_connect(GTK_OBJECT(prefsWin), "delete-event", closePrefs, NULL);
gtk_signal_connect(GTK_OBJECT(closeButton), "clicked", closePrefs, NULL); gtk_signal_connect(GTK_OBJECT(closeButton), "clicked", closePrefs, NULL);
@ -239,6 +232,9 @@ int InitGTKSubsystem(int argc, char** argv)
//GtkWidget* MainWindow; //GtkWidget* MainWindow;
GtkWidget* Menubar; GtkWidget* Menubar;
GtkWidget* vbox; GtkWidget* vbox;
GtkWidget* soundLabel;
GtkWidget* soundCheck;
GtkWidget* soundHbox;
int xres, yres; int xres, yres;
g_config->getOption("SDL.XResolution", &xres); g_config->getOption("SDL.XResolution", &xres);
@ -248,14 +244,30 @@ int InitGTKSubsystem(int argc, char** argv)
MainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL); MainWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(MainWindow), "fceuX GTK GUI - WIP"); gtk_window_set_title(GTK_WINDOW(MainWindow), "fceuX GTK GUI - WIP");
gtk_window_set_default_size(GTK_WINDOW(MainWindow), 359, 200);
vbox = gtk_vbox_new(FALSE, 3); vbox = gtk_vbox_new(FALSE, 3);
soundHbox = gtk_hbox_new(FALSE, 5);
soundLabel = gtk_label_new("Enable sound: ");
gtk_container_add(GTK_CONTAINER(MainWindow), vbox); gtk_container_add(GTK_CONTAINER(MainWindow), vbox);
Menubar = CreateMenubar(MainWindow); Menubar = CreateMenubar(MainWindow);
soundCheck = gtk_check_button_new();
int s;
g_config->getOption("SDL.Sound", &s);
if(s)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundCheck), TRUE);
else
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(soundCheck), FALSE);
//gtk_container_add(GTK_CONTAINER(vbox), Menubar); //gtk_container_add(GTK_CONTAINER(vbox), Menubar);
gtk_box_pack_start (GTK_BOX(vbox), Menubar, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX(vbox), Menubar, FALSE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), soundHbox, TRUE, FALSE, 5);
gtk_box_pack_start(GTK_BOX(soundHbox), soundLabel, FALSE, TRUE, 5);
gtk_box_pack_start(GTK_BOX(soundHbox), soundCheck, FALSE, TRUE, 5);
// broken SDL embedding code // broken SDL embedding code
@ -301,6 +313,8 @@ int InitGTKSubsystem(int argc, char** argv)
// signal handlers // signal handlers
g_signal_connect(G_OBJECT(MainWindow), "delete-event", quit, NULL); g_signal_connect(G_OBJECT(MainWindow), "delete-event", quit, NULL);
gtk_signal_connect(GTK_OBJECT(soundCheck), "clicked", G_CALLBACK(toggleSound), NULL);
//gtk_idle_add(mainLoop, MainWindow); //gtk_idle_add(mainLoop, MainWindow);
gtk_widget_set_size_request (GTK_WIDGET(MainWindow), 300, 200); gtk_widget_set_size_request (GTK_WIDGET(MainWindow), 300, 200);