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

diff --git a/gtk-gui.c b/gtk-gui.c
index 4b994d1..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;
@@ -338,9 +347,32 @@ static void renumber_dialog(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(dialog);
 }
 
+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";
+	}
+
+	gtk_show_about_dialog(NULL,
+		"program-name", "SubSurface",
+		"comments", "Half-arsed divelog software in C",
+		"license", "GPLv2",
+		"version", "1.0",
+		"copyright", "Linus Torvalds 2011",
+		/* Must be last: */
+		logo_property, logo,
+		NULL);
+}
+
 static GtkActionEntry menu_items[] = {
 	{ "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL},
 	{ "LogMenuAction",  GTK_STOCK_FILE, "Log", NULL, NULL, NULL},
+	{ "HelpMenuAction", GTK_STOCK_HELP, "Help", NULL, NULL, NULL},
 	{ "OpenFile",       GTK_STOCK_OPEN, NULL,   "<control>O", NULL, G_CALLBACK(file_open) },
 	{ "SaveFile",       GTK_STOCK_SAVE, NULL,   "<control>S", NULL, G_CALLBACK(file_save) },
 	{ "Print",          GTK_STOCK_PRINT, NULL,  "<control>P", NULL, G_CALLBACK(do_print) },
@@ -348,6 +380,7 @@ static GtkActionEntry menu_items[] = {
 	{ "Preferences",    NULL, "Preferences", NULL, NULL, G_CALLBACK(preferences_dialog) },
 	{ "Renumber",       NULL, "Renumber", NULL, NULL, G_CALLBACK(renumber_dialog) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
+	{ "About",           GTK_STOCK_ABOUT, NULL,  NULL, NULL, G_CALLBACK(about_dialog) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -368,6 +401,9 @@ static const gchar* ui_string = " \
 			<menu name=\"LogMenu\" action=\"LogMenuAction\"> \
 				<menuitem name=\"Renumber\" action=\"Renumber\" /> \
 			</menu> \
+			<menu name=\"Help\" action=\"HelpMenuAction\"> \
+				<menuitem name=\"About\" action=\"About\" /> \
+			</menu> \
 		</menubar> \
 	</ui> \
 ";
@@ -577,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);
@@ -600,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",
@@ -616,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);
@@ -641,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: