X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/07493583d2fd49343128488217fd19ddfc29eaad..6de95419da92c374ae4851c780b05daecbafd86a:/src/viktreeview.c diff --git a/src/viktreeview.c b/src/viktreeview.c index d7226f73..ede41783 100644 --- a/src/viktreeview.c +++ b/src/viktreeview.c @@ -70,46 +70,22 @@ struct _VikTreeview { }; /* TODO: find, make "static" and put up here all non-"a_" functions */ -static void treeview_class_init ( VikTreeviewClass *klass ); -static void treeview_init ( VikTreeview *vt ); -static void treeview_finalize ( GObject *gob ); -static void treeview_add_columns ( VikTreeview *vt ); +static void vik_treeview_finalize ( GObject *gob ); +static void vik_treeview_add_columns ( VikTreeview *vt ); -static gboolean treeview_drag_data_received ( GtkTreeDragDest *drag_dest, GtkTreePath *dest, GtkSelectionData *selection_data ); -static gboolean treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path ); +static gboolean vik_treeview_drag_data_received ( GtkTreeDragDest *drag_dest, GtkTreePath *dest, GtkSelectionData *selection_data ); +static gboolean vik_treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path ); -GType vik_treeview_get_type (void) -{ - static GType vt_type = 0; - - if (!vt_type) - { - static const GTypeInfo vt_info = - { - sizeof (VikTreeviewClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) treeview_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (VikTreeview), - 0, - (GInstanceInitFunc) treeview_init, - }; - vt_type = g_type_register_static ( GTK_TYPE_TREE_VIEW, "VikTreeview", &vt_info, 0 ); - } - - return vt_type; -} +G_DEFINE_TYPE (VikTreeview, vik_treeview, GTK_TYPE_TREE_VIEW) -static void treeview_class_init ( VikTreeviewClass *klass ) +static void vik_treeview_class_init ( VikTreeviewClass *klass ) { /* Destructor */ GObjectClass *object_class; object_class = G_OBJECT_CLASS (klass); - object_class->finalize = treeview_finalize; + object_class->finalize = vik_treeview_finalize; parent_class = g_type_class_peek_parent (klass); @@ -121,7 +97,7 @@ static void treeview_class_init ( VikTreeviewClass *klass ) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GTK_TYPE_POINTER ); } -static void treeview_edited_cb (GtkCellRendererText *cell, gchar *path_str, const gchar *new_name, VikTreeview *vt) +static void vik_treeview_edited_cb (GtkCellRendererText *cell, gchar *path_str, const gchar *new_name, VikTreeview *vt) { GtkTreeIter iter; @@ -131,23 +107,36 @@ static void treeview_edited_cb (GtkCellRendererText *cell, gchar *path_str, cons g_signal_emit ( G_OBJECT(vt), treeview_signals[VT_ITEM_EDITED_SIGNAL], 0, &iter, new_name ); } -static void treeview_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, VikTreeview *vt) +static void vik_treeview_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, VikTreeview *vt) { - GtkTreeIter iter; + GtkTreeIter iter_toggle; + GtkTreeIter iter_selected; /* get type and data */ - vik_treeview_get_iter_from_path_str ( vt, &iter, path_str ); - vt->was_a_toggle = TRUE; + vik_treeview_get_iter_from_path_str ( vt, &iter_toggle, path_str ); - g_signal_emit ( G_OBJECT(vt), -treeview_signals[VT_ITEM_TOGGLED_SIGNAL], 0, &iter ); + GtkTreePath *tp_toggle = gtk_tree_model_get_path ( vt->model, &iter_toggle ); + + if ( gtk_tree_selection_get_selected ( gtk_tree_view_get_selection ( GTK_TREE_VIEW ( vt ) ), NULL, &iter_selected ) ) { + GtkTreePath *tp_selected = gtk_tree_model_get_path ( vt->model, &iter_selected ); + if ( gtk_tree_path_compare ( tp_toggle, tp_selected ) ) + // Toggle set on different path + // therefore prevent subsequent auto selection (otherwise no action needed) + vt->was_a_toggle = TRUE; + } + else + // Toggle set on new path + // therefore prevent subsequent auto selection + vt->was_a_toggle = TRUE; + + g_signal_emit ( G_OBJECT(vt), treeview_signals[VT_ITEM_TOGGLED_SIGNAL], 0, &iter_toggle ); } /* Inspired by GTK+ test * http://git.gnome.org/browse/gtk+/tree/tests/testtooltips.c */ static gboolean -treeview_tooltip_cb (GtkWidget *widget, +vik_treeview_tooltip_cb (GtkWidget *widget, gint x, gint y, gboolean keyboard_tip, @@ -172,10 +161,6 @@ treeview_tooltip_cb (GtkWidget *widget, if ( rv == VIK_TREEVIEW_TYPE_SUBLAYER ) { gtk_tree_model_get (model, &iter, ITEM_DATA_COLUMN, &rv, -1); - // No tooltips ATM for the immediate Tracks / Waypoints tree list - if ( rv == 0 || rv == 1 ) - // VIK_TRW_LAYER_SUBLAYER_WAYPOINTS or VIK_TRW_LAYER_SUBLAYER_TRACKS - return FALSE; gpointer sublayer; gtk_tree_model_get (model, &iter, ITEM_POINTER_COLUMN, &sublayer, -1); @@ -198,7 +183,10 @@ treeview_tooltip_cb (GtkWidget *widget, return FALSE; } else { - gtk_tooltip_set_markup (tooltip, buffer); + // No point in using (Pango) markup verson - gtk_tooltip_set_markup() + // especially as waypoint comments may well contain HTML markup which confuses the pango markup parser + // This plain text is probably faster too. + gtk_tooltip_set_text (tooltip, buffer); } gtk_tree_view_set_tooltip_row (tree_view, tooltip, path); @@ -220,6 +208,13 @@ gint vik_treeview_item_get_type ( VikTreeview *vt, GtkTreeIter *iter ) return rv; } +gchar* vik_treeview_item_get_name ( VikTreeview *vt, GtkTreeIter *iter ) +{ + gchar *rv; + TREEVIEW_GET ( vt->model, iter, NAME_COLUMN, &rv ); + return rv; +} + gint vik_treeview_item_get_data ( VikTreeview *vt, GtkTreeIter *iter ) { gint rv; @@ -251,7 +246,7 @@ gboolean vik_treeview_get_iter_from_path_str ( VikTreeview *vt, GtkTreeIter *ite return gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL(vt->model), iter, path_str ); } -static void treeview_add_columns ( VikTreeview *vt ) +static void vik_treeview_add_columns ( VikTreeview *vt ) { gint col_offset; GtkCellRenderer *renderer; @@ -260,9 +255,9 @@ static void treeview_add_columns ( VikTreeview *vt ) /* Layer column */ renderer = gtk_cell_renderer_text_new (); g_signal_connect (renderer, "edited", - G_CALLBACK (treeview_edited_cb), vt); + G_CALLBACK (vik_treeview_edited_cb), vt); - g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); + g_object_set (G_OBJECT (renderer), "xalign", 0.0, "ellipsize", PANGO_ELLIPSIZE_END, NULL); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vt), -1, _("Layer Name"), @@ -271,9 +266,11 @@ static void treeview_add_columns ( VikTreeview *vt ) "editable", EDITABLE_COLUMN, NULL); + /* ATM the minimum overall width (and starting default) of the treeview size is determined + by the buttons added to the bottom of the layerspanel */ column = gtk_tree_view_get_column (GTK_TREE_VIEW (vt), col_offset - 1); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), - GTK_TREE_VIEW_COLUMN_AUTOSIZE); + GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (column), TRUE); /* Layer type */ @@ -295,7 +292,7 @@ static void treeview_add_columns ( VikTreeview *vt ) renderer = gtk_cell_renderer_toggle_new (); g_object_set (G_OBJECT (renderer), "xalign", 0.5, NULL); - g_signal_connect (renderer, "toggled", G_CALLBACK (treeview_toggled_cb), vt); + g_signal_connect (renderer, "toggled", G_CALLBACK (vik_treeview_toggled_cb), vt); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (vt), -1, "", @@ -314,7 +311,7 @@ static void treeview_add_columns ( VikTreeview *vt ) g_object_set (GTK_TREE_VIEW (vt), "has-tooltip", TRUE, NULL); - g_signal_connect (GTK_TREE_VIEW (vt), "query-tooltip", G_CALLBACK (treeview_tooltip_cb), vt); + g_signal_connect (GTK_TREE_VIEW (vt), "query-tooltip", G_CALLBACK (vik_treeview_tooltip_cb), vt); } static void select_cb(GtkTreeSelection *selection, gpointer data) @@ -325,9 +322,29 @@ static void select_cb(GtkTreeSelection *selection, gpointer data) VikLayer *vl; VikWindow * vw; + gpointer tmp_layer; + VikLayer *tmp_vl = NULL; + gint tmp_subtype = 0; + gint tmp_type = VIK_TREEVIEW_TYPE_LAYER; + if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) return; type = vik_treeview_item_get_type( vt, &iter); + /* Find the Sublayer type if possible */ + tmp_layer = vik_treeview_item_get_pointer ( vt, &iter ); + if (tmp_layer) { + if (type == VIK_TREEVIEW_TYPE_SUBLAYER) { + tmp_vl = VIK_LAYER(vik_treeview_item_get_parent(vt, &iter)); + tmp_subtype = vik_treeview_item_get_data(vt, &iter); + tmp_type = VIK_TREEVIEW_TYPE_SUBLAYER; + } + } + else { + tmp_subtype = vik_treeview_item_get_data(vt, &iter); + tmp_type = VIK_TREEVIEW_TYPE_SUBLAYER; + } + + /* Go up the tree to find the Vik Layer */ while ( type != VIK_TREEVIEW_TYPE_LAYER ) { if ( ! vik_treeview_item_get_parent_iter ( vt, &iter, &parent ) ) return; @@ -339,9 +356,22 @@ static void select_cb(GtkTreeSelection *selection, gpointer data) vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vl)); vik_window_selected_layer(vw, vl); + + if (tmp_vl == NULL) + tmp_vl = vl; + /* Apply settings now we have the all details */ + if ( vik_layer_selected ( tmp_vl, + tmp_subtype, + tmp_layer, + tmp_type, + vik_window_layers_panel(vw) ) ) { + /* Redraw required */ + vik_layers_panel_emit_update ( vik_window_layers_panel(vw) ); + } + } -static gboolean treeview_selection_filter(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data) +static gboolean vik_treeview_selection_filter(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *path, gboolean path_currently_selected, gpointer data) { VikTreeview *vt = data; @@ -353,19 +383,17 @@ static gboolean treeview_selection_filter(GtkTreeSelection *selection, GtkTreeMo return TRUE; } -void treeview_init ( VikTreeview *vt ) +void vik_treeview_init ( VikTreeview *vt ) { - guint16 i; - vt->was_a_toggle = FALSE; vt->model = GTK_TREE_MODEL(gtk_tree_store_new ( NUM_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN )); /* create tree view */ - gtk_tree_selection_set_select_function(gtk_tree_view_get_selection (GTK_TREE_VIEW(vt)), treeview_selection_filter, vt, NULL); + gtk_tree_selection_set_select_function(gtk_tree_view_get_selection (GTK_TREE_VIEW(vt)), vik_treeview_selection_filter, vt, NULL); gtk_tree_view_set_model ( GTK_TREE_VIEW(vt), vt->model ); - treeview_add_columns ( vt ); + vik_treeview_add_columns ( vt ); g_object_unref (vt->model); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (vt), TRUE); @@ -381,12 +409,13 @@ void treeview_init ( VikTreeview *vt ) GtkTreeDragDestIface *idest; isrc = g_type_interface_peek (g_type_class_peek(G_OBJECT_TYPE(vt->model)), GTK_TYPE_TREE_DRAG_SOURCE); - isrc->drag_data_delete = treeview_drag_data_delete; + isrc->drag_data_delete = vik_treeview_drag_data_delete; idest = g_type_interface_peek (g_type_class_peek(G_OBJECT_TYPE(vt->model)), GTK_TYPE_TREE_DRAG_DEST); - idest->drag_data_received = treeview_drag_data_received; + idest->drag_data_received = vik_treeview_drag_data_received; } + VikLayerTypeEnum i; for ( i = 0; i < VIK_LAYER_NUM_TYPES; i++ ) vt->layer_type_icons[i] = vik_layer_load_icon ( i ); /* if icon can't be loaded, it will be null and simply not be shown. */ @@ -443,9 +472,26 @@ gboolean vik_treeview_get_iter_at_pos ( VikTreeview *vt, GtkTreeIter *iter, gint return TRUE; } -void vik_treeview_select_iter ( VikTreeview *vt, GtkTreeIter *iter ) +/* Option to ensure visible */ +void vik_treeview_select_iter ( VikTreeview *vt, GtkTreeIter *iter, gboolean view_all ) { - gtk_tree_selection_select_iter ( gtk_tree_view_get_selection ( GTK_TREE_VIEW ( vt ) ), iter ); + GtkTreeView *tree_view = GTK_TREE_VIEW ( vt ); + GtkTreePath *path; + + if ( view_all ) { + path = gtk_tree_model_get_path ( gtk_tree_view_get_model (tree_view), iter ); + gtk_tree_view_expand_to_path ( tree_view, path ); + } + + gtk_tree_selection_select_iter ( gtk_tree_view_get_selection ( tree_view ), iter ); + + if ( view_all ) { + gtk_tree_view_scroll_to_cell ( tree_view, + path, + gtk_tree_view_get_expander_column (tree_view), + FALSE, + 0.0, 0.0 ); + } } gboolean vik_treeview_get_selected_iter ( VikTreeview *vt, GtkTreeIter *iter ) @@ -460,6 +506,12 @@ void vik_treeview_item_delete ( VikTreeview *vt, GtkTreeIter *iter ) /* Treeview Reform Project */ +void vik_treeview_item_set_icon ( VikTreeview *vt, GtkTreeIter *iter, const GdkPixbuf *icon ) +{ + g_return_if_fail ( iter != NULL ); + gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, ICON_COLUMN, icon, -1); +} + void vik_treeview_item_set_name ( VikTreeview *vt, GtkTreeIter *iter, const gchar *to ) { g_return_if_fail ( iter != NULL && to != NULL ); @@ -485,6 +537,11 @@ void vik_treeview_item_select ( VikTreeview *vt, GtkTreeIter *iter ) gtk_tree_selection_select_iter ( gtk_tree_view_get_selection ( GTK_TREE_VIEW ( vt ) ), iter ); } +void vik_treeview_item_unselect ( VikTreeview *vt, GtkTreeIter *iter ) +{ + gtk_tree_selection_unselect_iter ( gtk_tree_view_get_selection ( GTK_TREE_VIEW ( vt ) ), iter ); +} + void vik_treeview_add_layer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, gpointer item, gint data, gint icon_type ) { @@ -493,7 +550,7 @@ void vik_treeview_add_layer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTree gtk_tree_store_prepend ( GTK_TREE_STORE(vt->model), iter, parent_iter ); gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, NAME_COLUMN, name, VISIBLE_COLUMN, TRUE, TYPE_COLUMN, VIK_TREEVIEW_TYPE_LAYER, ITEM_PARENT_COLUMN, parent, ITEM_POINTER_COLUMN, item, - ITEM_DATA_COLUMN, data, HAS_VISIBLE_COLUMN, TRUE, EDITABLE_COLUMN, TRUE, + ITEM_DATA_COLUMN, data, HAS_VISIBLE_COLUMN, TRUE, EDITABLE_COLUMN, parent == NULL ? FALSE : TRUE, ICON_COLUMN, icon_type >= 0 ? vt->layer_type_icons[icon_type] : NULL, -1 ); } @@ -588,7 +645,7 @@ void vik_treeview_add_sublayer_alphabetized #endif -static void treeview_finalize ( GObject *gob ) +static void vik_treeview_finalize ( GObject *gob ) { VikTreeview *vt = VIK_TREEVIEW ( gob ); guint16 i; @@ -600,22 +657,19 @@ static void treeview_finalize ( GObject *gob ) G_OBJECT_CLASS(parent_class)->finalize(gob); } -static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTreePath *dest, GtkSelectionData *selection_data) +static gboolean vik_treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTreePath *dest, GtkSelectionData *selection_data) { GtkTreeModel *tree_model; - GtkTreeStore *tree_store; GtkTreeModel *src_model = NULL; GtkTreePath *src_path = NULL, *dest_cp = NULL; gboolean retval = FALSE; - GtkTreeIter src_iter, root_iter, dest_iter, dest_parent; - gint *i_src = NULL; + GtkTreeIter src_iter, root_iter, dest_parent; VikTreeview *vt; VikLayer *vl; g_return_val_if_fail (GTK_IS_TREE_STORE (drag_dest), FALSE); tree_model = GTK_TREE_MODEL (drag_dest); - tree_store = GTK_TREE_STORE (drag_dest); if (gtk_tree_get_row_drag_data (selection_data, &src_model, &src_path) && src_model == tree_model) { /* @@ -639,7 +693,6 @@ static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTree goto out; } - i_src = gtk_tree_path_get_indices (src_path); dest_cp = gtk_tree_path_copy (dest); gtk_tree_model_get_iter_first(tree_model, &root_iter); @@ -650,13 +703,9 @@ static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTree if (gtk_tree_path_get_depth(dest_cp)>1) { /* can't be sibling of top layer */ VikLayer *vl_src, *vl_dest; - /* Find the first ancestor that is a full layer, and store in dest_parent. - * In addition, put in dest_iter where Gtk wants us to insert the dragged object. - * (Note that this may end up being an invalid iter). - */ + /* Find the first ancestor that is a full layer, and store in dest_parent. */ do { gtk_tree_path_up(dest_cp); - dest_iter = dest_parent; gtk_tree_model_get_iter (src_model, &dest_parent, dest_cp); } while (gtk_tree_path_get_depth(dest_cp)>1 && vik_treeview_item_get_type(vt, &dest_parent) != VIK_TREEVIEW_TYPE_LAYER); @@ -686,11 +735,10 @@ static gboolean treeview_drag_data_received (GtkTreeDragDest *drag_dest, GtkTree /* * This may not be necessary. */ -static gboolean treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path ) +static gboolean vik_treeview_drag_data_delete ( GtkTreeDragSource *drag_source, GtkTreePath *path ) { gchar *s_dest = gtk_tree_path_to_string(path); g_print(_("delete data from %s\n"), s_dest); g_free(s_dest); return FALSE; } -