Mercurial > geeqie.yaz
annotate src/view_file_list.c @ 830:a06d885de883
Silent unused variable warning.
author | zas_ |
---|---|
date | Sat, 14 Jun 2008 06:52:52 +0000 |
parents | a204fc1d1145 |
children | 1d6fedb891dc |
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 { |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
726 gchar *size; |
167 | 727 gchar *sidecars = NULL; |
728 | |
729 if (fd->sidecar_files) | |
596 | 730 sidecars = file_data_sc_list_to_string(fd); |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
731 size = text_from_size(fd->size); |
442 | 732 |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
733 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
|
734 FILE_COLUMN_VERSION, fd->version, |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
735 FILE_COLUMN_THUMB, fd->pixbuf, |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
736 FILE_COLUMN_NAME, fd->name, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
737 FILE_COLUMN_SIDECARS, sidecars, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
738 FILE_COLUMN_SIZE, size, |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
739 FILE_COLUMN_DATE, text_from_time(fd->date), |
829 | 740 #define STORE_SET_IS_SLOW 1 |
741 #if STORE_SET_IS_SLOW | |
742 /* this is 3x faster on a directory with 20000 files */ | |
743 FILE_COLUMN_MARKS + 0, file_data_get_mark(fd, 0), | |
744 FILE_COLUMN_MARKS + 1, file_data_get_mark(fd, 1), | |
745 FILE_COLUMN_MARKS + 2, file_data_get_mark(fd, 2), | |
746 FILE_COLUMN_MARKS + 3, file_data_get_mark(fd, 3), | |
747 FILE_COLUMN_MARKS + 4, file_data_get_mark(fd, 4), | |
748 FILE_COLUMN_MARKS + 5, file_data_get_mark(fd, 5), | |
749 #if FILEDATA_MARKS_SIZE != 6 | |
750 #error this needs to be updated | |
751 #endif | |
752 #endif | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
753 FILE_COLUMN_COLOR, FALSE, -1); |
829 | 754 |
755 #if !STORE_SET_IS_SLOW | |
830 | 756 { |
757 gint i; | |
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); |
830 | 760 } |
829 | 761 #endif |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
762 g_free(size); |
167 | 763 if (sidecars) |
764 g_free(sidecars); | |
765 } | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
766 |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
767 static void vflist_setup_iter_recursive(ViewFile *vf, GtkTreeStore *store, GtkTreeIter *parent_iter, GList *list, GList *selected) |
167 | 768 { |
769 GList *work; | |
769 | 770 GtkTreeIter iter; |
167 | 771 gint valid; |
772 | |
769 | 773 valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, parent_iter); |
167 | 774 |
769 | 775 work = list; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
776 while (work) |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
777 { |
167 | 778 gint match; |
769 | 779 FileData *fd = work->data; |
167 | 780 gint done = FALSE; |
781 | |
782 while (!done) | |
783 { | |
769 | 784 FileData *old_fd = NULL; |
785 gint old_version = 0; | |
442 | 786 |
167 | 787 if (valid) |
788 { | |
769 | 789 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, |
790 FILE_COLUMN_POINTER, &old_fd, | |
791 FILE_COLUMN_VERSION, &old_version, | |
792 -1); | |
442 | 793 |
769 | 794 if (fd == old_fd) |
167 | 795 { |
796 match = 0; | |
797 } | |
798 else | |
799 { | |
769 | 800 if (parent_iter) |
801 match = filelist_sort_compare_filedata_full(fd, old_fd, SORT_NAME, TRUE); /* always sort sidecars by name */ | |
802 else | |
803 match = filelist_sort_compare_filedata_full(fd, old_fd, vf->sort_method, vf->sort_ascend); | |
804 | |
805 if (match == 0) g_warning("multiple fd for the same path"); | |
167 | 806 } |
769 | 807 |
167 | 808 } |
809 else | |
810 { | |
811 match = -1; | |
812 } | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
813 |
167 | 814 if (match < 0) |
815 { | |
816 GtkTreeIter new; | |
442 | 817 |
167 | 818 if (valid) |
819 { | |
769 | 820 gtk_tree_store_insert_before(store, &new, parent_iter, &iter); |
167 | 821 } |
822 else | |
823 { | |
769 | 824 gtk_tree_store_append(store, &new, parent_iter); |
167 | 825 } |
442 | 826 |
801 | 827 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
|
828 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
|
829 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
830 if (g_list_find(selected, fd)) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
831 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
832 /* 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
|
833 GtkTreeSelection *selection; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
834 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
|
835 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
|
836 } |
167 | 837 |
838 done = TRUE; | |
839 } | |
840 else if (match > 0) | |
841 { | |
801 | 842 file_data_unref(old_fd); |
769 | 843 valid = gtk_tree_store_remove(store, &iter); |
167 | 844 } |
845 else | |
846 { | |
769 | 847 if (fd->version != old_version) |
848 { | |
849 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
|
850 vflist_setup_iter_recursive(vf, store, &iter, fd->sidecar_files, selected); |
769 | 851 } |
167 | 852 |
769 | 853 if (valid) valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); |
167 | 854 |
855 done = TRUE; | |
856 } | |
857 } | |
858 work = work->next; | |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
859 } |
167 | 860 |
861 while (valid) | |
862 { | |
801 | 863 FileData *old_fd; |
864 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &old_fd, -1); | |
865 file_data_unref(old_fd); | |
866 | |
769 | 867 valid = gtk_tree_store_remove(store, &iter); |
167 | 868 } |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
869 } |
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
870 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
871 void vflist_sort_set(ViewFile *vf, SortType type, gint ascend) |
9 | 872 { |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
873 gint i; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
874 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
|
875 gint *new_order; |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
876 GtkTreeStore *store; |
9 | 877 GList *work; |
878 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
879 if (vf->sort_method == type && vf->sort_ascend == ascend) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
880 if (!vf->list) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
881 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
882 work = vf->list; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
883 i = 0; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
884 while (work) |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
885 { |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
886 FileData *fd = work->data; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
887 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
|
888 i++; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
889 work = work->next; |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
890 } |
9 | 891 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
892 vf->sort_method = type; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
893 vf->sort_ascend = ascend; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
894 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
895 vf->list = filelist_sort(vf->list, vf->sort_method, vf->sort_ascend); |
442 | 896 |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
897 new_order = g_malloc(i * sizeof(gint)); |
442 | 898 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
899 work = vf->list; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
900 i = 0; |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
901 while (work) |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
902 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
903 FileData *fd = work->data; |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
904 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
|
905 i++; |
93
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
906 work = work->next; |
f1c8f8632e23
Thu Nov 2 14:38:54 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
907 } |
442 | 908 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
909 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
|
910 gtk_tree_store_reorder(store, NULL, new_order); |
442 | 911 |
168
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
912 g_free(new_order); |
a55ada12322a
fixed vflist_find_row and vflist_sort_set to work correctly with sidecar
nadvornik
parents:
167
diff
changeset
|
913 g_hash_table_destroy(fd_idx_hash); |
9 | 914 } |
915 | |
916 /* | |
917 *----------------------------------------------------------------------------- | |
918 * thumb updates | |
919 *----------------------------------------------------------------------------- | |
920 */ | |
921 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
922 static gint vflist_thumb_next(ViewFile *vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
923 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
924 static void vflist_thumb_status(ViewFile *vf, gdouble val, const gchar *text) |
9 | 925 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
926 if (vf->func_thumb_status) |
9 | 927 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
928 vf->func_thumb_status(vf, val, text, vf->data_thumb_status); |
9 | 929 } |
930 } | |
931 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
932 static void vflist_thumb_cleanup(ViewFile *vf) |
9 | 933 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
934 vflist_thumb_status(vf, 0.0, NULL); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
935 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
936 vf->thumbs_count = 0; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
937 vf->thumbs_running = FALSE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
938 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
939 thumb_loader_free(vf->thumbs_loader); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
940 vf->thumbs_loader = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
941 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
942 vf->thumbs_filedata = NULL; |
9 | 943 } |
944 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
945 static void vflist_thumb_stop(ViewFile *vf) |
9 | 946 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
947 if (vf->thumbs_running) vflist_thumb_cleanup(vf); |
9 | 948 } |
949 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
950 static void vflist_thumb_do(ViewFile *vf, ThumbLoader *tl, FileData *fd) |
9 | 951 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
952 GtkTreeStore *store; |
9 | 953 GtkTreeIter iter; |
954 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
955 if (!fd || vflist_find_row(vf, fd, &iter) < 0) return; |
9 | 956 |
957 if (fd->pixbuf) g_object_unref(fd->pixbuf); | |
958 fd->pixbuf = thumb_loader_get_pixbuf(tl, TRUE); | |
959 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
960 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
|
961 gtk_tree_store_set(store, &iter, FILE_COLUMN_THUMB, fd->pixbuf, -1); |
9 | 962 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
963 vflist_thumb_status(vf, (gdouble)(vf->thumbs_count) / vflist_sidecar_list_count(vf->list), _("Loading thumbs...")); |
9 | 964 } |
965 | |
966 static void vflist_thumb_error_cb(ThumbLoader *tl, gpointer data) | |
967 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
968 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
969 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
970 if (vf->thumbs_filedata && vf->thumbs_loader == tl) |
9 | 971 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
972 vflist_thumb_do(vf, tl, vf->thumbs_filedata); |
9 | 973 } |
974 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
975 while (vflist_thumb_next(vf)); |
9 | 976 } |
977 | |
978 static void vflist_thumb_done_cb(ThumbLoader *tl, gpointer data) | |
979 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
980 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
981 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
982 if (vf->thumbs_filedata && vf->thumbs_loader == tl) |
9 | 983 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
984 vflist_thumb_do(vf, tl, vf->thumbs_filedata); |
9 | 985 } |
986 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
987 while (vflist_thumb_next(vf)); |
9 | 988 } |
989 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
990 static gint vflist_thumb_next(ViewFile *vf) |
9 | 991 { |
992 GtkTreePath *tpath; | |
993 FileData *fd = NULL; | |
994 | |
995 /* first check the visible files */ | |
996 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
997 if (GTK_WIDGET_REALIZED(vf->listview) && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
998 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 999 { |
1000 GtkTreeModel *store; | |
1001 GtkTreeIter iter; | |
1002 gint valid = TRUE; | |
1003 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1004 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1005 gtk_tree_model_get_iter(store, &iter, tpath); |
1006 gtk_tree_path_free(tpath); | |
1007 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1008 while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vf->listview), &iter, FALSE) == 0) |
9 | 1009 { |
1010 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1011 if (fd->pixbuf) fd = NULL; | |
1012 | |
1013 valid = gtk_tree_model_iter_next(store, &iter); | |
1014 } | |
1015 } | |
1016 | |
1017 /* then find first undone */ | |
1018 | |
1019 if (!fd) | |
1020 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1021 GList *work = vf->list; |
9 | 1022 while (work && !fd) |
1023 { | |
1024 FileData *fd_p = work->data; | |
442 | 1025 if (!fd_p->pixbuf) |
169 | 1026 fd = fd_p; |
1027 else | |
1028 { | |
1029 GList *work2 = fd_p->sidecar_files; | |
442 | 1030 |
169 | 1031 while (work2 && !fd) |
1032 { | |
442 | 1033 fd_p = work2->data; |
169 | 1034 if (!fd_p->pixbuf) fd = fd_p; |
1035 work2 = work2->next; | |
1036 } | |
1037 } | |
9 | 1038 work = work->next; |
1039 } | |
1040 } | |
1041 | |
1042 if (!fd) | |
1043 { | |
1044 /* done */ | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1045 vflist_thumb_cleanup(vf); |
9 | 1046 return FALSE; |
1047 } | |
1048 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1049 vf->thumbs_count++; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1050 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1051 vf->thumbs_filedata = fd; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1052 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1053 thumb_loader_free(vf->thumbs_loader); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1054 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1055 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
|
1056 thumb_loader_set_callbacks(vf->thumbs_loader, |
9 | 1057 vflist_thumb_done_cb, |
1058 vflist_thumb_error_cb, | |
1059 NULL, | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1060 vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1061 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1062 if (!thumb_loader_start(vf->thumbs_loader, fd->path)) |
9 | 1063 { |
1064 /* set icon to unknown, continue */ | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1065 DEBUG_1("thumb loader start failed %s", vf->thumbs_loader->path); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1066 vflist_thumb_do(vf, vf->thumbs_loader, fd); |
9 | 1067 |
1068 return TRUE; | |
1069 } | |
1070 | |
1071 return FALSE; | |
1072 } | |
1073 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1074 static void vflist_thumb_update(ViewFile *vf) |
9 | 1075 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1076 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1077 if (!VFLIST_INFO(vf, thumbs_enabled)) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1078 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1079 vflist_thumb_status(vf, 0.0, _("Loading thumbs...")); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1080 vf->thumbs_running = TRUE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1081 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1082 while (vflist_thumb_next(vf)); |
9 | 1083 } |
1084 | |
1085 /* | |
1086 *----------------------------------------------------------------------------- | |
1087 * row stuff | |
1088 *----------------------------------------------------------------------------- | |
1089 */ | |
1090 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1091 FileData *vflist_index_get_data(ViewFile *vf, gint row) |
9 | 1092 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1093 return g_list_nth_data(vf->list, row); |
9 | 1094 } |
1095 | |
664
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1096 gint vflist_index_by_path(ViewFile *vf, const gchar *path) |
9 | 1097 { |
1098 gint p = 0; | |
1099 GList *work; | |
1100 | |
1101 if (!path) return -1; | |
1102 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1103 work = vf->list; |
9 | 1104 while (work) |
1105 { | |
664
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1106 FileData *fd = work->data; |
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1107 if (strcmp(path, fd->path) == 0) return p; |
db373fb1b9d8
Merge vflist_row_by_path() into vflist_index_by_path().
zas_
parents:
659
diff
changeset
|
1108 |
9 | 1109 work = work->next; |
1110 p++; | |
1111 } | |
1112 | |
1113 return -1; | |
1114 } | |
1115 | |
736 | 1116 guint vflist_count(ViewFile *vf, gint64 *bytes) |
9 | 1117 { |
1118 if (bytes) | |
1119 { | |
1120 gint64 b = 0; | |
1121 GList *work; | |
1122 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1123 work = vf->list; |
9 | 1124 while (work) |
1125 { | |
1126 FileData *fd = work->data; | |
1127 work = work->next; | |
1128 b += fd->size; | |
1129 } | |
1130 | |
1131 *bytes = b; | |
1132 } | |
1133 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1134 return g_list_length(vf->list); |
9 | 1135 } |
1136 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1137 GList *vflist_get_list(ViewFile *vf) |
9 | 1138 { |
1139 GList *list = NULL; | |
1140 GList *work; | |
1141 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1142 work = vf->list; |
9 | 1143 while (work) |
1144 { | |
1145 FileData *fd = work->data; | |
1146 work = work->next; | |
1147 | |
138 | 1148 list = g_list_prepend(list, file_data_ref(fd)); |
9 | 1149 } |
1150 | |
1151 return g_list_reverse(list); | |
1152 } | |
1153 | |
1154 /* | |
1155 *----------------------------------------------------------------------------- | |
1156 * selections | |
1157 *----------------------------------------------------------------------------- | |
1158 */ | |
1159 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1160 static gint vflist_row_is_selected(ViewFile *vf, FileData *fd) |
9 | 1161 { |
1162 GtkTreeModel *store; | |
1163 GtkTreeSelection *selection; | |
1164 GList *slist; | |
1165 GList *work; | |
1166 gint found = FALSE; | |
1167 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1168 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1169 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1170 work = slist; | |
1171 while (!found && work) | |
1172 { | |
1173 GtkTreePath *tpath = work->data; | |
1174 FileData *fd_n; | |
1175 GtkTreeIter iter; | |
1176 | |
1177 gtk_tree_model_get_iter(store, &iter, tpath); | |
1178 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1); | |
1179 if (fd_n == fd) found = TRUE; | |
1180 work = work->next; | |
1181 } | |
1182 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1183 g_list_free(slist); | |
1184 | |
1185 return found; | |
1186 } | |
1187 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1188 gint vflist_index_is_selected(ViewFile *vf, gint row) |
9 | 1189 { |
1190 FileData *fd; | |
1191 | |
633 | 1192 fd = vf_index_get_data(vf, row); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1193 return vflist_row_is_selected(vf, fd); |
9 | 1194 } |
1195 | |
736 | 1196 guint vflist_selection_count(ViewFile *vf, gint64 *bytes) |
9 | 1197 { |
1198 GtkTreeModel *store; | |
1199 GtkTreeSelection *selection; | |
1200 GList *slist; | |
736 | 1201 guint count; |
9 | 1202 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1203 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1204 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1205 | |
1206 if (bytes) | |
1207 { | |
1208 gint64 b = 0; | |
1209 GList *work; | |
1210 | |
1211 work = slist; | |
1212 while (work) | |
1213 { | |
1214 GtkTreePath *tpath = work->data; | |
1215 GtkTreeIter iter; | |
1216 FileData *fd; | |
1217 | |
1218 gtk_tree_model_get_iter(store, &iter, tpath); | |
1219 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1220 b += fd->size; | |
1221 | |
1222 work = work->next; | |
1223 } | |
1224 | |
1225 *bytes = b; | |
1226 } | |
1227 | |
1228 count = g_list_length(slist); | |
1229 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1230 g_list_free(slist); | |
1231 | |
1232 return count; | |
1233 } | |
1234 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1235 GList *vflist_selection_get_list(ViewFile *vf) |
9 | 1236 { |
1237 GtkTreeModel *store; | |
1238 GtkTreeSelection *selection; | |
1239 GList *slist; | |
1240 GList *list = NULL; | |
1241 GList *work; | |
1242 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1243 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1244 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1245 work = slist; | |
1246 while (work) | |
1247 { | |
1248 GtkTreePath *tpath = work->data; | |
1249 FileData *fd; | |
1250 GtkTreeIter iter; | |
1251 | |
1252 gtk_tree_model_get_iter(store, &iter, tpath); | |
1253 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1254 | |
138 | 1255 list = g_list_prepend(list, file_data_ref(fd)); |
9 | 1256 |
1257 work = work->next; | |
1258 } | |
1259 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1260 g_list_free(slist); | |
1261 | |
1262 return g_list_reverse(list); | |
1263 } | |
1264 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1265 GList *vflist_selection_get_list_by_index(ViewFile *vf) |
9 | 1266 { |
1267 GtkTreeModel *store; | |
1268 GtkTreeSelection *selection; | |
1269 GList *slist; | |
1270 GList *list = NULL; | |
1271 GList *work; | |
1272 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1273 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1274 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1275 work = slist; | |
1276 while (work) | |
1277 { | |
1278 GtkTreePath *tpath = work->data; | |
1279 FileData *fd; | |
1280 GtkTreeIter iter; | |
1281 | |
1282 gtk_tree_model_get_iter(store, &iter, tpath); | |
1283 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
1284 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1285 list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vf->list, fd))); |
9 | 1286 |
1287 work = work->next; | |
1288 } | |
1289 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1290 g_list_free(slist); | |
1291 | |
1292 return g_list_reverse(list); | |
1293 } | |
1294 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1295 void vflist_select_all(ViewFile *vf) |
9 | 1296 { |
1297 GtkTreeSelection *selection; | |
1298 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1299 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1300 gtk_tree_selection_select_all(selection); |
1301 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1302 VFLIST_INFO(vf, select_fd) = NULL; |
9 | 1303 } |
1304 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1305 void vflist_select_none(ViewFile *vf) |
9 | 1306 { |
1307 GtkTreeSelection *selection; | |
1308 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1309 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1310 gtk_tree_selection_unselect_all(selection); |
1311 } | |
1312 | |
601 | 1313 static gboolean tree_model_iter_prev(GtkTreeModel *store, GtkTreeIter *iter) |
1314 { | |
1315 GtkTreePath *tpath; | |
1316 gboolean result; | |
1317 | |
1318 tpath = gtk_tree_model_get_path(store, iter); | |
1319 result = gtk_tree_path_prev(tpath); | |
1320 if (result) | |
1321 gtk_tree_model_get_iter(store, iter, tpath); | |
1322 | |
1323 gtk_tree_path_free(tpath); | |
1324 | |
1325 return result; | |
1326 } | |
1327 | |
1328 static gboolean tree_model_get_iter_last(GtkTreeModel *store, GtkTreeIter *iter) | |
1329 { | |
1330 if (!gtk_tree_model_get_iter_first(store, iter)) | |
1331 return FALSE; | |
1332 | |
1333 while (TRUE) | |
1334 { | |
1335 GtkTreeIter next = *iter; | |
1336 | |
1337 if (gtk_tree_model_iter_next(store, &next)) | |
1338 *iter = next; | |
1339 else | |
1340 break; | |
1341 } | |
1342 | |
1343 return TRUE; | |
1344 } | |
1345 | |
1346 void vflist_select_invert(ViewFile *vf) | |
1347 { | |
1348 GtkTreeIter iter; | |
1349 GtkTreeSelection *selection; | |
1350 GtkTreeModel *store; | |
1351 gboolean valid; | |
1352 | |
1353 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); | |
1354 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); | |
1355 | |
1356 /* Backward iteration prevents scrolling to the end of the list, | |
1357 * it scrolls to the first selected row instead. */ | |
1358 valid = tree_model_get_iter_last(store, &iter); | |
1359 | |
1360 while (valid) | |
1361 { | |
1362 gint selected = gtk_tree_selection_iter_is_selected(selection, &iter); | |
1363 | |
1364 if (selected) | |
1365 gtk_tree_selection_unselect_iter(selection, &iter); | |
1366 else | |
1367 gtk_tree_selection_select_iter(selection, &iter); | |
1368 | |
1369 valid = tree_model_iter_prev(store, &iter); | |
1370 } | |
1371 } | |
1372 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1373 void vflist_select_by_fd(ViewFile *vf, FileData *fd) |
138 | 1374 { |
9 | 1375 GtkTreeIter iter; |
1376 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1377 if (vflist_find_row(vf, fd, &iter) < 0) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1378 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1379 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
|
1380 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1381 if (!vflist_row_is_selected(vf, fd)) |
9 | 1382 { |
1383 GtkTreeSelection *selection; | |
1384 GtkTreeModel *store; | |
1385 GtkTreePath *tpath; | |
1386 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1387 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1388 gtk_tree_selection_unselect_all(selection); |
1389 gtk_tree_selection_select_iter(selection, &iter); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1390 vflist_move_cursor(vf, &iter); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1391 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1392 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1393 tpath = gtk_tree_model_get_path(store, &iter); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1394 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vf->listview), tpath, NULL, FALSE); |
9 | 1395 gtk_tree_path_free(tpath); |
1396 } | |
1397 } | |
1398 | |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1399 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
|
1400 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1401 GList *work; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1402 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1403 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
|
1404 work = vf->list; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1405 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1406 while (work) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1407 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1408 gint match; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1409 FileData *fd = work->data; |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1410 work = work->next; |
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 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1413 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
|
1414 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1415 if (match >= 0) |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1416 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1417 vflist_select_by_fd(vf, fd); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1418 break; |
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 } |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1423 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1424 void vflist_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode) |
150 | 1425 { |
1426 GtkTreeModel *store; | |
1427 GtkTreeIter iter; | |
1428 GtkTreeSelection *selection; | |
1429 gint valid; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1430 gint n = mark - 1; |
442 | 1431 |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1432 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
150 | 1433 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1434 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1435 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
442 | 1436 |
150 | 1437 valid = gtk_tree_model_get_iter_first(store, &iter); |
1438 while (valid) | |
1439 { | |
1440 FileData *fd; | |
161 | 1441 gboolean mark_val, selected; |
150 | 1442 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, -1); |
442 | 1443 |
800 | 1444 mark_val = file_data_get_mark(fd, n); |
161 | 1445 selected = gtk_tree_selection_iter_is_selected(selection, &iter); |
442 | 1446 |
1447 switch (mode) | |
161 | 1448 { |
1449 case MTS_MODE_SET: selected = mark_val; | |
1450 break; | |
1451 case MTS_MODE_OR: selected = mark_val | selected; | |
1452 break; | |
1453 case MTS_MODE_AND: selected = mark_val & selected; | |
1454 break; | |
1455 case MTS_MODE_MINUS: selected = !mark_val & selected; | |
1456 break; | |
1457 } | |
442 | 1458 |
161 | 1459 if (selected) |
150 | 1460 gtk_tree_selection_select_iter(selection, &iter); |
161 | 1461 else |
1462 gtk_tree_selection_unselect_iter(selection, &iter); | |
150 | 1463 |
1464 valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter); | |
1465 } | |
1466 } | |
1467 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1468 void vflist_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode) |
150 | 1469 { |
1470 GtkTreeModel *store; | |
1471 GtkTreeSelection *selection; | |
1472 GList *slist; | |
1473 GList *work; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1474 gint n = mark - 1; |
150 | 1475 |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1476 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
150 | 1477 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1478 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
150 | 1479 slist = gtk_tree_selection_get_selected_rows(selection, &store); |
1480 work = slist; | |
1481 while (work) | |
1482 { | |
1483 GtkTreePath *tpath = work->data; | |
1484 FileData *fd; | |
1485 GtkTreeIter iter; | |
1486 | |
1487 gtk_tree_model_get_iter(store, &iter, tpath); | |
1488 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd, -1); | |
442 | 1489 |
814 | 1490 file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */ |
800 | 1491 |
161 | 1492 switch (mode) |
1493 { | |
800 | 1494 case STM_MODE_SET: file_data_set_mark(fd, n, 1); |
161 | 1495 break; |
800 | 1496 case STM_MODE_RESET: file_data_set_mark(fd, n, 0); |
161 | 1497 break; |
800 | 1498 case STM_MODE_TOGGLE: file_data_set_mark(fd, n, !file_data_get_mark(fd, n)); |
161 | 1499 break; |
1500 } | |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
1501 |
814 | 1502 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
442 | 1503 |
800 | 1504 gtk_tree_store_set(GTK_TREE_STORE(store), &iter, FILE_COLUMN_MARKS + n, file_data_get_mark(fd, n), -1); |
150 | 1505 |
1506 work = work->next; | |
1507 } | |
1508 g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL); | |
1509 g_list_free(slist); | |
1510 } | |
1511 | |
9 | 1512 /* |
1513 *----------------------------------------------------------------------------- | |
1514 * core (population) | |
1515 *----------------------------------------------------------------------------- | |
1516 */ | |
1517 | |
1518 static void vflist_listview_set_height(GtkWidget *listview, gint thumb) | |
1519 { | |
1520 GtkTreeViewColumn *column; | |
1521 GtkCellRenderer *cell; | |
1522 GList *list; | |
1523 | |
770 | 1524 column = gtk_tree_view_get_column(GTK_TREE_VIEW(listview), 0); /* first column is thumbnail */ |
9 | 1525 if (!column) return; |
1526 | |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1527 gtk_tree_view_column_set_visible(column, thumb); |
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1528 |
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1529 gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 40); |
9 | 1530 |
1531 list = gtk_tree_view_column_get_cell_renderers(column); | |
1532 if (!list) return; | |
1533 cell = list->data; | |
1534 g_list_free(list); | |
1535 | |
802
3cfc54c77b30
fixed switching thumbnails in listview on and off - bug 1984825
nadvornik
parents:
801
diff
changeset
|
1536 g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL); |
9 | 1537 gtk_tree_view_columns_autosize(GTK_TREE_VIEW(listview)); |
1538 } | |
1539 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1540 static void vflist_populate_view(ViewFile *vf) |
9 | 1541 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1542 GtkTreeStore *store; |
9 | 1543 gint thumbs; |
1544 GtkTreeRowReference *visible_row = NULL; | |
1545 GtkTreePath *tpath; | |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1546 GList *selected; |
9 | 1547 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1548 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
|
1549 thumbs = VFLIST_INFO(vf, thumbs_enabled); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1550 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1551 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1552 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1553 if (!vf->list) |
9 | 1554 { |
801 | 1555 vflist_store_clear(vf); |
633 | 1556 vf_send_update(vf); |
9 | 1557 return; |
1558 } | |
1559 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1560 if (GTK_WIDGET_REALIZED(vf->listview) && |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1561 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 1562 { |
1563 visible_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(store), tpath); | |
1564 gtk_tree_path_free(tpath); | |
1565 } | |
1566 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1567 vflist_listview_set_height(vf->listview, thumbs); |
9 | 1568 |
771
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1569 selected = vflist_selection_get_list(vf); |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1570 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1571 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
|
1572 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1573 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
|
1574 { |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1575 /* all selected files disappeared */ |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1576 vflist_select_closest(vf, selected->data); |
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 |
24726eddb252
vflist_populate_view: better handle selected files that are renamed or deleted
nadvornik
parents:
770
diff
changeset
|
1579 filelist_free(selected); |
769 | 1580 |
9 | 1581 if (visible_row) |
1582 { | |
1583 if (gtk_tree_row_reference_valid(visible_row)) | |
1584 { | |
1585 tpath = gtk_tree_row_reference_get_path(visible_row); | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1586 gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(vf->listview), tpath, NULL, TRUE, 0.0, 0.0); |
9 | 1587 gtk_tree_path_free(tpath); |
1588 } | |
1589 gtk_tree_row_reference_free(visible_row); | |
1590 } | |
1591 | |
633 | 1592 vf_send_update(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1593 vflist_thumb_update(vf); |
9 | 1594 } |
1595 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1596 gint vflist_refresh(ViewFile *vf) |
9 | 1597 { |
1598 GList *old_list; | |
1599 gint ret = TRUE; | |
1600 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1601 old_list = vf->list; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1602 vf->list = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1603 |
762 | 1604 DEBUG_1("%s vflist_refresh: read dir", get_exec_time()); |
783 | 1605 if (vf->dir_fd) |
9 | 1606 { |
814 | 1607 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
|
1608 |
783 | 1609 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
|
1610 |
814 | 1611 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
|
1612 |
780
44128da39e13
Drop initialization to NULL since filelist_read() will take care of it.
zas_
parents:
775
diff
changeset
|
1613 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
|
1614 vf->list = filelist_sort(vf->list, vf->sort_method, vf->sort_ascend); |
9 | 1615 } |
762 | 1616 |
1617 DEBUG_1("%s vflist_refresh: populate view", get_exec_time()); | |
1618 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1619 vflist_populate_view(vf); |
9 | 1620 |
1621 filelist_free(old_list); | |
762 | 1622 DEBUG_1("%s vflist_refresh: done", get_exec_time()); |
9 | 1623 |
1624 return ret; | |
1625 } | |
1626 | |
772
f53c2bb5b1b1
replaced vflist_maint functions by vflist_refresh - it allows to follow
nadvornik
parents:
771
diff
changeset
|
1627 |
f53c2bb5b1b1
replaced vflist_maint functions by vflist_refresh - it allows to follow
nadvornik
parents:
771
diff
changeset
|
1628 |
9 | 1629 /* this overrides the low default of a GtkCellRenderer from 100 to CELL_HEIGHT_OVERRIDE, something sane for our purposes */ |
1630 | |
1631 #define CELL_HEIGHT_OVERRIDE 512 | |
1632 | |
1633 static void cell_renderer_height_override(GtkCellRenderer *renderer) | |
1634 { | |
1635 GParamSpec *spec; | |
1636 | |
1637 spec = g_object_class_find_property(G_OBJECT_GET_CLASS(G_OBJECT(renderer)), "height"); | |
1638 if (spec && G_IS_PARAM_SPEC_INT(spec)) | |
1639 { | |
1640 GParamSpecInt *spec_int; | |
1641 | |
1642 spec_int = G_PARAM_SPEC_INT(spec); | |
1643 if (spec_int->maximum < CELL_HEIGHT_OVERRIDE) spec_int->maximum = CELL_HEIGHT_OVERRIDE; | |
1644 } | |
1645 } | |
1646 | |
1647 static GdkColor *vflist_listview_color_shifted(GtkWidget *widget) | |
1648 { | |
1649 static GdkColor color; | |
1650 static GtkWidget *done = NULL; | |
1651 | |
1652 if (done != widget) | |
1653 { | |
1654 GtkStyle *style; | |
1655 | |
1656 style = gtk_widget_get_style(widget); | |
1657 memcpy(&color, &style->base[GTK_STATE_NORMAL], sizeof(color)); | |
1658 shift_color(&color, -1, 0); | |
1659 done = widget; | |
1660 } | |
1661 | |
1662 return &color; | |
1663 } | |
1664 | |
1665 static void vflist_listview_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, | |
1666 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) | |
1667 { | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1668 ViewFile *vf = data; |
9 | 1669 gboolean set; |
1670 | |
1671 gtk_tree_model_get(tree_model, iter, FILE_COLUMN_COLOR, &set, -1); | |
1672 g_object_set(G_OBJECT(cell), | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1673 "cell-background-gdk", vflist_listview_color_shifted(vf->listview), |
9 | 1674 "cell-background-set", set, NULL); |
1675 } | |
1676 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1677 static void vflist_listview_add_column(ViewFile *vf, gint n, const gchar *title, gint image, gint right_justify, gint expand) |
9 | 1678 { |
1679 GtkTreeViewColumn *column; | |
1680 GtkCellRenderer *renderer; | |
1681 | |
1682 column = gtk_tree_view_column_new(); | |
1683 gtk_tree_view_column_set_title(column, title); | |
1684 gtk_tree_view_column_set_min_width(column, 4); | |
1685 | |
1686 if (!image) | |
1687 { | |
149 | 1688 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY); |
9 | 1689 renderer = gtk_cell_renderer_text_new(); |
1690 if (right_justify) | |
1691 { | |
1692 g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL); | |
1693 } | |
1694 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
1695 gtk_tree_view_column_add_attribute(column, renderer, "text", n); | |
149 | 1696 if (expand) |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1697 gtk_tree_view_column_set_expand(column, TRUE); |
149 | 1698 } |
9 | 1699 else |
1700 { | |
1701 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); | |
1702 renderer = gtk_cell_renderer_pixbuf_new(); | |
1703 cell_renderer_height_override(renderer); | |
1704 gtk_tree_view_column_pack_start(column, renderer, TRUE); | |
1705 gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", n); | |
1706 } | |
1707 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1708 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
|
1709 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
|
1710 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); |
9 | 1711 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1712 gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
9 | 1713 } |
1714 | |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1715 static void vflist_listview_mark_toggled_cb(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) |
132 | 1716 { |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1717 ViewFile *vf = data; |
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1718 GtkTreeStore *store; |
149 | 1719 GtkTreePath *path = gtk_tree_path_new_from_string(path_str); |
1720 GtkTreeIter iter; | |
1721 FileData *fd; | |
1722 gboolean mark; | |
1723 guint col_idx; | |
442 | 1724 |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1725 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
149 | 1726 if (!path || !gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, path)) |
1727 return; | |
132 | 1728 |
513
985fdfebd89e
Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents:
512
diff
changeset
|
1729 col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_store_idx")); |
442 | 1730 |
149 | 1731 g_assert(col_idx >= FILE_COLUMN_MARKS && col_idx <= FILE_COLUMN_MARKS_LAST); |
442 | 1732 |
149 | 1733 gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, FILE_COLUMN_POINTER, &fd, col_idx, &mark, -1); |
150 | 1734 mark = !mark; |
814 | 1735 file_data_unregister_notify_func(vf_notify_cb, vf); /* we don't need the notification */ |
800 | 1736 file_data_set_mark(fd, col_idx - FILE_COLUMN_MARKS, mark); |
814 | 1737 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
442 | 1738 |
149 | 1739 gtk_tree_store_set(store, &iter, col_idx, mark, -1); |
1740 gtk_tree_path_free(path); | |
132 | 1741 } |
1742 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1743 static void vflist_listview_add_column_toggle(ViewFile *vf, gint n, const gchar *title) |
132 | 1744 { |
149 | 1745 GtkTreeViewColumn *column; |
1746 GtkCellRenderer *renderer; | |
1747 GtkTreeStore *store; | |
1748 gint index; | |
442 | 1749 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1750 store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
132 | 1751 |
149 | 1752 renderer = gtk_cell_renderer_toggle_new(); |
1753 column = gtk_tree_view_column_new_with_attributes(title, renderer, "active", n, NULL); | |
132 | 1754 |
149 | 1755 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
|
1756 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
|
1757 g_object_set_data(G_OBJECT(renderer), "column_store_idx", GUINT_TO_POINTER(n)); |
442 | 1758 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1759 index = gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
149 | 1760 gtk_tree_view_column_set_fixed_width(column, 16); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1761 gtk_tree_view_column_set_visible(column, vf->marks_enabled); |
132 | 1762 |
442 | 1763 |
784
16b3a5c8aedc
new notification system (used only in vflist for now)
nadvornik
parents:
783
diff
changeset
|
1764 g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(vflist_listview_mark_toggled_cb), vf); |
132 | 1765 } |
1766 | |
9 | 1767 /* |
1768 *----------------------------------------------------------------------------- | |
1769 * base | |
1770 *----------------------------------------------------------------------------- | |
1771 */ | |
1772 | |
783 | 1773 gint vflist_set_fd(ViewFile *vf, FileData *dir_fd) |
9 | 1774 { |
783 | 1775 if (!dir_fd) return FALSE; |
1776 if (vf->dir_fd == dir_fd) return TRUE; | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1777 |
783 | 1778 file_data_unref(vf->dir_fd); |
1779 vf->dir_fd = file_data_ref(dir_fd); | |
9 | 1780 |
1781 /* force complete reload */ | |
801 | 1782 vflist_store_clear(vf); |
9 | 1783 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1784 filelist_free(vf->list); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1785 vf->list = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1786 |
633 | 1787 return vf_refresh(vf); |
9 | 1788 } |
1789 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1790 void vflist_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 1791 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1792 ViewFile *vf = data; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1793 |
814 | 1794 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
|
1795 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1796 vflist_select_idle_cancel(vf); |
814 | 1797 vf_refresh_idle_cancel(vf); |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1798 vflist_thumb_stop(vf); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1799 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1800 filelist_free(vf->list); |
9 | 1801 } |
1802 | |
783 | 1803 ViewFile *vflist_new(ViewFile *vf, FileData *dir_fd) |
9 | 1804 { |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1805 GtkTreeStore *store; |
9 | 1806 GtkTreeSelection *selection; |
1807 | |
149 | 1808 GType flist_types[FILE_COLUMN_COUNT]; |
1809 int i; | |
442 | 1810 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1811 vf->info = g_new0(ViewFileInfoList, 1); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1812 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1813 VFLIST_INFO(vf, click_fd) = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1814 VFLIST_INFO(vf, select_fd) = NULL; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1815 VFLIST_INFO(vf, thumbs_enabled) = FALSE; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1816 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1817 VFLIST_INFO(vf, select_idle_id) = -1; |
9 | 1818 |
139 | 1819 flist_types[FILE_COLUMN_POINTER] = G_TYPE_POINTER; |
763
81f9e8dbb4bf
improved infrastructure for tracing changes, optimized vflist_populate_view
nadvornik
parents:
762
diff
changeset
|
1820 flist_types[FILE_COLUMN_VERSION] = G_TYPE_INT; |
139 | 1821 flist_types[FILE_COLUMN_THUMB] = GDK_TYPE_PIXBUF; |
1822 flist_types[FILE_COLUMN_NAME] = G_TYPE_STRING; | |
1823 flist_types[FILE_COLUMN_SIDECARS] = G_TYPE_STRING; | |
1824 flist_types[FILE_COLUMN_SIZE] = G_TYPE_STRING; | |
1825 flist_types[FILE_COLUMN_DATE] = G_TYPE_STRING; | |
1826 flist_types[FILE_COLUMN_COLOR] = G_TYPE_BOOLEAN; | |
1827 for (i = FILE_COLUMN_MARKS; i < FILE_COLUMN_MARKS + FILEDATA_MARKS_SIZE; i++) | |
1828 flist_types[i] = G_TYPE_BOOLEAN; | |
132 | 1829 |
142
b5aa95241859
display sidecar files (jpeg + raw) using gtk_tree_store
nadvornik
parents:
139
diff
changeset
|
1830 store = gtk_tree_store_newv(FILE_COLUMN_COUNT, flist_types); |
442 | 1831 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1832 vf->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); |
9 | 1833 g_object_unref(store); |
1834 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1835 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 1836 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
|
1837 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
|
1838 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1839 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
|
1840 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
|
1841 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1842 vflist_listview_add_column(vf, FILE_COLUMN_THUMB, "", TRUE, FALSE, FALSE); |
9 | 1843 |
518 | 1844 for (i = 0; i < FILEDATA_MARKS_SIZE; i++) |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1845 vflist_listview_add_column_toggle(vf, i + FILE_COLUMN_MARKS, ""); |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1846 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1847 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
|
1848 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
|
1849 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1850 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
|
1851 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
|
1852 |
814 | 1853 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
|
1854 return vf; |
9 | 1855 } |
1856 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1857 void vflist_thumb_set(ViewFile *vf, gint enable) |
9 | 1858 { |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1859 if (VFLIST_INFO(vf, thumbs_enabled) == enable) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1860 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1861 VFLIST_INFO(vf, thumbs_enabled) = enable; |
633 | 1862 if (vf->layout) vf_refresh(vf); |
9 | 1863 } |
1864 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1865 void vflist_marks_set(ViewFile *vf, gint enable) |
132 | 1866 { |
149 | 1867 GList *columns, *work; |
442 | 1868 |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1869 if (vf->marks_enabled == enable) return; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1870 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1871 vf->marks_enabled = enable; |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1872 |
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
559
diff
changeset
|
1873 columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(vf->listview)); |
442 | 1874 |
149 | 1875 work = columns; |
1876 while (work) | |
1877 { | |
1878 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
|
1879 gint col_idx = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_store_idx")); |
149 | 1880 work = work->next; |
442 | 1881 |
1882 if (col_idx <= FILE_COLUMN_MARKS_LAST && col_idx >= FILE_COLUMN_MARKS) | |
149 | 1883 gtk_tree_view_column_set_visible(column, enable); |
1884 } | |
442 | 1885 |
149 | 1886 g_list_free(columns); |
633 | 1887 //vf_refresh(vf); |
132 | 1888 } |
1889 |