X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=e15c94424fcd90014fb855ff67eb083de1a87377;hb=da47ee401d0b0ee9d2aed10aa934831b8ed02b55;hp=7c8e36423660253958835d10f5f1775c34841171;hpb=d81553e1514e158f59c1d7aba6ece46de9764163;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index 7c8e364..e15c944 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -87,6 +87,8 @@ void report_error(GError* error)
 static void file_open(GtkWidget *w, gpointer data)
 {
 	GtkWidget *dialog;
+	GtkFileFilter *filter;
+
 	dialog = gtk_file_chooser_dialog_new("Open File",
 		GTK_WINDOW(main_window),
 		GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -95,6 +97,13 @@ static void file_open(GtkWidget *w, gpointer data)
 		NULL);
 	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
 
+	filter = gtk_file_filter_new();
+	gtk_file_filter_add_pattern(filter, "*.xml");
+	gtk_file_filter_add_pattern(filter, "*.XML");
+	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);
+
 	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
 		GSList *filenames;
 		char *filename;
@@ -604,21 +613,23 @@ static void fill_computer_list(GtkListStore *store)
 	}
 }
 
-static GtkComboBox *dive_computer_selector(GtkWidget *dialog)
+static GtkComboBox *dive_computer_selector(GtkWidget *vbox)
 {
-	GtkWidget *hbox, *combo_box, *vbox;
+	GtkWidget *hbox, *combo_box, *frame;
 	GtkListStore *model;
 	GtkCellRenderer *renderer;
 
 	hbox = gtk_hbox_new(FALSE, 6);
-	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
 
 	model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
 	fill_computer_list(model);
 
+	frame = gtk_frame_new("Dive computer");
+	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3);
+
 	combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
-	gtk_box_pack_start(GTK_BOX(hbox), combo_box, FALSE, TRUE, 3);
+	gtk_container_add(GTK_CONTAINER(frame), combo_box);
 
 	renderer = gtk_cell_renderer_text_new();
 	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, TRUE);
@@ -627,13 +638,31 @@ static GtkComboBox *dive_computer_selector(GtkWidget *dialog)
 	return GTK_COMBO_BOX(combo_box);
 }
 
+static GtkEntry *dive_computer_device(GtkWidget *vbox)
+{
+	GtkWidget *hbox, *entry, *frame;
+
+	hbox = gtk_hbox_new(FALSE, 6);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
+
+	frame = gtk_frame_new("Device name");
+	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 3);
+
+	entry = gtk_entry_new();
+	gtk_container_add(GTK_CONTAINER(frame), entry);
+	gtk_entry_set_text(GTK_ENTRY(entry), "/dev/ttyUSB0");
+
+	return GTK_ENTRY(entry);
+}
+
 void import_dialog(GtkWidget *w, gpointer data)
 {
 	int result;
 	GtkWidget *dialog, *hbox, *vbox;
 	GtkComboBox *computer;
+	GtkEntry *device;
 	device_data_t devicedata = {
-		.devname = "/dev/ttyUSB0",
+		.devname = NULL,
 	};
 
 	dialog = gtk_dialog_new_with_buttons("Import from dive computer",
@@ -643,10 +672,12 @@ void import_dialog(GtkWidget *w, gpointer data)
 		GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
 		NULL);
 
-	computer = dive_computer_selector(dialog);
+	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+
+	computer = dive_computer_selector(vbox);
+	device = dive_computer_device(vbox);
 
 	hbox = gtk_hbox_new(FALSE, 6);
-	vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 3);
 	devicedata.progress.bar = gtk_progress_bar_new();
 	gtk_container_add(GTK_CONTAINER(hbox), devicedata.progress.bar);
@@ -668,6 +699,7 @@ void import_dialog(GtkWidget *w, gpointer data)
 			-1);
 		devicedata.type = type;
 		devicedata.name = comp;
+		devicedata.devname = gtk_entry_get_text(device);
 		do_import(&devicedata);
 		break;
 	default: