From 5ce226277955a7d1aa6f5d0e00acb2ee98041003 Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Mon, 3 Oct 2011 09:36:52 +0000 Subject: use an icon for file wanted/unwanted --- src/trg-files-tree-view.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/trg-files-tree-view.c') diff --git a/src/trg-files-tree-view.c b/src/trg-files-tree-view.c index e6f0f88..9d63920 100644 --- a/src/trg-files-tree-view.c +++ b/src/trg-files-tree-view.c @@ -24,8 +24,6 @@ #include "trg-tree-view.h" #include "trg-files-tree-view.h" #include "trg-files-model.h" -#include "trg-cell-renderer-wanted.h" -#include "trg-cell-renderer-priority.h" #include "trg-main-window.h" #include "requests.h" #include "util.h" @@ -52,8 +50,7 @@ static void set_unwanted_foreachfunc(GtkTreeModel * model, GtkTreeIter * iter, gpointer data G_GNUC_UNUSED) { - gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_WANTED, FALSE, - /* set wanted icon: FILESCOL_WANTED_ICON, GTK_STOCK_CANCEL,*/ -1); + gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_WANTED, GTK_STOCK_CANCEL, -1); } static void set_wanted_foreachfunc(GtkTreeModel * model, @@ -61,8 +58,8 @@ static void set_wanted_foreachfunc(GtkTreeModel * model, GtkTreeIter * iter, gpointer data G_GNUC_UNUSED) { - gtk_list_store_set(GTK_LIST_STORE(model), iter, FILESCOL_WANTED, TRUE, - /* set wanted icon: FILESCOL_WANTED_ICON, GTK_STOCK_APPLY,*/ -1); + gtk_list_store_set(GTK_LIST_STORE(model), iter, + FILESCOL_WANTED, GTK_STOCK_APPLY, -1); } static void set_priority_foreachfunc(GtkTreeModel * model, @@ -85,16 +82,18 @@ static void send_updated_file_prefs_foreachfunc(GtkTreeModel * model, { JsonObject *args = (JsonObject *) data; gint64 priority, id; - gboolean wanted; + gchar *wanted; gtk_tree_model_get(model, iter, FILESCOL_WANTED, &wanted, FILESCOL_PRIORITY, &priority, FILESCOL_ID, &id, -1); - if (wanted == FALSE) + if (!g_strcmp0(wanted, GTK_STOCK_CANCEL)) add_file_id_to_array(args, FIELD_FILES_UNWANTED, id); else add_file_id_to_array(args, FIELD_FILES_WANTED, id); + g_free(wanted); + if (priority == TR_PRI_LOW) add_file_id_to_array(args, FIELD_FILES_PRIORITY_LOW, id); else if (priority == TR_PRI_HIGH) @@ -287,7 +286,7 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self) trg_column_description *desc; desc = - trg_tree_view_reg_column(ttv, TRG_COLTYPE_PIXBUFICONTEXT, FILESCOL_NAME, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_GICONTEXT, FILESCOL_NAME, _("Name"), "name", 0); desc->model_column_icon = FILESCOL_ICON; desc->defaultWidth = 500; @@ -296,7 +295,7 @@ static void trg_files_tree_view_init(TrgFilesTreeView * self) _("Size"), "size", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_PROG, FILESCOL_PROGRESS, _("Progress"), "progress", 0); - trg_tree_view_reg_column(ttv, TRG_COLTYPE_WANT, FILESCOL_WANTED, + trg_tree_view_reg_column(ttv, TRG_COLTYPE_ICON, FILESCOL_WANTED, _("Wanted"), "wanted", 0); trg_tree_view_reg_column(ttv, TRG_COLTYPE_PRIO, FILESCOL_PRIORITY, _("Priority"), "priority", 0); -- cgit v1.2.3