diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-08 11:09:54 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-08 11:09:54 +0000 |
| commit | 006f84a565f2581e4e1e9aefecceac64658466e8 (patch) | |
| tree | 6225f30bfcc97374e967bf5cfad6cca66dbc6566 /ui/gtk | |
| parent | 4ed05f22b80ebb69bcebce5bb97d04ae42e96ffd (diff) | |
From Deon van der Westhuysen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9452
Patch: Stats_tree enhancements for sorting, averages and burst rate
Add sort, save-as and new columns to Qt ui, remove old functions
stats_tree.c / stats_tree_priv.h: Make all columns sortable. Remove unneeded functions stats_tree_get_strs_from_node, stats_tree_branch_to_str and stats_tree_is_sortable_column.
stats_tree_stat.c: Set all columns sortable.
stats_tree_dialog.cpp / stats_tree_dialog.h: Add new stats_tree columns. Make columns sortable. Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons.
stats_tree_dialog.ui: Remove copy to csv and copy to yaml buttons. Add copy to clipboard as plain text and save as buttons. Only define one column in ui, rest are added dynmically.
From me : fix trailing whitespace
svn path=/trunk/; revision=53848
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/stats_tree_stat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ui/gtk/stats_tree_stat.c b/ui/gtk/stats_tree_stat.c index bbb8018fc9..1b5d610288 100644 --- a/ui/gtk/stats_tree_stat.c +++ b/ui/gtk/stats_tree_stat.c @@ -489,10 +489,8 @@ init_gtk_tree(const char* opt_arg, void *userdata _U_) renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (stats_tree_get_column_name(count), renderer, "text", count+N_RESERVED_COL, NULL); - if (stats_tree_is_sortable_column(count)) { - gtk_tree_view_column_set_sort_column_id(column, count+N_RESERVED_COL); - gtk_tree_sortable_set_sort_func(sortable,count+N_RESERVED_COL, st_sort_func, sortable, NULL); - } + gtk_tree_view_column_set_sort_column_id(column, count+N_RESERVED_COL); + gtk_tree_sortable_set_sort_func(sortable,count+N_RESERVED_COL, st_sort_func, sortable, NULL); gtk_tree_view_column_set_resizable (column,TRUE); gtk_tree_view_column_set_sizing(column,GTK_TREE_VIEW_COLUMN_AUTOSIZE); gtk_tree_view_append_column (GTK_TREE_VIEW (st->pr->tree), column); |