--- a/src/gtkui/path_dlg.c Wed Apr 16 12:43:52 2008 +0000 +++ b/src/gtkui/path_dlg.c Mon Jul 21 00:08:34 2008 +0000 @@ -26,15 +26,15 @@ #include "gtkui/gtkui.h" static const gchar *path_label[] = { N_("Bios rom"), N_("Flash rom"), N_("Default disc path"), - N_("Save state path"), N_("Bootstrap IP.BIN") }; + N_("Save state path"), N_("Bootstrap IP.BIN") }; static const int path_id[] = { CONFIG_BIOS_PATH, CONFIG_FLASH_PATH, CONFIG_DEFAULT_PATH, - CONFIG_SAVE_PATH, CONFIG_BOOTSTRAP }; + CONFIG_SAVE_PATH, CONFIG_BOOTSTRAP }; static GtkFileChooserAction path_action[] = { - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_FILE_CHOOSER_ACTION_OPEN }; + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, + GTK_FILE_CHOOSER_ACTION_OPEN }; static GtkWidget *path_entry[5]; @@ -42,18 +42,18 @@ { GtkWidget *entry = GTK_WIDGET(user_data); GtkWidget *file = gtk_file_chooser_dialog_new( _("Select file"), NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL ); + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL ); const gchar *filename = gtk_entry_get_text(GTK_ENTRY(entry)); gtk_file_chooser_set_filename( GTK_FILE_CHOOSER(file), filename ); gtk_window_set_modal( GTK_WINDOW(file), TRUE ); gtk_widget_show_all( file ); gint result = gtk_dialog_run(GTK_DIALOG(file)); if( result == GTK_RESPONSE_ACCEPT ) { - filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(file) ); - gtk_entry_set_text(GTK_ENTRY(entry), filename); + filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(file) ); + gtk_entry_set_text(GTK_ENTRY(entry), filename); } gtk_widget_destroy(file); return TRUE; @@ -63,10 +63,10 @@ { GtkWidget *entry = GTK_WIDGET(user_data); GtkWidget *file = gtk_file_chooser_dialog_new( _("Select file"), NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL ); + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL ); const gchar *filename = gtk_entry_get_text(GTK_ENTRY(entry)); gtk_file_chooser_set_action( GTK_FILE_CHOOSER(file), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ); gtk_file_chooser_set_filename( GTK_FILE_CHOOSER(file), filename ); @@ -74,8 +74,8 @@ gtk_widget_show_all( file ); gint result = gtk_dialog_run(GTK_DIALOG(file)); if( result == GTK_RESPONSE_ACCEPT ) { - filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(file) ); - gtk_entry_set_text(GTK_ENTRY(entry), filename); + filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(file) ); + gtk_entry_set_text(GTK_ENTRY(entry), filename); } gtk_widget_destroy(file); return TRUE; @@ -86,23 +86,23 @@ GtkWidget *table = gtk_table_new( 5, 3, FALSE ); int i; for( i=0; i<5; i++ ) { - GtkWidget *text = path_entry[i] = gtk_entry_new(); - GtkWidget *button = gtk_button_new(); - gtk_table_attach( GTK_TABLE(table), gtk_label_new(Q_(path_label[i])), 0, 1, i, i+1, - GTK_SHRINK, GTK_SHRINK, 0, 0); - gtk_entry_set_text( GTK_ENTRY(text), lxdream_get_config_value(path_id[i]) ); - gtk_entry_set_width_chars( GTK_ENTRY(text), 48 ); - gtk_table_attach_defaults( GTK_TABLE(table), text, 1, 2, i, i+1 ); - gtk_table_attach( GTK_TABLE(table), button, 2, 3, i, i+1, GTK_SHRINK, GTK_SHRINK, 0, 0 ); - if( path_action[i] == GTK_FILE_CHOOSER_ACTION_OPEN ) { - GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image( GTK_BUTTON(button), image ); - g_signal_connect( button, "clicked", G_CALLBACK(path_file_button_clicked), text ); - } else { - GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image( GTK_BUTTON(button), image ); - g_signal_connect( button, "clicked", G_CALLBACK(path_dir_button_clicked), text ); - } + GtkWidget *text = path_entry[i] = gtk_entry_new(); + GtkWidget *button = gtk_button_new(); + gtk_table_attach( GTK_TABLE(table), gtk_label_new(Q_(path_label[i])), 0, 1, i, i+1, + GTK_SHRINK, GTK_SHRINK, 0, 0); + gtk_entry_set_text( GTK_ENTRY(text), lxdream_get_config_value(path_id[i]) ); + gtk_entry_set_width_chars( GTK_ENTRY(text), 48 ); + gtk_table_attach_defaults( GTK_TABLE(table), text, 1, 2, i, i+1 ); + gtk_table_attach( GTK_TABLE(table), button, 2, 3, i, i+1, GTK_SHRINK, GTK_SHRINK, 0, 0 ); + if( path_action[i] == GTK_FILE_CHOOSER_ACTION_OPEN ) { + GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image( GTK_BUTTON(button), image ); + g_signal_connect( button, "clicked", G_CALLBACK(path_file_button_clicked), text ); + } else { + GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image( GTK_BUTTON(button), image ); + g_signal_connect( button, "clicked", G_CALLBACK(path_dir_button_clicked), text ); + } } return table; @@ -111,15 +111,15 @@ void path_panel_done( GtkWidget *panel, gboolean isOK ) { if( isOK ) { - int i; - for(i=0; i<5; i++ ) { - const char *filename = gtk_entry_get_text( GTK_ENTRY(path_entry[i]) ); - lxdream_set_global_config_value( path_id[i], filename ); - } - - lxdream_save_config(); - dreamcast_config_changed(); - gtk_gui_update(); + int i; + for(i=0; i<5; i++ ) { + const char *filename = gtk_entry_get_text( GTK_ENTRY(path_entry[i]) ); + lxdream_set_global_config_value( path_id[i], filename ); + } + + lxdream_save_config(); + dreamcast_config_changed(); + gtk_gui_update(); } }