Mercurial > geeqie.yaz
annotate src/view_file_list.c @ 829:a204fc1d1145
optimized vflist_setup_iter
author | nadvornik |
---|---|
date | Fri, 13 Jun 2008 21:32:58 +0000 |
parents | 721c2bbaceec |
children | a06d885de883 |
rev | line source |
---|---|
9 | 1 /* |
196 | 2 * Geeqie |
9 | 3 * (C) 2004 John Ellis |
475 | 4 * Copyright (C) 2008 The Geeqie Team |
9 | 5 * |
6 * Author: John Ellis | |
7 * | |
8 * This software is released under the GNU General Public License (GNU GPL). | |
9 * Please read the included file COPYING for more information. | |
10 * This software comes with no warranty of any kind, use at your own risk! | |
11 */ | |
12 | |
281 | 13 #include "main.h" |
9 | 14 #include "view_file_list.h" |
15 | |
16 #include "cache_maint.h" | |
17 #include "dnd.h" | |
18 #include "editors.h" | |
19 #include "img-view.h" | |
20 #include "info.h" | |
21 #include "layout.h" | |
22 #include "layout_image.h" | |
23 #include "menu.h" | |
24 #include "thumb.h" | |
25 #include "utilops.h" | |
26 #include "ui_bookmark.h" | |
27 #include "ui_fileops.h" | |
28 #include "ui_menu.h" | |
29 #include "ui_tree_edit.h" | |
633 | 30 #include "view_file.h" |
9 | 31 |
32 #include <gdk/gdkkeysyms.h> /* for keyboard values */ | |
33 | |
34 | |
35 enum { | |
36 FILE_COLUMN_POINTER = 0, | |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
37 FILE_COLUMN_VERSION, |
9 | 38 FILE_COLUMN_THUMB, |
39 FILE_COLUMN_NAME, | |
139 | 40 FILE_COLUMN_SIDECARS, |
9 | 41 FILE_COLUMN_SIZE, |
42 FILE_COLUMN_DATE, | |
43 FILE_COLUMN_COLOR, | |
139 | 44 FILE_COLUMN_MARKS, |
45 FILE_COLUMN_MARKS_LAST = FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE - 1, | |
9 | 46 FILE_COLUMN_COUNT |
47 }; | |
48 | |
49 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
50 static gint vflist_row_is_selected(ViewFile *vf, FileData *fd); |
9 | 51 static gint vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
52 static void vflist_populate_view(ViewFile *vf); |
9 | 53 |
54 | |
55 /* | |
56 *----------------------------------------------------------------------------- | |
57 * misc | |
58 *----------------------------------------------------------------------------- | |
59 */ | |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
60 typedef struct { |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
61 FileData *fd; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
62 GtkTreeIter *iter; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
63 gint found; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
64 gint row; |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
65 } ViewFileFindRowData; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
66 |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
67 static gboolean vflist_find_row_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
68 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
69 ViewFileFindRowData *find = data; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
70 FileData *fd; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
71 gtk_tree_model_get(model, iter, FILE_COLUMN_POINTER, &fd, -1); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
72 if (fd == find->fd) |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
73 { |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
74 *find->iter = *iter; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
75 find->found = 1; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
76 return TRUE; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
77 } |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
78 find->row++; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
79 return FALSE; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
80 } |
9 | 81 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
82 static gint vflist_find_row(ViewFile *vf, FileData *fd, GtkTreeIter *iter) |
9 | 83 { |
84 GtkTreeModel *store; | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
85 ViewFileFindRowData data = {fd, iter, 0, 0}; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
86 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
87 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
88 gtk_tree_model_foreach(store, vflist_find_row_cb, &data); |
9 | 89 |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
90 if (data.found) |
9 | 91 { |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
92 return data.row; |
9 | 93 } |
94 | |
95 return -1; | |
96 } | |
97 | |
169 | 98 |
259 | 99 /* |
169 | 100 static gint vflist_find_sidecar_list_idx(GList *work, FileData *fd) |
101 { | |
102 gint i = 0; | |
103 while (work) | |
104 { | |
105 FileData *fd_p = work->data; | |
106 if (fd == fd_p) return i; | |
442 | 107 |
169 | 108 i++; |
109 | |
110 GList *work2 = fd_p->sidecar_files; | |
111 while (work2) | |
112 { | |
442 | 113 fd_p = work2->data; |
169 | 114 if (fd == fd_p) return i; |
442 | 115 |
169 | 116 i++; |
117 work2 = work2->next; | |
118 } | |
119 work = work->next; | |
120 } | |
121 return -1; | |
122 } | |
259 | 123 */ |
169 | 124 |
125 static gint vflist_sidecar_list_count(GList *work) | |
126 { | |
127 gint i = 0; | |
128 while (work) | |
129 { | |
130 FileData *fd = work->data; | |
131 i++; | |
132 | |
133 GList *work2 = fd->sidecar_files; | |
134 while (work2) | |
135 { | |
136 i++; | |
137 work2 = work2->next; | |
138 } | |
139 work = work->next; | |
140 } | |
141 return i; | |
142 } | |
143 | |
801 | 144 static gboolean vflist_store_clear_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) |
145 { | |
146 FileData *fd; | |
147 gtk_tree_model_get(model, iter, FILE_COLUMN_POINTER, &fd, -1); | |
148 file_data_unref(fd); | |
149 return FALSE; | |
150 } | |
151 | |
152 static void vflist_store_clear(ViewFile *vf) | |
153 { | |
154 GtkTreeModel *store; | |
155 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); | |
156 gtk_tree_model_foreach(store, vflist_store_clear_cb, NULL); | |
157 gtk_tree_store_clear(GTK_TREE_STORE(store)); | |
158 } | |
169 | 159 |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
160 void vflist_color_set(ViewFile *vf, FileData *fd, gint color_set) |
9 | 161 { |
162 GtkTreeModel *store; | |
163 GtkTreeIter iter; | |
164 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
165 if (vflist_find_row(vf, fd, &iter) < 0) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
166 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
167 gtk_tree_store_set(GTK_TREE_STORE(store), &iter, FILE_COLUMN_COLOR, color_set, -1); |
9 | 168 } |
169 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
170 static void vflist_move_cursor(ViewFile *vf, GtkTreeIter *iter) |
9 | 171 { |
172 GtkTreeModel *store; | |
173 GtkTreePath *tpath; | |
174 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
175 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 176 |
177 tpath = gtk_tree_model_get_path(store, iter); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
178 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vf->listview), tpath, NULL, FALSE); |
9 | 179 gtk_tree_path_free(tpath); |
180 } | |
181 | |
157 | 182 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
183 static gint vflist_column_idx(ViewFile *vf, gint store_idx) |
157 | 184 { |
185 GList *columns, *work; | |
186 gint i = 0; | |
187 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
188 columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(vf->listview)); |
157 | 189 work = columns; |
190 while (work) | |
191 { | |
192 GtkTreeViewColumn *column = work->data; | |
193 if (store_idx == GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), "column_store_idx"))) | |
194 break; | |
195 work = work->next; | |
196 i++; | |
197 } | |
442 | 198 |
157 | 199 g_list_free(columns); |
200 return i; | |
201 } | |
202 | |
203 | |
9 | 204 /* |
205 *----------------------------------------------------------------------------- | |
206 * dnd | |
207 *----------------------------------------------------------------------------- | |
208 */ | |
209 | |
210 static void vflist_dnd_get(GtkWidget *widget, GdkDragContext *context, | |
211 GtkSelectionData *selection_data, guint info, | |
212 guint time, gpointer data) | |
213 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
214 ViewFile *vf = data; |
9 | 215 GList *list = NULL; |
216 gchar *uri_text = NULL; | |
217 gint total; | |
218 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
219 if (!VFLIST_INFO(vf, click_fd)) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
220 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
221 if (vflist_row_is_selected(vf, VFLIST_INFO(vf, click_fd))) |
9 | 222 { |
633 | 223 list = vf_selection_get_list(vf); |
9 | 224 } |
225 else | |
226 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
227 list = g_list_append(NULL, file_data_ref(VFLIST_INFO(vf, click_fd))); |
9 | 228 } |
229 | |
230 if (!list) return; | |
231 | |
138 | 232 uri_text = uri_text_from_filelist(list, &total, (info == TARGET_TEXT_PLAIN)); |
233 filelist_free(list); | |
9 | 234 |
495 | 235 DEBUG_1(uri_text); |
9 | 236 |
64
04ff0df3ad2f
Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>
gqview
parents:
9
diff
changeset
|
237 gtk_selection_data_set(selection_data, selection_data->target, |
04ff0df3ad2f
Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>
gqview
parents:
9
diff
changeset
|
238 8, (guchar *)uri_text, total); |
9 | 239 g_free(uri_text); |
240 } | |
241 | |
242 static void vflist_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data) | |
243 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
244 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
245 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
246 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), TRUE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
247 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
248 if (VFLIST_INFO(vf, thumbs_enabled) && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
249 VFLIST_INFO(vf, click_fd) && VFLIST_INFO(vf, click_fd)->pixbuf) |
9 | 250 { |
736 | 251 guint items; |
9 | 252 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
253 if (vflist_row_is_selected(vf, VFLIST_INFO(vf, click_fd))) |
633 | 254 items = vf_selection_count(vf, NULL); |
9 | 255 else |
256 items = 1; | |
257 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
258 dnd_set_drag_icon(widget, context, VFLIST_INFO(vf, click_fd)->pixbuf, items); |
9 | 259 } |
260 } | |
261 | |
262 static void vflist_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data) | |
263 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
264 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
265 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
266 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE); |
9 | 267 |
268 if (context->action == GDK_ACTION_MOVE) | |
269 { | |
633 | 270 vf_refresh(vf); |
9 | 271 } |
272 } | |
273 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
274 void vflist_dnd_init(ViewFile *vf) |
9 | 275 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
276 gtk_drag_source_set(vf->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK, |
9 | 277 dnd_file_drag_types, dnd_file_drag_types_count, |
278 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
279 g_signal_connect(G_OBJECT(vf->listview), "drag_data_get", |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
280 G_CALLBACK(vflist_dnd_get), vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
281 g_signal_connect(G_OBJECT(vf->listview), "drag_begin", |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
282 G_CALLBACK(vflist_dnd_begin), vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
283 g_signal_connect(G_OBJECT(vf->listview), "drag_end", |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
284 G_CALLBACK(vflist_dnd_end), vf); |
9 | 285 } |
286 | |
287 /* | |
288 *----------------------------------------------------------------------------- | |
289 * pop-up menu | |
290 *----------------------------------------------------------------------------- | |
291 */ | |
292 | |
634 | 293 GList *vflist_pop_menu_file_list(ViewFile *vf) |
9 | 294 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
295 if (!VFLIST_INFO(vf, click_fd)) return NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
296 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
297 if (vflist_row_is_selected(vf, VFLIST_INFO(vf, click_fd))) |
9 | 298 { |
633 | 299 return vf_selection_get_list(vf); |
9 | 300 } |
301 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
302 return g_list_append(NULL, file_data_ref(VFLIST_INFO(vf, click_fd))); |
9 | 303 } |
304 | |
637 | 305 void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data) |
9 | 306 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
307 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
308 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
309 if (vflist_row_is_selected(vf, VFLIST_INFO(vf, click_fd))) |
9 | 310 { |
311 GList *list; | |
312 | |
633 | 313 list = vf_selection_get_list(vf); |
9 | 314 view_window_new_from_list(list); |
138 | 315 filelist_free(list); |
9 | 316 } |
317 else | |
318 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
319 view_window_new(VFLIST_INFO(vf, click_fd)); |
9 | 320 } |
321 } | |
322 | |
637 | 323 void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data) |
9 | 324 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
325 ViewFile *vf = data; |
9 | 326 GList *list; |
327 | |
634 | 328 list = vf_pop_menu_file_list(vf); |
341
15c6b94545a2
Move safe_delete* and in place rename options to file_ops
zas_
parents:
334
diff
changeset
|
329 if (options->file_ops.enable_in_place_rename && |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
330 list && !list->next && VFLIST_INFO(vf, click_fd)) |
9 | 331 { |
332 GtkTreeModel *store; | |
333 GtkTreeIter iter; | |
334 | |
138 | 335 filelist_free(list); |
9 | 336 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
337 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
338 if (vflist_find_row(vf, VFLIST_INFO(vf, click_fd), &iter) >= 0) |
9 | 339 { |
340 GtkTreePath *tpath; | |
341 | |
342 tpath = gtk_tree_model_get_path(store, &iter); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
343 tree_edit_by_path(GTK_TREE_VIEW(vf->listview), tpath, |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
344 vflist_column_idx(vf, FILE_COLUMN_NAME), VFLIST_INFO(vf, click_fd)->name, |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
345 vflist_row_rename_cb, vf); |
9 | 346 gtk_tree_path_free(tpath); |
347 } | |
348 return; | |
349 } | |
350 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
351 file_util_rename(NULL, list, vf->listview); |
9 | 352 } |
353 | |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
354 void vflist_pop_menu_thumbs_cb(GtkWidget *widget, gpointer data) |
9 | 355 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
356 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
357 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
358 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
359 if (vf->layout) |
9 | 360 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
361 layout_thumb_set(vf->layout, !VFLIST_INFO(vf, thumbs_enabled)); |
9 | 362 } |
363 else | |
364 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
365 vflist_thumb_set(vf, !VFLIST_INFO(vf, thumbs_enabled)); |
9 | 366 } |
367 } | |
368 | |
637 | 369 void vflist_pop_menu_refresh_cb(GtkWidget *widget, gpointer data) |
9 | 370 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
371 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
372 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
373 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE); |
633 | 374 vf_refresh(vf); |
9 | 375 } |
376 | |
637 | 377 void vflist_popup_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 378 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
379 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
380 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
381 VFLIST_INFO(vf, click_fd) = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
382 vf->popup = NULL; |
9 | 383 } |
384 | |
150 | 385 |
9 | 386 /* |
387 *----------------------------------------------------------------------------- | |
388 * callbacks | |
389 *----------------------------------------------------------------------------- | |
390 */ | |
391 | |
392 static gint vflist_row_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data) | |
393 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
394 ViewFile *vf = data; |
9 | 395 gchar *old_path; |
396 gchar *new_path; | |
397 | |
398 if (strlen(new) == 0) return FALSE; | |
399 | |
783 | 400 old_path = g_build_filename(vf->dir_fd->path, old, NULL); |
401 new_path = g_build_filename(vf->dir_fd->path, new, NULL); | |
9 | 402 |
726 | 403 if (strchr(new, G_DIR_SEPARATOR) != NULL) |
9 | 404 { |
405 gchar *text = g_strdup_printf(_("Invalid file name:\n%s"), new); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
406 file_util_warning_dialog(_("Error renaming file"), text, GTK_STOCK_DIALOG_ERROR, vf->listview); |
9 | 407 g_free(text); |
408 } | |
409 else if (isfile(new_path)) | |
410 { | |
411 gchar *text = g_strdup_printf(_("A file with name %s already exists."), new); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
412 file_util_warning_dialog(_("Error renaming file"), text, GTK_STOCK_DIALOG_ERROR, vf->listview); |
9 | 413 g_free(text); |
414 } | |
442 | 415 else |
9 | 416 { |
633 | 417 gint row = vf_index_by_path(vf, old_path); |
442 | 418 if (row >= 0) |
138 | 419 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
420 GList *work = g_list_nth(vf->list, row); |
138 | 421 FileData *fd = work->data; |
753 | 422 |
423 file_util_rename_simple(fd, new_path, vf->listview); | |
442 | 424 |
138 | 425 } |
426 | |
9 | 427 } |
428 g_free(old_path); | |
429 g_free(new_path); | |
430 | |
431 return FALSE; | |
432 } | |
433 | |
434 static void vflist_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) | |
435 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
436 ViewFile *vf = data; |
9 | 437 GtkTreeModel *store; |
438 GtkTreeIter iter; | |
439 GtkTreePath *tpath; | |
440 gint cw, ch; | |
441 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
442 if (vflist_find_row(vf, VFLIST_INFO(vf, click_fd), &iter) < 0) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
443 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 444 tpath = gtk_tree_model_get_path(store, &iter); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
445 tree_view_get_cell_clamped(GTK_TREE_VIEW(vf->listview), tpath, FILE_COLUMN_NAME - 1, TRUE, x, y, &cw, &ch); |
9 | 446 gtk_tree_path_free(tpath); |
447 *y += ch; | |
448 popup_menu_position_clamp(menu, x, y, 0); | |
449 } | |
450 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
451 gint vflist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
9 | 452 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
453 ViewFile *vf = data; |
9 | 454 GtkTreePath *tpath; |
455 | |
456 if (event->keyval != GDK_Menu) return FALSE; | |
457 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
458 gtk_tree_view_get_cursor(GTK_TREE_VIEW(vf->listview), &tpath, NULL); |
9 | 459 if (tpath) |
460 { | |
461 GtkTreeModel *store; | |
462 GtkTreeIter iter; | |
463 | |
464 store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); | |
465 gtk_tree_model_get_iter(store, &iter, tpath); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
466 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &VFLIST_INFO(vf, click_fd), -1); |
9 | 467 gtk_tree_path_free(tpath); |
468 } | |
469 else | |
470 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
471 VFLIST_INFO(vf, click_fd) = NULL; |
9 | 472 } |
473 | |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
474 vf->popup = vf_pop_menu(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
475 gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, vflist_menu_position_cb, vf, 0, GDK_CURRENT_TIME); |
9 | 476 |
477 return TRUE; | |
478 } | |
479 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
480 gint vflist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 481 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
482 ViewFile *vf = data; |
9 | 483 GtkTreePath *tpath; |
484 GtkTreeIter iter; | |
485 FileData *fd = NULL; | |
149 | 486 GtkTreeViewColumn *column; |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
487 |
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
488 vf->clicked_mark = 0; |
442 | 489 |
9 | 490 if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y, |
132 | 491 &tpath, &column, NULL, NULL)) |
9 | 492 { |
493 GtkTreeModel *store; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
494 gint col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx")); |
442 | 495 |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
496 if (bevent->button == MOUSE_BUTTON_LEFT && |
149 | 497 col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST) |
498 return FALSE; | |
442 | 499 |
655
beacc4c68c53
Fix last patch, only set vf->clicked_mark for a valid mark.
zas_
parents:
654
diff
changeset
|
500 if (col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST) |
beacc4c68c53
Fix last patch, only set vf->clicked_mark for a valid mark.
zas_
parents:
654
diff
changeset
|
501 vf->clicked_mark = 1 + (col_idx - FILE_COLUMN_MARKS); |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
502 |
149 | 503 store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); |
9 | 504 |
505 gtk_tree_model_get_iter(store, &iter, tpath); | |
506 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
507 #if 0 | |
508 gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE); | |
509 #endif | |
510 gtk_tree_path_free(tpath); | |
511 } | |
512 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
513 VFLIST_INFO(vf, click_fd) = fd; |
9 | 514 |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
515 if (bevent->button == MOUSE_BUTTON_RIGHT) |
9 | 516 { |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
517 vf->popup = vf_pop_menu(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
518 gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, NULL, NULL, |
9 | 519 bevent->button, bevent->time); |
520 return TRUE; | |
521 } | |
522 | |
523 if (!fd) return FALSE; | |
524 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
525 if (bevent->button == MOUSE_BUTTON_MIDDLE) |
9 | 526 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
527 if (!vflist_row_is_selected(vf, fd)) |
9 | 528 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
529 vflist_color_set(vf, fd, TRUE); |
9 | 530 } |
531 return TRUE; | |
532 } | |
533 | |
534 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
535 if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_BUTTON_PRESS && |
9 | 536 !(bevent->state & GDK_SHIFT_MASK ) && |
537 !(bevent->state & GDK_CONTROL_MASK ) && | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
538 vflist_row_is_selected(vf, fd)) |
9 | 539 { |
526 | 540 GtkTreeSelection *selection; |
541 | |
9 | 542 gtk_widget_grab_focus(widget); |
526 | 543 |
544 | |
545 /* returning FALSE and further processing of the event is needed for | |
546 correct operation of the expander, to show the sidecar files. | |
547 It however resets the selection of multiple files. With this condition | |
548 it should work for both cases */ | |
549 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); | |
550 return (gtk_tree_selection_count_selected_rows(selection) > 1); | |
9 | 551 } |
552 | |
553 #if 0 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
554 if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS) |
9 | 555 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
556 if (vf->layout) layout_image_full_screen_start(vf->layout); |
9 | 557 } |
558 #endif | |
559 | |
560 return FALSE; | |
561 } | |
562 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
563 gint vflist_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 564 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
565 ViewFile *vf = data; |
9 | 566 GtkTreePath *tpath; |
567 GtkTreeIter iter; | |
568 FileData *fd = NULL; | |
569 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
570 if (bevent->button == MOUSE_BUTTON_MIDDLE) |
9 | 571 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
572 vflist_color_set(vf, VFLIST_INFO(vf, click_fd), FALSE); |
9 | 573 } |
574 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
575 if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) |
9 | 576 { |
577 return TRUE; | |
578 } | |
579 | |
580 if ((bevent->x != 0 || bevent->y != 0) && | |
581 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y, | |
582 &tpath, NULL, NULL, NULL)) | |
583 { | |
584 GtkTreeModel *store; | |
585 | |
586 store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); | |
587 gtk_tree_model_get_iter(store, &iter, tpath); | |
588 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
589 gtk_tree_path_free(tpath); | |
590 } | |
591 | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
592 if (bevent->button == MOUSE_BUTTON_MIDDLE) |
9 | 593 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
594 if (fd && VFLIST_INFO(vf, click_fd) == fd) |
9 | 595 { |
596 GtkTreeSelection *selection; | |
597 | |
598 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
599 if (vflist_row_is_selected(vf, fd)) |
9 | 600 { |
601 gtk_tree_selection_unselect_iter(selection, &iter); | |
602 } | |
603 else | |
604 { | |
605 gtk_tree_selection_select_iter(selection, &iter); | |
606 } | |
607 } | |
608 return TRUE; | |
609 } | |
610 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
611 if (fd && VFLIST_INFO(vf, click_fd) == fd && |
9 | 612 !(bevent->state & GDK_SHIFT_MASK ) && |
613 !(bevent->state & GDK_CONTROL_MASK ) && | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
614 vflist_row_is_selected(vf, fd)) |
9 | 615 { |
616 GtkTreeSelection *selection; | |
617 | |
618 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); | |
619 gtk_tree_selection_unselect_all(selection); | |
620 gtk_tree_selection_select_iter(selection, &iter); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
621 vflist_move_cursor(vf, &iter); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
622 // return TRUE;// FIXME - expand |
9 | 623 } |
624 | |
625 return FALSE; | |
626 } | |
627 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
628 static void vflist_select_image(ViewFile *vf, FileData *sel_fd) |
9 | 629 { |
138 | 630 FileData *read_ahead_fd = NULL; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
631 gint row; |
144 | 632 FileData *cur_fd; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
633 if (!sel_fd) return; |
442 | 634 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
635 cur_fd = layout_image_get_fd(vf->layout); |
144 | 636 if (sel_fd == cur_fd) return; /* no change */ |
442 | 637 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
638 row = g_list_index(vf->list, sel_fd); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
639 // FIXME sidecar data |
9 | 640 |
334 | 641 if (sel_fd && options->image.enable_read_ahead && row >= 0) |
9 | 642 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
643 if (row > g_list_index(vf->list, cur_fd) && |
736 | 644 (guint) (row + 1) < vf_count(vf, NULL)) |
9 | 645 { |
633 | 646 read_ahead_fd = vf_index_get_data(vf, row + 1); |
9 | 647 } |
648 else if (row > 0) | |
649 { | |
633 | 650 read_ahead_fd = vf_index_get_data(vf, row - 1); |
9 | 651 } |
652 } | |
653 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
654 layout_image_set_with_ahead(vf->layout, sel_fd, read_ahead_fd); |
9 | 655 } |
656 | |
657 static gint vflist_select_idle_cb(gpointer data) | |
658 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
659 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
660 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
661 if (!vf->layout) |
9 | 662 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
663 VFLIST_INFO(vf, select_idle_id) = -1; |
9 | 664 return FALSE; |
665 } | |
666 | |
633 | 667 vf_send_update(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
668 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
669 if (VFLIST_INFO(vf, select_fd)) |
9 | 670 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
671 vflist_select_image(vf, VFLIST_INFO(vf, select_fd)); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
672 VFLIST_INFO(vf, select_fd) = NULL; |
9 | 673 } |
674 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
675 VFLIST_INFO(vf, select_idle_id) = -1; |
9 | 676 return FALSE; |
677 } | |
678 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
679 static void vflist_select_idle_cancel(ViewFile *vf) |
9 | 680 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
681 if (VFLIST_INFO(vf, select_idle_id) != -1) g_source_remove(VFLIST_INFO(vf, select_idle_id)); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
682 VFLIST_INFO(vf, select_idle_id) = -1; |
9 | 683 } |
684 | |
685 static gboolean vflist_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath, | |
686 gboolean path_currently_selected, gpointer data) | |
687 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
688 ViewFile *vf = data; |
9 | 689 GtkTreeIter iter; |
690 | |
691 if (!path_currently_selected && | |
692 gtk_tree_model_get_iter(store, &iter, tpath)) | |
693 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
694 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &VFLIST_INFO(vf, select_fd), -1); |
9 | 695 } |
696 else | |
697 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
698 VFLIST_INFO(vf, select_fd) = NULL; |
9 | 699 } |
700 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
701 if (vf->layout && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
702 VFLIST_INFO(vf, select_idle_id) == -1) |
9 | 703 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
704 VFLIST_INFO(vf, select_idle_id) = g_idle_add(vflist_select_idle_cb, vf); |
9 | 705 } |
706 | |
707 return TRUE; | |
708 } | |
709 | |
710 /* | |
711 *----------------------------------------------------------------------------- | |
712 * misc | |
713 *----------------------------------------------------------------------------- | |
714 */ | |
715 | |
259 | 716 /* |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
717 static gboolean vflist_dummy_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath, |
442 | 718 gboolean path_currently_selected, gpointer data) |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
719 { |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
720 return TRUE; |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
721 } |
259 | 722 */ |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
723 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
724 static void vflist_setup_iter(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *iter, FileData *fd) |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
725 { |
167 | 726 int i; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
727 gchar *size; |
167 | 728 gchar *sidecars = NULL; |
729 | |
730 if (fd->sidecar_files) | |
596 | 731 sidecars = file_data_sc_list_to_string(fd); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
732 size = text_from_size(fd->size); |
442 | 733 |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
734 gtk_tree_store_set(store, iter, FILE_COLUMN_POINTER, fd, |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
735 FILE_COLUMN_VERSION, fd->version, |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
736 FILE_COLUMN_THUMB, fd->pixbuf, |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
737 FILE_COLUMN_NAME, fd->name, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
738 FILE_COLUMN_SIDECARS, sidecars, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
739 FILE_COLUMN_SIZE, size, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
740 FILE_COLUMN_DATE, text_from_time(fd->date), |
829 | 741 #define STORE_SET_IS_SLOW 1 |
742 #if STORE_SET_IS_SLOW | |
743 /* this is 3x faster on a directory with 20000 files */ | |
744 FILE_COLUMN_MARKS + 0, file_data_get_mark(fd, 0), | |
745 FILE_COLUMN_MARKS + 1, file_data_get_mark(fd, 1), | |
746 FILE_COLUMN_MARKS + 2, file_data_get_mark(fd, 2), | |
747 FILE_COLUMN_MARKS + 3, file_data_get_mark(fd, 3), | |
748 FILE_COLUMN_MARKS + 4, file_data_get_mark(fd, 4), | |
749 FILE_COLUMN_MARKS + 5, file_data_get_mark(fd, 5), | |
750 #if FILEDATA_MARKS_SIZE != 6 | |
751 #error this needs to be updated | |
752 #endif | |
753 #endif | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
754 FILE_COLUMN_COLOR, FALSE, -1); |
829 | 755 |
756 #if !STORE_SET_IS_SLOW | |
757 | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
758 for (i = 0; i < FILEDATA_MARKS_SIZE; i++) |
800 | 759 gtk_tree_store_set(store, iter, FILE_COLUMN_MARKS + i, file_data_get_mark(fd, i), -1); |
829 | 760 #endif |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
761 g_free(size); |
167 | 762 if (sidecars) |
763 g_free(sidecars); | |
764 } | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
765 |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
766 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected) |
167 | 767 { |
768 GList *work; | |
769 | 769 GtkTreeIter iter; |
167 | 770 gint valid; |
771 | |
769 | 772 valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, parent_iter); |
167 | 773 |
769 | 774 work = list; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
775 while (work) |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
776 { |
167 | 777 gint match; |
769 | 778 FileData *fd = work->data; |
167 | 779 gint done = FALSE; |
780 | |
781 while (!done) | |
782 { | |
769 | 783 FileData *old_fd = NULL; |
784 gint old_version = 0; | |
442 | 785 |
167 | 786 if (valid) |
787 { | |
769 | 788 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, |
789 FILE_COLUMN_POINTER, &old_fd, | |
790 FILE_COLUMN_VERSION, &old_version, | |
791 -1); | |
442 | 792 |
769 | 793 if (fd == old_fd) |
167 | 794 { |
795 match = 0; | |
796 } | |
797 else | |
798 { | |
769 | 799 if (parent_iter) |
800 match = filelist_sort_compare_filedata_full(fd, old_fd, SORT_NAME, TRUE); /* always sort sidecars by name */ | |
801 else | |
802 match = filelist_sort_compare_filedata_full(fd, old_fd, vf->sort_method, vf->sort_ascend); | |
803 | |
804 if (match == 0) g_warning("multiple fd for the same path"); | |
167 | 805 } |
769 | 806 |
167 | 807 } |
808 else | |
809 { | |
810 match = -1; | |
811 } | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
812 |
167 | 813 if (match < 0) |
814 { | |
815 GtkTreeIter new; | |
442 | 816 |
167 | 817 if (valid) |
818 { | |
769 | 819 gtk_tree_store_insert_before(store, &new, parent_iter, &iter); |
167 | 820 } |
821 else | |
822 { | |
769 | 823 gtk_tree_store_append(store, &new, parent_iter); |
167 | 824 } |
442 | 825 |
801 | 826 vflist_setup_iter(vf, store, &new, file_data_ref(fd)); |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
827 vflist_setup_iter_recursive(vf, store, &new, fd->sidecar_files, selected); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
828 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
829 if (g_list_find(selected, fd)) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
830 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
831 /* renamed files - the same fd appears at different position - select it again*/ |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
832 GtkTreeSelection *selection; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
833 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
834 gtk_tree_selection_select_iter(selection, &new); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
835 } |
167 | 836 |
837 done = TRUE; | |
838 } | |
839 else if (match > 0) | |
840 { | |
801 | 841 file_data_unref(old_fd); |
769 | 842 valid = gtk_tree_store_remove(store, &iter); |
167 | 843 } |
844 else | |
845 { | |
769 | 846 if (fd->version != old_version) |
847 { | |
848 vflist_setup_iter(vf, store, &iter, fd); | |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
849 vflist_setup_iter_recursive(vf, store, &iter, fd->sidecar_files, selected); |
769 | 850 } |
167 | 851 |
769 | 852 if (valid) valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); |
167 | 853 |
854 done = TRUE; | |
855 } | |
856 } | |
857 work = work->next; | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
858 } |
167 | 859 |
860 while (valid) | |
861 { | |
801 | 862 FileData *old_fd; |
863 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &old_fd, -1); | |
864 file_data_unref(old_fd); | |
865 | |
769 | 866 valid = gtk_tree_store_remove(store, &iter); |
167 | 867 } |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
868 } |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
869 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
870 void vflist_sort_set(ViewFile *vf, SortType type, gint ascend) |
9 | 871 { |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
872 gint i; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
873 GHashTable *fd_idx_hash = g_hash_table_new(NULL, NULL); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
874 gint *new_order; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
875 GtkTreeStore *store; |
9 | 876 GList *work; |
877 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
878 if (vf->sort_method == type && vf->sort_ascend == ascend) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
879 if (!vf->list) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
880 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
881 work = vf->list; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
882 i = 0; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
883 while (work) |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
884 { |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
885 FileData *fd = work->data; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
886 g_hash_table_insert(fd_idx_hash, fd, GINT_TO_POINTER(i)); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
887 i++; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
888 work = work->next; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
889 } |
9 | 890 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
891 vf->sort_method = type; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
892 vf->sort_ascend = ascend; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
893 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
894 vf->list = filelist_sort(vf->list, vf->sort_method, vf->sort_ascend); |
442 | 895 |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
896 new_order = g_malloc(i * sizeof(gint)); |
442 | 897 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
898 work = vf->list; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
899 i = 0; |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
900 while (work) |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
901 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
902 FileData *fd = work->data; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
903 new_order[i] = GPOINTER_TO_INT(g_hash_table_lookup(fd_idx_hash, fd)); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
904 i++; |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
905 work = work->next; |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
906 } |
442 | 907 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
908 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
909 gtk_tree_store_reorder(store, NULL, new_order); |
442 | 910 |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
911 g_free(new_order); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
912 g_hash_table_destroy(fd_idx_hash); |
9 | 913 } |
914 | |
915 /* | |
916 *----------------------------------------------------------------------------- | |
917 * thumb updates | |
918 *----------------------------------------------------------------------------- | |
919 */ | |
920 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
921 static gint vflist_thumb_next(ViewFile *vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
922 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
923 static void vflist_thumb_status(ViewFile *vf, gdouble val, const gchar *text) |
9 | 924 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
925 if (vf->func_thumb_status) |
9 | 926 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
927 vf->func_thumb_status(vf, val, text, vf->data_thumb_status); |
9 | 928 } |
929 } | |
930 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
931 static void vflist_thumb_cleanup(ViewFile *vf) |
9 | 932 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
933 vflist_thumb_status(vf, 0.0, NULL); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
934 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
935 vf->thumbs_count = 0; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
936 vf->thumbs_running = FALSE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
937 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
938 thumb_loader_free(vf->thumbs_loader); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
939 vf->thumbs_loader = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
940 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
941 vf->thumbs_filedata = NULL; |
9 | 942 } |
943 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
944 static void vflist_thumb_stop(ViewFile *vf) |
9 | 945 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
946 if (vf->thumbs_running) vflist_thumb_cleanup(vf); |
9 | 947 } |
948 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
949 static void vflist_thumb_do(ViewFile *vf, ThumbLoader *tl, FileData *fd) |
9 | 950 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
951 GtkTreeStore *store; |
9 | 952 GtkTreeIter iter; |
953 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
954 if (!fd || vflist_find_row(vf, fd, &iter) < 0) return; |
9 | 955 |
956 if (fd->pixbuf) g_object_unref(fd->pixbuf); | |
957 fd->pixbuf = thumb_loader_get_pixbuf(tl, TRUE); | |
958 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
959 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
960 gtk_tree_store_set(store, &iter, FILE_COLUMN_THUMB, fd->pixbuf, -1); |
9 | 961 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
962 vflist_thumb_status(vf, (gdouble)(vf->thumbs_count) / vflist_sidecar_list_count(vf->list), _("Loading thumbs...")); |
9 | 963 } |
964 | |
965 static void vflist_thumb_error_cb(ThumbLoader *tl, gpointer data) | |
966 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
967 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
968 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
969 if (vf->thumbs_filedata && vf->thumbs_loader == tl) |
9 | 970 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
971 vflist_thumb_do(vf, tl, vf->thumbs_filedata); |
9 | 972 } |
973 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
974 while (vflist_thumb_next(vf)); |
9 | 975 } |
976 | |
977 static void vflist_thumb_done_cb(ThumbLoader *tl, gpointer data) | |
978 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
979 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
980 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
981 if (vf->thumbs_filedata && vf->thumbs_loader == tl) |
9 | 982 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
983 vflist_thumb_do(vf, tl, vf->thumbs_filedata); |
9 | 984 } |
985 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
986 while (vflist_thumb_next(vf)); |
9 | 987 } |
988 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
989 static gint vflist_thumb_next(ViewFile *vf) |
9 | 990 { |
991 GtkTreePath *tpath; | |
992 FileData *fd = NULL; | |
993 | |
994 /* first check the visible files */ | |
995 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
996 if (GTK_WIDGET_REALIZED(vf->listview) && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
997 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 998 { |
999 GtkTreeModel *store; | |
1000 GtkTreeIter iter; | |
1001 gint valid = TRUE; | |
1002 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1003 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1004 gtk_tree_model_get_iter(store, &iter, tpath); |
1005 gtk_tree_path_free(tpath); | |
1006 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1007 while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vf->listview), &iter, FALSE) == 0) |
9 | 1008 { |
1009 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1010 if (fd->pixbuf) fd = NULL; | |
1011 | |
1012 valid = gtk_tree_model_iter_next(store, &iter); | |
1013 } | |
1014 } | |
1015 | |
1016 /* then find first undone */ | |
1017 | |
1018 if (!fd) | |
1019 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1020 GList *work = vf->list; |
9 | 1021 while (work && !fd) |
1022 { | |
1023 FileData *fd_p = work->data; | |
442 | 1024 if (!fd_p->pixbuf) |
169 | 1025 fd = fd_p; |
1026 else | |
1027 { | |
1028 GList *work2 = fd_p->sidecar_files; | |
442 | 1029 |
169 | 1030 while (work2 && !fd) |
1031 { | |
442 | 1032 fd_p = work2->data; |
169 | 1033 if (!fd_p->pixbuf) fd = fd_p; |
1034 work2 = work2->next; | |
1035 } | |
1036 } | |
9 | 1037 work = work->next; |
1038 } | |
1039 } | |
1040 | |
1041 if (!fd) | |
1042 { | |
1043 /* done */ | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1044 vflist_thumb_cleanup(vf); |
9 | 1045 return FALSE; |
1046 } | |
1047 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1048 vf->thumbs_count++; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1049 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1050 vf->thumbs_filedata = fd; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1051 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1052 thumb_loader_free(vf->thumbs_loader); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1053 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1054 vf->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1055 thumb_loader_set_callbacks(vf->thumbs_loader, |
9 | 1056 vflist_thumb_done_cb, |
1057 vflist_thumb_error_cb, | |
1058 NULL, | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1059 vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1060 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1061 if (!thumb_loader_start(vf->thumbs_loader, fd->path)) |
9 | 1062 { |
1063 /* set icon to unknown, continue */ | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1064 DEBUG_1("thumb loader start failed %s", vf->thumbs_loader->path); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1065 vflist_thumb_do(vf, vf->thumbs_loader, fd); |
9 | 1066 |
1067 return TRUE; | |
1068 } | |
1069 | |
1070 return FALSE; | |
1071 } | |
1072 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1073 static void vflist_thumb_update(ViewFile *vf) |
9 | 1074 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1075 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1076 if (!VFLIST_INFO(vf, thumbs_enabled)) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1077 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1078 vflist_thumb_status(vf, 0.0, _("Loading thumbs...")); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1079 vf->thumbs_running = TRUE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1080 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1081 while (vflist_thumb_next(vf)); |
9 | 1082 } |
1083 | |
1084 /* | |
1085 *----------------------------------------------------------------------------- | |
1086 * row stuff | |
1087 *----------------------------------------------------------------------------- | |
1088 */ | |
1089 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1090 FileData *vflist_index_get_data(ViewFile *vf, gint row) |
9 | 1091 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1092 return g_list_nth_data(vf->list, row); |
9 | 1093 } |
1094 | |
664
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1095 gint vflist_index_by_path(ViewFile *vf, const gchar *path) |
9 | 1096 { |
1097 gint p = 0; | |
1098 GList *work; | |
1099 | |
1100 if (!path) return -1; | |
1101 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1102 work = vf->list; |
9 | 1103 while (work) |
1104 { | |
664
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1105 FileData *fd = work->data; |
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1106 if (strcmp(path, fd->path) == 0) return p; |
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1107 |
9 | 1108 work = work->next; |
1109 p++; | |
1110 } | |
1111 | |
1112 return -1; | |
1113 } | |
1114 | |
736 | 1115 guint vflist_count(ViewFile *vf, gint64 *bytes) |
9 | 1116 { |
1117 if (bytes) | |
1118 { | |
1119 gint64 b = 0; | |
1120 GList *work; | |
1121 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1122 work = vf->list; |
9 | 1123 while (work) |
1124 { | |
1125 FileData *fd = work->data; | |
1126 work = work->next; | |
1127 b += fd->size; | |
1128 } | |
1129 | |
1130 *bytes = b; | |
1131 } | |
1132 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1133 return g_list_length(vf->list); |
9 | 1134 } |
1135 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1136 GList *vflist_get_list(ViewFile *vf) |
9 | 1137 { |
1138 GList *list = NULL; | |
1139 GList *work; | |
1140 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1141 work = vf->list; |
9 | 1142 while (work) |
1143 { | |
1144 FileData *fd = work->data; | |
1145 work = work->next; | |
1146 | |
138 | 1147 list = g_list_prepend(list, file_data_ref(fd)); |
9 | 1148 } |
1149 | |
1150 return g_list_reverse(list); | |
1151 } | |
1152 | |
1153 /* | |
1154 *----------------------------------------------------------------------------- | |
1155 * selections | |
1156 *----------------------------------------------------------------------------- | |
1157 */ | |
1158 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1159 static gint vflist_row_is_selected(ViewFile *vf, FileData *fd) |
9 | 1160 { |
1161 GtkTreeModel *store; | |
1162 GtkTreeSelection *selection; | |
1163 GList *slist; | |
1164 GList *work; | |
1165 gint found = FALSE; | |
1166 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1167 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1168 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1169 work = slist; | |
1170 while (!found && work) | |
1171 { | |
1172 GtkTreePath *tpath = work->data; | |
1173 FileData *fd_n; | |
1174 GtkTreeIter iter; | |
1175 | |
1176 gtk_tree_model_get_iter(store, &iter, tpath); | |
1177 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1); | |
1178 if (fd_n == fd) found = TRUE; | |
1179 work = work->next; | |
1180 } | |
1181 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1182 g_list_free(slist); | |
1183 | |
1184 return found; | |
1185 } | |
1186 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1187 gint vflist_index_is_selected(ViewFile *vf, gint row) |
9 | 1188 { |
1189 FileData *fd; | |
1190 | |
633 | 1191 fd = vf_index_get_data(vf, row); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1192 return vflist_row_is_selected(vf, fd); |
9 | 1193 } |
1194 | |
736 | 1195 guint vflist_selection_count(ViewFile *vf, gint64 *bytes) |
9 | 1196 { |
1197 GtkTreeModel *store; | |
1198 GtkTreeSelection *selection; | |
1199 GList *slist; | |
736 | 1200 guint count; |
9 | 1201 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1202 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1203 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1204 | |
1205 if (bytes) | |
1206 { | |
1207 gint64 b = 0; | |
1208 GList *work; | |
1209 | |
1210 work = slist; | |
1211 while (work) | |
1212 { | |
1213 GtkTreePath *tpath = work->data; | |
1214 GtkTreeIter iter; | |
1215 FileData *fd; | |
1216 | |
1217 gtk_tree_model_get_iter(store, &iter, tpath); | |
1218 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1219 b += fd->size; | |
1220 | |
1221 work = work->next; | |
1222 } | |
1223 | |
1224 *bytes = b; | |
1225 } | |
1226 | |
1227 count = g_list_length(slist); | |
1228 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1229 g_list_free(slist); | |
1230 | |
1231 return count; | |
1232 } | |
1233 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1234 GList *vflist_selection_get_list(ViewFile *vf) |
9 | 1235 { |
1236 GtkTreeModel *store; | |
1237 GtkTreeSelection *selection; | |
1238 GList *slist; | |
1239 GList *list = NULL; | |
1240 GList *work; | |
1241 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1242 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1243 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1244 work = slist; | |
1245 while (work) | |
1246 { | |
1247 GtkTreePath *tpath = work->data; | |
1248 FileData *fd; | |
1249 GtkTreeIter iter; | |
1250 | |
1251 gtk_tree_model_get_iter(store, &iter, tpath); | |
1252 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1253 | |
138 | 1254 list = g_list_prepend(list, file_data_ref(fd)); |
9 | 1255 |
1256 work = work->next; | |
1257 } | |
1258 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1259 g_list_free(slist); | |
1260 | |
1261 return g_list_reverse(list); | |
1262 } | |
1263 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1264 GList *vflist_selection_get_list_by_index(ViewFile *vf) |
9 | 1265 { |
1266 GtkTreeModel *store; | |
1267 GtkTreeSelection *selection; | |
1268 GList *slist; | |
1269 GList *list = NULL; | |
1270 GList *work; | |
1271 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1272 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1273 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1274 work = slist; | |
1275 while (work) | |
1276 { | |
1277 GtkTreePath *tpath = work->data; | |
1278 FileData *fd; | |
1279 GtkTreeIter iter; | |
1280 | |
1281 gtk_tree_model_get_iter(store, &iter, tpath); | |
1282 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1283 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1284 list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vf->list, fd))); |
9 | 1285 |
1286 work = work->next; | |
1287 } | |
1288 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1289 g_list_free(slist); | |
1290 | |
1291 return g_list_reverse(list); | |
1292 } | |
1293 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1294 void vflist_select_all(ViewFile *vf) |
9 | 1295 { |
1296 GtkTreeSelection *selection; | |
1297 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1298 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1299 gtk_tree_selection_select_all(selection); |
1300 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1301 VFLIST_INFO(vf, select_fd) = NULL; |
9 | 1302 } |
1303 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1304 void vflist_select_none(ViewFile *vf) |
9 | 1305 { |
1306 GtkTreeSelection *selection; | |
1307 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1308 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1309 gtk_tree_selection_unselect_all(selection); |
1310 } | |
1311 | |
601 | 1312 static gboolean tree_model_iter_prev(GtkTreeModel *store, GtkTreeIter *iter) |
1313 { | |
1314 GtkTreePath *tpath; | |
1315 gboolean result; | |
1316 | |
1317 tpath = gtk_tree_model_get_path(store, iter); | |
1318 result = gtk_tree_path_prev(tpath); | |
1319 if (result) | |
1320 gtk_tree_model_get_iter(store, iter, tpath); | |
1321 | |
1322 gtk_tree_path_free(tpath); | |
1323 | |
1324 return result; | |
1325 } | |
1326 | |
1327 static gboolean tree_model_get_iter_last(GtkTreeModel *store, GtkTreeIter *iter) | |
1328 { | |
1329 if (!gtk_tree_model_get_iter_first(store, iter)) | |
1330 return FALSE; | |
1331 | |
1332 while (TRUE) | |
1333 { | |
1334 GtkTreeIter next = *iter; | |
1335 | |
1336 if (gtk_tree_model_iter_next(store, &next)) | |
1337 *iter = next; | |
1338 else | |
1339 break; | |
1340 } | |
1341 | |
1342 return TRUE; | |
1343 } | |
1344 | |
1345 void vflist_select_invert(ViewFile *vf) | |
1346 { | |
1347 GtkTreeIter iter; | |
1348 GtkTreeSelection *selection; | |
1349 GtkTreeModel *store; | |
1350 gboolean valid; | |
1351 | |
1352 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); | |
1353 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); | |
1354 | |
1355 /* Backward iteration prevents scrolling to the end of the list, | |
1356 * it scrolls to the first selected row instead. */ | |
1357 valid = tree_model_get_iter_last(store, &iter); | |
1358 | |
1359 while (valid) | |
1360 { | |
1361 gint selected = gtk_tree_selection_iter_is_selected(selection, &iter); | |
1362 | |
1363 if (selected) | |
1364 gtk_tree_selection_unselect_iter(selection, &iter); | |
1365 else | |
1366 gtk_tree_selection_select_iter(selection, &iter); | |
1367 | |
1368 valid = tree_model_iter_prev(store, &iter); | |
1369 } | |
1370 } | |
1371 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1372 void vflist_select_by_fd(ViewFile *vf, FileData *fd) |
138 | 1373 { |
9 | 1374 GtkTreeIter iter; |
1375 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1376 if (vflist_find_row(vf, fd, &iter) < 0) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1377 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1378 tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, TRUE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1379 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1380 if (!vflist_row_is_selected(vf, fd)) |
9 | 1381 { |
1382 GtkTreeSelection *selection; | |
1383 GtkTreeModel *store; | |
1384 GtkTreePath *tpath; | |
1385 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1386 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1387 gtk_tree_selection_unselect_all(selection); |
1388 gtk_tree_selection_select_iter(selection, &iter); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1389 vflist_move_cursor(vf, &iter); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1390 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1391 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1392 tpath = gtk_tree_model_get_path(store, &iter); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1393 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vf->listview), tpath, NULL, FALSE); |
9 | 1394 gtk_tree_path_free(tpath); |
1395 } | |
1396 } | |
1397 | |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1398 static void vflist_select_closest(ViewFile *vf, FileData *sel_fd) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1399 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1400 GList *work; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1401 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1402 if (sel_fd->parent) sel_fd = sel_fd->parent; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1403 work = vf->list; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1404 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1405 while (work) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1406 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1407 gint match; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1408 FileData *fd = work->data; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1409 work = work->next; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1410 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1411 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1412 match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1413 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1414 if (match >= 0) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1415 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1416 vflist_select_by_fd(vf, fd); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1417 break; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1418 } |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1419 } |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1420 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1421 } |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1422 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1423 void vflist_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode) |
150 | 1424 { |
1425 GtkTreeModel *store; | |
1426 GtkTreeIter iter; | |
1427 GtkTreeSelection *selection; | |
1428 gint valid; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1429 gint n = mark - 1; |
442 | 1430 |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1431 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
150 | 1432 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1433 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1434 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
442 | 1435 |
150 | 1436 valid = gtk_tree_model_get_iter_first(store, &iter); |
1437 while (valid) | |
1438 { | |
1439 FileData *fd; | |
161 | 1440 gboolean mark_val, selected; |
150 | 1441 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, -1); |
442 | 1442 |
800 | 1443 mark_val = file_data_get_mark(fd, n); |
161 | 1444 selected = gtk_tree_selection_iter_is_selected(selection, &iter); |
442 | 1445 |
1446 switch (mode) | |
161 | 1447 { |
1448 case MTS_MODE_SET: selected = mark_val; | |
1449 break; | |
1450 case MTS_MODE_OR: selected = mark_val | selected; | |
1451 break; | |
1452 case MTS_MODE_AND: selected = mark_val & selected; | |
1453 break; | |
1454 case MTS_MODE_MINUS: selected = !mark_val & selected; | |
1455 break; | |
1456 } | |
442 | 1457 |
161 | 1458 if (selected) |
150 | 1459 gtk_tree_selection_select_iter(selection, &iter); |
161 | 1460 else |
1461 gtk_tree_selection_unselect_iter(selection, &iter); | |
150 | 1462 |
1463 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); | |
1464 } | |
1465 } | |
1466 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1467 void vflist_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode) |
150 | 1468 { |
1469 GtkTreeModel *store; | |
1470 GtkTreeSelection *selection; | |
1471 GList *slist; | |
1472 GList *work; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1473 gint n = mark - 1; |
150 | 1474 |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1475 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
150 | 1476 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1477 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
150 | 1478 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1479 work = slist; | |
1480 while (work) | |
1481 { | |
1482 GtkTreePath *tpath = work->data; | |
1483 FileData *fd; | |
1484 GtkTreeIter iter; | |
1485 | |
1486 gtk_tree_model_get_iter(store, &iter, tpath); | |
1487 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
442 | 1488 |
814 | 1489 file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */ |
800 | 1490 |
161 | 1491 switch (mode) |
1492 { | |
800 | 1493 case STM_MODE_SET: file_data_set_mark(fd, n, 1); |
161 | 1494 break; |
800 | 1495 case STM_MODE_RESET: file_data_set_mark(fd, n, 0); |
161 | 1496 break; |
800 | 1497 case STM_MODE_TOGGLE: file_data_set_mark(fd, n, !file_data_get_mark(fd, n)); |
161 | 1498 break; |
1499 } | |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
1500 |
814 | 1501 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
442 | 1502 |
800 | 1503 gtk_tree_store_set(GTK_TREE_STORE(store), &iter, FILE_COLUMN_MARKS + n, file_data_get_mark(fd, n), -1); |
150 | 1504 |
1505 work = work->next; | |
1506 } | |
1507 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1508 g_list_free(slist); | |
1509 } | |
1510 | |
9 | 1511 /* |
1512 *----------------------------------------------------------------------------- | |
1513 * core (population) | |
1514 *----------------------------------------------------------------------------- | |
1515 */ | |
1516 | |
1517 static void vflist_listview_set_height(GtkWidget *listview, gint thumb) | |
1518 { | |
1519 GtkTreeViewColumn *column; | |
1520 GtkCellRenderer *cell; | |
1521 GList *list; | |
1522 | |
770 | 1523 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), 0); /* first column is thumbnail */ |
9 | 1524 if (!column) return; |
1525 | |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1526 gtk_tree_view_column_set_visible(column, thumb); |
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1527 |
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1528 gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 40); |
9 | 1529 |
1530 list = gtk_tree_view_column_get_cell_renderers(column); | |
1531 if (!list) return; | |
1532 cell = list->data; | |
1533 g_list_free(list); | |
1534 | |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1535 g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL); |
9 | 1536 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview)); |
1537 } | |
1538 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1539 static void vflist_populate_view(ViewFile *vf) |
9 | 1540 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1541 GtkTreeStore *store; |
9 | 1542 gint thumbs; |
1543 GtkTreeRowReference *visible_row = NULL; | |
1544 GtkTreePath *tpath; | |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1545 GList *selected; |
9 | 1546 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1547 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1548 thumbs = VFLIST_INFO(vf, thumbs_enabled); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1549 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1550 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1551 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1552 if (!vf->list) |
9 | 1553 { |
801 | 1554 vflist_store_clear(vf); |
633 | 1555 vf_send_update(vf); |
9 | 1556 return; |
1557 } | |
1558 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1559 if (GTK_WIDGET_REALIZED(vf->listview) && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1560 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 1561 { |
1562 visible_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), tpath); | |
1563 gtk_tree_path_free(tpath); | |
1564 } | |
1565 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1566 vflist_listview_set_height(vf->listview, thumbs); |
9 | 1567 |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1568 selected = vflist_selection_get_list(vf); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1569 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1570 vflist_setup_iter_recursive(vf, store, NULL, vf->list, selected); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1571 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1572 if (selected && vflist_selection_count(vf, NULL) == 0) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1573 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1574 /* all selected files disappeared */ |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1575 vflist_select_closest(vf, selected->data); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1576 } |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1577 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1578 filelist_free(selected); |
769 | 1579 |
9 | 1580 if (visible_row) |
1581 { | |
1582 if (gtk_tree_row_reference_valid(visible_row)) | |
1583 { | |
1584 tpath = gtk_tree_row_reference_get_path(visible_row); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1585 gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(vf->listview), tpath, NULL, TRUE, 0.0, 0.0); |
9 | 1586 gtk_tree_path_free(tpath); |
1587 } | |
1588 gtk_tree_row_reference_free(visible_row); | |
1589 } | |
1590 | |
633 | 1591 vf_send_update(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1592 vflist_thumb_update(vf); |
9 | 1593 } |
1594 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1595 gint vflist_refresh(ViewFile *vf) |
9 | 1596 { |
1597 GList *old_list; | |
1598 gint ret = TRUE; | |
1599 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1600 old_list = vf->list; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1601 vf->list = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1602 |
762 | 1603 DEBUG_1("%s vflist_refresh: read dir", get_exec_time()); |
783 | 1604 if (vf->dir_fd) |
9 | 1605 { |
814 | 1606 file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification of changes detected by filelist_read */ |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1607 |
783 | 1608 ret = filelist_read(vf->dir_fd, &vf->list, NULL); |
780
44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents:
775
diff
changeset
|
1609 |
814 | 1610 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1611 |
780
44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents:
775
diff
changeset
|
1612 DEBUG_1("%s vflist_refresh: sort", get_exec_time()); |
44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents:
775
diff
changeset
|
1613 vf->list = filelist_sort(vf->list, vf->sort_method, vf->sort_ascend); |
9 | 1614 } |
762 | 1615 |
1616 DEBUG_1("%s vflist_refresh: populate view", get_exec_time()); | |
1617 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1618 vflist_populate_view(vf); |
9 | 1619 |
1620 filelist_free(old_list); | |
762 | 1621 DEBUG_1("%s vflist_refresh: done", get_exec_time()); |
9 | 1622 |
1623 return ret; | |
1624 } | |
1625 | |
772
f53c2bb5b1b1
replaced vflist_maint functions by vflist_refresh - it allows to follow
nadvornik
parents:
771
diff
changeset
|
1626 |
f53c2bb5b1b1
replaced vflist_maint functions by vflist_refresh - it allows to follow
nadvornik
parents:
771
diff
changeset
|
1627 |
9 | 1628 /* this overrides the low default of a GtkCellRenderer from 100 to CELL_HEIGHT_OVERRIDE, something sane for our purposes */ |
1629 | |
1630 #define CELL_HEIGHT_OVERRIDE 512 | |
1631 | |
1632 static void cell_renderer_height_override(GtkCellRenderer *renderer) | |
1633 { | |
1634 GParamSpec *spec; | |
1635 | |
1636 spec = g_object_class_find_property(G_OBJECT_GET_CLASS(G_OBJECT(renderer)), "height"); | |
1637 if (spec && G_IS_PARAM_SPEC_INT(spec)) | |
1638 { | |
1639 GParamSpecInt *spec_int; | |
1640 | |
1641 spec_int = G_PARAM_SPEC_INT(spec); | |
1642 if (spec_int->maximum < CELL_HEIGHT_OVERRIDE) spec_int->maximum = CELL_HEIGHT_OVERRIDE; | |
1643 } | |
1644 } | |
1645 | |
1646 static GdkColor *vflist_listview_color_shifted(GtkWidget *widget) | |
1647 { | |
1648 static GdkColor color; | |
1649 static GtkWidget *done = NULL; | |
1650 | |
1651 if (done != widget) | |
1652 { | |
1653 GtkStyle *style; | |
1654 | |
1655 style = gtk_widget_get_style(widget); | |
1656 memcpy(&color, &style->base[GTK_STATE_NORMAL], sizeof(color)); | |
1657 shift_color(&color, -1, 0); | |
1658 done = widget; | |
1659 } | |
1660 | |
1661 return &color; | |
1662 } | |
1663 | |
1664 static void vflist_listview_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, | |
1665 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) | |
1666 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1667 ViewFile *vf = data; |
9 | 1668 gboolean set; |
1669 | |
1670 gtk_tree_model_get(tree_model, iter, FILE_COLUMN_COLOR, &set, -1); | |
1671 g_object_set(G_OBJECT(cell), | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1672 "cell-background-gdk", vflist_listview_color_shifted(vf->listview), |
9 | 1673 "cell-background-set", set, NULL); |
1674 } | |
1675 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1676 static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gint image, gint right_justify, gint expand) |
9 | 1677 { |
1678 GtkTreeViewColumn *column; | |
1679 GtkCellRenderer *renderer; | |
1680 | |
1681 column = gtk_tree_view_column_new(); | |
1682 gtk_tree_view_column_set_title(column, title); | |
1683 gtk_tree_view_column_set_min_width(column, 4); | |
1684 | |
1685 if (!image) | |
1686 { | |
149 | 1687 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY); |
9 | 1688 renderer = gtk_cell_renderer_text_new(); |
1689 if (right_justify) | |
1690 { | |
1691 g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL); | |
1692 } | |
1693 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
1694 gtk_tree_view_column_add_attribute(column, renderer, "text", n); | |
149 | 1695 if (expand) |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1696 gtk_tree_view_column_set_expand(column, TRUE); |
149 | 1697 } |
9 | 1698 else |
1699 { | |
1700 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); | |
1701 renderer = gtk_cell_renderer_pixbuf_new(); | |
1702 cell_renderer_height_override(renderer); | |
1703 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
1704 gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n); | |
1705 } | |
1706 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1707 gtk_tree_view_column_set_cell_data_func(column, renderer, vflist_listview_color_cb, vf, NULL); |
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1708 g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); |
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1709 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); |
9 | 1710 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1711 gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
9 | 1712 } |
1713 | |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1714 static void vflist_listview_mark_toggled_cb(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) |
132 | 1715 { |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1716 ViewFile *vf = data; |
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1717 GtkTreeStore *store; |
149 | 1718 GtkTreePath *path = gtk_tree_path_new_from_string(path_str); |
1719 GtkTreeIter iter; | |
1720 FileData *fd; | |
1721 gboolean mark; | |
1722 guint col_idx; | |
442 | 1723 |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1724 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
149 | 1725 if (!path || !gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path)) |
1726 return; | |
132 | 1727 |
513
985fdfebd89e
Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents:
512
diff
changeset
|
1728 col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_store_idx")); |
442 | 1729 |
149 | 1730 g_assert(col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST); |
442 | 1731 |
149 | 1732 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, col_idx, &mark, -1); |
150 | 1733 mark = !mark; |
814 | 1734 file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */ |
800 | 1735 file_data_set_mark(fd, col_idx - FILE_COLUMN_MARKS, mark); |
814 | 1736 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
442 | 1737 |
149 | 1738 gtk_tree_store_set(store, &iter, col_idx, mark, -1); |
1739 gtk_tree_path_free(path); | |
132 | 1740 } |
1741 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1742 static void vflist_listview_add_column_toggle(ViewFile *vf, gint n, const gchar *title) |
132 | 1743 { |
149 | 1744 GtkTreeViewColumn *column; |
1745 GtkCellRenderer *renderer; | |
1746 GtkTreeStore *store; | |
1747 gint index; | |
442 | 1748 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1749 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
132 | 1750 |
149 | 1751 renderer = gtk_cell_renderer_toggle_new(); |
1752 column = gtk_tree_view_column_new_with_attributes(title, renderer, "active", n, NULL); | |
132 | 1753 |
149 | 1754 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); |
512
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1755 g_object_set_data(G_OBJECT(column), "column_store_idx", GUINT_TO_POINTER(n)); |
f9bf33be53ff
Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents:
507
diff
changeset
|
1756 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); |
442 | 1757 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1758 index = gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
149 | 1759 gtk_tree_view_column_set_fixed_width(column, 16); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1760 gtk_tree_view_column_set_visible(column, vf->marks_enabled); |
132 | 1761 |
442 | 1762 |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1763 g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(vflist_listview_mark_toggled_cb), vf); |
132 | 1764 } |
1765 | |
9 | 1766 /* |
1767 *----------------------------------------------------------------------------- | |
1768 * base | |
1769 *----------------------------------------------------------------------------- | |
1770 */ | |
1771 | |
783 | 1772 gint vflist_set_fd(ViewFile *vf, FileData *dir_fd) |
9 | 1773 { |
783 | 1774 if (!dir_fd) return FALSE; |
1775 if (vf->dir_fd == dir_fd) return TRUE; | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1776 |
783 | 1777 file_data_unref(vf->dir_fd); |
1778 vf->dir_fd = file_data_ref(dir_fd); | |
9 | 1779 |
1780 /* force complete reload */ | |
801 | 1781 vflist_store_clear(vf); |
9 | 1782 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1783 filelist_free(vf->list); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1784 vf->list = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1785 |
633 | 1786 return vf_refresh(vf); |
9 | 1787 } |
1788 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1789 void vflist_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 1790 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1791 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1792 |
814 | 1793 file_data_unregister_notify_func(vf_notify_cb, vf); |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1794 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1795 vflist_select_idle_cancel(vf); |
814 | 1796 vf_refresh_idle_cancel(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1797 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1798 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1799 filelist_free(vf->list); |
9 | 1800 } |
1801 | |
783 | 1802 ViewFile *vflist_new(ViewFile *vf, FileData *dir_fd) |
9 | 1803 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1804 GtkTreeStore *store; |
9 | 1805 GtkTreeSelection *selection; |
1806 | |
149 | 1807 GType flist_types[FILE_COLUMN_COUNT]; |
1808 int i; | |
442 | 1809 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1810 vf->info = g_new0(ViewFileInfoList, 1); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1811 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1812 VFLIST_INFO(vf, click_fd) = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1813 VFLIST_INFO(vf, select_fd) = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1814 VFLIST_INFO(vf, thumbs_enabled) = FALSE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1815 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1816 VFLIST_INFO(vf, select_idle_id) = -1; |
9 | 1817 |
139 | 1818 flist_types[FILE_COLUMN_POINTER] = G_TYPE_POINTER; |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
1819 flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT; |
139 | 1820 flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF; |
1821 flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING; | |
1822 flist_types[FILE_COLUMN_SIDECARS] = G_TYPE_STRING; | |
1823 flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING; | |
1824 flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING; | |
1825 flist_types[FILE_COLUMN_COLOR] = G_TYPE_BOOLEAN; | |
1826 for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++) | |
1827 flist_types[i] = G_TYPE_BOOLEAN; | |
132 | 1828 |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1829 store = gtk_tree_store_newv(FILE_COLUMN_COUNT, flist_types); |
442 | 1830 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1831 vf->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); |
9 | 1832 g_object_unref(store); |
1833 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1834 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1835 gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1836 gtk_tree_selection_set_select_function(selection, vflist_select_cb, vf, NULL); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1837 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1838 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vf->listview), FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1839 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vf->listview), FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1840 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1841 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE); |
9 | 1842 |
518 | 1843 for (i = 0; i < FILEDATA_MARKS_SIZE; i++) |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1844 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, ""); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1845 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1846 vflist_listview_add_column(vf, FILE_COLUMN_NAME, _("Name"), FALSE, FALSE, FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1847 vflist_listview_add_column(vf, FILE_COLUMN_SIDECARS, _("SC"), FALSE, FALSE, FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1848 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1849 vflist_listview_add_column(vf, FILE_COLUMN_SIZE, _("Size"), FALSE, TRUE, FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1850 vflist_listview_add_column(vf, FILE_COLUMN_DATE, _("Date"), FALSE, TRUE, FALSE); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1851 |
814 | 1852 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1853 return vf; |
9 | 1854 } |
1855 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1856 void vflist_thumb_set(ViewFile *vf, gint enable) |
9 | 1857 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1858 if (VFLIST_INFO(vf, thumbs_enabled) == enable) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1859 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1860 VFLIST_INFO(vf, thumbs_enabled) = enable; |
633 | 1861 if (vf->layout) vf_refresh(vf); |
9 | 1862 } |
1863 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1864 void vflist_marks_set(ViewFile *vf, gint enable) |
132 | 1865 { |
149 | 1866 GList *columns, *work; |
442 | 1867 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1868 if (vf->marks_enabled == enable) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1869 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1870 vf->marks_enabled = enable; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1871 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1872 columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(vf->listview)); |
442 | 1873 |
149 | 1874 work = columns; |
1875 while (work) | |
1876 { | |
1877 GtkTreeViewColumn *column = work->data; | |
513
985fdfebd89e
Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents:
512
diff
changeset
|
1878 gint col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx")); |
149 | 1879 work = work->next; |
442 | 1880 |
1881 if (col_idx <= FILE_COLUMN_MARKS_LAST && col_idx >= FILE_COLUMN_MARKS) | |
149 | 1882 gtk_tree_view_column_set_visible(column, enable); |
1883 } | |
442 | 1884 |
149 | 1885 g_list_free(columns); |
633 | 1886 //vf_refresh(vf); |
132 | 1887 } |
1888 |