mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ui-work' of git://git.hohndel.org/subsurface

Browse source 
Pull small UI updates from Dirk Hohndel:
 "Not sure if you like the change to the About screen.  :-)

  The other one is simply a small improvement for people importing xml
  files from the UI - it gets them an at least somewhat sane starting
  directory to work from."

* 'ui-work' of git://git.hohndel.org/subsurface:
  Set default path for file import to the last path opened
  Update the About screen
This commit is contained in:
Linus Torvalds 2012-09-11 00:57:15 +08:00
commit 3febfb74fa
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gtk-gui.c
View file

@ -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,
@ -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, &current_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");