X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=bc8e6e00097e8f8c4f51cb00b3eaadedf415b5d6;hb=c89f88378a0a19d6b7e0771b6fd8dc31acfaf2f7;hp=a536c15e688101efaf616e2c1adf818125876342;hpb=415383d65ef425de8ddee86324632e3f720827f9;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index a536c15..bc8e6e0 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -98,7 +98,7 @@ void report_error(GError* error)
 	{
 		return;
 	}
-	
+
 	if (error_info_bar == NULL)
 	{
 		error_count = 1;
@@ -108,11 +108,11 @@ void report_error(GError* error)
 		g_signal_connect(error_info_bar, "response", G_CALLBACK(on_info_bar_response), NULL);
 		gtk_info_bar_set_message_type(GTK_INFO_BAR(error_info_bar),
 		                              GTK_MESSAGE_ERROR);
-		
+
 		error_label = gtk_label_new(error->message);
 		GtkWidget *container = gtk_info_bar_get_content_area(GTK_INFO_BAR(error_info_bar));
 		gtk_container_add(GTK_CONTAINER(container), error_label);
-		
+
 		gtk_box_pack_start(GTK_BOX(main_vbox), error_info_bar, FALSE, FALSE, 0);
 		gtk_widget_show_all(main_vbox);
 	}
@@ -151,7 +151,7 @@ static void file_open(GtkWidget *w, gpointer data)
 		GSList *filenames, *fn_glist;
 		char *filename;
 		filenames = fn_glist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
-		
+
 		GError *error = NULL;
 		while(filenames != NULL) {
 			filename = filenames->data;
@@ -162,7 +162,7 @@ static void file_open(GtkWidget *w, gpointer data)
 				g_error_free(error);
 				error = NULL;
 			}
-			
+
 			g_free(filename);
 			filenames = g_slist_next(filenames);
 		}
@@ -175,6 +175,8 @@ static void file_open(GtkWidget *w, gpointer data)
 /* return the path and the file component contained in the full path */
 static char *path_and_file(char *pathin, char **fileout) {
 	char *slash = pathin, *next;
+	char *result;
+	size_t len, n;
 
 	if (! pathin) {
 		*fileout = strdup("");
@@ -185,7 +187,19 @@ static char *path_and_file(char *pathin, char **fileout) {
 	if (pathin != slash)
 		slash++;
 	*fileout = strdup(slash);
-        return strndup(pathin, slash - pathin);
+
+	/* strndup(pathin, slash - pathin) */
+	n = slash - pathin;
+	len = strlen(pathin);
+	if (n < len)
+		len = n;
+
+	result = (char *)malloc(len + 1);
+	if (!result)
+		return 0;
+
+	result[len] = '\0';
+	return (char *)memcpy(result, pathin, len);
 }
 
 static void file_save_as(GtkWidget *w, gpointer data)
@@ -206,6 +220,10 @@ static void file_save_as(GtkWidget *w, gpointer data)
 	current_dir = path_and_file(existing_filename, &current_file);
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), current_dir);
 	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), current_file);
+
+	free(current_dir);
+	free(current_file);
+
 	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
 		filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 	}
@@ -410,6 +428,7 @@ OPTIONCALLBACK(temperature_toggle, visible_cols.temperature)
 OPTIONCALLBACK(totalweight_toggle, visible_cols.totalweight)
 OPTIONCALLBACK(suit_toggle, visible_cols.suit)
 OPTIONCALLBACK(cylinder_toggle, visible_cols.cylinder)
+OPTIONCALLBACK(autogroup_toggle, autogroup)
 
 static void event_toggle(GtkWidget *w, gpointer _data)
 {
@@ -505,8 +524,22 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6);
 	g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(suit_toggle), NULL);
 
+	frame = gtk_frame_new("Divelist Font");
+	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+
 	font = gtk_font_button_new_with_font(divelist_font);
-	gtk_box_pack_start(GTK_BOX(vbox), font, FALSE, FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(frame),font);
+
+	frame = gtk_frame_new("Misc. Options");
+	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), frame, FALSE, FALSE, 5);
+
+	box = gtk_hbox_new(FALSE, 6);
+	gtk_container_add(GTK_CONTAINER(frame), box);
+
+	button = gtk_check_button_new_with_label("Automatically group dives in trips");
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), autogroup);
+	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 6);
+	g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(autogroup_toggle), NULL);
 
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -535,6 +568,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 		subsurface_set_conf("SAC", PREF_BOOL, BOOL_TO_PTR(visible_cols.sac));
 		subsurface_set_conf("OTU", PREF_BOOL, BOOL_TO_PTR(visible_cols.otu));
 		subsurface_set_conf("divelist_font", PREF_STRING, divelist_font);
+		subsurface_set_conf("autogroup", PREF_BOOL, BOOL_TO_PTR(autogroup));
 
 		/* Flush the changes out to the system */
 		subsurface_flush_conf();
@@ -815,6 +849,8 @@ void init_ui(int *argcp, char ***argvp)
 
 	divelist_font = subsurface_get_conf("divelist_font", PREF_STRING);
 
+	autogroup = PTR_TO_BOOL(subsurface_get_conf("autogroup", PREF_BOOL));
+
 	default_dive_computer_vendor = subsurface_get_conf("dive_computer_vendor", PREF_STRING);
 	default_dive_computer_product = subsurface_get_conf("dive_computer_product", PREF_STRING);
 	default_dive_computer_device = subsurface_get_conf("dive_computer_device", PREF_STRING);