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