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