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