Mercurial > geeqie

comparison src/view_dir_tree.c @ 1452:67b40740122e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gint -> gboolean where applicable.
author zas_
date Mon, 16 Mar 2009 19:11:39 +0000
parents a3d3208b0c50
children 299d45d4b1cc
comparison
equal deleted inserted replaced
1451:0e67a5992d51 1452:67b40740122e
73 } 73 }
74 74
75 gint vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent) 75 gint vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent)
76 { 76 {
77 GtkTreeModel *store; 77 GtkTreeModel *store;
78 gint valid; 78 gboolean valid;
79 79
80 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); 80 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
81 if (parent) 81 if (parent)
82 { 82 {
83 valid = gtk_tree_model_iter_children(store, iter, parent); 83 valid = gtk_tree_model_iter_children(store, iter, parent);
117 { 117 {
118 gtk_tree_store_set(GTK_TREE_STORE(store), iter, DIR_COLUMN_ICON, pixbuf, -1); 118 gtk_tree_store_set(GTK_TREE_STORE(store), iter, DIR_COLUMN_ICON, pixbuf, -1);
119 } 119 }
120 } 120 }
121 121
122 static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gint expand) 122 static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean expand)
123 { 123 {
124 GtkTreeModel *store; 124 GtkTreeModel *store;
125 GtkTreePath *tpath; 125 GtkTreePath *tpath;
126 126
127 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); 127 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
136 gtk_tree_view_collapse_row(GTK_TREE_VIEW(vd->view), tpath); 136 gtk_tree_view_collapse_row(GTK_TREE_VIEW(vd->view), tpath);
137 } 137 }
138 gtk_tree_path_free(tpath); 138 gtk_tree_path_free(tpath);
139 } 139 }
140 140
141 static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gint expand) 141 static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gboolean expand)
142 { 142 {
143 GtkTreeIter iter; 143 GtkTreeIter iter;
144 144
145 if (vd_find_row(vd, fd, &iter)) 145 if (vd_find_row(vd, fd, &iter))
146 { 146 {
160 *---------------------------------------------------------------------------- 160 *----------------------------------------------------------------------------
161 * dnd 161 * dnd
162 *---------------------------------------------------------------------------- 162 *----------------------------------------------------------------------------
163 */ 163 */
164 164
165 static gint vdtree_dnd_drop_expand_cb(gpointer data) 165 static gboolean vdtree_dnd_drop_expand_cb(gpointer data)
166 { 166 {
167 ViewDir *vd = data; 167 ViewDir *vd = data;
168 GtkTreeIter iter; 168 GtkTreeIter iter;
169 169
170 if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter)) 170 if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter))
250 static GList *parts_list_add_node_points(ViewDir *vd, GList *list) 250 static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
251 { 251 {
252 GList *work; 252 GList *work;
253 GtkTreeModel *store; 253 GtkTreeModel *store;
254 GtkTreeIter iter; 254 GtkTreeIter iter;
255 gint valid; 255 gboolean valid;
256 256
257 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); 257 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
258 valid = gtk_tree_model_get_iter_first(store, &iter); 258 valid = gtk_tree_model_get_iter_first(store, &iter);
259 259
260 work = list; 260 work = list;
323 *---------------------------------------------------------------------------- 323 *----------------------------------------------------------------------------
324 * node traversal, management 324 * node traversal, management
325 *---------------------------------------------------------------------------- 325 *----------------------------------------------------------------------------
326 */ 326 */
327 327
328 static gint vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter) 328 static gboolean vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter)
329 { 329 {
330 GtkTreeModel *store; 330 GtkTreeModel *store;
331 331
332 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)); 332 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
333 if (!nd || !gtk_tree_model_iter_children(store, iter, parent)) return -1; 333 if (!nd || !gtk_tree_model_iter_children(store, iter, parent)) return -1;
431 } 431 }
432 gtk_tree_path_free(tpath); 432 gtk_tree_path_free(tpath);
433 } 433 }
434 } 434 }
435 435
436 gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint force, FileData *target_fd) 436 gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
437 { 437 {
438 GtkTreeModel *store; 438 GtkTreeModel *store;
439 GList *list; 439 GList *list;
440 GList *work; 440 GList *work;
441 GList *old; 441 GList *old;
573 nd->last_update = current_time; 573 nd->last_update = current_time;
574 574
575 return TRUE; 575 return TRUE;
576 } 576 }
577 577
578 FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gint expand, gint force) 578 FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand, gboolean force)
579 { 579 {
580 GList *list; 580 GList *list;
581 GList *work; 581 GList *work;
582 FileData *fd = NULL; 582 FileData *fd = NULL;
583 583
694 { 694 {
695 vd->select_func(vd, fd->path, vd->select_data); 695 vd->select_func(vd, fd->path, vd->select_data);
696 } 696 }
697 } 697 }
698 698
699 gint vdtree_set_fd(ViewDir *vd, FileData *dir_fd) 699 gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
700 { 700 {
701 FileData *fd; 701 FileData *fd;
702 GtkTreeIter iter; 702 GtkTreeIter iter;
703 703
704 if (!dir_fd) return FALSE; 704 if (!dir_fd) return FALSE;
751 *---------------------------------------------------------------------------- 751 *----------------------------------------------------------------------------
752 * callbacks 752 * callbacks
753 *---------------------------------------------------------------------------- 753 *----------------------------------------------------------------------------
754 */ 754 */
755 755
756 gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) 756 gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
757 { 757 {
758 ViewDir *vd = data; 758 ViewDir *vd = data;
759 GtkTreePath *tpath; 759 GtkTreePath *tpath;
760 GtkTreeIter iter; 760 GtkTreeIter iter;
761 FileData *fd = NULL; 761 FileData *fd = NULL;
798 } 798 }
799 799
800 return FALSE; 800 return FALSE;
801 } 801 }
802 802
803 static gint vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath, 803 static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
804 GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander) 804 GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
805 { 805 {
806 gint depth; 806 gint depth;
807 gint size; 807 gint size;
808 gint sep; 808 gint sep;
809 gint exp_width; 809 gint exp_width;
822 } 822 }
823 823
824 return FALSE; 824 return FALSE;
825 } 825 }
826 826
827 gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) 827 gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
828 { 828 {
829 ViewDir *vd = data; 829 ViewDir *vd = data;
830 GtkTreePath *tpath; 830 GtkTreePath *tpath;
831 GtkTreeViewColumn *column; 831 GtkTreeViewColumn *column;
832 GtkTreeIter iter; 832 GtkTreeIter iter;