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