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