Search
lxdream.org :: lxdream/src/gui/ctrl_dlg.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/gui/ctrl_dlg.c
changeset 450:207461e79f21
prev447:3e095bfcb476
next455:3080881d00d4
author nkeynes
date Wed Oct 17 11:26:45 2007 +0000 (13 years ago)
permissions -rw-r--r--
last change Split config management out to config.[ch]
Manage config filename
Check home dir + sysconfdir for conf file
Initial work on a path settings dialog
file annotate diff log raw
1.1 --- a/src/gui/ctrl_dlg.c Tue Oct 16 12:36:29 2007 +0000
1.2 +++ b/src/gui/ctrl_dlg.c Wed Oct 17 11:26:45 2007 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /**
1.5 - * $Id: ctrl_dlg.c,v 1.1 2007-10-16 12:36:29 nkeynes Exp $
1.6 + * $Id: ctrl_dlg.c,v 1.2 2007-10-17 11:26:45 nkeynes Exp $
1.7 *
1.8 * Define the main (emu) GTK window, along with its menubars,
1.9 * toolbars, etc.
1.10 @@ -79,7 +79,7 @@
1.11 }
1.12 }
1.13 }
1.14 - dreamcast_save_config("testrc");
1.15 + lxdream_save_config();
1.16 }
1.17
1.18 void controller_cancel_changes( )
1.19 @@ -93,7 +93,7 @@
1.20 }
1.21 }
1.22
1.23 -GtkWidget *controller_pane_new()
1.24 +GtkWidget *controller_panel_new()
1.25 {
1.26 GtkWidget *table = gtk_table_new(4, 3, TRUE);
1.27 GtkTreeIter iter;
1.28 @@ -125,7 +125,7 @@
1.29 maple_data[i].new_device = device;
1.30 maple_data[i].combo = combo;
1.31 maple_data[i].button = button;
1.32 - g_signal_connect( button, "activate",
1.33 + g_signal_connect( button, "clicked",
1.34 G_CALLBACK( controller_properties_activated ), &maple_data[i] );
1.35 g_signal_connect( combo, "changed",
1.36 G_CALLBACK( controller_device_changed ), &maple_data[i] );
1.37 @@ -136,18 +136,7 @@
1.38
1.39 void controller_dialog_run( GtkWindow *parent )
1.40 {
1.41 - GtkWidget *dialog =
1.42 - gtk_dialog_new_with_buttons("Controller Settings", parent,
1.43 - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
1.44 - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
1.45 - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
1.46 - NULL);
1.47 - GtkWidget *panel = controller_pane_new();
1.48 - gint result;
1.49 - gtk_widget_show_all(panel);
1.50 - gtk_container_add( GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), panel );
1.51 - result = gtk_dialog_run( GTK_DIALOG(dialog) );
1.52 - gtk_widget_destroy( dialog );
1.53 + gint result = gtk_gui_run_property_dialog( "Controller Settings", controller_panel_new() );
1.54 if( result == GTK_RESPONSE_ACCEPT ) {
1.55 controller_commit_changes();
1.56 } else {
.