From 8c7c11c6446c1adbb1e6fd5c041e48b3a3e9e814 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 6 Sep 2012 14:27:34 -0700 Subject: Update the About screen Add the current year and the second main author, err, me. Signed-off-by: Dirk Hohndel --- gtk-gui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-gui.c b/gtk-gui.c index a2f130ac2..2cdd56dcf 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -697,10 +697,10 @@ static void about_dialog(GtkWidget *w, gpointer data) gtk_show_about_dialog(NULL, "program-name", "SubSurface", - "comments", "Half-arsed divelog software in C", + "comments", "Multi-platform divelog software in C", "license", "GPLv2", "version", VERSION_STRING, - "copyright", "Linus Torvalds 2011", + "copyright", "Linus Torvalds, Dirk Hohndel, and others, 2011, 2012", "logo-icon-name", "subsurface", /* Must be last: */ logo_property, logo, -- cgit v1.2.3-70-g09d2 From 109dab56eb32bca4d43ada6b62f5c29e5e10b687 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 6 Sep 2012 14:31:38 -0700 Subject: Set default path for file import to the last path opened This may not be the path the import files are in, but it's better than the current default of 'nothing'. Signed-off-by: Dirk Hohndel --- gtk-gui.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk-gui.c b/gtk-gui.c index 2cdd56dcf..79933fb85 100644 --- a/gtk-gui.c +++ b/gtk-gui.c @@ -1174,6 +1174,7 @@ static GtkWidget *xml_file_selector(GtkWidget *vbox, GtkWidget *main_dialog) { GtkWidget *hbox, *frame, *chooser, *dialog; GtkFileFilter *filter; + char *current_file, *current_dir; hbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); @@ -1187,7 +1188,10 @@ static GtkWidget *xml_file_selector(GtkWidget *vbox, GtkWidget *main_dialog) GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE); - + current_dir = path_and_file(existing_filename, ¤t_file); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), current_dir); + free(current_dir); + free(current_file); filter = gtk_file_filter_new(); gtk_file_filter_add_pattern(filter, "*.xml"); gtk_file_filter_add_pattern(filter, "*.XML"); -- cgit v1.2.3-70-g09d2