X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=c6b79b69076d374887b1ee44565d2af8897a06b0;hb=4b77a5def6df965cae63dec8b836e18e1e09cd58;hp=f95ff88cebcccc38ed152799c9150ae8e5a300ab;hpb=7721036fabb91902acfbf929ff450f59971cc4a3;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index f95ff88..c6b79b6 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -162,7 +162,7 @@ static void ask_save_changes()
 	dialog = gtk_dialog_new_with_buttons("Save Changes?",
 		GTK_WINDOW(main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-		GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_NO, GTK_RESPONSE_NO,
 		NULL);
 	content = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 	label = gtk_label_new ("You have unsaved changes\nWould you like to save those before exiting the program?");
@@ -202,17 +202,25 @@ static void quit(GtkWidget *w, gpointer data)
 }
 
 GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title,
-				data_func_t data_func, PangoAlignment align, gboolean visible)
+				data_func_t data_func, unsigned int flags)
 {
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *col;
 	double xalign = 0.0; /* left as default */
+	PangoAlignment align;
+	gboolean visible;
+
+	align = (flags & ALIGN_LEFT) ? PANGO_ALIGN_LEFT :
+		(flags & ALIGN_RIGHT) ? PANGO_ALIGN_RIGHT :
+		PANGO_ALIGN_CENTER;
+	visible = !(flags & INVISIBLE);
 
 	renderer = gtk_cell_renderer_text_new();
 	col = gtk_tree_view_column_new();
 
 	gtk_tree_view_column_set_title(col, title);
-	gtk_tree_view_column_set_sort_column_id(col, index);
+	if (!(flags & UNSORTABLE))
+		gtk_tree_view_column_set_sort_column_id(col, index);
 	gtk_tree_view_column_set_resizable(col, TRUE);
 	gtk_tree_view_column_pack_start(col, renderer, TRUE);
 	if (data_func)
@@ -578,10 +586,10 @@ static GtkActionEntry menu_items[] = {
 	{ "SelectEvents",   NULL, "SelectEvents", NULL, NULL, G_CALLBACK(selectevents_dialog) },
 	{ "Quit",           GTK_STOCK_QUIT, NULL,   "<control>Q", NULL, G_CALLBACK(quit) },
 	{ "About",          GTK_STOCK_ABOUT, NULL,  NULL, NULL, G_CALLBACK(about_dialog) },
-	{ "ViewList",       NULL, "List",  "F1", NULL, G_CALLBACK(view_list) },
-	{ "ViewProfile",    NULL, "Profile", "F2", NULL, G_CALLBACK(view_profile) },
-	{ "ViewInfo",       NULL, "Info", "F3", NULL, G_CALLBACK(view_info) },
-	{ "ViewThree",       NULL, "Three", "F4", NULL, G_CALLBACK(view_three) },
+	{ "ViewList",       NULL, "List",  "<control>1", NULL, G_CALLBACK(view_list) },
+	{ "ViewProfile",    NULL, "Profile", "<control>2", NULL, G_CALLBACK(view_profile) },
+	{ "ViewInfo",       NULL, "Info", "<control>3", NULL, G_CALLBACK(view_info) },
+	{ "ViewThree",       NULL, "Three", "<control>4", NULL, G_CALLBACK(view_three) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -905,7 +913,7 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox)
 
 	entry = gtk_entry_new();
 	gtk_container_add(GTK_CONTAINER(frame), entry);
-	gtk_entry_set_text(GTK_ENTRY(entry), "/dev/ttyUSB0");
+	gtk_entry_set_text(GTK_ENTRY(entry), subsurface_USB_name());
 
 	return GTK_ENTRY(entry);
 }