annotate src/collect.c @ 1367:fe4da037be21

When g_new0() is used, drop redundant initializations to NULL, FALSE or 0, second pass.
author zas_
date Sun, 01 Mar 2009 23:14:19 +0000
parents 79937bc55f3a
children 3a9fb1b52559
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 138
diff changeset
2 * Geeqie
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
3 * (C) 2006 John Ellis
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1272
diff changeset
4 * Copyright (C) 2008 - 2009 The Geeqie Team
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
5 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
6 * Author: John Ellis
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
7 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
11 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
12
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 259
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
15 #include "collect.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
16
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
17 #include "collect-dlg.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
18 #include "collect-io.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
19 #include "collect-table.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
20 #include "editors.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 516
diff changeset
21 #include "filedata.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
22 #include "img-view.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
23 #include "layout.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
24 #include "layout_image.h"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 816
diff changeset
25 #include "misc.h"
91
d063f97503b7 Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 85
diff changeset
26 #include "pixbuf_util.h"
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
27 #include "print.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
28 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
29 #include "ui_tree_edit.h"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 816
diff changeset
30 #include "utilops.h"
648
e34c1002e553 Move some functions from main.[ch] to new window.[ch].
zas_
parents: 586
diff changeset
31 #include "window.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
32
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
33 #include <gdk/gdkkeysyms.h> /* for keyboard values */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
34
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
35
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
36 #define COLLECT_DEF_WIDTH 440
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
37 #define COLLECT_DEF_HEIGHT 450
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
38
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
39 static GList *collection_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
40 static GList *collection_window_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
41
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
42 static void collection_window_get_geometry(CollectWindow *cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
43 static void collection_window_refresh(CollectWindow *cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
44 static void collection_window_update_title(CollectWindow *cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
45 static void collection_window_add(CollectWindow *cw, CollectInfo *ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
46 static void collection_window_insert(CollectWindow *cw, CollectInfo *ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
47 static void collection_window_remove(CollectWindow *cw, CollectInfo *ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
48 static void collection_window_update(CollectWindow *cw, CollectInfo *ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
49
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
50 static void collection_window_close(CollectWindow *cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
51
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
52 static void collection_notify_cb(FileData *fd, NotifyType type, gpointer data);
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
53
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
54 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
55 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
56 * data, list handling
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
57 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
58 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
59
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
60 CollectInfo *collection_info_new(FileData *fd, struct stat *st, GdkPixbuf *pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
61 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
62 CollectInfo *ci;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
63
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
64 if (!fd) return NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
65
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
66 ci = g_new0(CollectInfo, 1);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
67 ci->fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
68
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
69 ci->pixbuf = pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
70 if (ci->pixbuf) g_object_ref(ci->pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
71
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
72 return ci;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
73 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
74
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
75 void collection_info_free_thumb(CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
76 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
77 if (ci->pixbuf) g_object_unref(ci->pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
78 ci->pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
79 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
80
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
81 void collection_info_free(CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
82 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
83 if (!ci) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
84
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
85 file_data_unref(ci->fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
86 collection_info_free_thumb(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
87 g_free(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
88 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
89
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
90 void collection_info_set_thumb(CollectInfo *ci, GdkPixbuf *pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
91 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
92 if (pixbuf) g_object_ref(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
93 collection_info_free_thumb(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
94 ci->pixbuf = pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
95 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
96
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
97 gint collection_info_load_thumb(CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
98 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
99 if (!ci) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
100
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
101 collection_info_free_thumb(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
102
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
103 log_printf("collection_info_load_thumb not implemented!\n(because an instant thumb loader not implemented)");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
104 return FALSE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 358
diff changeset
105 #if 0
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
106 if (create_thumbnail(ci->fd->path, &ci->pixmap, &ci->mask) < 0) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
107
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
108 if (ci->pixmap) gdk_pixmap_ref(ci->pixmap);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
109 if (ci->mask) gdk_bitmap_ref(ci->mask);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
110
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
111 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
112 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
113 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
114
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
115 void collection_list_free(GList *list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
116 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
117 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
118 work = list;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
119 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
120 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
121 collection_info_free((CollectInfo *)work->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
122 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
123 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
124 g_list_free(list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
125 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
126
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
127 /* an ugly static var, well what ya gonna do ? */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
128 static SortType collection_list_sort_method = SORT_NAME;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
129
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
130 static gint collection_list_sort_cb(gconstpointer a, gconstpointer b)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
131 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
132 const CollectInfo *cia = a;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
133 const CollectInfo *cib = b;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
134
1347
79937bc55f3a Add missing space between switch and first parenthesis.
zas_
parents: 1292
diff changeset
135 switch (collection_list_sort_method)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
136 {
785
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
137 case SORT_NAME:
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
138 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
139 case SORT_NONE:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
140 return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
141 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
142 case SORT_SIZE:
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
143 if (cia->fd->size < cib->fd->size) return -1;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
144 if (cia->fd->size > cib->fd->size) return 1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
145 return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
146 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
147 case SORT_TIME:
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
148 if (cia->fd->date < cib->fd->date) return -1;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
149 if (cia->fd->date > cib->fd->date) return 1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
150 return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
151 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
152 case SORT_PATH:
786
a20ff446347e Compare paths using utf8_collate_key() since paths are utf8-encoded.
zas_
parents: 785
diff changeset
153 return utf8_compare(cia->fd->path, cib->fd->path, options->file_sort.case_sensitive);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
154 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
155 #ifdef HAVE_STRVERSCMP
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
156 case SORT_NUMBER:
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
157 return strverscmp(cia->fd->name, cib->fd->name);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
158 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
159 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
160 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
161 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
162 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
163
785
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
164 if (options->file_sort.case_sensitive)
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
165 return strcmp(cia->fd->collate_key_name, cib->fd->collate_key_name);
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
166 else
548b193c084c Use uft8_collate_key() to sort utf8 strings.
zas_
parents: 753
diff changeset
167 return strcmp(cia->fd->collate_key_name_nocase, cib->fd->collate_key_name_nocase);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
168 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
169
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
170 GList *collection_list_sort(GList *list, SortType method)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
171 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
172 if (method == SORT_NONE) return list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
173
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
174 collection_list_sort_method = method;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
175
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
176 return g_list_sort(list, collection_list_sort_cb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
177 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
178
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
179 GList *collection_list_add(GList *list, CollectInfo *ci, SortType method)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
180 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
181 if (method != SORT_NONE)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
182 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
183 collection_list_sort_method = method;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
184 list = g_list_insert_sorted(list, ci, collection_list_sort_cb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
185 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
186 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
187 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
188 list = g_list_append(list, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
189 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
190
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
191 return list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
192 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
193
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
194 GList *collection_list_insert(GList *list, CollectInfo *ci, CollectInfo *insert_ci, SortType method)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
195 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
196 if (method != SORT_NONE)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
197 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
198 collection_list_sort_method = method;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
199 list = g_list_insert_sorted(list, ci, collection_list_sort_cb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
200 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
201 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
202 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
203 GList *point;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
204
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
205 point = g_list_find(list, insert_ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
206 list = uig_list_insert_link(list, point, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
207 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
208
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
209 return list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
210 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
211
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
212 GList *collection_list_remove(GList *list, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
213 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
214 list = g_list_remove(list, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
215 collection_info_free(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
216 return list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
217 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
218
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
219 CollectInfo *collection_list_find_fd(GList *list, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
220 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
221 GList *work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
222
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
223 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
224 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
225 CollectInfo *ci = work->data;
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
226 if (ci->fd == fd) return ci;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
227 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
228 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
229
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
230 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
231 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
232
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
233 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
234 static GList *collection_list_find_link(GList *list, gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
235 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
236 GList *work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
237
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
238 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
239 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
240 CollectInfo *ci = work->data;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
241 if (strcmp(ci->fd->path, path) == 0) return work;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
242 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
243 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
244
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
245 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
246 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
247
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
248 static gint collection_list_find_index(GList *list, gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
249 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
250 gint c = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
251 GList *work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
252
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
253 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
254 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
255 CollectInfo *ci = work->data;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
256 if (strcmp(ci->fd->path, path) == 0) return c;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
257 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
258 c++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
259 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
260
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
261 return -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
262 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
263 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
264
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
265 GList *collection_list_to_filelist(GList *list)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
266 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
267 GList *filelist = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
268 GList *work = list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
269
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
270 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
271 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
272 CollectInfo *info = work->data;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
273 filelist = g_list_prepend(filelist, file_data_ref(info->fd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
274 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
275 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
276
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
277 filelist = g_list_reverse(filelist);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
278 return filelist;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
279 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
280
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
281 CollectWindow *collection_window_find(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
282 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
283 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
284
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
285 work = collection_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
286 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
287 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
288 CollectWindow *cw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
289 if (cw->cd == cd) return cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
290 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
291 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
292
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
293 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
294 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
295
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
296 CollectWindow *collection_window_find_by_path(const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
297 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
298 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
299
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
300 if (!path) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
301
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
302 work = collection_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
303 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
304 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
305 CollectWindow *cw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
306 if (cw->cd->path && strcmp(cw->cd->path, path) == 0) return cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
307 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
308 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
309
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
310 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
311 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
312
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
313 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
314 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
315 * please use these to actually add/remove stuff
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
316 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
317 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
318
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
319 CollectionData *collection_new(const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
320 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
321 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
322 static gint untitled_counter = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
323
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
324 cd = g_new0(CollectionData, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
325
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
326 cd->ref = 1; /* starts with a ref of 1 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
327 cd->sort_method = SORT_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
328 cd->window_w = COLLECT_DEF_WIDTH;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
329 cd->window_h = COLLECT_DEF_HEIGHT;
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
330 cd->existence = g_hash_table_new(NULL, NULL);
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
331
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
332 if (path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
333 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
334 cd->path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
335 cd->name = g_strdup(filename_from_path(cd->path));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
336 /* load it */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
337 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
338 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
339 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
340 if (untitled_counter == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
341 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
342 cd->name = g_strdup(_("Untitled"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
343 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
344 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
345 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
346 cd->name = g_strdup_printf(_("Untitled (%d)"), untitled_counter + 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
347 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
348
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
349 untitled_counter++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
350 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
351
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
352 file_data_register_notify_func(collection_notify_cb, cd, NOTIFY_PRIORITY_MEDIUM);
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
353
1367
fe4da037be21 When g_new0() is used, drop redundant initializations to NULL, FALSE or 0, second pass.
zas_
parents: 1347
diff changeset
354
fe4da037be21 When g_new0() is used, drop redundant initializations to NULL, FALSE or 0, second pass.
zas_
parents: 1347
diff changeset
355 collection_list = g_list_append(collection_list, cd);
fe4da037be21 When g_new0() is used, drop redundant initializations to NULL, FALSE or 0, second pass.
zas_
parents: 1347
diff changeset
356
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
357 return cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
358 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
359
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
360 void collection_free(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
361 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
362 if (!cd) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
363
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
364 DEBUG_1("collection \"%s\" freed", cd->name);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
365
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
366 collection_load_stop(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
367 collection_list_free(cd->list);
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
368
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
369 file_data_unregister_notify_func(collection_notify_cb, cd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
370
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
371 collection_list = g_list_remove(collection_list, cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
372
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
373 g_hash_table_destroy(cd->existence);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 358
diff changeset
374
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
375 g_free(cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
376 g_free(cd->name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
377
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
378 g_free(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
379 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
380
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
381 void collection_ref(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
382 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
383 cd->ref++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
384
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
385 DEBUG_1("collection \"%s\" ref count = %d", cd->name, cd->ref);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
386 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
387
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
388 void collection_unref(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
389 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
390 cd->ref--;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
391
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
392 DEBUG_1("collection \"%s\" ref count = %d", cd->name, cd->ref);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
393
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
394 if (cd->ref < 1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
395 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
396 collection_free(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
397 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
398 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
399
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
400 void collection_path_changed(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
401 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
402 collection_window_update_title(collection_window_find(cd));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
403 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
404
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
405 gint collection_to_number(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
406 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
407 return g_list_index(collection_list, cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
408 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
409
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
410 CollectionData *collection_from_number(gint n)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
411 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
412 return g_list_nth_data(collection_list, n);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
413 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
414
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
415 CollectionData *collection_from_dnd_data(const gchar *data, GList **list, GList **info_list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
416 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
417 CollectionData *cd;
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
418 gint collection_number;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
419 const gchar *ptr;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
420
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
421 if (list) *list = NULL;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
422 if (info_list) *info_list = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
423
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
424 if (strncmp(data, "COLLECTION:", 11) != 0) return NULL;
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
425
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
426 ptr = data + 11;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
427
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
428 collection_number = atoi(ptr);
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
429 cd = collection_from_number(collection_number);
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
430 if (!cd) return NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
431
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
432 if (!list && !info_list) return cd;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
433
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
434 while (*ptr != '\0' && *ptr != '\n' ) ptr++;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
435 if (*ptr == '\0') return cd;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
436 ptr++;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
437
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
438 while (*ptr != '\0')
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
439 {
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
440 guint item_number;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
441 CollectInfo *info;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
442
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
443 item_number = (guint) atoi(ptr);
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
444 while (*ptr != '\n' && *ptr != '\0') ptr++;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
445 if (*ptr == '\0')
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
446 break;
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
447 else
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
448 while (*ptr == '\n') ptr++;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
449
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
450 info = g_list_nth_data(cd->list, item_number);
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
451 if (!info) continue;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
452
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
453 if (list) *list = g_list_append(*list, file_data_ref(info->fd));
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
454 if (info_list) *info_list = g_list_append(*info_list, info);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
455 }
816
cf5bbd0beaae collection_from_dnd_data(): simplify and optimize.
zas_
parents: 815
diff changeset
456
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
457 return cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
458 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
459
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
460 gchar *collection_info_list_to_dnd_data(CollectionData *cd, GList *list, gint *length)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
461 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
462 GList *work;
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
463 GList *temp = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
464 gchar *ptr;
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
465 gchar *text;
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
466 gchar *uri_text;
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
467 gint collection_number;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
468
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
469 *length = 0;
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
470 if (!list) return NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
471
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
472 collection_number = collection_to_number(cd);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
473 if (collection_number < 0) return NULL;
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
474
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
475 text = g_strdup_printf("COLLECTION:%d\n", collection_number);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
476 *length += strlen(text);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
477 temp = g_list_prepend(temp, text);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
478
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
479 work = list;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
480 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
481 {
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
482 gint item_number = g_list_index(cd->list, work->data);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
483
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
484 work = work->next;
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
485
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
486 if (item_number < 0) continue;
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
487
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
488 text = g_strdup_printf("%d\n", item_number);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
489 temp = g_list_prepend(temp, text);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
490 *length += strlen(text);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
491 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
492
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
493 *length += 1; /* ending nul char */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
494
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
495 uri_text = g_malloc(*length);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
496 ptr = uri_text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
497
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
498 work = g_list_last(temp);
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
499 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
500 {
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
501 gint len;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
502 gchar *text = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
503
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
504 work = work->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
505
815
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
506 len = strlen(text);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
507 memcpy(ptr, text, len);
7daea970a89a collection_info_list_to_dnd_data(): simplify and optimize.
zas_
parents: 803
diff changeset
508 ptr += len;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
509 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
510
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
511 ptr[0] = '\0';
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
512
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
513 string_list_free(temp);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
514
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
515 return uri_text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
516 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
517
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
518 gint collection_info_valid(CollectionData *cd, CollectInfo *info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
519 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
520 if (collection_to_number(cd) < 0) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
521
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
522 return (g_list_index(cd->list, info) != 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
523 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
524
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
525 CollectInfo *collection_next_by_info(CollectionData *cd, CollectInfo *info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
526 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
527 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
528
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
529 work = g_list_find(cd->list, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
530
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
531 if (!work) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
532 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
533 if (work) return work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
534 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
535 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
536
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
537 CollectInfo *collection_prev_by_info(CollectionData *cd, CollectInfo *info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
538 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
539 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
540
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
541 work = g_list_find(cd->list, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
542
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
543 if (!work) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
544 work = work->prev;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
545 if (work) return work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
546 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
547 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
548
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
549 CollectInfo *collection_get_first(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
550 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
551 if (cd->list) return cd->list->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
552
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
553 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
554 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
555
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
556 CollectInfo *collection_get_last(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
557 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
558 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
559
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
560 list = g_list_last(cd->list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
561
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
562 if (list) return list->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
563
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
564 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
565 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
566
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
567 void collection_set_sort_method(CollectionData *cd, SortType method)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
568 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
569 if (!cd) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
570
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
571 if (cd->sort_method == method) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
572
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
573 cd->sort_method = method;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
574 cd->list = collection_list_sort(cd->list, cd->sort_method);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
575 if (cd->list) cd->changed = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
576
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
577 collection_window_refresh(collection_window_find(cd));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
578 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
579
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
580 void collection_set_update_info_func(CollectionData *cd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
581 void (*func)(CollectionData *, CollectInfo *, gpointer), gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
582 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
583 cd->info_updated_func = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
584 cd->info_updated_data = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
585 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
586
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
587 static CollectInfo *collection_info_new_if_not_exists(CollectionData *cd, struct stat *st, FileData *fd)
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
588 {
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
589 CollectInfo *ci;
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
590
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
591 if (g_hash_table_lookup(cd->existence, fd->path)) return NULL;
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
592
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
593 ci = collection_info_new(fd, st, NULL);
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
594 if (ci) g_hash_table_insert(cd->existence, fd->path, "");
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
595 return ci;
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
596 }
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
597
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
598 gint collection_add_check(CollectionData *cd, FileData *fd, gint sorted, gint must_exist)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
599 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
600 struct stat st;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
601 gint valid;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
602
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
603 if (must_exist)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
604 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
605 valid = (stat_utf8(fd->path, &st) && !S_ISDIR(st.st_mode));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
606 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
607 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
608 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
609 valid = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
610 st.st_size = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
611 st.st_mtime = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
612 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
613
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
614 if (valid)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
615 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
616 CollectInfo *ci;
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
617
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
618 ci = collection_info_new_if_not_exists(cd, &st, fd);
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
619 if (!ci) return FALSE;
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
620 DEBUG_3("add to collection: %s", fd->path);
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
621
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
622 cd->list = collection_list_add(cd->list, ci, sorted ? cd->sort_method : SORT_NONE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
623 cd->changed = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
624
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
625 if (!sorted || cd->sort_method == SORT_NONE)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
626 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
627 collection_window_add(collection_window_find(cd), ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
628 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
629 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
630 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
631 collection_window_insert(collection_window_find(cd), ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
632 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
633 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
634
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
635 return valid;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
636 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
637
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
638 gint collection_add(CollectionData *cd, FileData *fd, gint sorted)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
639 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
640 return collection_add_check(cd, fd, sorted, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
641 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
642
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
643 gint collection_insert(CollectionData *cd, FileData *fd, CollectInfo *insert_ci, gint sorted)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
644 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
645 struct stat st;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
646
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
647 if (!insert_ci) return collection_add(cd, fd, sorted);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
648
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
649 if (stat_utf8(fd->path, &st) >= 0 && !S_ISDIR(st.st_mode))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
650 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
651 CollectInfo *ci;
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
652
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
653 ci = collection_info_new_if_not_exists(cd, &st, fd);
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
654 if (!ci) return FALSE;
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
655
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
656 DEBUG_3("insert in collection: %s", fd->path);
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
657
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
658 cd->list = collection_list_insert(cd->list, ci, insert_ci, sorted ? cd->sort_method : SORT_NONE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
659 cd->changed = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
660
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
661 collection_window_insert(collection_window_find(cd), ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
662
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
663 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
664 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
665
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
666 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
667 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
668
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
669 gint collection_remove(CollectionData *cd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
670 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
671 CollectInfo *ci;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
672
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
673 ci = collection_list_find_fd(cd->list, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
674
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
675 if (!ci) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
676
303
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
677 g_hash_table_remove(cd->existence, fd->path);
6ff0bc50ac46 Prevent multiple insertion of the same file in a collection.
zas_
parents: 289
diff changeset
678
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
679 cd->list = g_list_remove(cd->list, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
680 cd->changed = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
681
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
682 collection_window_remove(collection_window_find(cd), ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
683 collection_info_free(ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
684
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
685 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
686 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
687
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
688 static void collection_remove_by_info(CollectionData *cd, CollectInfo *info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
689 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
690 if (!info || !g_list_find(cd->list, info)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
691
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
692 cd->list = g_list_remove(cd->list, info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
693 cd->changed = (cd->list != NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
694
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
695 collection_window_remove(collection_window_find(cd), info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
696 collection_info_free(info);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
697 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
698
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
699 void collection_remove_by_info_list(CollectionData *cd, GList *list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
700 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
701 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
702
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
703 if (!list) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
704
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
705 if (!list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
706 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
707 /* more efficient (in collect-table) to remove a single item this way */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
708 collection_remove_by_info(cd, (CollectInfo *)list->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
709 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
710 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
711
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
712 work = list;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 513
diff changeset
713 while (work)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
714 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
715 cd->list = collection_list_remove(cd->list, work->data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
716 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
717 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
718 cd->changed = (cd->list != NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
719
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
720 collection_window_refresh(collection_window_find(cd));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
721 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
722
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
723 gint collection_rename(CollectionData *cd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
724 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
725 CollectInfo *ci;
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
726 ci = collection_list_find_fd(cd->list, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
727
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
728 if (!ci) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
729
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
730 cd->changed = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
731
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
732 collection_window_update(collection_window_find(cd), ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
733
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
734 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
735 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
736
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
737 void collection_update_geometry(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
738 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
739 collection_window_get_geometry(collection_window_find(cd));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
740 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
741
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
742 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
743 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
744 * simple maintenance for renaming, deleting
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
745 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
746 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
747
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
748 static void collection_notify_cb(FileData *fd, NotifyType type, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
749 {
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
750 CollectionData *cd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
751
803
764fd82dd099 better check for notify type
nadvornik
parents: 799
diff changeset
752 if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
753
1347
79937bc55f3a Add missing space between switch and first parenthesis.
zas_
parents: 1292
diff changeset
754 switch (fd->change->type)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
755 {
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
756 case FILEDATA_CHANGE_MOVE:
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
757 case FILEDATA_CHANGE_RENAME:
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
758 collection_rename(cd, fd);
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
759 break;
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
760 case FILEDATA_CHANGE_COPY:
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
761 break;
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
762 case FILEDATA_CHANGE_DELETE:
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
763 while (collection_remove(cd, fd));
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
764 break;
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
765 case FILEDATA_CHANGE_UNSPECIFIED:
1211
e2bbe90b0dcd most of the metadata options now works
nadvornik
parents: 1176
diff changeset
766 case FILEDATA_CHANGE_WRITE_METADATA:
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
767 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
768 }
799
278962ba162a use the new notification for collections
nadvornik
parents: 786
diff changeset
769
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
770 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
771
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
772
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
773 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
774 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
775 * window key presses
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
776 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
777 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
778
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
779 static gint collection_window_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
780 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
781 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
782 gint stop_signal = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
783 gint edit_val = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
784 GList *list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
785
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
786 if (event->state & GDK_CONTROL_MASK)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
787 {
85
9d5c75b5ec28 Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
788 stop_signal = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
789 switch (event->keyval)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
790 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
791 case '1':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
792 edit_val = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
793 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
794 case '2':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
795 edit_val = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
796 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
797 case '3':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
798 edit_val = 2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
799 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
800 case '4':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
801 edit_val = 3;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
802 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
803 case '5':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
804 edit_val = 4;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
805 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
806 case '6':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
807 edit_val = 5;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
808 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
809 case '7':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
810 edit_val = 6;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
811 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
812 case '8':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
813 edit_val = 7;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
814 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
815 case '9':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
816 edit_val = 8;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
817 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
818 case '0':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
819 edit_val = 9;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
820 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
821 case 'A': case 'a':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
822 if (event->state & GDK_SHIFT_MASK)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
823 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
824 collection_table_unselect_all(cw->table);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
825 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
826 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
827 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
828 collection_table_select_all(cw->table);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
829 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
830 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
831 case 'L': case 'l':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
832 list = layout_list(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
833 if (list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
834 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
835 collection_table_add_filelist(cw->table, list);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
836 filelist_free(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
837 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
838 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
839 case 'C': case 'c':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
840 file_util_copy(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
841 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
842 case 'M': case 'm':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
843 file_util_move(NULL, collection_table_selection_get_list(cw->table), NULL, cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
844 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
845 case 'R': case 'r':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
846 file_util_rename(NULL, collection_table_selection_get_list(cw->table), cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
847 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
848 case 'D': case 'd':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
849 file_util_delete(NULL, collection_table_selection_get_list(cw->table), cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
850 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
851 case 'S': case 's':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
852 collection_dialog_save_as(NULL, cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
853 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
854 case 'W': case 'w':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
855 collection_window_close(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
856 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
857 default:
85
9d5c75b5ec28 Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
858 stop_signal = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
859 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
860 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
861 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
862 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
863 {
85
9d5c75b5ec28 Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
864 stop_signal = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
865 switch (event->keyval)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
866 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
867 case GDK_Return: case GDK_KP_Enter:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
868 layout_image_set_collection(NULL, cw->cd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
869 collection_table_get_focus_info(cw->table));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
870 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
871 case 'V': case 'v':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
872 view_window_new_from_collection(cw->cd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
873 collection_table_get_focus_info(cw->table));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
874 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
875 case 'S': case 's':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
876 if (!cw->cd->path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
877 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
878 collection_dialog_save_as(NULL, cw->cd);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 358
diff changeset
879 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
880 else if (!collection_save(cw->cd, cw->cd->path))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
881 {
673
fbebf5cf4a55 Do not use printf() directly but use new wrapper function log_printf() instead.
zas_
parents: 671
diff changeset
882 log_printf("failed saving to collection path: %s\n", cw->cd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
883 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
884 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
885 case 'A': case 'a':
85
9d5c75b5ec28 Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
886 collection_dialog_append(NULL, cw->cd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
887 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
888 case 'N': case 'n':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
889 collection_set_sort_method(cw->cd, SORT_NAME);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
890 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
891 #ifdef HAVE_STRVERSCMP
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
892 case 'I': case 'i':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
893 collection_set_sort_method(cw->cd, SORT_NUMBER);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
894 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
895 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
896 case 'D': case 'd':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
897 collection_set_sort_method(cw->cd, SORT_TIME);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
898 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
899 case 'B': case 'b':
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
900 collection_set_sort_method(cw->cd, SORT_SIZE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
901 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
902 case 'P': case 'p':
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
903 if (event->state & GDK_SHIFT_MASK)
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
904 {
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
905 CollectInfo *info;
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
906
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
907 info = collection_table_get_focus_info(cw->table);
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
908
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
909 print_window_new(info->fd, collection_table_selection_get_list(cw->table),
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
910 collection_list_to_filelist(cw->cd->list), cw->window);
94
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
911 }
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
912 else
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
913 {
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
914 collection_set_sort_method(cw->cd, SORT_PATH);
50dc5a14d37b Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
915 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
916 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
917 case GDK_Delete: case GDK_KP_Delete:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
918 list = g_list_copy(cw->table->selection);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
919 if (list)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
920 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
921 collection_remove_by_info_list(cw->cd, list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
922 g_list_free(list);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
923 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
924 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
925 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
926 collection_remove_by_info(cw->cd, collection_table_get_focus_info(cw->table));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
927 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
928 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
929 default:
85
9d5c75b5ec28 Fri Oct 20 09:20:10 2006 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
930 stop_signal = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
931 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
932 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
933 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
934 #if 0
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
935 if (edit_val != -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
936 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
937 list = collection_table_selection_get_list(cw->table);
753
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 726
diff changeset
938 file_util_start_editor_from_filelist(edit_val, list, cw->window);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 94
diff changeset
939 filelist_free(list);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
940 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1211
diff changeset
941 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
942 return stop_signal;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
943 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
944
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
945 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
946 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
947 * window
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
948 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
949 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
950 static void collection_window_get_geometry(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
951 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
952 CollectionData *cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
953
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
954 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
955
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
956 cd = cw->cd;
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
957 gdk_window_get_position(cw->window->window, &cd->window_x, &cd->window_y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
958 gdk_drawable_get_size(cw->window->window, &cd->window_w, &cd->window_h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
959 cd->window_read = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
960 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
961
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
962 static void collection_window_refresh(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
963 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
964 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
965
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
966 collection_table_refresh(cw->table);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
967 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
968
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
969 static void collection_window_update_title(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
970 {
1176
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
971 gboolean free_name = FALSE;
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
972 gchar *name;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
973 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
974
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
975 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
976
1176
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
977 if (file_extension_match(cw->cd->name, GQ_COLLECTION_EXT))
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
978 {
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
979 name = remove_extension_from_path(cw->cd->name);
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
980 free_name = TRUE;
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
981 }
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
982 else
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
983 {
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
984 name = cw->cd->name;
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
985 }
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
986
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
987 buf = g_strdup_printf(_("%s - Collection - %s"), name, GQ_APPNAME);
d3e51e1a02f8 Hide .gqv extension from collection name in collection window title and recent menu list.
zas_
parents: 1174
diff changeset
988 if (free_name) g_free(name);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
989 gtk_window_set_title(GTK_WINDOW(cw->window), buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
990 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
991 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
992
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
993 static void collection_window_update_info(CollectionData *cd, CollectInfo *ci, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
994 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
995 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
996
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
997 collection_table_file_update(cw->table, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
998 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
999
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1000 static void collection_window_add(CollectWindow *cw, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1001 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1002 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1003
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1004 if (!ci->pixbuf) collection_load_thumb_idle(cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1005 collection_table_file_add(cw->table, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1006 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1007
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1008 static void collection_window_insert(CollectWindow *cw, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1009 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1010 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1011
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1012 if (!ci->pixbuf) collection_load_thumb_idle(cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1013 collection_table_file_insert(cw->table, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1014 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1015 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1016
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1017 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1018 static void collection_window_move(CollectWindow *cw, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1019 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1020 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1021 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1022 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1023
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1024 static void collection_window_remove(CollectWindow *cw, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1025 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1026 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1027
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1028 collection_table_file_remove(cw->table, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1029 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1030
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1031 static void collection_window_update(CollectWindow *cw, CollectInfo *ci)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1032 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1033 if (!cw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1034
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1035 collection_table_file_update(cw->table, ci);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1036 collection_table_file_update(cw->table, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1037 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1038
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1039 static void collection_window_close_final(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1040 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1041 if (cw->close_dialog) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1042
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1043 collection_window_list = g_list_remove(collection_window_list, cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1044 collection_window_get_geometry(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1045
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1046 gtk_widget_destroy(cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1047
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1048 collection_set_update_info_func(cw->cd, NULL, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1049 collection_unref(cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1050
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1051 g_free(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1052 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1053
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1054 static void collection_close_save_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1055 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1056 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1057
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1058 cw->close_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1059 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1060
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1061 if (!cw->cd->path)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 358
diff changeset
1062 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1063 collection_dialog_save_close(NULL, cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1064 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1065 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1066 else if (!collection_save(cw->cd, cw->cd->path))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1067 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1068 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1069 buf = g_strdup_printf(_("Failed to save the collection:\n%s"), cw->cd->path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1070 warning_dialog(_("Save Failed"), buf, GTK_STOCK_DIALOG_ERROR, cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1071 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1072 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1073 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1074
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1075 collection_window_close_final(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1076 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1077
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1078 static void collection_close_close_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1079 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1080 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1081
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1082 cw->close_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1083 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1084
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1085 collection_window_close_final(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1086 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1087
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1088 static void collection_close_cancel_cb(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1089 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1090 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1091
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1092 cw->close_dialog = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1093 generic_dialog_close(gd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1094 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1095
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1096 static void collection_close_dlg_show(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1097 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1098 GenericDialog *gd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1099
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1100 if (cw->close_dialog)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1101 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1102 gtk_window_present(GTK_WINDOW(cw->close_dialog));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1103 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1104 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1105
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1106 gd = generic_dialog_new(_("Close collection"),
1174
0bea79d87065 Drop useless wmclass stuff. Gtk will take care of it and as said in the documentation using gtk_window_set_wmclass() is sort of pointless.
zas_
parents: 1055
diff changeset
1107 "close_collection", cw->window, FALSE,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1108 collection_close_cancel_cb, cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1109 generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1110 _("Close collection"),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1111 _("Collection has been modified.\nSave first?"));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1112
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1113 generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL, collection_close_save_cb, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1114 generic_dialog_add_button(gd, GTK_STOCK_DELETE, _("_Discard"), collection_close_close_cb, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1115
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1116 cw->close_dialog = gd->dialog;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1117
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1118 gtk_widget_show(gd->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1119 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1120
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1121 static void collection_window_close(CollectWindow *cw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1122 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1123 if (!cw->cd->changed && !cw->close_dialog)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1124 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1125 collection_window_close_final(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1126 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1127 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1128
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1129 collection_close_dlg_show(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1130 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1131
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1132 void collection_window_close_by_collection(CollectionData *cd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1133 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1134 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1135
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1136 cw = collection_window_find(cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1137 if (cw) collection_window_close_final(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1138 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1139
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1140 gint collection_window_modified_exists(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1141 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1142 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1143
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1144 work = collection_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1145 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1146 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1147 CollectWindow *cw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1148 if (cw->cd->changed) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1149 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1150 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1151
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1152 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1153 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1154
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1155 static gint collection_window_delete(GtkWidget *widget, GdkEvent *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1156 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1157 CollectWindow *cw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1158 collection_window_close(cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1159
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1160 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1161 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1162
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1163 CollectWindow *collection_window_new(const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1164 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1165 CollectWindow *cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1166 GtkWidget *vbox;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1167 GtkWidget *frame;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1168 GtkWidget *status_label;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1169 GtkWidget *extra_label;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1170 GdkGeometry geometry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1171
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1172 cw = g_new0(CollectWindow, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1173
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1174 collection_window_list = g_list_append(collection_window_list, cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1175
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1176 cw->cd = collection_new(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1177
289
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
1178 cw->window = window_new(GTK_WINDOW_TOPLEVEL, "collection", PIXBUF_INLINE_ICON_BOOK, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1179
1029
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1022
diff changeset
1180 geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1022
diff changeset
1181 geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1182 geometry.base_width = COLLECT_DEF_WIDTH;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1183 geometry.base_height = COLLECT_DEF_HEIGHT;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1184 gtk_window_set_geometry_hints(GTK_WINDOW(cw->window), NULL, &geometry,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1185 GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1186
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1187
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 318
diff changeset
1188 if (options->layout.save_window_positions && path && collection_load_only_geometry(cw->cd, path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1189 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1190 /* FIXME: x, y is not implemented */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1191 gtk_window_set_default_size(GTK_WINDOW(cw->window), cw->cd->window_w, cw->cd->window_h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1192 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1193 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1194 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1195 gtk_window_set_default_size(GTK_WINDOW(cw->window), COLLECT_DEF_WIDTH, COLLECT_DEF_HEIGHT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1196 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1197
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1198 gtk_window_set_resizable(GTK_WINDOW(cw->window), TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1199 collection_window_update_title(cw);
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 512
diff changeset
1200 gtk_container_set_border_width(GTK_CONTAINER(cw->window), 0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1201
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1202 g_signal_connect(G_OBJECT(cw->window), "delete_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1203 G_CALLBACK(collection_window_delete), cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1204
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 512
diff changeset
1205 g_signal_connect(G_OBJECT(cw->window), "key_press_event",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1206 G_CALLBACK(collection_window_keypress), cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1207
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1208 vbox = gtk_vbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1209 gtk_container_add(GTK_CONTAINER(cw->window), vbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1210 gtk_widget_show(vbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1211
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1212 cw->table = collection_table_new(cw->cd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1213 gtk_box_pack_start(GTK_BOX(vbox), cw->table->scrolled, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1214 gtk_widget_show(cw->table->scrolled);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1215
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1216 cw->status_box = gtk_hbox_new(TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1217 gtk_box_pack_start(GTK_BOX(vbox), cw->status_box, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1218 gtk_widget_show(cw->status_box);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1219
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1220 frame = gtk_frame_new(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1221 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1222 gtk_box_pack_start(GTK_BOX(cw->status_box), frame, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1223 gtk_widget_show(frame);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1224
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1225 status_label = gtk_label_new("");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1226 gtk_container_add(GTK_CONTAINER(frame), status_label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1227 gtk_widget_show(status_label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1228
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1229 extra_label = gtk_progress_bar_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1230 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(extra_label), 0.0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1231 gtk_box_pack_start(GTK_BOX(cw->status_box), extra_label, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1232 gtk_widget_show(extra_label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1233
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1234 collection_table_set_labels(cw->table, status_label, extra_label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1235
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1236 gtk_widget_show(cw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1237 gtk_widget_grab_focus(cw->table->listview);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1238
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1239 collection_set_update_info_func(cw->cd, collection_window_update_info, cw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1240
726
a1dcef8cd1ae Use G_DIR_SEPARATOR where applicable.
zas_
parents: 673
diff changeset
1241 if (path && *path == G_DIR_SEPARATOR) collection_load_begin(cw->cd, NULL, COLLECTION_LOAD_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1242
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1243 return cw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1244 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1029
diff changeset
1245 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */