X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/469856bf9dec2656433baaa976b9af84d79769ae..a2fe72b1e9a5d37ed565f84db83eaccb68060e12:/src/viktreeview.c diff --git a/src/viktreeview.c b/src/viktreeview.c index da09a822..0e50b307 100644 --- a/src/viktreeview.c +++ b/src/viktreeview.c @@ -67,62 +67,72 @@ struct _VikTreeview { GdkPixbuf *layer_type_icons[VIK_LAYER_NUM_TYPES]; gboolean was_a_toggle; + gboolean editing; }; /* 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) +G_DEFINE_TYPE (VikTreeview, vik_treeview, GTK_TYPE_TREE_VIEW) + +static void vik_cclosure_marshal_VOID__POINTER_POINTER ( GClosure *closure, + GValue *return_value, + guint n_param_vals, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data ) { - static GType vt_type = 0; + typedef gboolean (*VikMarshalFunc_VOID__POINTER_POINTER) ( gpointer data1, + gconstpointer arg_1, + gconstpointer arg_2, + gpointer data2 ); - 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 ); - } + register VikMarshalFunc_VOID__POINTER_POINTER callback; + register GCClosure* cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_vals == 3); - return vt_type; + if (G_CCLOSURE_SWAP_DATA(closure)) { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (VikMarshalFunc_VOID__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback); + callback ( data1, + g_value_get_pointer(param_values + 1), + g_value_get_pointer(param_values + 2), + data2 ); } -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); treeview_signals[VT_ITEM_EDITED_SIGNAL] = g_signal_new ( "item_edited", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikTreeviewClass, item_edited), NULL, NULL, - gtk_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, GTK_TYPE_POINTER, G_TYPE_POINTER); - /* VOID__UINT_POINTER: kinda hack-ish, but it works. */ + vik_cclosure_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); treeview_signals[VT_ITEM_TOGGLED_SIGNAL] = g_signal_new ( "item_toggled", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (VikTreeviewClass, item_toggled), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, GTK_TYPE_POINTER ); + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_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) { + vt->editing = FALSE; GtkTreeIter iter; /* get type and data */ @@ -131,7 +141,17 @@ 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_edit_start_cb (GtkCellRenderer *cell, GtkCellEditable *editable, gchar *path, VikTreeview *vt) +{ + vt->editing = TRUE; +} + +static void vik_treeview_edit_stop_cb (GtkCellRenderer *cell, VikTreeview *vt) +{ + vt->editing = FALSE; +} + +static void vik_treeview_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, VikTreeview *vt) { GtkTreeIter iter_toggle; GtkTreeIter iter_selected; @@ -147,12 +167,15 @@ static void treeview_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, V // Toggle set on different path // therefore prevent subsequent auto selection (otherwise no action needed) vt->was_a_toggle = TRUE; + gtk_tree_path_free ( tp_selected ); } else // Toggle set on new path // therefore prevent subsequent auto selection vt->was_a_toggle = TRUE; + gtk_tree_path_free ( tp_toggle ); + g_signal_emit ( G_OBJECT(vt), treeview_signals[VT_ITEM_TOGGLED_SIGNAL], 0, &iter_toggle ); } @@ -160,7 +183,7 @@ static void treeview_toggled_cb (GtkCellRendererToggle *cell, gchar *path_str, V * 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, @@ -185,10 +208,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); @@ -203,15 +222,21 @@ treeview_tooltip_cb (GtkWidget *widget, gtk_tree_model_get (model, &iter, ITEM_POINTER_COLUMN, &layer, -1); g_snprintf (buffer, sizeof(buffer), "%s", vik_layer_layer_tooltip (VIK_LAYER(layer))); } - else + else { + gtk_tree_path_free (path); return FALSE; + } // Don't display null strings :) if ( strncmp (buffer, "(null)", 6) == 0 ) { + gtk_tree_path_free (path); 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); @@ -233,6 +258,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; @@ -264,7 +296,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; @@ -273,7 +305,10 @@ 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_signal_connect (renderer, "editing-started", G_CALLBACK (vik_treeview_edit_start_cb), vt); + g_signal_connect (renderer, "editing-canceled", G_CALLBACK (vik_treeview_edit_stop_cb), vt); g_object_set (G_OBJECT (renderer), "xalign", 0.0, "ellipsize", PANGO_ELLIPSIZE_END, NULL); @@ -310,7 +345,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, "", @@ -329,7 +364,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) @@ -389,7 +424,7 @@ static void select_cb(GtkTreeSelection *selection, gpointer data) } -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; @@ -401,19 +436,23 @@ 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->editing = 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 ); + + // Can not specify 'auto' sort order with a 'GtkTreeSortable' on the name since we want to control the ordering of layers + // Thus need to create special sort to operate on a subsection of treeview (i.e. from a specific child either a layer or sublayer) + // see vik_treeview_sort_children() + g_object_unref (vt->model); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (vt), TRUE); @@ -429,12 +468,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. */ @@ -510,6 +550,7 @@ void vik_treeview_select_iter ( VikTreeview *vt, GtkTreeIter *iter, gboolean vie gtk_tree_view_get_expander_column (tree_view), FALSE, 0.0, 0.0 ); + gtk_tree_path_free ( path ); } } @@ -518,6 +559,14 @@ gboolean vik_treeview_get_selected_iter ( VikTreeview *vt, GtkTreeIter *iter ) return gtk_tree_selection_get_selected ( gtk_tree_view_get_selection ( GTK_TREE_VIEW ( vt ) ), NULL, iter ); } +gboolean vik_treeview_get_editing ( VikTreeview *vt ) +{ + // Don't know how to get cell for the selected item + //return GPOINTER_TO_INT(g_object_get_data ( G_OBJECT(cell), "editing" )); + // Instead maintain our own value applying to the whole tree + return vt->editing; +} + void vik_treeview_item_delete ( VikTreeview *vt, GtkTreeIter *iter ) { gtk_tree_store_remove ( GTK_TREE_STORE(vt->model), iter ); @@ -525,6 +574,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 ); @@ -537,6 +592,15 @@ void vik_treeview_item_set_visible ( VikTreeview *vt, GtkTreeIter *iter, gboolea gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, VISIBLE_COLUMN, to, -1 ); } +void vik_treeview_item_toggle_visible ( VikTreeview *vt, GtkTreeIter *iter ) +{ + g_return_if_fail ( iter != NULL ); + gboolean to; + TREEVIEW_GET ( vt->model, iter, VISIBLE_COLUMN, &to ); + to = !to; + gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, VISIBLE_COLUMN, to, -1 ); +} + void vik_treeview_expand ( VikTreeview *vt, GtkTreeIter *iter ) { GtkTreePath *path; @@ -555,33 +619,40 @@ 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 ) +void vik_treeview_add_layer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, gboolean above, + gpointer item, gint data, VikLayerTypeEnum layer_type ) { g_assert ( iter != NULL ); - g_assert ( icon_type < VIK_LAYER_NUM_TYPES ); - gtk_tree_store_prepend ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + if ( above ) + gtk_tree_store_prepend ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + else + gtk_tree_store_append ( 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, parent == NULL ? FALSE : TRUE, - ICON_COLUMN, icon_type >= 0 ? vt->layer_type_icons[icon_type] : NULL, -1 ); + ICON_COLUMN, layer_type >= 0 ? vt->layer_type_icons[layer_type] : NULL, -1 ); } -void vik_treeview_insert_layer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, - gpointer item, gint data, gint icon_type, GtkTreeIter *sibling ) +void vik_treeview_insert_layer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, gboolean above, + gpointer item, gint data, VikLayerTypeEnum layer_type, GtkTreeIter *sibling ) { g_assert ( iter != NULL ); - g_assert ( icon_type < VIK_LAYER_NUM_TYPES ); if (sibling) { - gtk_tree_store_insert_before ( GTK_TREE_STORE(vt->model), iter, parent_iter, sibling ); + if (above) + gtk_tree_store_insert_before ( GTK_TREE_STORE(vt->model), iter, parent_iter, sibling ); + else + gtk_tree_store_insert_after ( GTK_TREE_STORE(vt->model), iter, parent_iter, sibling ); } else { - gtk_tree_store_append ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + if (above) + gtk_tree_store_append ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + else + 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, - ICON_COLUMN, icon_type >= 0 ? vt->layer_type_icons[icon_type] : NULL, -1 ); + ICON_COLUMN, layer_type >= 0 ? vt->layer_type_icons[layer_type] : NULL, -1 ); } void vik_treeview_add_sublayer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, gpointer item, @@ -589,80 +660,106 @@ void vik_treeview_add_sublayer ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkT { g_assert ( iter != NULL ); - gtk_tree_store_prepend ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + gtk_tree_store_append ( 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_SUBLAYER, ITEM_PARENT_COLUMN, parent, ITEM_POINTER_COLUMN, item, ITEM_DATA_COLUMN, data, HAS_VISIBLE_COLUMN, has_visible, EDITABLE_COLUMN, editable, ICON_COLUMN, icon, -1 ); } - -#ifdef VIK_CONFIG_ALPHABETIZED_TRW - -void vik_treeview_sublayer_realphabetize ( VikTreeview *vt, GtkTreeIter *iter, const gchar *newname ) +// Inspired by the internals of GtkTreeView sorting itself +typedef struct _SortTuple { - GtkTreeIter search_iter, parent_iter; - gchar *search_name = NULL; - g_assert ( iter != NULL ); + gint offset; + gchar *name; +} SortTuple; - gtk_tree_model_iter_parent ( vt->model, &parent_iter, iter ); +/** + * If order is true sort ascending, otherwise a descending sort + */ +static gint sort_tuple_compare ( gconstpointer a, gconstpointer b, gpointer order ) +{ + SortTuple *sa = (SortTuple *)a; + SortTuple *sb = (SortTuple *)b; - g_assert ( gtk_tree_model_iter_children ( vt->model, &search_iter, &parent_iter ) ); + // Default ascending order + gint answer = g_strcmp0 ( sa->name, sb->name ); - do { - gtk_tree_model_get ( vt->model, &search_iter, NAME_COLUMN, &search_name, -1 ); - if ( strcmp ( search_name, newname ) > 0 ) /* not >= or would trip on itself */ - { - gtk_tree_store_move_before ( GTK_TREE_STORE(vt->model), iter, &search_iter ); - g_free (search_name); - search_name = NULL; - return; - } - g_free (search_name); - search_name = NULL; - } while ( gtk_tree_model_iter_next ( vt->model, &search_iter ) ); + if ( !GPOINTER_TO_INT(order) ) { + // Invert sort order for descending order + answer = -answer; + } - gtk_tree_store_move_before ( GTK_TREE_STORE(vt->model), iter, NULL ); + return answer; } -void vik_treeview_add_sublayer_alphabetized - ( VikTreeview *vt, GtkTreeIter *parent_iter, GtkTreeIter *iter, const gchar *name, gpointer parent, gpointer item, - gint data, GdkPixbuf *icon, gboolean has_visible, gboolean editable ) +/** + * Note: I don't believe we can sensibility use built in model sort gtk_tree_model_sort_new_with_model() on the name, + * since that would also sort the layers - but that needs to be user controlled for ordering, such as which maps get drawn on top. + * + * vik_treeview_sort_children: + * @vt: The treeview to operate on + * @parent: The level within the treeview to sort + * @order: How the items should be sorted + * + * Use the gtk_tree_store_reorder method as it very quick + * + * This ordering can be performed on demand and works for any parent iterator (i.e. both sublayer and layer levels) + * + * It should be called whenever an individual sublayer item is added or renamed (or after a group of sublayer items have been added). + * + * Previously with insertion sort on every sublayer addition: adding 10,000 items would take over 30 seconds! + * Now sorting after simply adding all tracks takes 1 second. + * For a KML file with over 10,000 tracks (3Mb zipped) - See 'UK Hampshire Rights of Way' + * http://www3.hants.gov.uk/row/row-maps.htm + */ +void vik_treeview_sort_children ( VikTreeview *vt, GtkTreeIter *parent, vik_layer_sort_order_t order ) { - GtkTreeIter search_iter; - gchar *search_name = NULL; - g_assert ( iter != NULL ); + if ( order == VL_SO_NONE ) + // Nothing to do + return; - if ( gtk_tree_model_iter_children ( vt->model, &search_iter, parent_iter ) ) - { - gboolean found_greater_string = FALSE; - do { - gtk_tree_model_get ( vt->model, &search_iter, NAME_COLUMN, &search_name, -1 ); - if ( strcmp ( search_name, name ) >= 0 ) - { - gtk_tree_store_insert_before ( GTK_TREE_STORE(vt->model), iter, parent_iter, &search_iter ); - found_greater_string = TRUE; - g_free (search_name); - search_name = NULL; - break; - } - g_free (search_name); - search_name = NULL; - } while ( gtk_tree_model_iter_next ( vt->model, &search_iter ) ); + GtkTreeModel *model = vt->model; + GtkTreeIter child; + if ( !gtk_tree_model_iter_children ( model, &child, parent ) ) + return; - if ( ! found_greater_string ) - gtk_tree_store_append ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + guint length = gtk_tree_model_iter_n_children ( model, parent ); + + // Create an array to store the position offsets + SortTuple *sort_array; + sort_array = g_new ( SortTuple, length ); + + guint ii = 0; + do { + sort_array[ii].offset = ii; + gtk_tree_model_get ( model, &child, NAME_COLUMN, &(sort_array[ii].name), -1 ); + ii++; + } while ( gtk_tree_model_iter_next (model, &child) ); + + gboolean sort_order = (order == VL_SO_ALPHABETICAL_ASCENDING ); + + // Sort list... + g_qsort_with_data (sort_array, + length, + sizeof (SortTuple), + sort_tuple_compare, + GINT_TO_POINTER(sort_order)); + + // As the sorted list contains the reordered position offsets, extract this and then apply to the treeview + gint *positions = g_malloc ( sizeof(gdouble) * length ); + for ( ii = 0; ii < length; ii++ ) { + positions[ii] = sort_array[ii].offset; + g_free ( sort_array[ii].name ); } - else - gtk_tree_store_prepend ( GTK_TREE_STORE(vt->model), iter, parent_iter ); + g_free ( sort_array ); - gtk_tree_store_set ( GTK_TREE_STORE(vt->model), iter, NAME_COLUMN, name, VISIBLE_COLUMN, TRUE, TYPE_COLUMN, VIK_TREEVIEW_TYPE_SUBLAYER, ITEM_PARENT_COLUMN, parent, ITEM_POINTER_COLUMN, item, ITEM_DATA_COLUMN, data, HAS_VISIBLE_COLUMN, has_visible, EDITABLE_COLUMN, editable, ICON_COLUMN, icon, -1 ); + // This is extremely fast compared to the old alphabetical insertion + gtk_tree_store_reorder ( GTK_TREE_STORE(model), parent, positions ); + g_free ( positions ); } -#endif - -static void treeview_finalize ( GObject *gob ) +static void vik_treeview_finalize ( GObject *gob ) { VikTreeview *vt = VIK_TREEVIEW ( gob ); - guint16 i; - + VikLayerTypeEnum i; for ( i = 0; i < VIK_LAYER_NUM_TYPES; i++ ) if ( vt->layer_type_icons[i] != NULL ) g_object_unref ( G_OBJECT(vt->layer_type_icons[i]) ); @@ -670,7 +767,7 @@ 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; GtkTreeModel *src_model = NULL; @@ -748,11 +845,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; } -