geeqie: src/utilops.c comparison

comparison src/utilops.c @ 924:96a1f535ce89

indicate check warnings and errors in delete and rename dialogs

author	nadvornik
date	Wed, 23 Jul 2008 22:19:16 +0000
parents	b416159a5820
children	6a42ab7051f2

comparison

equal deleted inserted replaced

-:893cd191db23
+:96a1f535ce89
 #include "ui_fileops.h"
 #include "ui_misc.h"
 #include "ui_tabcomp.h"
 #include "editors.h"
+static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget);
 /*
 *--------------------------------------------------------------------------
 * Adds 1 or 2 images (if 2, side by side) to a GenericDialog
 *--------------------------------------------------------------------------
 */
 	gpointer resume_data;
 };
 enum {
 	UTILITY_COLUMN_FD = 0,
+	UTILITY_COLUMN_PIXBUF,
 	UTILITY_COLUMN_PATH,
 	UTILITY_COLUMN_NAME,
 	UTILITY_COLUMN_SIDECARS,
 	UTILITY_COLUMN_DEST_PATH,
 	UTILITY_COLUMN_DEST_NAME,
 	g_free(ud->dest_path);
 	g_free(ud);
 }
-static GtkTreeViewColumn *file_util_dialog_add_list_column(GtkWidget *view, const gchar *text, gint n)
+static GtkTreeViewColumn *file_util_dialog_add_list_column(GtkWidget *view, const gchar *text, gboolean image, gint n)
 {
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	column = gtk_tree_view_column_new();
 	gtk_tree_view_column_set_title(column, text);
 	gtk_tree_view_column_set_min_width(column, 4);
-	gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+	if (image)
-	renderer = gtk_cell_renderer_text_new();
+		{
-	gtk_tree_view_column_pack_start(column, renderer, TRUE);
+		gtk_tree_view_column_set_min_width(column, 20);
-	gtk_tree_view_column_add_attribute(column, renderer, "text", n);
+		gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+		renderer = gtk_cell_renderer_pixbuf_new();
+		gtk_tree_view_column_pack_start(column, renderer, TRUE);
+		gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n);
+		}
+	else
+		{
+		gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
+		renderer = gtk_cell_renderer_text_new();
+		gtk_tree_view_column_pack_start(column, renderer, TRUE);
+		gtk_tree_view_column_add_attribute(column, renderer, "text", n);
+		}
 	gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
 	return column;
 }
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
 				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 	gtk_box_pack_start(GTK_BOX(box), scrolled, TRUE, TRUE, 0);
 	gtk_widget_show(scrolled);
-	store = gtk_list_store_new(UTILITY_COLUMN_COUNT, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+	store = gtk_list_store_new(UTILITY_COLUMN_COUNT, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 	view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 	g_object_unref(store);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(view), TRUE);
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(view), FALSE);
+	file_util_dialog_add_list_column(view, "", TRUE, UTILITY_COLUMN_PIXBUF);
 	if (full_paths)
 		{
-		file_util_dialog_add_list_column(view, _("Location"), UTILITY_COLUMN_PATH);
+		file_util_dialog_add_list_column(view, _("Location"), FALSE, UTILITY_COLUMN_PATH);
 		}
 	else
 		{
-		file_util_dialog_add_list_column(view, _("Name"), UTILITY_COLUMN_NAME);
+		file_util_dialog_add_list_column(view, _("Name"), FALSE, UTILITY_COLUMN_NAME);
 		}
 	gtk_widget_set_size_request(view, UTILITY_LIST_MIN_WIDTH, UTILITY_LIST_MIN_HEIGHT);
 	gtk_container_add(GTK_CONTAINER(scrolled), view);
 	gtk_widget_show(view);
 		sidecars = file_data_sc_list_to_string(fd);
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter,
 				   UTILITY_COLUMN_FD, fd,
+				   UTILITY_COLUMN_PIXBUF, file_util_get_error_icon(fd, view),
 				   UTILITY_COLUMN_PATH, fd->path,
 				   UTILITY_COLUMN_NAME, fd->name,
 				   UTILITY_COLUMN_SIDECARS, sidecars,
 				   UTILITY_COLUMN_DEST_PATH, fd->change ? fd->change->dest : "error",
 				   UTILITY_COLUMN_DEST_NAME, fd->change ? filename_from_path(fd->change->dest) : "error",
 			file_util_perform_ci_internal(ud);
 			}
 		}
 }
+static GdkPixbuf *file_util_get_error_icon(FileData *fd, GtkWidget *widget)
+{
+	static GdkPixbuf *pb_warning;
+	static GdkPixbuf *pb_error;
+	gint error;
+	if (!pb_warning)
+		{
+		pb_warning = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU, NULL);
+		}
+	if (!pb_error)
+		{
+		pb_error = gtk_widget_render_icon(widget, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
+		}
+	error = file_data_sc_check_ci_dest(fd);
+	if (!error) return NULL;
+	if (error & CHANGE_ERROR_MASK)
+		{
+		return pb_error;
+		}
+	else
+		{
+		return pb_warning;
+		}
+}
 static void file_util_check_resume_cb(GenericDialog *gd, gpointer data)
 {
 	UtilityData *ud = data;
 	ud->phase = UTILITY_PHASE_CHECKED;
 			const gchar *dest = gtk_entry_get_text(GTK_ENTRY(ud->rename_entry));
 			gtk_tree_model_get(store, &iter, UTILITY_COLUMN_FD, &fd, -1);
 			file_data_sc_update_ci_rename(fd, dest);
 			gtk_list_store_set(GTK_LIST_STORE(store), &iter,
+					   UTILITY_COLUMN_PIXBUF, file_util_get_error_icon(fd, ud->listview),
 			                   UTILITY_COLUMN_DEST_PATH, fd->change->dest,
 				           UTILITY_COLUMN_DEST_NAME, filename_from_path(fd->change->dest),
 					   -1);
 			}
 		return;
 			dest = g_strdup_printf("%s%0*d%s", front, padding, n, end);
 			}
 		file_data_sc_update_ci_rename(fd, dest);
 		gtk_list_store_set(GTK_LIST_STORE(store), &iter,
-		                   UTILITY_COLUMN_DEST_PATH, fd->change->dest,
+				   UTILITY_COLUMN_PIXBUF, file_util_get_error_icon(fd, ud->listview),
+				   UTILITY_COLUMN_DEST_PATH, fd->change->dest,
 				   UTILITY_COLUMN_DEST_NAME, filename_from_path(fd->change->dest),
 				   -1);
 		g_free(dest);
 		n++;
 	g_free(dir_msg);
 	box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
 	ud->listview = file_util_dialog_add_list(box, ud->flist, FALSE);
-	file_util_dialog_add_list_column(ud->listview, _("Sidecars"), UTILITY_COLUMN_SIDECARS);
+	file_util_dialog_add_list_column(ud->listview, _("Sidecars"), FALSE, UTILITY_COLUMN_SIDECARS);
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ud->listview));
 	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 	gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, NULL);
 	generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE);
 	box = pref_group_new(box, TRUE, ud->messages.desc_flist, GTK_ORIENTATION_HORIZONTAL);
 	ud->listview = file_util_dialog_add_list(box, ud->flist, FALSE);
-	file_util_dialog_add_list_column(ud->listview, _("Sidecars"), UTILITY_COLUMN_SIDECARS);
+	file_util_dialog_add_list_column(ud->listview, _("Sidecars"), FALSE, UTILITY_COLUMN_SIDECARS);
-	file_util_dialog_add_list_column(ud->listview, _("New name"), UTILITY_COLUMN_DEST_NAME);
+	file_util_dialog_add_list_column(ud->listview, _("New name"), FALSE, UTILITY_COLUMN_DEST_NAME);
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ud->listview));
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE);
 	gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, NULL);

Mercurial > geeqie

comparison src/utilops.c @ 924:96a1f535ce89