diff options
| -rw-r--r-- | src/trg-files-tree-view.c | 2 | ||||
| -rw-r--r-- | src/trg-peers-tree-view.c | 2 | ||||
| -rw-r--r-- | src/trg-torrent-tree-view.c | 2 | ||||
| -rw-r--r-- | src/trg-trackers-tree-view.c | 2 | ||||
| -rw-r--r-- | src/trg-tree-view.c | 37 | ||||
| -rw-r--r-- | src/trg-tree-view.h | 3 |
6 files changed, 30 insertions, 18 deletions
diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c index a7a7682..4b0d604 100644 --- a/src/trg-files-tree-view.c +++ b/src/trg-files-tree-view.c @@ -287,7 +287,7 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, FILESCOL_NAME, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, FILESCOL_NAME, _("Name"), "name", 0); desc->model_column_icon = FILESCOL_ICON; desc->defaultWidth = 500; diff --git a/src/trg-peers-tree-view.c b/src/trg-peers-tree-view.c index e85cbd2..0a3d48a 100644 --- a/src/trg-peers-tree-view.c +++ b/src/trg-peers-tree-view.c @@ -47,7 +47,7 @@ static void trg_peers_tree_view_init(TrgPeersTreeView * self) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, PEERSCOL_IP, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, PEERSCOL_IP, _("IP"), "ip", 0); desc->model_column_icon = PEERSCOL_ICON; diff --git a/src/trg-torrent-tree-view.c b/src/trg-torrent-tree-view.c index 74bce98..6dd65d5 100644 --- a/src/trg-torrent-tree-view.c +++ b/src/trg-torrent-tree-view.c @@ -40,7 +40,7 @@ static void trg_torrent_tree_view_init(TrgTorrentTreeView * tttv) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, TORRENT_COLUMN_NAME, _("Name"), "name", 0); desc->model_column_icon = TORRENT_COLUMN_ICON; diff --git a/src/trg-trackers-tree-view.c b/src/trg-trackers-tree-view.c index f4c1e87..8101869 100644 --- a/src/trg-trackers-tree-view.c +++ b/src/trg-trackers-tree-view.c @@ -163,7 +163,7 @@ static void trg_trackers_tree_view_init(TrgTrackersTreeView * self) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICONTEXT, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_STOCKICONTEXT, TRACKERCOL_TIER, _("Tier"), "tier", TRG_COLUMN_UNREMOVABLE); desc->model_column_icon = TRACKERCOL_ICON; diff --git a/src/trg-tree-view.c b/src/trg-tree-view.c index 0ad4024..ae156dd 100644 --- a/src/trg-tree-view.c +++ b/src/trg-tree-view.c @@ -247,6 +247,25 @@ col_onButtonPressed(GtkButton * button, GdkEventButton * event, return FALSE; } +static GtkTreeViewColumn *trg_tree_view_icontext_column_new(trg_column_description *desc, + gchar *renderer_property) +{ + GtkTreeViewColumn *column = gtk_tree_view_column_new(); + GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); + + gtk_tree_view_column_set_title(column, desc->header); + gtk_tree_view_column_pack_start(column, renderer, FALSE); + gtk_tree_view_column_set_attributes(column, renderer, renderer_property, + desc->model_column_icon, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_set_attributes(column, renderer, "text", + desc->model_column, NULL); + + return column; +} + static void trg_tree_view_add_column_after(TrgTreeView * tv, trg_column_description * desc, gint64 width, @@ -319,19 +338,11 @@ static void trg_tree_view_add_column_after(TrgTreeView * tv, desc->model_column, NULL); break; - case TRG_COLTYPE_ICONTEXT: - column = gtk_tree_view_column_new(); - - renderer = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_set_title(column, desc->header); - gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_set_attributes(column, renderer, "stock-id", - desc->model_column_icon, NULL); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_set_attributes(column, renderer, "text", - desc->model_column, NULL); + case TRG_COLTYPE_STOCKICONTEXT: + column = trg_tree_view_icontext_column_new(desc, "stock-id"); + break; + case TRG_COLTYPE_PIXBUFICONTEXT: + column = trg_tree_view_icontext_column_new(desc, "pixbuf"); break; case TRG_COLTYPE_WANT: renderer = trg_cell_renderer_wanted_new(); diff --git a/src/trg-tree-view.h b/src/trg-tree-view.h index ac9bb52..086fd5b 100644 --- a/src/trg-tree-view.h +++ b/src/trg-tree-view.h @@ -51,7 +51,8 @@ GtkWidget *trg_tree_view_new(void); G_END_DECLS GList *trg_tree_view_get_selected_refs_list(GtkTreeView * tv); enum { - TRG_COLTYPE_ICONTEXT, + TRG_COLTYPE_STOCKICONTEXT, + TRG_COLTYPE_PIXBUFICONTEXT, TRG_COLTYPE_TEXT, TRG_COLTYPE_SIZE, TRG_COLTYPE_RATIO, |