geeqie.yaz: src/view_file_list.c comparison

comparison src/view_file_list.c @ 132:661cd91e5a7e

First implementation of marks for all photos.

author	bruclik
date	Fri, 13 Jul 2007 14:03:08 +0000
parents	55166d93498d
children	71e1ebee420e

comparison

equal deleted inserted replaced

-:b1acdfc7271b
+:661cd91e5a7e
 #include "utilops.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
 #include "ui_tree_edit.h"
+#include "typedefs.h"
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 enum {
 	FILE_COLUMN_THUMB,
 	FILE_COLUMN_NAME,
 	FILE_COLUMN_SIZE,
 	FILE_COLUMN_DATE,
 	FILE_COLUMN_COLOR,
+FILE_COLUMN_MARKS,
 	FILE_COLUMN_COUNT
 };
 static gint vflist_row_is_selected(ViewFileList *vfl, FileData *fd);
 {
 	ViewFileList *vfl = data;
 	GtkTreePath *tpath;
 	GtkTreeIter iter;
 	FileData *fd = NULL;
+GtkTreeViewColumn *column;
+gint colnum;
 	if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
-					  &tpath, NULL, NULL, NULL))
+					  &tpath, &column, NULL, NULL))
 		{
 		GtkTreeModel *store;
+colnum = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column"));
-		store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+if (colnum <= FILE_COLUMN_MARKS - 2 + FILEDATA_MARKS_SIZE && colnum >= FILE_COLUMN_MARKS - 2)
+return FALSE;
+store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
 		gtk_tree_model_get_iter(store, &iter, tpath);
 		gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1);
 #if 0
 		gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
 #endif
 	work = vfl->list;
 	while (work)
 		{
 		FileData *fd;
 		gchar *size;
+int i;
 		fd = work->data;
 		size = text_from_size(fd->size);
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter, FILE_COLUMN_POINTER, fd,
 						 FILE_COLUMN_THUMB, (vfl->thumbs_enabled) ? fd->pixbuf : NULL,
 						 FILE_COLUMN_NAME, fd->name,
 						 FILE_COLUMN_SIZE, size,
 						 FILE_COLUMN_DATE, text_from_time(fd->date),
 						 FILE_COLUMN_COLOR, FALSE, -1);
-		g_free(size);
+for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+gtk_list_store_set(store, &iter, FILE_COLUMN_MARKS + i, fd->marks[i], -1);
+g_free(size);
 		if (select_list && select_list->data == fd)
 			{
 			select_list = g_list_remove(select_list, fd);
 			gtk_tree_selection_select_iter(selection, &iter);
 	GList *list;
 	column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), FILE_COLUMN_THUMB - 1);
 	if (!column) return;
-	gtk_tree_view_column_set_fixed_width(column, (thumb) ? thumb_max_width : 4);
+	gtk_tree_view_column_set_fixed_width(column, (thumb) ? thumb_max_width : FILE_COLUMN_MARKS);
 	list = gtk_tree_view_column_get_cell_renderers(column);
 	if (!list) return;
 	cell = list->data;
 	g_list_free(list);
 		gint done = FALSE;
 		while (!done)
 			{
 			FileData *old_fd = NULL;
+int i;
 			if (valid)
 				{
 				gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &old_fd, -1);
 				match = CASE_SORT(fd->name, old_fd->name);
 				}
 								FILE_COLUMN_THUMB, (thumbs) ? fd->pixbuf : NULL,
 								FILE_COLUMN_NAME, fd->name,
 								FILE_COLUMN_SIZE, size,
 								FILE_COLUMN_DATE, text_from_time(fd->date),
 								FILE_COLUMN_COLOR, FALSE, -1);
-				g_free(size);
+for (i = 0; i < FILEDATA_MARKS_SIZE; i++)
+gtk_list_store_set(store, &new, FILE_COLUMN_MARKS + i, fd->marks[i], -1);
+g_free(size);
 				done = TRUE;
 				}
 			else if (match > 0)
 				{
 	g_object_set(G_OBJECT(cell),
 		     "cell-background-gdk", vflist_listview_color_shifted(vfl->listview),
 		     "cell-background-set", set, NULL);
 }
-static void vflist_listview_add_column(ViewFileList *vfl, gint n, const gchar *title, gint image, gint right_justify)
+static void vflist_listview_add_column(ViewFileList *vfl, gint n, const gchar *title, gint image, gint right_justify, gint expand)
 {
 	GtkTreeViewColumn *column;
 	GtkCellRenderer *renderer;
 	column = gtk_tree_view_column_new();
 			{
 			g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
 			}
 		gtk_tree_view_column_pack_start(column, renderer, TRUE);
 		gtk_tree_view_column_add_attribute(column, renderer, "text", n);
-		}
+if (expand)
+gtk_tree_view_column_set_expand(column, TRUE);
+}
 	else
 		{
 		gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
 		renderer = gtk_cell_renderer_pixbuf_new();
 		cell_renderer_height_override(renderer);
 	gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vfl, NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(vfl->listview), column);
 }
+static void vflist_listview_mark_toggled(GtkCellRendererToggle *cell, gchar *path_str, GtkListStore *store)
+{
+GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+guint *marks;
+GtkTreeIter iter;
+FileData *fd;
+gboolean mark;
+guint column;
+if (!path || !gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path))
+return;
+column = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(cell), "column"));
+gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, column, &mark, -1);
+mark ^= 1;
+fd->marks[column] = mark;
+gtk_list_store_set(store, &iter, column, mark, -1);
+gtk_tree_path_free(path);
+}
+static void vflist_listview_add_column_toggle(ViewFileList *vfl, gint n, const gchar *title)
+{
+GtkTreeViewColumn *column;
+GtkCellRenderer *renderer;
+GtkListStore *store;
+gint index;
+	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vfl->listview)));
+renderer = gtk_cell_renderer_toggle_new();
+column = gtk_tree_view_column_new_with_attributes(title, renderer, "active", n, NULL);
+gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+g_object_set_data (G_OBJECT (column), "column", GUINT_TO_POINTER(n));
+g_object_set_data (G_OBJECT (renderer), "column", GUINT_TO_POINTER(n));
+index = gtk_tree_view_append_column(GTK_TREE_VIEW(vfl->listview), column);
+gtk_tree_view_column_set_fixed_width(column, 16);
+gtk_tree_view_column_set_visible(column, vfl->marks_enabled);
+g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(vflist_listview_mark_toggled), store);
+}
 /*
 *-----------------------------------------------------------------------------
 * base
 *-----------------------------------------------------------------------------
 */
 {
 	ViewFileList *vfl;
 	GtkListStore *store;
 	GtkTreeSelection *selection;
+GType *flist_types;
+int i;
 	vfl = g_new0(ViewFileList, 1);
 	vfl->path = NULL;
 	vfl->list = NULL;
 	vfl->click_fd = NULL;
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vfl->widget),
 				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 	g_signal_connect(G_OBJECT(vfl->widget), "destroy",
 			 G_CALLBACK(vflist_destroy_cb), vfl);
-	store = gtk_list_store_new(6, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING,
+flist_types = g_new(GType, FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE);
-				   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+flist_types[0] = G_TYPE_POINTER;
-	vfl->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+flist_types[1] = GDK_TYPE_PIXBUF;
+flist_types[2] = G_TYPE_STRING;
+flist_types[3] = G_TYPE_STRING;
+flist_types[4] = G_TYPE_STRING;
+flist_types[5] = G_TYPE_BOOLEAN;
+for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++)
+flist_types[i] = G_TYPE_BOOLEAN;
+store = gtk_list_store_newv(FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE, flist_types);
+g_free(flist_types);
+vfl->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
 	g_object_unref(store);
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vfl->listview));
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
 	gtk_tree_selection_set_select_function(selection, vflist_select_cb, vfl, NULL);
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vfl->listview), FALSE);
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vfl->listview), FALSE);
-	vflist_listview_add_column(vfl, FILE_COLUMN_THUMB, "", TRUE, FALSE);
+	vflist_listview_add_column(vfl, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE);
-	vflist_listview_add_column(vfl, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE);
+	vflist_listview_add_column(vfl, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, FALSE);
-	vflist_listview_add_column(vfl, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE);
+	vflist_listview_add_column(vfl, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE);
-	vflist_listview_add_column(vfl, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE);
+	vflist_listview_add_column(vfl, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, TRUE);
-	g_signal_connect(G_OBJECT(vfl->listview), "key_press_event",
+for(i = 0; i < FILEDATA_MARKS_SIZE;i++)
+vflist_listview_add_column_toggle(vfl, i + FILE_COLUMN_MARKS, "");
+g_signal_connect(G_OBJECT(vfl->listview), "key_press_event",
 			 G_CALLBACK(vflist_press_key_cb), vfl);
 	gtk_container_add (GTK_CONTAINER(vfl->widget), vfl->listview);
 	gtk_widget_show(vfl->listview);
 	vflist_dnd_init(vfl);
 	g_signal_connect(G_OBJECT(vfl->listview), "button_press_event",
 			 G_CALLBACK(vflist_press_cb), vfl);
 	g_signal_connect(G_OBJECT(vfl->listview), "button_release_event",
 			 G_CALLBACK(vflist_release_cb), vfl);
 	if (path) vflist_set_path(vfl, path);
 	return vfl;
 }
 {
 	if (vfl->thumbs_enabled == enable) return;
 	vfl->thumbs_enabled = enable;
 	vflist_refresh(vfl);
+}
+void vflist_marks_set(ViewFileList *vfl, gint enable)
+{
+GtkListStore *store;
+GtkTreeViewColumn *column;
+int i;
+	if (vfl->marks_enabled == enable) return;
+	vfl->marks_enabled = enable;
+for (i = 0; i < FILEDATA_MARKS_SIZE; i++) {
+/* index - 2 because column's store != tree view */
+column = gtk_tree_view_get_column(GTK_TREE_VIEW(vfl->listview), i + FILE_COLUMN_MARKS - 2);
+gtk_tree_view_column_set_visible(column, enable);
+}
+//vflist_refresh(vfl);
 }
 void vflist_set_layout(ViewFileList *vfl, LayoutWindow *layout)
 {
 	vfl->layout = layout;

Mercurial > geeqie.yaz

comparison src/view_file_list.c @ 132:661cd91e5a7e