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