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