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

diff --git a/gtk-gui.c b/gtk-gui.c
index 002b804..be5adb9 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -130,7 +130,6 @@ static void file_open(GtkWidget *w, gpointer data)
 		}
 		g_slist_free(filenames);
 		report_dives();
-		dive_list_update_dives();
 	}
 	gtk_widget_destroy(dialog);
 }
@@ -205,6 +204,42 @@ static void quit(GtkWidget *w, gpointer data)
 	gtk_main_quit();
 }
 
+GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title,
+				data_func_t data_func, PangoAlignment align, gboolean visible)
+{
+	GtkCellRenderer *renderer;
+	GtkTreeViewColumn *col;
+	double xalign = 0.0; /* left as default */
+
+	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);
+	gtk_tree_view_column_set_resizable(col, TRUE);
+	gtk_tree_view_column_pack_start(col, renderer, TRUE);
+	if (data_func)
+		gtk_tree_view_column_set_cell_data_func(col, renderer, data_func, (void *)(long)index, NULL);
+	else
+		gtk_tree_view_column_add_attribute(col, renderer, "text", index);
+	gtk_object_set(GTK_OBJECT(renderer), "alignment", align, NULL);
+	switch (align) {
+	case PANGO_ALIGN_LEFT:
+		xalign = 0.0;
+		break;
+	case PANGO_ALIGN_CENTER:
+		xalign = 0.5;
+		break;
+	case PANGO_ALIGN_RIGHT:
+		xalign = 1.0;
+		break;
+	}
+	gtk_cell_renderer_set_alignment(GTK_CELL_RENDERER(renderer), xalign, 0.5);
+	gtk_tree_view_column_set_visible(col, visible);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), col);
+	return col;
+}
+
 static void create_radio(GtkWidget *vbox, const char *name, ...)
 {
 	va_list args;
@@ -353,6 +388,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",
@@ -370,6 +406,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) {
@@ -552,11 +596,14 @@ void init_ui(int argc, char **argv)
 	GtkWidget *equipment;
 	GtkWidget *menubar;
 	GtkWidget *vbox;
+	GtkSettings *settings;
 	static const GtkTargetEntry notebook_target = {
 		"GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
 	};
 
 	gtk_init(&argc, &argv);
+	settings = gtk_settings_get_default();
+	gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting");
 
 	g_type_init();
 	gconf = gconf_client_get_default();
@@ -634,22 +681,75 @@ void run_ui(void)
 	gtk_main();
 }
 
+typedef struct {
+	cairo_rectangle_int_t rect;
+	const char *text;
+} tooltip_record_t;
+
+static tooltip_record_t *tooltip_rects;
+static int tooltips;
+
+void attach_tooltip(int x, int y, int w, int h, const char *text)
+{
+	cairo_rectangle_int_t *rect;
+	tooltip_rects = realloc(tooltip_rects, (tooltips + 1) * sizeof(tooltip_record_t));
+	rect = &tooltip_rects[tooltips].rect;
+	rect->x = x;
+	rect->y = y;
+	rect->width = w;
+	rect->height = h;
+	tooltip_rects[tooltips].text = text;
+	tooltips++;
+}
+
+#define INSIDE_RECT(_r,_x,_y)	((_r.x <= _x) && (_r.x + _r.width >= _x) && \
+				(_r.y <= _y) && (_r.y + _r.height >= _y))
+
+static gboolean profile_tooltip (GtkWidget *widget, gint x, gint y,
+			gboolean keyboard_mode, GtkTooltip *tooltip, gpointer user_data)
+{
+	int i;
+	cairo_rectangle_int_t *drawing_area = user_data;
+	gint tx = x - drawing_area->x; /* get transformed coordinates */
+	gint ty = y - drawing_area->y;
+
+	/* are we over an event marker ? */
+	for (i = 0; i < tooltips; i++) {
+		if (INSIDE_RECT(tooltip_rects[i].rect, tx, ty)) {
+			gtk_tooltip_set_text(tooltip,tooltip_rects[i].text);
+			return TRUE; /* show tooltip */
+		}
+	}
+	return FALSE; /* don't show tooltip */
+}
+
 static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	struct dive *dive = current_dive;
 	struct graphics_context gc = { .printer = 0 };
-	int w,h;
+	static cairo_rectangle_int_t drawing_area;
 
-	w = widget->allocation.width;
-	h = widget->allocation.height;
+	/* the drawing area gives TOTAL width * height - x,y is used as the topx/topy offset
+	 * so effective drawing area is width-2x * height-2y */
+	drawing_area.width = widget->allocation.width;
+	drawing_area.height = widget->allocation.height;
+	drawing_area.x = drawing_area.width / 20.0;
+	drawing_area.y = drawing_area.height / 20.0;
 
 	gc.cr = gdk_cairo_create(widget->window);
+	g_object_set(widget, "has-tooltip", TRUE, NULL);
+	g_signal_connect(widget, "query-tooltip", G_CALLBACK(profile_tooltip), &drawing_area);
 	set_source_rgb(&gc, 0, 0, 0);
 	cairo_paint(gc.cr);
 
-	if (dive)
-		plot(&gc, w, h, dive);
-
+	if (dive) {
+		if (tooltip_rects) {
+			free(tooltip_rects);
+			tooltip_rects = NULL;
+		}
+		tooltips = 0;
+		plot(&gc, &drawing_area, dive);
+	}
 	cairo_destroy(gc.cr);
 
 	return FALSE;
@@ -789,7 +889,6 @@ void import_dialog(GtkWidget *w, gpointer data)
 	gtk_widget_destroy(dialog);
 
 	report_dives();
-	dive_list_update_dives();
 }
 
 void update_progressbar(progressbar_t *progress, double value)