static void 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 );
+
+ 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 );
+ g_signal_emit ( G_OBJECT(vt), treeview_signals[VT_ITEM_TOGGLED_SIGNAL], 0, &iter_toggle );
}
/* Inspired by GTK+ test
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);
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;
g_signal_connect (renderer, "edited",
G_CALLBACK (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"),
"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 */
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;
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)
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 )
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 )
{
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 );
}
static gboolean 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) {
/*
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);
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);
projects / andy / viking.git / blobdiff