X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=002b804148cb977a10d79a45138b96d1ce8f4799;hb=c15f798a85db53dae404a9113266a4d2bc72fbc6;hp=701e8fe4671ae4fe9718d3030a7be7b4e40e20b4;hpb=fda230235ce8879736803dc9e0ae918ce471201f;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index 701e8fe..002b804 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -103,6 +103,8 @@ static void file_open(GtkWidget *w, gpointer data)
 	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);
@@ -460,8 +462,8 @@ static void switch_page(GtkNotebook *notebook, gint arg1, gpointer user_data)
 	repaint_dive();
 }
 
-static const char notebook_name[] = "123";
-
+static const char notebook_group[] = "123";
+#define GRP_ID ((void *)notebook_group)
 typedef struct {
 	char *name;
 	GtkWidget *widget;
@@ -500,8 +502,10 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 	gtk_container_add(GTK_CONTAINER(win), vbox);
 
 	notebook = gtk_notebook_new();
+	gtk_notebook_set_group(GTK_NOTEBOOK(notebook), GRP_ID);
 	gtk_widget_set_name(notebook, nbdp->name);
-	gtk_notebook_set_group_name(GTK_NOTEBOOK(notebook), notebook_name);
+	/* 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);
 
@@ -510,19 +514,12 @@ static GtkNotebook *create_new_notebook_window(GtkNotebook *source,
 }
 
 static void drag_cb(GtkWidget *widget, GdkDragContext *context,
-	gint x, gint y,
-	GtkSelectionData *selection_data,
-	guint info, guint time,
+	gint x, gint y, guint time,
 	gpointer user_data)
 {
 	GtkWidget *source;
 	notebook_data_t *nbdp;
 
-	/*
-	 * We don't actually really *use* this yet, but Dirk wants to
-	 * do all the tabs as detatched tabs, and we'd need to use
-	 * this all to figure out which window we're talking about.
-	 */
 	source = gtk_drag_get_source_widget(context);
 	if (nbd[0].name && ! strcmp(nbd[0].name,gtk_widget_get_name(source)))
 		nbdp = nbd;
@@ -598,7 +595,7 @@ void init_ui(int argc, char **argv)
 	/* Notebook for dive info vs profile vs .. */
 	notebook = gtk_notebook_new();
 	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 6);
-	gtk_notebook_set_group_name(GTK_NOTEBOOK(notebook), notebook_name);
+	gtk_notebook_set_group(GTK_NOTEBOOK(notebook), GRP_ID);
 	g_signal_connect(notebook, "create-window", G_CALLBACK(create_new_notebook_window), NULL);
 	gtk_drag_dest_set(notebook, GTK_DEST_DEFAULT_ALL, &notebook_target, 1, GDK_ACTION_MOVE);
 	g_signal_connect(notebook, "drag-drop", G_CALLBACK(drag_cb), notebook);
@@ -637,46 +634,6 @@ void run_ui(void)
 	gtk_main();
 }
 
-/* get the filenames the user selects and call the parsing function
- * on them
- * return 0 if the user cancelled the dialog
- */
-int open_import_file_dialog(char *filterpattern, char *filtertext, 
-			void(* parse_function)(char *))
-{
-	int ret=0;
-
-	GtkWidget *dialog;
-	GtkFileFilter *filter = gtk_file_filter_new ();
-	gtk_file_filter_add_pattern (filter, filterpattern);
-	gtk_file_filter_set_name(filter, filtertext);
-	dialog = gtk_file_chooser_dialog_new("Open 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), TRUE);
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);
-
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-		GSList *filenames;
-		char *filename;
-		filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
-		while(filenames != NULL) {
-			filename = (char *)filenames->data;
-			parse_function(filename);
-			g_free(filename);
-			filenames = g_slist_next(filenames);
-		}
-		g_slist_free(filenames);
-		ret = 1;
-	}
-	gtk_widget_destroy(dialog);
-
-	return ret;
-}
-
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	struct dive *dive = current_dive;