Mercurial > geeqie
annotate src/view_file_icon.c @ 1764:91ec4714b905
ignored multiple directories specified on commandline
IMHO this was inconsistent - specifying one directory had completely
different effect than specifying two or more directories. Moreover,
it segfaulted.
Now only one directory is allowed.
author | nadvornik |
---|---|
date | Thu, 01 Oct 2009 18:40:34 +0000 |
parents | caf0e4b8319d |
children | 9a351e8f3b97 |
rev | line source |
---|---|
9 | 1 /* |
196 | 2 * Geeqie |
111
3a69a7a3f461
Wed Nov 15 02:05:27 2006 John Ellis <johne@verizon.net>
gqview
parents:
85
diff
changeset
|
3 * (C) 2006 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_icon.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 "cellrenderericon.h" |
18 #include "collect.h" | |
19 #include "collect-io.h" | |
20 #include "collect-table.h" | |
21 #include "dnd.h" | |
22 #include "editors.h" | |
23 #include "img-view.h" | |
586 | 24 #include "filedata.h" |
9 | 25 #include "layout.h" |
26 #include "layout_image.h" | |
27 #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
|
28 #include "metadata.h" |
9 | 29 #include "thumb.h" |
30 #include "utilops.h" | |
31 #include "ui_fileops.h" | |
32 #include "ui_menu.h" | |
33 #include "ui_tree_edit.h" | |
904
1698baa37871
Move uri_*() functions to separate files: uri_utils.[ch]
zas_
parents:
852
diff
changeset
|
34 #include "uri_utils.h" |
633 | 35 #include "view_file.h" |
9 | 36 |
37 #include <gdk/gdkkeysyms.h> /* for keyboard values */ | |
38 | |
557
d8d61dc4ff52
Introduce ViewFileInfoList and ViewFileInfoIcon (not used yet).
zas_
parents:
516
diff
changeset
|
39 |
9 | 40 /* between these, the icon width is increased by thumb_max_width / 2 */ |
41 #define THUMB_MIN_ICON_WIDTH 128 | |
42 #define THUMB_MAX_ICON_WIDTH 150 | |
43 | |
44 #define VFICON_MAX_COLUMNS 32 | |
45 #define THUMB_BORDER_PADDING 2 | |
46 | |
47 #define VFICON_TIP_DELAY 500 | |
48 | |
49 enum { | |
50 FILE_COLUMN_POINTER = 0, | |
51 FILE_COLUMN_COUNT | |
52 }; | |
53 | |
54 typedef enum { | |
55 SELECTION_NONE = 0, | |
56 SELECTION_SELECTED = 1 << 0, | |
57 SELECTION_PRELIGHT = 1 << 1, | |
58 SELECTION_FOCUS = 1 << 2 | |
59 } SelectionType; | |
60 | |
61 typedef struct _IconData IconData; | |
62 struct _IconData | |
63 { | |
64 SelectionType selected; | |
138 | 65 FileData *fd; |
9 | 66 }; |
67 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
68 static gint vficon_index_by_id(ViewFile *vf, IconData *in_id); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
69 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
70 static IconData *vficon_icon_data(ViewFile *vf, FileData *fd) |
138 | 71 { |
72 IconData *id = NULL; | |
73 GList *work; | |
74 | |
75 if (!fd) return NULL; | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
76 work = vf->list; |
138 | 77 while (work && !id) |
78 { | |
79 IconData *chk = work->data; | |
80 work = work->next; | |
81 if (chk->fd == fd) id = chk; | |
82 } | |
83 return id; | |
84 } | |
85 | |
812 | 86 #if 0 |
87 /* not used */ | |
783 | 88 static gint iconlist_read(FileData *dir_fd, GList **list) |
9 | 89 { |
90 GList *temp; | |
91 GList *work; | |
92 | |
783 | 93 if (!filelist_read(dir_fd, &temp, NULL)) return FALSE; |
9 | 94 |
95 work = temp; | |
96 while (work) | |
97 { | |
98 FileData *fd; | |
99 IconData *id; | |
100 | |
101 fd = work->data; | |
442 | 102 g_assert(fd->magick == 0x12345678); |
9 | 103 id = g_new0(IconData, 1); |
104 | |
105 id->selected = SELECTION_NONE; | |
138 | 106 id->fd = fd; |
9 | 107 |
108 work->data = id; | |
109 work = work->next; | |
110 } | |
111 | |
112 *list = temp; | |
113 | |
114 return TRUE; | |
115 } | |
812 | 116 #endif |
9 | 117 |
118 static void iconlist_free(GList *list) | |
119 { | |
138 | 120 GList *work = list; |
121 while (work) | |
122 { | |
123 IconData *id = work->data; | |
124 file_data_unref(id->fd); | |
125 g_free(id); | |
442 | 126 work = work->next; |
127 } | |
128 | |
129 g_list_free(list); | |
138 | 130 |
131 } | |
132 | |
1002 | 133 gint iconlist_sort_file_cb(gpointer a, gpointer b) |
138 | 134 { |
135 IconData *ida = a; | |
136 IconData *idb = b; | |
137 return filelist_sort_compare_filedata(ida->fd, idb->fd); | |
138 } | |
633 | 139 |
1453 | 140 GList *iconlist_sort(GList *list, SortType method, gboolean ascend) |
138 | 141 { |
142 return filelist_sort_full(list, method, ascend, (GCompareFunc) iconlist_sort_file_cb); | |
143 } | |
144 | |
1453 | 145 GList *iconlist_insert_sort(GList *list, IconData *id, SortType method, gboolean ascend) |
138 | 146 { |
147 return filelist_insert_sort_full(list, id, method, ascend, (GCompareFunc) iconlist_sort_file_cb); | |
9 | 148 } |
149 | |
150 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
151 static void vficon_toggle_filenames(ViewFile *vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
152 static void vficon_selection_remove(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter); |
1453 | 153 static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
154 static void vficon_set_focus(ViewFile *vf, IconData *id); |
1453 | 155 static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force); |
9 | 156 |
157 | |
158 /* | |
159 *----------------------------------------------------------------------------- | |
160 * pop-up menu | |
161 *----------------------------------------------------------------------------- | |
162 */ | |
163 | |
1761 | 164 GList *vficon_selection_get_one(ViewFile *vf, FileData *fd) |
165 { | |
166 return g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd)); | |
167 } | |
168 | |
634 | 169 GList *vficon_pop_menu_file_list(ViewFile *vf) |
9 | 170 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
171 if (!VFICON(vf)->click_id) return NULL; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
172 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
173 if (VFICON(vf)->click_id->selected & SELECTION_SELECTED) |
9 | 174 { |
633 | 175 return vf_selection_get_list(vf); |
9 | 176 } |
177 | |
1761 | 178 return vficon_selection_get_one(vf, VFICON(vf)->click_id->fd); |
9 | 179 } |
180 | |
637 | 181 void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data) |
9 | 182 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
183 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
184 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
185 if (!VFICON(vf)->click_id) return; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
186 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
187 if (VFICON(vf)->click_id->selected & SELECTION_SELECTED) |
9 | 188 { |
189 GList *list; | |
442 | 190 |
633 | 191 list = vf_selection_get_list(vf); |
9 | 192 view_window_new_from_list(list); |
138 | 193 filelist_free(list); |
9 | 194 } |
195 else | |
196 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
197 view_window_new(VFICON(vf)->click_id->fd); |
9 | 198 } |
199 } | |
200 | |
637 | 201 void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data) |
9 | 202 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
203 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
204 |
634 | 205 file_util_rename(NULL, vf_pop_menu_file_list(vf), vf->listview); |
9 | 206 } |
207 | |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
208 void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data) |
9 | 209 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
210 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
211 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
212 vficon_toggle_filenames(vf); |
9 | 213 } |
214 | |
637 | 215 void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data) |
9 | 216 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
217 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
218 |
633 | 219 vf_refresh(vf); |
9 | 220 } |
221 | |
637 | 222 void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 223 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
224 ViewFile *vf = data; |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
225 vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
226 VFICON(vf)->click_id = NULL; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
227 vf->popup = NULL; |
9 | 228 } |
229 | |
230 /* | |
231 *------------------------------------------------------------------- | |
232 * signals | |
233 *------------------------------------------------------------------- | |
234 */ | |
235 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
236 static void vficon_send_layout_select(ViewFile *vf, IconData *id) |
9 | 237 { |
138 | 238 FileData *read_ahead_fd = NULL; |
144 | 239 FileData *sel_fd; |
240 FileData *cur_fd; | |
241 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
242 if (!vf->layout || !id || !id->fd) return; |
144 | 243 |
244 sel_fd = id->fd; | |
442 | 245 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
246 cur_fd = layout_image_get_fd(vf->layout); |
144 | 247 if (sel_fd == cur_fd) return; /* no change */ |
442 | 248 |
334 | 249 if (options->image.enable_read_ahead) |
9 | 250 { |
251 gint row; | |
252 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
253 row = g_list_index(vf->list, id); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
254 if (row > vficon_index_by_fd(vf, cur_fd) && |
736 | 255 (guint) (row + 1) < vf_count(vf, NULL)) |
9 | 256 { |
633 | 257 read_ahead_fd = vf_index_get_data(vf, row + 1); |
9 | 258 } |
259 else if (row > 0) | |
260 { | |
633 | 261 read_ahead_fd = vf_index_get_data(vf, row - 1); |
9 | 262 } |
263 } | |
264 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
265 layout_image_set_with_ahead(vf->layout, sel_fd, read_ahead_fd); |
9 | 266 } |
267 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
268 static void vficon_toggle_filenames(ViewFile *vf) |
9 | 269 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
270 VFICON(vf)->show_text = !VFICON(vf)->show_text; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
271 options->show_icon_names = VFICON(vf)->show_text; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
272 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
273 vficon_populate_at_new_size(vf, vf->listview->allocation.width, vf->listview->allocation.height, TRUE); |
9 | 274 } |
275 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
276 static gint vficon_get_icon_width(ViewFile *vf) |
9 | 277 { |
278 gint width; | |
279 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
280 if (!VFICON(vf)->show_text) return options->thumbnails.max_width; |
333 | 281 |
282 width = options->thumbnails.max_width + options->thumbnails.max_width / 2; | |
9 | 283 if (width < THUMB_MIN_ICON_WIDTH) width = THUMB_MIN_ICON_WIDTH; |
333 | 284 if (width > THUMB_MAX_ICON_WIDTH) width = options->thumbnails.max_width; |
9 | 285 |
286 return width; | |
287 } | |
288 | |
289 /* | |
290 *------------------------------------------------------------------- | |
291 * misc utils | |
292 *------------------------------------------------------------------- | |
293 */ | |
294 | |
1453 | 295 static gboolean vficon_find_position(ViewFile *vf, IconData *id, gint *row, gint *col) |
9 | 296 { |
297 gint n; | |
298 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
299 n = g_list_index(vf->list, id); |
9 | 300 |
301 if (n < 0) return FALSE; | |
302 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
303 *row = n / VFICON(vf)->columns; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
304 *col = n - (*row * VFICON(vf)->columns); |
9 | 305 |
306 return TRUE; | |
307 } | |
308 | |
1453 | 309 static gboolean vficon_find_iter(ViewFile *vf, IconData *id, GtkTreeIter *iter, gint *column) |
9 | 310 { |
311 GtkTreeModel *store; | |
312 gint row, col; | |
313 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
314 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
315 if (!vficon_find_position(vf, id, &row, &col)) return FALSE; |
9 | 316 if (!gtk_tree_model_iter_nth_child(store, iter, NULL, row)) return FALSE; |
317 if (column) *column = col; | |
318 | |
319 return TRUE; | |
320 } | |
321 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
322 static IconData *vficon_find_data(ViewFile *vf, gint row, gint col, GtkTreeIter *iter) |
9 | 323 { |
324 GtkTreeModel *store; | |
325 GtkTreeIter p; | |
326 | |
327 if (row < 0 || col < 0) return NULL; | |
328 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
329 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 330 if (gtk_tree_model_iter_nth_child(store, &p, NULL, row)) |
331 { | |
332 GList *list; | |
333 | |
334 gtk_tree_model_get(store, &p, FILE_COLUMN_POINTER, &list, -1); | |
335 if (!list) return NULL; | |
336 | |
337 if (iter) *iter = p; | |
338 | |
339 return g_list_nth_data(list, col); | |
340 } | |
341 | |
342 return NULL; | |
343 } | |
344 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
345 static IconData *vficon_find_data_by_coord(ViewFile *vf, gint x, gint y, GtkTreeIter *iter) |
9 | 346 { |
347 GtkTreePath *tpath; | |
348 GtkTreeViewColumn *column; | |
349 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
350 if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), x, y, |
9 | 351 &tpath, &column, NULL, NULL)) |
352 { | |
353 GtkTreeModel *store; | |
354 GtkTreeIter row; | |
355 GList *list; | |
356 gint n; | |
357 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
358 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 359 gtk_tree_model_get_iter(store, &row, tpath); |
360 gtk_tree_path_free(tpath); | |
361 | |
362 gtk_tree_model_get(store, &row, FILE_COLUMN_POINTER, &list, -1); | |
363 | |
364 n = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_number")); | |
365 if (list) | |
366 { | |
367 if (iter) *iter = row; | |
368 return g_list_nth_data(list, n); | |
369 } | |
370 } | |
371 | |
372 return NULL; | |
373 } | |
374 | |
966 | 375 static void vficon_mark_toggled_cb(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) |
376 { | |
377 ViewFile *vf = data; | |
378 GtkTreeModel *store; | |
379 GtkTreePath *path = gtk_tree_path_new_from_string(path_str); | |
380 GtkTreeIter row; | |
381 gint column; | |
382 GList *list; | |
383 guint toggled_mark; | |
967 | 384 IconData *id; |
966 | 385 |
386 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); | |
387 if (!path || !gtk_tree_model_get_iter(store, &row, path)) | |
995 | 388 return; |
966 | 389 |
390 gtk_tree_model_get(store, &row, FILE_COLUMN_POINTER, &list, -1); | |
391 | |
392 column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_number")); | |
393 g_object_get(G_OBJECT(cell), "toggled_mark", &toggled_mark, NULL); | |
394 | |
967 | 395 id = g_list_nth_data(list, column); |
966 | 396 if (id) |
397 { | |
398 FileData *fd = id->fd; | |
399 file_data_set_mark(fd, toggled_mark, !file_data_get_mark(fd, toggled_mark)); | |
400 } | |
401 } | |
402 | |
403 | |
9 | 404 /* |
405 *------------------------------------------------------------------- | |
406 * tooltip type window | |
407 *------------------------------------------------------------------- | |
408 */ | |
409 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
410 static void tip_show(ViewFile *vf) |
9 | 411 { |
412 GtkWidget *label; | |
413 gint x, y; | |
414 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
415 if (VFICON(vf)->tip_window) return; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
416 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
417 gdk_window_get_pointer(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview)), &x, &y, NULL); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
418 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
419 VFICON(vf)->tip_id = vficon_find_data_by_coord(vf, x, y, NULL); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
420 if (!VFICON(vf)->tip_id) return; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
421 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
422 VFICON(vf)->tip_window = gtk_window_new(GTK_WINDOW_POPUP); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
423 gtk_window_set_resizable(GTK_WINDOW(VFICON(vf)->tip_window), FALSE); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
424 gtk_container_set_border_width(GTK_CONTAINER(VFICON(vf)->tip_window), 2); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
425 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
426 label = gtk_label_new(VFICON(vf)->tip_id->fd->name); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
427 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
428 g_object_set_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label", label); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
429 gtk_container_add(GTK_CONTAINER(VFICON(vf)->tip_window), label); |
9 | 430 gtk_widget_show(label); |
431 | |
432 gdk_window_get_pointer(NULL, &x, &y, NULL); | |
433 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
434 if (!GTK_WIDGET_REALIZED(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
435 gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
436 gtk_widget_show(VFICON(vf)->tip_window); |
9 | 437 } |
438 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
439 static void tip_hide(ViewFile *vf) |
9 | 440 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
441 if (VFICON(vf)->tip_window) gtk_widget_destroy(VFICON(vf)->tip_window); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
442 VFICON(vf)->tip_window = NULL; |
9 | 443 } |
444 | |
1453 | 445 static gboolean tip_schedule_cb(gpointer data) |
9 | 446 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
447 ViewFile *vf = data; |
9 | 448 GtkWidget *window; |
449 | |
1523 | 450 if (!VFICON(vf)->tip_delay_id) return FALSE; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
451 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
452 window = gtk_widget_get_toplevel(vf->listview); |
9 | 453 |
454 if (GTK_WIDGET_SENSITIVE(window) && | |
455 GTK_WINDOW(window)->has_focus) | |
456 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
457 tip_show(vf); |
9 | 458 } |
459 | |
1523 | 460 VFICON(vf)->tip_delay_id = 0; |
9 | 461 return FALSE; |
462 } | |
463 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
464 static void tip_schedule(ViewFile *vf) |
9 | 465 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
466 tip_hide(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
467 |
1523 | 468 if (VFICON(vf)->tip_delay_id) |
9 | 469 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
470 g_source_remove(VFICON(vf)->tip_delay_id); |
1523 | 471 VFICON(vf)->tip_delay_id = 0; |
9 | 472 } |
473 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
474 if (!VFICON(vf)->show_text) |
9 | 475 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
476 VFICON(vf)->tip_delay_id = g_timeout_add(VFICON_TIP_DELAY, tip_schedule_cb, vf); |
9 | 477 } |
478 } | |
479 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
480 static void tip_unschedule(ViewFile *vf) |
9 | 481 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
482 tip_hide(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
483 |
1523 | 484 if (VFICON(vf)->tip_delay_id) |
485 { | |
486 g_source_remove(VFICON(vf)->tip_delay_id); | |
487 VFICON(vf)->tip_delay_id = 0; | |
488 } | |
9 | 489 } |
490 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
491 static void tip_update(ViewFile *vf, IconData *id) |
9 | 492 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
493 if (VFICON(vf)->tip_window) |
9 | 494 { |
495 gint x, y; | |
496 | |
497 gdk_window_get_pointer(NULL, &x, &y, NULL); | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
498 gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
499 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
500 if (id != VFICON(vf)->tip_id) |
9 | 501 { |
502 GtkWidget *label; | |
503 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
504 VFICON(vf)->tip_id = id; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
505 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
506 if (!VFICON(vf)->tip_id) |
9 | 507 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
508 tip_hide(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
509 tip_schedule(vf); |
9 | 510 return; |
511 } | |
512 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
513 label = g_object_get_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label"); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
514 gtk_label_set_text(GTK_LABEL(label), VFICON(vf)->tip_id->fd->name); |
9 | 515 } |
516 } | |
517 else | |
518 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
519 tip_schedule(vf); |
9 | 520 } |
521 } | |
522 | |
523 /* | |
524 *------------------------------------------------------------------- | |
525 * dnd | |
526 *------------------------------------------------------------------- | |
527 */ | |
528 | |
529 static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context, | |
530 GtkSelectionData *selection_data, guint info, | |
531 guint time, gpointer data) | |
532 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
533 ViewFile *vf = data; |
9 | 534 GList *list = NULL; |
535 gchar *uri_text = NULL; | |
536 gint total; | |
537 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
538 if (!VFICON(vf)->click_id) return; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
539 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
540 if (VFICON(vf)->click_id->selected & SELECTION_SELECTED) |
9 | 541 { |
633 | 542 list = vf_selection_get_list(vf); |
9 | 543 } |
544 else | |
545 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
546 list = g_list_append(NULL, file_data_ref(VFICON(vf)->click_id->fd)); |
9 | 547 } |
548 | |
549 if (!list) return; | |
138 | 550 uri_text = uri_text_from_filelist(list, &total, (info == TARGET_TEXT_PLAIN)); |
551 filelist_free(list); | |
9 | 552 |
1164 | 553 DEBUG_1("%s", uri_text); |
9 | 554 |
555 gtk_selection_data_set(selection_data, selection_data->target, | |
64
04ff0df3ad2f
Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>
gqview
parents:
9
diff
changeset
|
556 8, (guchar *)uri_text, total); |
9 | 557 g_free(uri_text); |
558 } | |
559 | |
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
|
560 static void vficon_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
|
561 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
|
562 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
|
563 { |
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
|
564 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
|
565 |
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
|
566 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
|
567 IconData *id = vficon_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
|
568 |
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
|
569 if (id && id->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
|
570 /* Add keywords to file */ |
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
|
571 FileData *fd = id->fd; |
1264
de24174d9e55
Silent two minor warnings: GtkSelectionData data field is guchar* while g_strndup() wants gchar * as first parameter.
zas_
parents:
1242
diff
changeset
|
572 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
|
573 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
|
574 |
1238
947e603a52c6
simplified metadata interface, dropped metadata_read,
nadvornik
parents:
1233
diff
changeset
|
575 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
|
576 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
|
577 g_free(str); |
1291
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1284
diff
changeset
|
578 /* |
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1284
diff
changeset
|
579 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
|
580 if (vf->layout && vf->layout->bar_info) { |
1291
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1284
diff
changeset
|
581 bar_set_fd(vf->layout->bar_info, id->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
|
582 } |
1291
50ae02a4a675
replaced bar_info with an universal bar, restored the original
nadvornik
parents:
1284
diff
changeset
|
583 */ |
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
|
584 } |
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
|
585 } |
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
|
586 } |
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
|
587 |
9 | 588 static void vficon_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data) |
589 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
590 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
591 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
592 tip_unschedule(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
593 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
594 if (VFICON(vf)->click_id && VFICON(vf)->click_id->fd->thumb_pixbuf) |
9 | 595 { |
596 gint items; | |
597 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
598 if (VFICON(vf)->click_id->selected & SELECTION_SELECTED) |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
599 items = g_list_length(VFICON(vf)->selection); |
9 | 600 else |
601 items = 1; | |
602 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
603 dnd_set_drag_icon(widget, context, VFICON(vf)->click_id->fd->thumb_pixbuf, items); |
9 | 604 } |
605 } | |
606 | |
607 static void vficon_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data) | |
608 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
609 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
610 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
611 vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL); |
9 | 612 |
613 if (context->action == GDK_ACTION_MOVE) | |
614 { | |
633 | 615 vf_refresh(vf); |
9 | 616 } |
617 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
618 tip_unschedule(vf); |
9 | 619 } |
620 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
621 void vficon_dnd_init(ViewFile *vf) |
9 | 622 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
623 gtk_drag_source_set(vf->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK, |
9 | 624 dnd_file_drag_types, dnd_file_drag_types_count, |
625 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
|
626 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
|
627 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
|
628 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
|
629 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
630 g_signal_connect(G_OBJECT(vf->listview), "drag_data_get", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
631 G_CALLBACK(vficon_dnd_get), vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
632 g_signal_connect(G_OBJECT(vf->listview), "drag_begin", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
633 G_CALLBACK(vficon_dnd_begin), vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
634 g_signal_connect(G_OBJECT(vf->listview), "drag_end", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
635 G_CALLBACK(vficon_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
|
636 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
|
637 G_CALLBACK(vficon_drag_data_received), vf); |
9 | 638 } |
639 | |
640 /* | |
641 *------------------------------------------------------------------- | |
642 * cell updates | |
643 *------------------------------------------------------------------- | |
644 */ | |
645 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
646 static void vficon_selection_set(ViewFile *vf, IconData *id, SelectionType value, GtkTreeIter *iter) |
9 | 647 { |
648 GtkTreeModel *store; | |
649 GList *list; | |
650 | |
138 | 651 if (!id) return; |
652 | |
9 | 653 |
654 if (id->selected == value) return; | |
655 id->selected = value; | |
656 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
657 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 658 if (iter) |
659 { | |
660 gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1); | |
661 if (list) gtk_list_store_set(GTK_LIST_STORE(store), iter, FILE_COLUMN_POINTER, list, -1); | |
662 } | |
663 else | |
664 { | |
665 GtkTreeIter row; | |
666 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
667 if (vficon_find_iter(vf, id, &row, NULL)) |
9 | 668 { |
669 gtk_tree_model_get(store, &row, FILE_COLUMN_POINTER, &list, -1); | |
670 if (list) gtk_list_store_set(GTK_LIST_STORE(store), &row, FILE_COLUMN_POINTER, list, -1); | |
671 } | |
672 } | |
673 } | |
674 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
675 static void vficon_selection_add(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter) |
9 | 676 { |
138 | 677 if (!id) return; |
678 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
679 vficon_selection_set(vf, id, id->selected | mask, iter); |
9 | 680 } |
681 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
682 static void vficon_selection_remove(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter) |
9 | 683 { |
138 | 684 if (!id) return; |
685 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
686 vficon_selection_set(vf, id, id->selected & ~mask, iter); |
9 | 687 } |
688 | |
852 | 689 void vficon_marks_set(ViewFile *vf, gint enable) |
690 { | |
691 vficon_populate_at_new_size(vf, vf->listview->allocation.width, vf->listview->allocation.height, TRUE); | |
692 } | |
693 | |
9 | 694 /* |
695 *------------------------------------------------------------------- | |
696 * selections | |
697 *------------------------------------------------------------------- | |
698 */ | |
699 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
700 static void vficon_verify_selections(ViewFile *vf) |
9 | 701 { |
702 GList *work; | |
703 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
704 work = VFICON(vf)->selection; |
9 | 705 while (work) |
706 { | |
138 | 707 IconData *id = work->data; |
9 | 708 work = work->next; |
577 | 709 |
710 if (vficon_index_by_id(vf, id) >= 0) continue; | |
711 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
712 VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id); |
9 | 713 } |
714 } | |
715 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
716 void vficon_select_all(ViewFile *vf) |
9 | 717 { |
718 GList *work; | |
719 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
720 g_list_free(VFICON(vf)->selection); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
721 VFICON(vf)->selection = NULL; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
722 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
723 work = vf->list; |
9 | 724 while (work) |
725 { | |
138 | 726 IconData *id = work->data; |
577 | 727 work = work->next; |
728 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
729 VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id); |
577 | 730 vficon_selection_add(vf, id, SELECTION_SELECTED, NULL); |
9 | 731 } |
732 | |
633 | 733 vf_send_update(vf); |
9 | 734 } |
735 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
736 void vficon_select_none(ViewFile *vf) |
9 | 737 { |
738 GList *work; | |
739 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
740 work = VFICON(vf)->selection; |
9 | 741 while (work) |
742 { | |
577 | 743 IconData *id = work->data; |
9 | 744 work = work->next; |
577 | 745 |
746 vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL); | |
9 | 747 } |
748 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
749 g_list_free(VFICON(vf)->selection); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
750 VFICON(vf)->selection = NULL; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
751 |
633 | 752 vf_send_update(vf); |
9 | 753 } |
754 | |
601 | 755 void vficon_select_invert(ViewFile *vf) |
756 { | |
757 GList *work; | |
758 | |
759 work = vf->list; | |
760 while (work) | |
761 { | |
762 IconData *id = work->data; | |
763 work = work->next; | |
764 | |
765 if (id->selected & SELECTION_SELECTED) | |
766 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
767 VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id); |
601 | 768 vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL); |
769 } | |
770 else | |
771 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
772 VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id); |
601 | 773 vficon_selection_add(vf, id, SELECTION_SELECTED, NULL); |
774 } | |
775 } | |
776 | |
633 | 777 vf_send_update(vf); |
601 | 778 } |
779 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
780 static void vficon_select(ViewFile *vf, IconData *id) |
9 | 781 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
782 VFICON(vf)->prev_selection = id; |
138 | 783 |
784 if (!id || id->selected & SELECTION_SELECTED) return; | |
785 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
786 VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
787 vficon_selection_add(vf, id, SELECTION_SELECTED, NULL); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
788 |
633 | 789 vf_send_update(vf); |
9 | 790 } |
791 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
792 static void vficon_unselect(ViewFile *vf, IconData *id) |
9 | 793 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
794 VFICON(vf)->prev_selection = id; |
138 | 795 |
796 if (!id || !(id->selected & SELECTION_SELECTED) ) return; | |
797 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
798 VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
799 vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
800 |
633 | 801 vf_send_update(vf); |
9 | 802 } |
803 | |
1453 | 804 static void vficon_select_util(ViewFile *vf, IconData *id, gboolean select) |
9 | 805 { |
806 if (select) | |
807 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
808 vficon_select(vf, id); |
9 | 809 } |
810 else | |
811 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
812 vficon_unselect(vf, id); |
9 | 813 } |
814 } | |
815 | |
1453 | 816 static void vficon_select_region_util(ViewFile *vf, IconData *start, IconData *end, gboolean select) |
9 | 817 { |
818 gint row1, col1; | |
819 gint row2, col2; | |
820 gint t; | |
821 gint i, j; | |
822 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
823 if (!vficon_find_position(vf, start, &row1, &col1) || |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
824 !vficon_find_position(vf, end, &row2, &col2) ) return; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
825 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
826 VFICON(vf)->prev_selection = end; |
9 | 827 |
330 | 828 if (!options->collections.rectangular_selection) |
9 | 829 { |
830 GList *work; | |
138 | 831 IconData *id; |
9 | 832 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
833 if (g_list_index(vf->list, start) > g_list_index(vf->list, end)) |
9 | 834 { |
138 | 835 id = start; |
9 | 836 start = end; |
138 | 837 end = id; |
9 | 838 } |
839 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
840 work = g_list_find(vf->list, start); |
9 | 841 while (work) |
842 { | |
138 | 843 id = work->data; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
844 vficon_select_util(vf, id, select); |
442 | 845 |
9 | 846 if (work->data != end) |
847 work = work->next; | |
848 else | |
849 work = NULL; | |
850 } | |
851 return; | |
852 } | |
853 | |
854 if (row2 < row1) | |
855 { | |
856 t = row1; | |
857 row1 = row2; | |
858 row2 = t; | |
859 } | |
860 if (col2 < col1) | |
861 { | |
862 t = col1; | |
863 col1 = col2; | |
864 col2 = t; | |
865 } | |
866 | |
506
fc9c8a3e1a8b
Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents:
499
diff
changeset
|
867 DEBUG_1("table: %d x %d to %d x %d", row1, col1, row2, col2); |
9 | 868 |
869 for (i = row1; i <= row2; i++) | |
870 { | |
871 for (j = col1; j <= col2; j++) | |
872 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
873 IconData *id = vficon_find_data(vf, i, j, NULL); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
874 if (id) vficon_select_util(vf, id, select); |
9 | 875 } |
876 } | |
877 } | |
878 | |
1453 | 879 gboolean vficon_index_is_selected(ViewFile *vf, gint row) |
9 | 880 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
881 IconData *id = g_list_nth_data(vf->list, row); |
138 | 882 |
883 if (!id) return FALSE; | |
884 | |
885 return (id->selected & SELECTION_SELECTED); | |
9 | 886 } |
887 | |
736 | 888 guint vficon_selection_count(ViewFile *vf, gint64 *bytes) |
9 | 889 { |
890 if (bytes) | |
891 { | |
892 gint64 b = 0; | |
893 GList *work; | |
894 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
895 work = VFICON(vf)->selection; |
9 | 896 while (work) |
897 { | |
138 | 898 IconData *id = work->data; |
899 FileData *fd = id->fd; | |
442 | 900 g_assert(fd->magick == 0x12345678); |
9 | 901 b += fd->size; |
902 | |
903 work = work->next; | |
904 } | |
905 | |
906 *bytes = b; | |
907 } | |
908 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
909 return g_list_length(VFICON(vf)->selection); |
9 | 910 } |
911 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
912 GList *vficon_selection_get_list(ViewFile *vf) |
9 | 913 { |
914 GList *list = NULL; | |
1622 | 915 GList *work, *work2; |
9 | 916 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
917 work = VFICON(vf)->selection; |
9 | 918 while (work) |
919 { | |
138 | 920 IconData *id = work->data; |
921 FileData *fd = id->fd; | |
442 | 922 g_assert(fd->magick == 0x12345678); |
138 | 923 |
924 list = g_list_prepend(list, file_data_ref(fd)); | |
1622 | 925 |
926 work2 = fd->sidecar_files; | |
927 while (work2) | |
928 { | |
929 fd = work2->data; | |
930 list = g_list_prepend(list, file_data_ref(fd)); | |
931 work2 = work2->next; | |
932 } | |
9 | 933 |
934 work = work->next; | |
935 } | |
936 | |
937 list = g_list_reverse(list); | |
938 | |
939 return list; | |
940 } | |
941 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
942 GList *vficon_selection_get_list_by_index(ViewFile *vf) |
9 | 943 { |
944 GList *list = NULL; | |
945 GList *work; | |
946 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
947 work = VFICON(vf)->selection; |
9 | 948 while (work) |
949 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
950 list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vf->list, work->data))); |
9 | 951 work = work->next; |
952 } | |
953 | |
954 return g_list_reverse(list); | |
955 } | |
956 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
957 static void vficon_select_by_id(ViewFile *vf, IconData *id) |
138 | 958 { |
959 if (!id) return; | |
960 | |
961 if (!(id->selected & SELECTION_SELECTED)) | |
962 { | |
633 | 963 vf_select_none(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
964 vficon_select(vf, id); |
138 | 965 } |
966 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
967 vficon_set_focus(vf, id); |
138 | 968 } |
969 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
970 void vficon_select_by_fd(ViewFile *vf, FileData *fd) |
138 | 971 { |
972 IconData *id = NULL; | |
973 GList *work; | |
9 | 974 |
975 if (!fd) return; | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
976 work = vf->list; |
138 | 977 while (work && !id) |
9 | 978 { |
138 | 979 IconData *chk = work->data; |
980 work = work->next; | |
981 if (chk->fd == fd) id = chk; | |
9 | 982 } |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
983 vficon_select_by_id(vf, id); |
9 | 984 } |
985 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
986 void vficon_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode) |
165 | 987 { |
988 GList *work; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
989 gint n = mark - 1; |
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
990 |
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
991 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
165 | 992 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
993 work = vf->list; |
165 | 994 while (work) |
995 { | |
996 IconData *id = work->data; | |
997 FileData *fd = id->fd; | |
998 gboolean mark_val, selected; | |
999 | |
442 | 1000 g_assert(fd->magick == 0x12345678); |
165 | 1001 |
800 | 1002 mark_val = file_data_get_mark(fd, n); |
165 | 1003 selected = (id->selected & SELECTION_SELECTED); |
442 | 1004 |
1005 switch (mode) | |
165 | 1006 { |
1007 case MTS_MODE_SET: selected = mark_val; | |
1008 break; | |
1009 case MTS_MODE_OR: selected = mark_val | selected; | |
1010 break; | |
1011 case MTS_MODE_AND: selected = mark_val & selected; | |
1012 break; | |
1013 case MTS_MODE_MINUS: selected = !mark_val & selected; | |
1014 break; | |
1015 } | |
442 | 1016 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1017 vficon_select_util(vf, id, selected); |
165 | 1018 |
1019 work = work->next; | |
1020 } | |
1021 } | |
1022 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1023 void vficon_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode) |
165 | 1024 { |
1025 GList *slist; | |
1026 GList *work; | |
654
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1027 gint n = mark -1; |
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1028 |
6dcfac4b356f
Get rid of vflist_pop_menu() col_idx parameter, use new Viewfile field
zas_
parents:
637
diff
changeset
|
1029 g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE); |
165 | 1030 |
633 | 1031 slist = vf_selection_get_list(vf); |
165 | 1032 work = slist; |
1033 while (work) | |
1034 { | |
1035 FileData *fd = work->data; | |
442 | 1036 |
165 | 1037 switch (mode) |
1038 { | |
800 | 1039 case STM_MODE_SET: file_data_set_mark(fd, n, 1); |
165 | 1040 break; |
800 | 1041 case STM_MODE_RESET: file_data_set_mark(fd, n, 0); |
165 | 1042 break; |
800 | 1043 case STM_MODE_TOGGLE: file_data_set_mark(fd, n, !file_data_get_mark(fd, n)); |
165 | 1044 break; |
1045 } | |
1046 work = work->next; | |
1047 } | |
1048 filelist_free(slist); | |
1049 } | |
138 | 1050 |
811 | 1051 static void vficon_select_closest(ViewFile *vf, FileData *sel_fd) |
1052 { | |
1053 GList *work; | |
1233
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1054 IconData *id = NULL; |
811 | 1055 |
1056 if (sel_fd->parent) sel_fd = sel_fd->parent; | |
1057 work = vf->list; | |
1058 | |
1059 while (work) | |
1060 { | |
1061 gint match; | |
1233
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1062 FileData *fd; |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1063 |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1064 id = work->data; |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1065 fd = id->fd; |
811 | 1066 work = work->next; |
1067 | |
1068 match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend); | |
1069 | |
1233
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1070 if (match >= 0) break; |
811 | 1071 } |
1233
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1072 |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1073 if (id) |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1074 { |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1075 vficon_select(vf, id); |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1076 vficon_send_layout_select(vf, id); |
b51874ca8642
fixed updating of selection after deleting the last image from the list
nadvornik
parents:
1206
diff
changeset
|
1077 } |
811 | 1078 } |
1079 | |
138 | 1080 |
9 | 1081 /* |
1082 *------------------------------------------------------------------- | |
1083 * focus | |
1084 *------------------------------------------------------------------- | |
1085 */ | |
1086 | |
1453 | 1087 static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative) |
9 | 1088 { |
1089 gint new_row; | |
1090 gint new_col; | |
1091 | |
1092 if (relative) | |
1093 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1094 new_row = VFICON(vf)->focus_row; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1095 new_col = VFICON(vf)->focus_column; |
9 | 1096 |
1097 new_row += row; | |
1098 if (new_row < 0) new_row = 0; | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1099 if (new_row >= VFICON(vf)->rows) new_row = VFICON(vf)->rows - 1; |
9 | 1100 |
516 | 1101 while (col != 0) |
9 | 1102 { |
1103 if (col < 0) | |
1104 { | |
1105 new_col--; | |
1106 col++; | |
1107 } | |
1108 else | |
1109 { | |
1110 new_col++; | |
1111 col--; | |
1112 } | |
1113 | |
1114 if (new_col < 0) | |
1115 { | |
1116 if (new_row > 0) | |
1117 { | |
1118 new_row--; | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1119 new_col = VFICON(vf)->columns - 1; |
9 | 1120 } |
1121 else | |
1122 { | |
1123 new_col = 0; | |
1124 } | |
1125 } | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1126 if (new_col >= VFICON(vf)->columns) |
9 | 1127 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1128 if (new_row < VFICON(vf)->rows - 1) |
9 | 1129 { |
1130 new_row++; | |
1131 new_col = 0; | |
1132 } | |
1133 else | |
1134 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1135 new_col = VFICON(vf)->columns - 1; |
9 | 1136 } |
1137 } | |
1138 } | |
1139 } | |
1140 else | |
1141 { | |
1142 new_row = row; | |
1143 new_col = col; | |
1144 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1145 if (new_row >= VFICON(vf)->rows) |
9 | 1146 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1147 if (VFICON(vf)->rows > 0) |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1148 new_row = VFICON(vf)->rows - 1; |
9 | 1149 else |
1150 new_row = 0; | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1151 new_col = VFICON(vf)->columns - 1; |
9 | 1152 } |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1153 if (new_col >= VFICON(vf)->columns) new_col = VFICON(vf)->columns - 1; |
9 | 1154 } |
1155 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1156 if (new_row == VFICON(vf)->rows - 1) |
9 | 1157 { |
1158 gint l; | |
1159 | |
1160 /* if we moved beyond the last image, go to the last image */ | |
1161 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1162 l = g_list_length(vf->list); |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1163 if (VFICON(vf)->rows > 1) l -= (VFICON(vf)->rows - 1) * VFICON(vf)->columns; |
9 | 1164 if (new_col >= l) new_col = l - 1; |
1165 } | |
1166 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1167 vficon_set_focus(vf, vficon_find_data(vf, new_row, new_col, NULL)); |
9 | 1168 } |
1169 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1170 static void vficon_set_focus(ViewFile *vf, IconData *id) |
9 | 1171 { |
1172 GtkTreeIter iter; | |
1173 gint row, col; | |
1174 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1175 if (g_list_find(vf->list, VFICON(vf)->focus_id)) |
9 | 1176 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1177 if (id == VFICON(vf)->focus_id) |
9 | 1178 { |
1179 /* ensure focus row col are correct */ | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1180 vficon_find_position(vf, VFICON(vf)->focus_id, &VFICON(vf)->focus_row, &VFICON(vf)->focus_column); |
9 | 1181 return; |
1182 } | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1183 vficon_selection_remove(vf, VFICON(vf)->focus_id, SELECTION_FOCUS, NULL); |
9 | 1184 } |
1185 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1186 if (!vficon_find_position(vf, id, &row, &col)) |
9 | 1187 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1188 VFICON(vf)->focus_id = NULL; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1189 VFICON(vf)->focus_row = -1; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1190 VFICON(vf)->focus_column = -1; |
9 | 1191 return; |
1192 } | |
1193 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1194 VFICON(vf)->focus_id = id; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1195 VFICON(vf)->focus_row = row; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1196 VFICON(vf)->focus_column = col; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1197 vficon_selection_add(vf, VFICON(vf)->focus_id, SELECTION_FOCUS, NULL); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1198 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1199 if (vficon_find_iter(vf, VFICON(vf)->focus_id, &iter, NULL)) |
9 | 1200 { |
1201 GtkTreePath *tpath; | |
1202 GtkTreeViewColumn *column; | |
1203 GtkTreeModel *store; | |
1204 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1205 tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, FALSE); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1206 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1207 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1208 tpath = gtk_tree_model_get_path(store, &iter); |
1209 /* focus is set to an extra column with 0 width to hide focus, we draw it ourself */ | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1210 column = gtk_tree_view_get_column(GTK_TREE_VIEW(vf->listview), VFICON_MAX_COLUMNS); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1211 gtk_tree_view_set_cursor(GTK_TREE_VIEW(vf->listview), tpath, column, FALSE); |
9 | 1212 gtk_tree_path_free(tpath); |
1213 } | |
1214 } | |
1215 | |
1005 | 1216 #if 0 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1217 static void vficon_update_focus(ViewFile *vf) |
9 | 1218 { |
1219 gint new_row = 0; | |
1220 gint new_col = 0; | |
1221 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1222 if (VFICON(vf)->focus_id && vficon_find_position(vf, VFICON(vf)->focus_id, &new_row, &new_col)) |
9 | 1223 { |
1224 /* first find the old focus, if it exists and is valid */ | |
1225 } | |
1226 else | |
1227 { | |
1228 /* (try to) stay where we were */ | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1229 new_row = VFICON(vf)->focus_row; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1230 new_col = VFICON(vf)->focus_column; |
9 | 1231 } |
1232 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1233 vficon_move_focus(vf, new_row, new_col, FALSE); |
9 | 1234 } |
1005 | 1235 #endif |
9 | 1236 |
1237 /* used to figure the page up/down distances */ | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1238 static gint page_height(ViewFile *vf) |
9 | 1239 { |
1240 GtkAdjustment *adj; | |
1241 gint page_size; | |
1242 gint row_height; | |
1243 gint ret; | |
1244 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1245 adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vf->listview)); |
9 | 1246 page_size = (gint)adj->page_increment; |
1247 | |
333 | 1248 row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2; |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1249 if (VFICON(vf)->show_text) row_height += options->thumbnails.max_height / 3; |
9 | 1250 |
1251 ret = page_size / row_height; | |
1252 if (ret < 1) ret = 1; | |
1253 | |
1254 return ret; | |
1255 } | |
1256 | |
1257 /* | |
1258 *------------------------------------------------------------------- | |
1259 * keyboard | |
1260 *------------------------------------------------------------------- | |
1261 */ | |
1262 | |
1263 static void vfi_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) | |
1264 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1265 ViewFile *vf = data; |
9 | 1266 GtkTreeModel *store; |
1267 GtkTreeIter iter; | |
1268 gint column; | |
1269 GtkTreePath *tpath; | |
1270 gint cw, ch; | |
1271 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1272 if (!vficon_find_iter(vf, VFICON(vf)->click_id, &iter, &column)) return; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1273 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1274 tpath = gtk_tree_model_get_path(store, &iter); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1275 tree_view_get_cell_clamped(GTK_TREE_VIEW(vf->listview), tpath, column, FALSE, x, y, &cw, &ch); |
9 | 1276 gtk_tree_path_free(tpath); |
1277 *y += ch; | |
1278 popup_menu_position_clamp(menu, x, y, 0); | |
1279 } | |
1280 | |
1453 | 1281 gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
9 | 1282 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1283 ViewFile *vf = data; |
9 | 1284 gint focus_row = 0; |
1285 gint focus_col = 0; | |
138 | 1286 IconData *id; |
1453 | 1287 gboolean stop_signal; |
85
9d5c75b5ec28
Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
1288 |
9d5c75b5ec28
Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
1289 stop_signal = TRUE; |
9 | 1290 switch (event->keyval) |
1291 { | |
1292 case GDK_Left: case GDK_KP_Left: | |
1293 focus_col = -1; | |
1294 break; | |
1295 case GDK_Right: case GDK_KP_Right: | |
1296 focus_col = 1; | |
1297 break; | |
1298 case GDK_Up: case GDK_KP_Up: | |
1299 focus_row = -1; | |
1300 break; | |
1301 case GDK_Down: case GDK_KP_Down: | |
1302 focus_row = 1; | |
1303 break; | |
1304 case GDK_Page_Up: case GDK_KP_Page_Up: | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1305 focus_row = -page_height(vf); |
9 | 1306 break; |
1307 case GDK_Page_Down: case GDK_KP_Page_Down: | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1308 focus_row = page_height(vf); |
9 | 1309 break; |
1310 case GDK_Home: case GDK_KP_Home: | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1311 focus_row = -VFICON(vf)->focus_row; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1312 focus_col = -VFICON(vf)->focus_column; |
9 | 1313 break; |
1314 case GDK_End: case GDK_KP_End: | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1315 focus_row = VFICON(vf)->rows - 1 - VFICON(vf)->focus_row; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1316 focus_col = VFICON(vf)->columns - 1 - VFICON(vf)->focus_column; |
9 | 1317 break; |
1318 case GDK_space: | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1319 id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL); |
138 | 1320 if (id) |
9 | 1321 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1322 VFICON(vf)->click_id = id; |
9 | 1323 if (event->state & GDK_CONTROL_MASK) |
1324 { | |
1325 gint selected; | |
1326 | |
138 | 1327 selected = id->selected & SELECTION_SELECTED; |
9 | 1328 if (selected) |
1329 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1330 vficon_unselect(vf, id); |
9 | 1331 } |
1332 else | |
1333 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1334 vficon_select(vf, id); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1335 vficon_send_layout_select(vf, id); |
9 | 1336 } |
1337 } | |
1338 else | |
1339 { | |
633 | 1340 vf_select_none(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1341 vficon_select(vf, id); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1342 vficon_send_layout_select(vf, id); |
9 | 1343 } |
1344 } | |
1345 break; | |
1346 case GDK_Menu: | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1347 id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1348 VFICON(vf)->click_id = id; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1349 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1350 vficon_selection_add(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1351 tip_unschedule(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1352 |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
1353 vf->popup = vf_pop_menu(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1354 gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, vfi_menu_position_cb, vf, 0, GDK_CURRENT_TIME); |
9 | 1355 break; |
1356 default: | |
85
9d5c75b5ec28
Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
1357 stop_signal = FALSE; |
9 | 1358 break; |
1359 } | |
1360 | |
1361 if (focus_row != 0 || focus_col != 0) | |
1362 { | |
138 | 1363 IconData *new_id; |
1364 IconData *old_id; | |
1365 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1366 old_id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1367 vficon_move_focus(vf, focus_row, focus_col, TRUE); |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1368 new_id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL); |
138 | 1369 |
1370 if (new_id != old_id) | |
9 | 1371 { |
1372 if (event->state & GDK_SHIFT_MASK) | |
1373 { | |
330 | 1374 if (!options->collections.rectangular_selection) |
9 | 1375 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1376 vficon_select_region_util(vf, old_id, new_id, FALSE); |
9 | 1377 } |
1378 else | |
1379 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1380 vficon_select_region_util(vf, VFICON(vf)->click_id, old_id, FALSE); |
9 | 1381 } |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1382 vficon_select_region_util(vf, VFICON(vf)->click_id, new_id, TRUE); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1383 vficon_send_layout_select(vf, new_id); |
9 | 1384 } |
1385 else if (event->state & GDK_CONTROL_MASK) | |
1386 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1387 VFICON(vf)->click_id = new_id; |
9 | 1388 } |
1389 else | |
1390 { | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1391 VFICON(vf)->click_id = new_id; |
633 | 1392 vf_select_none(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1393 vficon_select(vf, new_id); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1394 vficon_send_layout_select(vf, new_id); |
9 | 1395 } |
1396 } | |
1397 } | |
1398 | |
1399 if (stop_signal) | |
1400 { | |
85
9d5c75b5ec28
Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
1401 #if 0 |
9 | 1402 g_signal_stop_emission_by_name(GTK_OBJECT(widget), "key_press_event"); |
85
9d5c75b5ec28
Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
1403 #endif |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1404 tip_unschedule(vf); |
9 | 1405 } |
1406 | |
1407 return stop_signal; | |
1408 } | |
1409 | |
1410 /* | |
1411 *------------------------------------------------------------------- | |
1412 * mouse | |
1413 *------------------------------------------------------------------- | |
1414 */ | |
1415 | |
1453 | 1416 static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 1417 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1418 ViewFile *vf = data; |
138 | 1419 IconData *id; |
1420 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1421 id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, NULL); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1422 tip_update(vf, id); |
9 | 1423 |
1424 return FALSE; | |
1425 } | |
1426 | |
1453 | 1427 gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 1428 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1429 ViewFile *vf = data; |
9 | 1430 GtkTreeIter iter; |
138 | 1431 IconData *id; |
9 | 1432 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1433 tip_unschedule(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1434 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1435 id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, &iter); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1436 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1437 VFICON(vf)->click_id = id; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1438 vficon_selection_add(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, &iter); |
9 | 1439 |
1440 switch (bevent->button) | |
1441 { | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1442 case MOUSE_BUTTON_LEFT: |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1443 if (!GTK_WIDGET_HAS_FOCUS(vf->listview)) |
9 | 1444 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1445 gtk_widget_grab_focus(vf->listview); |
9 | 1446 } |
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
|
1447 #if 1 |
9 | 1448 if (bevent->type == GDK_2BUTTON_PRESS && |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1449 vf->layout) |
9 | 1450 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1451 vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, &iter); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1452 layout_image_full_screen_start(vf->layout); |
9 | 1453 } |
1454 #endif | |
1455 break; | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
1456 case MOUSE_BUTTON_RIGHT: |
659
542bb47fef04
Merge vflist_pop_menu() and vficon_pop_menu() into vf_pop_menu().
zas_
parents:
658
diff
changeset
|
1457 vf->popup = vf_pop_menu(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1458 gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time); |
9 | 1459 break; |
1460 default: | |
1461 break; | |
1462 } | |
1463 | |
966 | 1464 return FALSE; |
9 | 1465 } |
1466 | |
1453 | 1467 gboolean vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
9 | 1468 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1469 ViewFile *vf = data; |
9 | 1470 GtkTreeIter iter; |
138 | 1471 IconData *id = NULL; |
1453 | 1472 gboolean was_selected; |
9 | 1473 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1474 tip_schedule(vf); |
9 | 1475 |
580 | 1476 if ((gint)bevent->x != 0 || (gint)bevent->y != 0) |
9 | 1477 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1478 id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, &iter); |
9 | 1479 } |
1480 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1481 if (VFICON(vf)->click_id) |
9 | 1482 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1483 vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL); |
9 | 1484 } |
1485 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1486 if (!id || VFICON(vf)->click_id != id) return TRUE; |
580 | 1487 |
1453 | 1488 was_selected = !!(id->selected & SELECTION_SELECTED); |
580 | 1489 |
1490 switch (bevent->button) | |
9 | 1491 { |
580 | 1492 case MOUSE_BUTTON_LEFT: |
9 | 1493 { |
580 | 1494 vficon_set_focus(vf, id); |
1495 | |
1496 if (bevent->state & GDK_CONTROL_MASK) | |
9 | 1497 { |
1453 | 1498 gboolean select; |
580 | 1499 |
1500 select = !(id->selected & SELECTION_SELECTED); | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1501 if ((bevent->state & GDK_SHIFT_MASK) && VFICON(vf)->prev_selection) |
580 | 1502 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1503 vficon_select_region_util(vf, VFICON(vf)->prev_selection, id, select); |
580 | 1504 } |
1505 else | |
1506 { | |
1507 vficon_select_util(vf, id, select); | |
1508 } | |
9 | 1509 } |
1510 else | |
1511 { | |
633 | 1512 vf_select_none(vf); |
580 | 1513 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1514 if ((bevent->state & GDK_SHIFT_MASK) && VFICON(vf)->prev_selection) |
580 | 1515 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1516 vficon_select_region_util(vf, VFICON(vf)->prev_selection, id, TRUE); |
580 | 1517 } |
1518 else | |
1519 { | |
1520 vficon_select_util(vf, id, TRUE); | |
1521 was_selected = FALSE; | |
1522 } | |
9 | 1523 } |
1524 } | |
580 | 1525 break; |
1526 case MOUSE_BUTTON_MIDDLE: | |
9 | 1527 { |
580 | 1528 vficon_select_util(vf, id, !(id->selected & SELECTION_SELECTED)); |
9 | 1529 } |
580 | 1530 break; |
1531 default: | |
1532 break; | |
9 | 1533 } |
580 | 1534 |
1535 if (!was_selected && (id->selected & SELECTION_SELECTED)) | |
9 | 1536 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1537 vficon_send_layout_select(vf, id); |
9 | 1538 } |
1539 | |
1540 return TRUE; | |
1541 } | |
1542 | |
1453 | 1543 static gboolean vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data) |
9 | 1544 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1545 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1546 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1547 tip_unschedule(vf); |
9 | 1548 return FALSE; |
1549 } | |
1550 | |
1551 /* | |
1552 *------------------------------------------------------------------- | |
1553 * population | |
1554 *------------------------------------------------------------------- | |
1555 */ | |
1556 | |
1557 static gboolean vficon_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data) | |
1558 { | |
1559 GList *list; | |
1560 | |
1561 gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1); | |
1562 g_list_free(list); | |
1563 | |
1564 return FALSE; | |
1565 } | |
1566 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1567 static void vficon_clear_store(ViewFile *vf) |
9 | 1568 { |
1569 GtkTreeModel *store; | |
1570 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1571 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1572 gtk_tree_model_foreach(store, vficon_destroy_node_cb, NULL); |
1573 | |
1574 gtk_list_store_clear(GTK_LIST_STORE(store)); | |
1575 } | |
1576 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1577 static GList *vficon_add_row(ViewFile *vf, GtkTreeIter *iter) |
9 | 1578 { |
1579 GtkListStore *store; | |
1580 GList *list = NULL; | |
1581 gint i; | |
1582 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1583 for (i = 0; i < VFICON(vf)->columns; i++) list = g_list_prepend(list, NULL); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1584 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1585 store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview))); |
9 | 1586 gtk_list_store_append(store, iter); |
1587 gtk_list_store_set(store, iter, FILE_COLUMN_POINTER, list, -1); | |
1588 | |
1589 return list; | |
1590 } | |
1591 | |
1453 | 1592 static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_position) |
9 | 1593 { |
1594 GtkTreeModel *store; | |
1595 GtkTreePath *tpath; | |
1596 GList *work; | |
138 | 1597 IconData *visible_id = NULL; |
805 | 1598 gint r, c; |
1453 | 1599 gboolean valid; |
805 | 1600 GtkTreeIter iter; |
9 | 1601 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1602 vficon_verify_selections(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1603 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1604 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1605 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1606 if (keep_position && GTK_WIDGET_REALIZED(vf->listview) && |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1607 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 1608 { |
1609 GtkTreeIter iter; | |
1610 GList *list; | |
1611 | |
1612 gtk_tree_model_get_iter(store, &iter, tpath); | |
1613 gtk_tree_path_free(tpath); | |
1614 | |
1615 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); | |
138 | 1616 if (list) visible_id = list->data; |
9 | 1617 } |
1618 | |
1619 | |
1620 if (resize) | |
1621 { | |
1622 gint i; | |
1623 gint thumb_width; | |
805 | 1624 |
1625 vficon_clear_store(vf); | |
9 | 1626 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1627 thumb_width = vficon_get_icon_width(vf); |
9 | 1628 |
1629 for (i = 0; i < VFICON_MAX_COLUMNS; i++) | |
1630 { | |
1631 GtkTreeViewColumn *column; | |
1632 GtkCellRenderer *cell; | |
1633 GList *list; | |
1634 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1635 column = gtk_tree_view_get_column(GTK_TREE_VIEW(vf->listview), i); |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1636 gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->columns)); |
9 | 1637 gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6)); |
1638 | |
1639 list = gtk_tree_view_column_get_cell_renderers(column); | |
1640 cell = (list) ? list->data : NULL; | |
1641 g_list_free(list); | |
1642 | |
1643 if (cell && GQV_IS_CELL_RENDERER_ICON(cell)) | |
1644 { | |
1645 g_object_set(G_OBJECT(cell), "fixed_width", thumb_width, | |
333 | 1646 "fixed_height", options->thumbnails.max_height, |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1647 "show_text", VFICON(vf)->show_text, |
852 | 1648 "show_marks", vf->marks_enabled, |
1649 "num_marks", FILEDATA_MARKS_SIZE, | |
1650 NULL); | |
9 | 1651 } |
1652 } | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1653 if (GTK_WIDGET_REALIZED(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview)); |
9 | 1654 } |
1655 | |
805 | 1656 r = -1; |
1657 c = 0; | |
1658 | |
1659 valid = gtk_tree_model_iter_children(store, &iter, NULL); | |
1660 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1661 work = vf->list; |
9 | 1662 while (work) |
1663 { | |
1664 GList *list; | |
805 | 1665 r++; |
1666 c = 0; | |
1667 if (valid) | |
1668 { | |
1669 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); | |
1670 gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1); | |
1671 } | |
1672 else | |
1673 { | |
1674 list = vficon_add_row(vf, &iter); | |
1675 } | |
1676 | |
1677 while (list) | |
9 | 1678 { |
585 | 1679 IconData *id; |
1680 | |
805 | 1681 if (work) |
1682 { | |
1683 id = work->data; | |
1684 work = work->next; | |
1685 c++; | |
1686 } | |
1687 else | |
1688 { | |
1689 id = NULL; | |
1690 } | |
1691 | |
1692 list->data = id; | |
9 | 1693 list = list->next; |
1694 } | |
805 | 1695 if (valid) valid = gtk_tree_model_iter_next(store, &iter); |
9 | 1696 } |
1697 | |
805 | 1698 r++; |
1699 while (valid) | |
1700 { | |
1701 GList *list; | |
1702 | |
1703 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); | |
1704 valid = gtk_list_store_remove(GTK_LIST_STORE(store), &iter); | |
1705 g_list_free(list); | |
1706 } | |
1707 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1708 VFICON(vf)->rows = r; |
805 | 1709 |
138 | 1710 if (visible_id && |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1711 gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 1712 { |
1713 GtkTreeIter iter; | |
1714 GList *list; | |
1715 | |
1716 gtk_tree_model_get_iter(store, &iter, tpath); | |
1717 gtk_tree_path_free(tpath); | |
1718 | |
1719 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); | |
138 | 1720 if (g_list_find(list, visible_id) == NULL && |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1721 vficon_find_iter(vf, visible_id, &iter, NULL)) |
9 | 1722 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1723 tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, FALSE); |
9 | 1724 } |
1725 } | |
1726 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1727 |
633 | 1728 vf_send_update(vf); |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1729 vf_thumb_update(vf); |
9 | 1730 } |
1731 | |
1453 | 1732 static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force) |
9 | 1733 { |
1734 gint new_cols; | |
1735 gint thumb_width; | |
1736 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1737 thumb_width = vficon_get_icon_width(vf); |
9 | 1738 |
1739 new_cols = w / (thumb_width + (THUMB_BORDER_PADDING * 6)); | |
1740 if (new_cols < 1) new_cols = 1; | |
1741 | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1742 if (!force && new_cols == VFICON(vf)->columns) return; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1743 |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1744 VFICON(vf)->columns = new_cols; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1745 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1746 vficon_populate(vf, TRUE, TRUE); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1747 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1748 DEBUG_1("col tab pop cols=%d rows=%d", VFICON(vf)->columns, VFICON(vf)->rows); |
9 | 1749 } |
1750 | |
1751 | |
812 | 1752 #if 0 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1753 static void vficon_sync_idle(ViewFile *vf) |
9 | 1754 { |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1755 if (VFICON(vf)->sync_idle_id == -1) |
9 | 1756 { |
1757 /* high priority, the view needs to be resynced before a redraw | |
1758 * may contain invalid pointers at this time | |
1759 */ | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
1760 VFICON(vf)->sync_idle_id = g_idle_add_full(G_PRIORITY_HIGH, vficon_sync_idle_cb, vf, NULL); |
9 | 1761 } |
1762 } | |
812 | 1763 #endif |
9 | 1764 |
1765 static void vficon_sized_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data) | |
1766 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1767 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1768 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1769 vficon_populate_at_new_size(vf, allocation->width, allocation->height, FALSE); |
9 | 1770 } |
1771 | |
1772 /* | |
1773 *----------------------------------------------------------------------------- | |
1774 * misc | |
1775 *----------------------------------------------------------------------------- | |
1776 */ | |
1777 | |
1453 | 1778 void vficon_sort_set(ViewFile *vf, SortType type, gboolean ascend) |
9 | 1779 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1780 if (vf->sort_method == type && vf->sort_ascend == ascend) return; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1781 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1782 vf->sort_method = type; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1783 vf->sort_ascend = ascend; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1784 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1785 if (!vf->list) return; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1786 |
817
ad7f56cea841
dropped vficon_sync, use vficon_refresh everywhere
nadvornik
parents:
814
diff
changeset
|
1787 vf_refresh(vf); |
9 | 1788 } |
1789 | |
1790 /* | |
1791 *----------------------------------------------------------------------------- | |
1792 * thumb updates | |
1793 *----------------------------------------------------------------------------- | |
1794 */ | |
1795 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1796 void vficon_thumb_progress_count(GList *list, gint *count, gint *done) |
843 | 1797 { |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1798 GList *work = list; |
843 | 1799 while (work) |
1800 { | |
1801 IconData *id = work->data; | |
1802 FileData *fd = id->fd; | |
1803 work = work->next; | |
1804 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1805 if (fd->thumb_pixbuf) (*done)++; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1806 (*count)++; |
9 | 1807 } |
1808 } | |
1809 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1810 void vficon_set_thumb_fd(ViewFile *vf, FileData *fd) |
9 | 1811 { |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1812 GtkTreeModel *store; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1813 GtkTreeIter iter; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1814 GList *list; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1815 |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1816 if (!vficon_find_iter(vf, vficon_icon_data(vf, fd), &iter, NULL)) return; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1817 |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1818 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1819 |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1820 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1821 gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1); |
9 | 1822 } |
1823 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1824 |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1825 FileData *vficon_thumb_next_fd(ViewFile *vf) |
9 | 1826 { |
1827 GtkTreePath *tpath; | |
1828 FileData *fd = NULL; | |
1829 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1830 if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) |
9 | 1831 { |
1832 GtkTreeModel *store; | |
1833 GtkTreeIter iter; | |
1437 | 1834 gboolean valid = TRUE; |
9 | 1835 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1836 store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); |
9 | 1837 gtk_tree_model_get_iter(store, &iter, tpath); |
1838 gtk_tree_path_free(tpath); | |
1839 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1840 while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vf->listview), &iter, FALSE) == 0) |
9 | 1841 { |
1842 GList *list; | |
1843 | |
1844 gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1); | |
1845 | |
1846 while (!fd && list) | |
1847 { | |
138 | 1848 IconData *id = list->data; |
845 | 1849 if (id && !id->fd->thumb_pixbuf) fd = id->fd; |
9 | 1850 list = list->next; |
1851 } | |
1852 | |
1853 valid = gtk_tree_model_iter_next(store, &iter); | |
1854 } | |
1855 } | |
1856 | |
1857 /* then find first undone */ | |
1858 | |
1859 if (!fd) | |
1860 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1861 GList *work = vf->list; |
9 | 1862 while (work && !fd) |
1863 { | |
138 | 1864 IconData *id = work->data; |
1865 FileData *fd_p = id->fd; | |
9 | 1866 work = work->next; |
1867 | |
845 | 1868 if (!fd_p->thumb_pixbuf) fd = fd_p; |
9 | 1869 } |
1870 } | |
1871 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1872 return fd; |
9 | 1873 } |
1874 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1875 void vficon_thumb_reset_all(ViewFile *vf) |
9 | 1876 { |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1877 GList *work = vf->list; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1878 |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1879 while (work) |
1506
d352a44545a6
Force thumbnails refreshing when thumbnails dimensions are modified through Preferences.
zas_
parents:
1503
diff
changeset
|
1880 { |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1881 IconData *id = work->data; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1882 FileData *fd = id->fd; |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1883 if (fd->thumb_pixbuf) |
1506
d352a44545a6
Force thumbnails refreshing when thumbnails dimensions are modified through Preferences.
zas_
parents:
1503
diff
changeset
|
1884 { |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1885 g_object_unref(fd->thumb_pixbuf); |
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1886 fd->thumb_pixbuf = NULL; |
1506
d352a44545a6
Force thumbnails refreshing when thumbnails dimensions are modified through Preferences.
zas_
parents:
1503
diff
changeset
|
1887 } |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1888 work = work->next; |
1506
d352a44545a6
Force thumbnails refreshing when thumbnails dimensions are modified through Preferences.
zas_
parents:
1503
diff
changeset
|
1889 } |
9 | 1890 } |
1891 | |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
1892 |
9 | 1893 /* |
1894 *----------------------------------------------------------------------------- | |
1895 * row stuff | |
1896 *----------------------------------------------------------------------------- | |
1897 */ | |
1898 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1899 FileData *vficon_index_get_data(ViewFile *vf, gint row) |
9 | 1900 { |
138 | 1901 IconData *id; |
442 | 1902 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1903 id = g_list_nth_data(vf->list, row); |
138 | 1904 return id ? id->fd : NULL; |
9 | 1905 } |
1906 | |
1907 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1908 gint vficon_index_by_fd(ViewFile *vf, FileData *in_fd) |
138 | 1909 { |
1910 gint p = 0; | |
1911 GList *work; | |
1912 | |
1913 if (!in_fd) return -1; | |
1914 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1915 work = vf->list; |
138 | 1916 while (work) |
1917 { | |
1918 IconData *id = work->data; | |
1919 FileData *fd = id->fd; | |
1920 if (fd == in_fd) return p; | |
1921 work = work->next; | |
1922 p++; | |
1923 } | |
1924 | |
1925 return -1; | |
1926 } | |
1927 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1928 static gint vficon_index_by_id(ViewFile *vf, IconData *in_id) |
138 | 1929 { |
1930 gint p = 0; | |
1931 GList *work; | |
1932 | |
1933 if (!in_id) return -1; | |
1934 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1935 work = vf->list; |
138 | 1936 while (work) |
1937 { | |
1938 IconData *id = work->data; | |
1939 if (id == in_id) return p; | |
1940 work = work->next; | |
1941 p++; | |
1942 } | |
1943 | |
1944 return -1; | |
1945 } | |
1946 | |
736 | 1947 guint vficon_count(ViewFile *vf, gint64 *bytes) |
9 | 1948 { |
1949 if (bytes) | |
1950 { | |
1951 gint64 b = 0; | |
1952 GList *work; | |
1953 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1954 work = vf->list; |
9 | 1955 while (work) |
1956 { | |
138 | 1957 IconData *id = work->data; |
1958 FileData *fd = id->fd; | |
9 | 1959 work = work->next; |
579 | 1960 |
9 | 1961 b += fd->size; |
1962 } | |
1963 | |
1964 *bytes = b; | |
1965 } | |
1966 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1967 return g_list_length(vf->list); |
9 | 1968 } |
1969 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1970 GList *vficon_get_list(ViewFile *vf) |
9 | 1971 { |
1972 GList *list = NULL; | |
1973 GList *work; | |
1974 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
1975 work = vf->list; |
9 | 1976 while (work) |
1977 { | |
138 | 1978 IconData *id = work->data; |
1979 FileData *fd = id->fd; | |
9 | 1980 work = work->next; |
1981 | |
138 | 1982 list = g_list_prepend(list, file_data_ref(fd)); |
9 | 1983 } |
1984 | |
1985 return g_list_reverse(list); | |
1986 } | |
1987 | |
1988 /* | |
1989 *----------------------------------------------------------------------------- | |
1990 * | |
1991 *----------------------------------------------------------------------------- | |
1992 */ | |
1993 | |
1453 | 1994 static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position) |
9 | 1995 { |
1437 | 1996 gboolean ret = TRUE; |
810 | 1997 GList *work, *work_fd; |
138 | 1998 IconData *focus_id; |
810 | 1999 GList *new_filelist = NULL; |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2000 FileData *first_selected = NULL; |
832 | 2001 GList *new_iconlist = NULL; |
138 | 2002 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2003 focus_id = VFICON(vf)->focus_id; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2004 |
783 | 2005 if (vf->dir_fd) |
9 | 2006 { |
810 | 2007 ret = filelist_read(vf->dir_fd, &new_filelist, NULL); |
964 | 2008 new_filelist = file_data_filter_marks_list(new_filelist, vf_marks_get_filter(vf)); |
9 | 2009 } |
2010 | |
810 | 2011 vf->list = iconlist_sort(vf->list, vf->sort_method, vf->sort_ascend); /* the list might not be sorted if there were renames */ |
2012 new_filelist = filelist_sort(new_filelist, vf->sort_method, vf->sort_ascend); | |
2013 | |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2014 if (VFICON(vf)->selection) |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2015 { |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2016 first_selected = ((IconData *)(VFICON(vf)->selection->data))->fd; |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2017 file_data_ref(first_selected); |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2018 g_list_free(VFICON(vf)->selection); |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2019 VFICON(vf)->selection = NULL; |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2020 |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2021 |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2022 } |
811 | 2023 |
9 | 2024 /* check for same files from old_list */ |
810 | 2025 work = vf->list; |
2026 work_fd = new_filelist; | |
2027 while (work || work_fd) | |
9 | 2028 { |
810 | 2029 IconData *id = NULL; |
2030 FileData *fd = NULL; | |
2031 FileData *new_fd = NULL; | |
2032 gint match; | |
2033 | |
2034 if (work && work_fd) | |
9 | 2035 { |
810 | 2036 id = work->data; |
2037 fd = id->fd; | |
2038 | |
2039 new_fd = work_fd->data; | |
2040 | |
2041 if (fd == new_fd) | |
9 | 2042 { |
810 | 2043 /* not changed, go to next */ |
2044 work = work->next; | |
2045 work_fd = work_fd->next; | |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2046 if (id->selected & SELECTION_SELECTED) |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2047 { |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2048 VFICON(vf)->selection = g_list_prepend(VFICON(vf)->selection, id); |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2049 } |
810 | 2050 continue; |
9 | 2051 } |
810 | 2052 |
2053 match = filelist_sort_compare_filedata_full(fd, new_fd, vf->sort_method, vf->sort_ascend); | |
2054 if (match == 0) g_warning("multiple fd for the same path"); | |
2055 } | |
2056 else if (work) | |
2057 { | |
2058 id = work->data; | |
2059 fd = id->fd; | |
2060 match = -1; | |
2061 } | |
2062 else /* work_fd */ | |
2063 { | |
2064 new_fd = work_fd->data; | |
2065 match = 1; | |
9 | 2066 } |
810 | 2067 |
2068 if (match < 0) | |
2069 { | |
2070 /* file no longer exists, delete from vf->list */ | |
2071 GList *to_delete = work; | |
2072 work = work->next; | |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2073 if (id == VFICON(vf)->prev_selection) VFICON(vf)->prev_selection = NULL; |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2074 if (id == VFICON(vf)->click_id) VFICON(vf)->click_id = NULL; |
810 | 2075 file_data_unref(fd); |
2076 g_free(id); | |
2077 vf->list = g_list_delete_link(vf->list, to_delete); | |
2078 } | |
2079 else | |
2080 { | |
2081 /* new file, add to vf->list */ | |
2082 id = g_new0(IconData, 1); | |
2083 | |
2084 id->selected = SELECTION_NONE; | |
2085 id->fd = file_data_ref(new_fd); | |
832 | 2086 if (work) |
2087 vf->list = g_list_insert_before(vf->list, work, id); | |
2088 else | |
2089 new_iconlist = g_list_prepend(new_iconlist, id); /* it is faster to append all new entries together later */ | |
2090 | |
810 | 2091 work_fd = work_fd->next; |
2092 } | |
2093 | |
9 | 2094 } |
2095 | |
832 | 2096 if (new_iconlist) |
2097 { | |
2098 vf->list = g_list_concat(vf->list, g_list_reverse(new_iconlist)); | |
2099 } | |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2100 |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2101 VFICON(vf)->selection = g_list_reverse(VFICON(vf)->selection); |
832 | 2102 |
810 | 2103 filelist_free(new_filelist); |
9 | 2104 |
831
b02a24ebf441
fixed iconview update after deletion of selected image
nadvornik
parents:
817
diff
changeset
|
2105 vficon_populate(vf, TRUE, keep_position); |
b02a24ebf441
fixed iconview update after deletion of selected image
nadvornik
parents:
817
diff
changeset
|
2106 |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2107 if (first_selected && !VFICON(vf)->selection) |
811 | 2108 { |
2109 /* all selected files disappeared */ | |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2110 vficon_select_closest(vf, first_selected); |
811 | 2111 } |
996
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2112 file_data_unref(first_selected); |
4794cf5ecd8e
correctly maintain selection during iconlist refresh
nadvornik
parents:
995
diff
changeset
|
2113 |
9 | 2114 /* attempt to keep focus on same icon when refreshing */ |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2115 if (focus_id && g_list_find(vf->list, focus_id)) |
9 | 2116 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2117 vficon_set_focus(vf, focus_id); |
9 | 2118 } |
2119 | |
2120 return ret; | |
2121 } | |
2122 | |
1453 | 2123 gboolean vficon_refresh(ViewFile *vf) |
9 | 2124 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2125 return vficon_refresh_real(vf, TRUE); |
9 | 2126 } |
2127 | |
2128 /* | |
2129 *----------------------------------------------------------------------------- | |
2130 * draw, etc. | |
2131 *----------------------------------------------------------------------------- | |
2132 */ | |
2133 | |
2134 typedef struct _ColumnData ColumnData; | |
2135 struct _ColumnData | |
2136 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2137 ViewFile *vf; |
9 | 2138 gint number; |
2139 }; | |
2140 | |
2141 static void vficon_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, | |
2142 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) | |
2143 { | |
1621 | 2144 GList *list; |
2145 IconData *id; | |
9 | 2146 ColumnData *cd = data; |
1621 | 2147 ViewFile *vf = cd->vf; |
2148 | |
2149 if (!GQV_IS_CELL_RENDERER_ICON(cell)) return; | |
9 | 2150 |
2151 gtk_tree_model_get(tree_model, iter, FILE_COLUMN_POINTER, &list, -1); | |
442 | 2152 |
138 | 2153 id = g_list_nth_data(list, cd->number); |
1621 | 2154 |
2155 if (id) | |
9 | 2156 { |
1621 | 2157 GdkColor color_fg; |
2158 GdkColor color_bg; | |
2159 GtkStyle *style; | |
2160 gchar *name_sidecars; | |
2161 gchar *link; | |
2162 GtkStateType state = GTK_STATE_NORMAL; | |
2163 | |
2164 g_assert(id->fd->magick == 0x12345678); | |
2165 | |
2166 link = islink(id->fd->path) ? GQ_LINK_STR : ""; | |
2167 if (id->fd->sidecar_files) | |
2168 { | |
2169 gchar *sidecars = file_data_sc_list_to_string(id->fd); | |
2170 name_sidecars = g_strdup_printf("%s%s %s", link, id->fd->name, sidecars); | |
2171 g_free(sidecars); | |
2172 } | |
2173 else | |
2174 { | |
2175 gchar *disabled_grouping = id->fd->disable_grouping ? _(" [NO GROUPING]") : ""; | |
2176 name_sidecars = g_strdup_printf("%s%s%s", link, id->fd->name, disabled_grouping); | |
2177 } | |
2178 | |
2179 style = gtk_widget_get_style(vf->listview); | |
2180 if (id->selected & SELECTION_SELECTED) | |
2181 { | |
2182 state = GTK_STATE_SELECTED; | |
2183 } | |
2184 | |
2185 memcpy(&color_fg, &style->text[state], sizeof(color_fg)); | |
2186 memcpy(&color_bg, &style->base[state], sizeof(color_bg)); | |
2187 | |
2188 if (id->selected & SELECTION_PRELIGHT) | |
2189 { | |
2190 shift_color(&color_bg, -1, 0); | |
2191 } | |
2192 | |
2193 g_object_set(cell, "pixbuf", id->fd->thumb_pixbuf, | |
2194 "text", name_sidecars, | |
2195 "marks", file_data_get_marks(id->fd), | |
2196 "show_marks", vf->marks_enabled, | |
2197 "cell-background-gdk", &color_bg, | |
2198 "cell-background-set", TRUE, | |
2199 "foreground-gdk", &color_fg, | |
2200 "foreground-set", TRUE, | |
2201 "has-focus", (VFICON(vf)->focus_id == id), NULL); | |
2202 g_free(name_sidecars); | |
9 | 2203 } |
2204 else | |
2205 { | |
1621 | 2206 g_object_set(cell, "pixbuf", NULL, |
2207 "text", NULL, | |
2208 "show_marks", FALSE, | |
2209 "cell-background-set", FALSE, | |
2210 "foreground-set", FALSE, | |
2211 "has-focus", FALSE, NULL); | |
9 | 2212 } |
2213 } | |
2214 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2215 static void vficon_append_column(ViewFile *vf, gint n) |
9 | 2216 { |
2217 ColumnData *cd; | |
2218 GtkTreeViewColumn *column; | |
2219 GtkCellRenderer *renderer; | |
2220 | |
2221 column = gtk_tree_view_column_new(); | |
2222 gtk_tree_view_column_set_min_width(column, 0); | |
2223 | |
2224 gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED); | |
2225 gtk_tree_view_column_set_alignment(column, 0.5); | |
2226 | |
2227 renderer = gqv_cell_renderer_icon_new(); | |
2228 gtk_tree_view_column_pack_start(column, renderer, FALSE); | |
2229 g_object_set(G_OBJECT(renderer), "xpad", THUMB_BORDER_PADDING * 2, | |
2230 "ypad", THUMB_BORDER_PADDING, | |
2231 "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL); | |
2232 | |
2233 g_object_set_data(G_OBJECT(column), "column_number", GINT_TO_POINTER(n)); | |
966 | 2234 g_object_set_data(G_OBJECT(renderer), "column_number", GINT_TO_POINTER(n)); |
9 | 2235 |
2236 cd = g_new0(ColumnData, 1); | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2237 cd->vf = vf; |
9 | 2238 cd->number = n; |
2239 gtk_tree_view_column_set_cell_data_func(column, renderer, vficon_cell_data_cb, cd, g_free); | |
2240 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2241 gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column); |
966 | 2242 |
2243 g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(vficon_mark_toggled_cb), vf); | |
9 | 2244 } |
2245 | |
2246 /* | |
2247 *----------------------------------------------------------------------------- | |
2248 * base | |
2249 *----------------------------------------------------------------------------- | |
2250 */ | |
2251 | |
1453 | 2252 gboolean vficon_set_fd(ViewFile *vf, FileData *dir_fd) |
9 | 2253 { |
1453 | 2254 gboolean ret; |
9 | 2255 |
783 | 2256 if (!dir_fd) return FALSE; |
2257 if (vf->dir_fd == dir_fd) return TRUE; | |
2258 | |
2259 file_data_unref(vf->dir_fd); | |
2260 vf->dir_fd = file_data_ref(dir_fd); | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2261 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2262 g_list_free(VFICON(vf)->selection); |
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2263 VFICON(vf)->selection = NULL; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2264 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2265 iconlist_free(vf->list); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2266 vf->list = NULL; |
9 | 2267 |
2268 /* NOTE: populate will clear the store for us */ | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2269 ret = vficon_refresh_real(vf, FALSE); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2270 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2271 VFICON(vf)->focus_id = NULL; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2272 vficon_move_focus(vf, 0, 0, FALSE); |
9 | 2273 |
2274 return ret; | |
2275 } | |
2276 | |
573
2996f1bbc305
Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents:
562
diff
changeset
|
2277 void vficon_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 2278 { |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2279 ViewFile *vf = data; |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2280 |
814 | 2281 vf_refresh_idle_cancel(vf); |
787 | 2282 |
814 | 2283 file_data_unregister_notify_func(vf_notify_cb, vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2284 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2285 tip_unschedule(vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2286 |
1608
fe9ac4a5c969
Merge common thumb code from view_file_list and view_file_icon to view_file.
zas_
parents:
1598
diff
changeset
|
2287 vf_thumb_cleanup(vf); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2288 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2289 iconlist_free(vf->list); |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2290 g_list_free(VFICON(vf)->selection); |
9 | 2291 } |
2292 | |
783 | 2293 ViewFile *vficon_new(ViewFile *vf, FileData *dir_fd) |
9 | 2294 { |
2295 GtkListStore *store; | |
2296 GtkTreeSelection *selection; | |
2297 gint i; | |
2298 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2299 vf->info = g_new0(ViewFileInfoIcon, 1); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2300 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2301 VFICON(vf)->show_text = options->show_icon_names; |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2302 |
9 | 2303 store = gtk_list_store_new(1, G_TYPE_POINTER); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2304 vf->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); |
9 | 2305 g_object_unref(store); |
2306 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2307 selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview)); |
9 | 2308 gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_NONE); |
2309 | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2310 gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vf->listview), FALSE); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2311 gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vf->listview), FALSE); |
9 | 2312 |
2313 for (i = 0; i < VFICON_MAX_COLUMNS; i++) | |
2314 { | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2315 vficon_append_column(vf, i); |
9 | 2316 } |
2317 | |
2318 /* zero width column to hide tree view focus, we draw it ourselves */ | |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2319 vficon_append_column(vf, i); |
9 | 2320 /* end column to fill white space */ |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2321 vficon_append_column(vf, i); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2322 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2323 g_signal_connect(G_OBJECT(vf->listview), "size_allocate", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2324 G_CALLBACK(vficon_sized_cb), vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2325 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2326 gtk_widget_set_events(vf->listview, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | |
9 | 2327 GDK_BUTTON_PRESS_MASK | GDK_LEAVE_NOTIFY_MASK); |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2328 |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2329 g_signal_connect(G_OBJECT(vf->listview),"motion_notify_event", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2330 G_CALLBACK(vficon_motion_cb), vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2331 g_signal_connect(G_OBJECT(vf->listview), "leave_notify_event", |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2332 G_CALLBACK(vficon_leave_cb), vf); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2333 |
968
065a129fd42b
Simplify things related to ViewFileInfoList * and ViewFileInfoIcon * type casting:
zas_
parents:
967
diff
changeset
|
2334 /* force VFICON(vf)->columns to be at least 1 (sane) - this will be corrected in the size_cb */ |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2335 vficon_populate_at_new_size(vf, 1, 1, FALSE); |
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2336 |
814 | 2337 file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM); |
787 | 2338 |
574
3da75054d4e1
Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents:
573
diff
changeset
|
2339 return vf; |
9 | 2340 } |
2341 | |
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
1005
diff
changeset
|
2342 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |