X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=39703ff60eaad94102aad648fe41b2da687ac92c;hb=86fdd83e7b9cc661940470c7b7d83316b223f572;hp=cecfb7259107eb329e0390aa322fc01b47f4743f;hpb=f4820455e2019c1a9deba7e90ed7f06111a4cb39;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index cecfb72..39703ff 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -43,6 +43,7 @@ void repaint_dive(void)
 }
 
 static char *existing_filename;
+static gboolean need_icon = TRUE;
 
 static void on_info_bar_response(GtkWidget *widget, gint response,
                                  gpointer data)
@@ -116,7 +117,7 @@ static void file_open(GtkWidget *w, gpointer data)
 		
 		GError *error = NULL;
 		while(filenames != NULL) {
-			filename = (char *)filenames->data;
+			filename = filenames->data;
 			parse_xml_file(filename, &error);
 			if (error != NULL)
 			{
@@ -129,7 +130,7 @@ static void file_open(GtkWidget *w, gpointer data)
 			filenames = g_slist_next(filenames);
 		}
 		g_slist_free(filenames);
-		report_dives();
+		report_dives(FALSE);
 	}
 	gtk_widget_destroy(dialog);
 }
@@ -388,6 +389,7 @@ static void preferences_dialog(GtkWidget *w, gpointer data)
 static void renumber_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
+	struct dive *dive;
 	GtkWidget *dialog, *frame, *button, *vbox;
 
 	dialog = gtk_dialog_new_with_buttons("Renumber",
@@ -405,6 +407,14 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
 	button = gtk_spin_button_new_with_range(1, 50000, 1);
 	gtk_container_add(GTK_CONTAINER(frame), button);
 
+	/*
+	 * Do we have a number for the first dive already? Use that
+	 * as the default.
+	 */
+	dive = get_dive(0);
+	if (dive && dive->number)
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(button), dive->number);
+
 	gtk_widget_show_all(dialog);
 	result = gtk_dialog_run(GTK_DIALOG(dialog));
 	if (result == GTK_RESPONSE_ACCEPT) {
@@ -419,11 +429,14 @@ static void about_dialog(GtkWidget *w, gpointer data)
 {
 	const char *logo_property = NULL;
 	GdkPixbuf *logo = NULL;
-	GtkWidget *image = gtk_image_new_from_file("icon.svg");
 
-	if (image) {
-		logo = gtk_image_get_pixbuf(GTK_IMAGE(image));
-		logo_property = "logo";
+	if (need_icon) {
+		GtkWidget *image = gtk_image_new_from_file("subsurface.svg");
+
+		if (image) {
+			logo = gtk_image_get_pixbuf(GTK_IMAGE(image));
+			logo_property = "logo";
+		}
 	}
 
 	gtk_show_about_dialog(NULL,
@@ -432,6 +445,7 @@ static void about_dialog(GtkWidget *w, gpointer data)
 		"license", "GPLv2",
 		"version", VERSION_STRING,
 		"copyright", "Linus Torvalds 2011",
+		"logo-icon-name", "subsurface",
 		/* Must be last: */
 		logo_property, logo,
 		NULL);
@@ -515,6 +529,7 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 {
 	GtkWidget *win, *notebook, *vbox;
 	notebook_data_t *nbdp;
+	GtkAllocation allocation;
 
 	/* pick the right notebook page data and return if both are detached */
 	if (nbd[0].widget == NULL)
@@ -542,7 +557,8 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 	/* disallow drop events */
 	gtk_drag_dest_set(notebook, 0, NULL, 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
-	gtk_widget_set_size_request(notebook, 450, 350);
+	gtk_widget_get_allocation(page, &allocation);
+	gtk_window_set_default_size(GTK_WINDOW(win), allocation.width, allocation.height);
 
 	gtk_widget_show_all(win);
 	return GTK_NOTEBOOK(notebook);
@@ -587,6 +603,8 @@ void init_ui(int argc, char **argv)
 	GtkWidget *equipment;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
+	GdkScreen *screen;
+	GtkIconTheme *icon_theme=NULL;
 	GtkSettings *settings;
 	static const GtkTargetEntry notebook_target = {
 		"GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
@@ -618,7 +636,20 @@ void init_ui(int argc, char **argv)
 
 	error_info_bar = NULL;
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_icon_from_file(GTK_WINDOW(win), "icon.svg", NULL);
+	g_set_application_name ("subsurface");
+	/* Let's check if the subsurface icon has been installed or if
+	 * we need to try to load it from the current directory */
+	screen = gdk_screen_get_default();
+	if (screen)
+		icon_theme = gtk_icon_theme_get_for_screen(screen);
+	if (icon_theme) {
+		if (gtk_icon_theme_has_icon(icon_theme, "subsurface")) {
+			need_icon = FALSE;
+			gtk_window_set_default_icon_name ("subsurface");
+		}
+	}
+	if (need_icon)
+		gtk_window_set_icon_from_file(GTK_WINDOW(win), "subsurface.svg", NULL);
 	g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK(on_delete), NULL);
 	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
 	main_window = win;
@@ -827,12 +858,70 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox)
 	return GTK_ENTRY(entry);
 }
 
+/* once a file is selected in the FileChooserButton we want to exit the import dialog */
+static void on_file_set(GtkFileChooserButton *widget, gpointer _data)
+{
+	GtkDialog *main_dialog = _data;
+
+	gtk_dialog_response(main_dialog, GTK_RESPONSE_ACCEPT);
+}
+
+static GtkWidget *xml_file_selector(GtkWidget *vbox, GtkWidget *main_dialog)
+{
+	GtkWidget *hbox, *frame, *chooser, *dialog;
+	GtkFileFilter *filter;
+
+	hbox = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
+
+	frame = gtk_frame_new("XML file name");
+	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3);
+	dialog = gtk_file_chooser_dialog_new("Open XML File",
+		GTK_WINDOW(main_window),
+		GTK_FILE_CHOOSER_ACTION_OPEN,
+		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+		NULL);
+	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
+
+	filter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(filter, "*.xml");
+	gtk_file_filter_add_pattern(filter, "*.XML");
+	gtk_file_filter_add_pattern(filter, "*.sda");
+	gtk_file_filter_add_pattern(filter, "*.SDA");
+	gtk_file_filter_add_mime_type(filter, "text/xml");
+	gtk_file_filter_set_name(filter, "XML file");
+	gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(dialog), filter);
+
+	chooser = gtk_file_chooser_button_new_with_dialog(dialog);
+	g_signal_connect(G_OBJECT(chooser), "file-set", G_CALLBACK(on_file_set), main_dialog);
+
+	gtk_file_chooser_button_set_width_chars(GTK_FILE_CHOOSER_BUTTON(chooser), 30);
+	gtk_container_add(GTK_CONTAINER(frame), chooser);
+
+	return chooser;
+}
+
+static void do_import_file(gpointer data, gpointer user_data)
+{
+	GError *error = NULL;
+	parse_xml_file(data, &error);
+
+	if (error != NULL)
+	{
+		report_error(error);
+		g_error_free(error);
+		error = NULL;
+	}
+}
+
 void import_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
-	GtkWidget *dialog, *hbox, *vbox;
+	GtkWidget *dialog, *hbox, *vbox, *label;
 	GtkComboBox *computer;
 	GtkEntry *device;
+	GtkWidget *XMLchooser;
 	device_data_t devicedata = {
 		.devname = NULL,
 	};
@@ -845,10 +934,11 @@ void import_dialog(GtkWidget *w, gpointer data)
 		NULL);
 
 	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-
+	label = gtk_label_new("Import: \nLoad XML file or import directly from dive computer");
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 3);
+	XMLchooser = xml_file_selector(vbox, dialog);
 	computer = dive_computer_selector(vbox);
 	device = dive_computer_device(vbox);
-
 	hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 3);
 	devicedata.progress.bar = gtk_progress_bar_new();
@@ -861,25 +951,34 @@ void import_dialog(GtkWidget *w, gpointer data)
 		GtkTreeIter iter;
 		GtkTreeModel *model;
 		const char *comp;
+		GSList *list;
 	case GTK_RESPONSE_ACCEPT:
-		if (!gtk_combo_box_get_active_iter(computer, &iter))
-			break;
-		model = gtk_combo_box_get_model(computer);
-		gtk_tree_model_get(model, &iter,
-			0, &comp,
-			1, &type,
-			-1);
-		devicedata.type = type;
-		devicedata.name = comp;
-		devicedata.devname = gtk_entry_get_text(device);
-		do_import(&devicedata);
+		/* what happened - did the user pick a file? In that case
+		 * we ignore whether a dive computer model was picked */
+		list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(XMLchooser));
+		if (g_slist_length(list) == 0) {
+			if (!gtk_combo_box_get_active_iter(computer, &iter))
+				break;
+			model = gtk_combo_box_get_model(computer);
+			gtk_tree_model_get(model, &iter,
+					0, &comp,
+					1, &type,
+					-1);
+			devicedata.type = type;
+			devicedata.name = comp;
+			devicedata.devname = gtk_entry_get_text(device);
+			do_import(&devicedata);
+		} else {
+			g_slist_foreach(list,do_import_file,NULL);
+			g_slist_free(list);
+		}
 		break;
 	default:
 		break;
 	}
 	gtk_widget_destroy(dialog);
 
-	report_dives();
+	report_dives(TRUE);
 }
 
 void update_progressbar(progressbar_t *progress, double value)
@@ -890,7 +989,7 @@ void update_progressbar(progressbar_t *progress, double value)
 
 void set_filename(const char *filename)
 {
-	if (filename)
+	if (!existing_filename && filename)
 		existing_filename = strdup(filename);
 	return;
 }