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