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