annotate src/layout.c @ 1461:e015b6573d36

improved config file formatting
author nadvornik
date Thu, 19 Mar 2009 22:12:14 +0000
parents a3d3208b0c50
children 25168240a247
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: 166
diff changeset
2 * Geeqie
113
55166d93498d Fri Nov 24 21:37:01 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: 1279
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
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 278
diff changeset
13 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
14 #include "layout.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
15
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
16 #include "color-man.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 583
diff changeset
17 #include "filedata.h"
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
18 #include "histogram.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
19 #include "image.h"
482
75b7154e6435 Use image_osd_toggle() in layout_menu_overlay_cb().
zas_
parents: 480
diff changeset
20 #include "image-overlay.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
21 #include "layout_config.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
22 #include "layout_image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
23 #include "layout_util.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
24 #include "menu.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
25 #include "pixbuf-renderer.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
26 #include "pixbuf_util.h"
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
27 #include "utilops.h"
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
28 #include "view_dir.h"
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
29 #include "view_file.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
30 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31 #include "ui_menu.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
32 #include "ui_misc.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
33 #include "ui_tabcomp.h"
648
e34c1002e553 Move some functions from main.[ch] to new window.[ch].
zas_
parents: 632
diff changeset
34 #include "window.h"
1214
31402ecb2aed write metadata after timeout, image change or dir change
nadvornik
parents: 1177
diff changeset
35 #include "metadata.h"
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
36 #include "rcfile.h"
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
37 #include "bar.h"
1320
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
38 #include "bar_sort.h"
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
39 #include "preferences.h"
648
e34c1002e553 Move some functions from main.[ch] to new window.[ch].
zas_
parents: 632
diff changeset
40
528
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
41 #ifdef HAVE_LIRC
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
42 #include "lirc.h"
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
43 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
44
41
6281cc38e5ca Wed Apr 27 15:17:57 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
45 #define MAINWINDOW_DEF_WIDTH 700
6281cc38e5ca Wed Apr 27 15:17:57 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
46 #define MAINWINDOW_DEF_HEIGHT 500
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
47
553
32cf2e7992fd Change default positions of dividers since width of the main menu
zas_
parents: 531
diff changeset
48 #define MAIN_WINDOW_DIV_HPOS (MAINWINDOW_DEF_WIDTH / 2)
32cf2e7992fd Change default positions of dividers since width of the main menu
zas_
parents: 531
diff changeset
49 #define MAIN_WINDOW_DIV_VPOS (MAINWINDOW_DEF_HEIGHT / 2)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
50
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
51 #define TOOLWINDOW_DEF_WIDTH 260
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
52 #define TOOLWINDOW_DEF_HEIGHT 450
553
32cf2e7992fd Change default positions of dividers since width of the main menu
zas_
parents: 531
diff changeset
53
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
54 #define PROGRESS_WIDTH 150
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
55 #define PIXEL_LABEL_WIDTH 130
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
56 #define ZOOM_LABEL_WIDTH 64
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 #define PANE_DIVIDER_SIZE 10
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
59
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
60
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
61 GList *layout_window_list = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
62
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
63
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
64 static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *needle);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
67 /*
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 * misc
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
70 *-----------------------------------------------------------------------------
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
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
73 gboolean layout_valid(LayoutWindow **lw)
9
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 if (*lw == NULL)
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 (layout_window_list) *lw = layout_window_list->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
78 return (*lw != 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 return (g_list_find(layout_window_list, *lw) != NULL);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
84 LayoutWindow *layout_find_by_image(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
85 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
86 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
87
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
88 work = layout_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
89 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
90 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
91 LayoutWindow *lw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
92 work = work->next;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
93
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
94 if (lw->image == imd) return lw;
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 return NULL;
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
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
100 LayoutWindow *layout_find_by_image_fd(ImageWindow *imd)
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
101 {
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
102 GList *work;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
103
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
104 work = layout_window_list;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
105 while (work)
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
106 {
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
107 LayoutWindow *lw = work->data;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
108 work = work->next;
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
109
368
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
110 if (lw->image->image_fd == imd->image_fd)
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
111 return lw;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
112 }
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
113
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
114 return NULL;
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
115 }
95fe470440ad New Go to directory view feature that permits to find and display the directory
zas_
parents: 340
diff changeset
116
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
117 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
118 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
119 * menu, toolbar, and dir view
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
122
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
123 static void layout_path_entry_changed_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
124 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
125 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
126 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
127
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
128 if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
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 buf = g_strdup(gtk_entry_get_text(GTK_ENTRY(lw->path_entry)));
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
131 if (!lw->dir_fd || strcmp(buf, lw->dir_fd->path) != 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
132 {
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
133 layout_set_path(lw, buf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
134 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
135
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
136 g_free(buf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
137 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
138
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
139 static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
140 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
141 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
142 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
143
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
144 buf = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
145 parse_out_relatives(buf);
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
146
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
147 if (isdir(buf))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
148 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
149 if ((!lw->dir_fd || strcmp(lw->dir_fd->path, buf) != 0) && layout_set_path(lw, buf))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
150 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
151 gint pos = -1;
726
a1dcef8cd1ae Use G_DIR_SEPARATOR where applicable.
zas_
parents: 725
diff changeset
152 /* put the G_DIR_SEPARATOR back, if we are in tab completion for a dir and result was path change */
725
eda074e91ddd Use G_DIR_SEPARATOR_S where applicable.
zas_
parents: 694
diff changeset
153 gtk_editable_insert_text(GTK_EDITABLE(lw->path_entry), G_DIR_SEPARATOR_S, -1, &pos);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
154 gtk_editable_set_position(GTK_EDITABLE(lw->path_entry),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
155 strlen(gtk_entry_get_text(GTK_ENTRY(lw->path_entry))));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
156 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
157 }
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
158 else if (lw->dir_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
159 {
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
160 gchar *base = remove_level_from_path(buf);
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
161
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
162 if (strcmp(lw->dir_fd->path, base) == 0)
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
163 {
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
164 layout_list_scroll_to_subpart(lw, filename_from_path(buf));
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
165 }
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
166 g_free(base);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
167 }
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
168
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
169 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
170 }
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 static void layout_path_entry_cb(const gchar *path, gpointer data)
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 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
175 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
176
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
177 buf = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
178 parse_out_relatives(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
179
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
180 layout_set_path(lw, buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
181
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
182 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
183 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
184
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
185 static void layout_vd_select_cb(ViewDir *vd, const gchar *path, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
186 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
187 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
188
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
189 layout_set_path(lw, path);
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
1167
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
192 static void layout_path_entry_tab_append_cb(const gchar *path, gpointer data, gint n)
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
193 {
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
194 LayoutWindow *lw = data;
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
195
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
196 if (!lw || !lw->back_button) return;
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
197 if (!layout_valid(&lw)) return;
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
198
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
199 /* Enable back button if it makes sense */
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
200 gtk_widget_set_sensitive(lw->back_button, (n > 1));
1167
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
201 }
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
202
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
203 static GtkWidget *layout_tool_setup(LayoutWindow *lw)
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 GtkWidget *box;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
206 GtkWidget *menu_bar;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
207 GtkWidget *tabcomp;
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 box = gtk_vbox_new(FALSE, 0);
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 menu_bar = layout_actions_menu_bar(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
212 gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
213 gtk_widget_show(menu_bar);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
214
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1334
diff changeset
215 lw->toolbar = layout_actions_toolbar(lw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
216 gtk_box_pack_start(GTK_BOX(box), lw->toolbar, FALSE, FALSE, 0);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
217 if (!lw->options.toolbar_hidden) gtk_widget_show(lw->toolbar);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
218
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
219 tabcomp = tab_completion_new_with_history(&lw->path_entry, NULL, "path_list", -1,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
220 layout_path_entry_cb, lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
221 tab_completion_add_tab_func(lw->path_entry, layout_path_entry_tab_cb, lw);
1167
e812b1a7adda Add a back button in the toolbar: it allows to go back and forth between two directories. Experimental, please test and comment on ml.
zas_
parents: 1055
diff changeset
222 tab_completion_add_append_func(lw->path_entry, layout_path_entry_tab_append_cb, lw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
223 gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
224 gtk_widget_show(tabcomp);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
225
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
226 g_signal_connect(G_OBJECT(lw->path_entry->parent), "changed",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
227 G_CALLBACK(layout_path_entry_changed_cb), lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
228
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
229 lw->vd = vd_new(lw->options.dir_view_type, lw->dir_fd);
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
230 vd_set_layout(lw->vd, lw);
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
231 vd_set_select_func(lw->vd, layout_vd_select_cb, lw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
232
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
233 lw->dir_view = lw->vd->widget;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
234
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
235 gtk_box_pack_start(GTK_BOX(box), lw->dir_view, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
236 gtk_widget_show(lw->dir_view);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
237
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
238 gtk_widget_show(box);
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 return box;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
241 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
242
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 * sort button (and menu)
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
249 static void layout_sort_menu_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
250 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
251 LayoutWindow *lw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
252 SortType type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
253
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
254 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
255
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
256 lw = submenu_item_get_data(widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
257 if (!lw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
258
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
259 type = (SortType)GPOINTER_TO_INT(data);
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 layout_sort_set(lw, type, lw->sort_ascend);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
264 static void layout_sort_menu_ascend_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
265 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
266 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
267
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
268 layout_sort_set(lw, lw->sort_method, !lw->sort_ascend);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
271 static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
272 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
273 /* destroy the menu */
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1029
diff changeset
274 #if GTK_CHECK_VERSION(2,12,0)
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1029
diff changeset
275 g_object_unref(widget);
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1029
diff changeset
276 #else
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
277 gtk_widget_unref(GTK_WIDGET(widget));
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1029
diff changeset
278 #endif
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 static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
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 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
284 GtkWidget *menu;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
285 GdkEvent *event;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
286 guint32 etime;
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 menu = submenu_add_sort(NULL, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->sort_method);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
289
88
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
290 /* take ownership of menu */
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
291 #ifdef GTK_OBJECT_FLOATING
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
292 /* GTK+ < 2.10 */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
293 g_object_ref(G_OBJECT(menu));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
294 gtk_object_sink(GTK_OBJECT(menu));
88
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
295 #else
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
296 /* GTK+ >= 2.10 */
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
297 g_object_ref_sink(G_OBJECT(menu));
2099ee3f9a8d Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
gqview
parents: 81
diff changeset
298 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
299
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
300 /* ascending option */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
301 menu_item_add_divider(menu);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
302 menu_item_add_check(menu, _("Ascending"), lw->sort_ascend, G_CALLBACK(layout_sort_menu_ascend_cb), lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
303
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
304 g_signal_connect(G_OBJECT(menu), "selection_done",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
305 G_CALLBACK(layout_sort_menu_hide_cb), NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
306
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
307 event = gtk_get_current_event();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
308 if (event)
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 etime = gdk_event_get_time(event);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
311 gdk_event_free(event);
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 else
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 etime = 0;
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 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, etime);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
319 }
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 static GtkWidget *layout_sort_button(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
322 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
323 GtkWidget *button;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
324
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
325 button = gtk_button_new_with_label(sort_type_get_text(lw->sort_method));
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
326 g_signal_connect(G_OBJECT(button), "clicked",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
327 G_CALLBACK(layout_sort_button_press_cb), lw);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
328 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
329
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
330 return button;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
331 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
332
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 *-----------------------------------------------------------------------------
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
335 * color profile button (and menu)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
336 *-----------------------------------------------------------------------------
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
337 */
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
338
1006
45ce6c1f331e Silent warnings about unused functions when lcms is not used.
zas_
parents: 995
diff changeset
339 #ifdef HAVE_LCMS
45ce6c1f331e Silent warnings about unused functions when lcms is not used.
zas_
parents: 995
diff changeset
340
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
341 static void layout_color_menu_enable_cb(GtkWidget *widget, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
342 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
343 LayoutWindow *lw = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
344
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
345 layout_image_color_profile_set_use(lw, (!layout_image_color_profile_get_use(lw)));
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
346 layout_image_refresh(lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
347 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
348
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
349 static void layout_color_menu_use_image_cb(GtkWidget *widget, gpointer data)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
350 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
351 LayoutWindow *lw = data;
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
352 gint input, screen;
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
353 gboolean use_image;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
354
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
355 if (!layout_image_color_profile_get(lw, &input, &screen, &use_image)) return;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
356 layout_image_color_profile_set(lw, input, screen, !use_image);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
357 layout_image_refresh(lw);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
358 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
359
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
360 #define COLOR_MENU_KEY "color_menu_key"
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
361
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
362 static void layout_color_menu_input_cb(GtkWidget *widget, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
363 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
364 LayoutWindow *lw = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
365 gint type;
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
366 gint input, screen;
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
367 gboolean use_image;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
368
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
369 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
370
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
371 type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), COLOR_MENU_KEY));
432
96f8389c36de fixed max. number of profiles
nadvornik
parents: 426
diff changeset
372 if (type < 0 || type >= COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS) return;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
373
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
374 if (!layout_image_color_profile_get(lw, &input, &screen, &use_image)) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
375 if (type == input) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
376
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
377 layout_image_color_profile_set(lw, type, screen, use_image);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
378 layout_image_refresh(lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
379 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
380
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
381 static void layout_color_menu_screen_cb(GtkWidget *widget, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
382 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
383 LayoutWindow *lw = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
384 gint type;
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
385 gint input, screen;
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
386 gboolean use_image;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
387
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
388 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
389
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
390 type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), COLOR_MENU_KEY));
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
391 if (type < 0 || type > 1) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
392
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
393 if (!layout_image_color_profile_get(lw, &input, &screen, &use_image)) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
394 if (type == screen) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
395
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
396 layout_image_color_profile_set(lw, input, type, use_image);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
397 layout_image_refresh(lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
398 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
399
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
400 static gchar *layout_color_name_parse(const gchar *name)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
401 {
1333
bdc19836c33d Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
zas_
parents: 1332
diff changeset
402 if (!name || !*name) return g_strdup(_("Empty"));
269
dca6c0b9f862 Simplify layout_color_name_parse() using g_strdelimit().
zas_
parents: 268
diff changeset
403 return g_strdelimit(g_strdup(name), "_", '-');
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
404 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
405
1006
45ce6c1f331e Silent warnings about unused functions when lcms is not used.
zas_
parents: 995
diff changeset
406 #endif /* HAVE_LCMS */
45ce6c1f331e Silent warnings about unused functions when lcms is not used.
zas_
parents: 995
diff changeset
407
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
408 static void layout_color_button_press_cb(GtkWidget *widget, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
409 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
410 #ifndef HAVE_LCMS
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
411 gchar *msg = g_strdup_printf(_("This installation of %s was not built with support for color profiles."), GQ_APPNAME);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
412 file_util_warning_dialog(_("Color profiles not supported"),
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
413 msg,
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
414 GTK_STOCK_DIALOG_INFO, widget);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
415 g_free(msg);
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
416 return;
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
417 #else
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
418 LayoutWindow *lw = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
419 GtkWidget *menu;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
420 GtkWidget *item;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
421 gchar *buf;
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
422 gboolean active;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
423 gint input = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
424 gint screen = 0;
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
425 gboolean use_image = FALSE;
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1416
diff changeset
426 gboolean from_image;
1333
bdc19836c33d Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
zas_
parents: 1332
diff changeset
427 gint image_profile;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
428 gint i;
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
429
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
430 if (!layout_image_color_profile_get(lw, &input, &screen, &use_image)) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
431
1333
bdc19836c33d Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
zas_
parents: 1332
diff changeset
432 image_profile = layout_image_color_profile_get_from_image(lw);
bdc19836c33d Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
zas_
parents: 1332
diff changeset
433 from_image = use_image && (image_profile != COLOR_PROFILE_NONE);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
434 menu = popup_menu_short_lived();
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
435
270
67db7e4505c6 Move active variable affectation after the test.
zas_
parents: 269
diff changeset
436 active = layout_image_color_profile_get_use(lw);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
437 menu_item_add_check(menu, _("Use _color profiles"), active,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
438 G_CALLBACK(layout_color_menu_enable_cb), lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
439
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
440 menu_item_add_divider(menu);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
441
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
442 item = menu_item_add_check(menu, _("Use profile from _image"), use_image,
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
443 G_CALLBACK(layout_color_menu_use_image_cb), lw);
1363
d87deb05d59f Enable 'Use profile from image' item of color management menu only if such profile information is available from image.
zas_
parents: 1362
diff changeset
444 gtk_widget_set_sensitive(item, image_profile == COLOR_PROFILE_MEM || (image_profile > COLOR_PROFILE_NONE && image_profile < COLOR_PROFILE_FILE));
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
445
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
446 for (i = COLOR_PROFILE_SRGB; i < COLOR_PROFILE_FILE; i++)
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
447 {
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
448 const gchar *label;
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
449
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
450 switch (i)
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
451 {
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
452 case COLOR_PROFILE_SRGB: label = _("sRGB"); break;
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
453 case COLOR_PROFILE_ADOBERGB: label = _("AdobeRGB compatible"); break;
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
454 default: label = "fixme"; break;
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
455 }
1333
bdc19836c33d Really fix up color profiles options tests. Add an indicator of the embedded color profile when recognized (a * just after sRGB or AdobeRGB compatible).
zas_
parents: 1332
diff changeset
456 buf = g_strdup_printf(_("Input _%d: %s%s"), i, label, (i == image_profile) ? " *" : "");
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
457 item = menu_item_add_radio(menu, (i == COLOR_PROFILE_SRGB) ? NULL : item,
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
458 buf, (input == i),
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
459 G_CALLBACK(layout_color_menu_input_cb), lw);
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
460 g_free(buf);
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
461 g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(i));
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
462 gtk_widget_set_sensitive(item, active && !from_image);
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
463 }
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
464
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
465 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
466 {
1342
06ec1279e33e Color profiles menu: test for file access before allowing to select it as input profile.
zas_
parents: 1336
diff changeset
467 const gchar *name = options->color_profile.input_name[i];
06ec1279e33e Color profiles menu: test for file access before allowing to select it as input profile.
zas_
parents: 1336
diff changeset
468 const gchar *file = options->color_profile.input_file[i];
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
469 gchar *end;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
470
1342
06ec1279e33e Color profiles menu: test for file access before allowing to select it as input profile.
zas_
parents: 1336
diff changeset
471 if (!name || !name[0]) name = filename_from_path(file);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
472
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
473 end = layout_color_name_parse(name);
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
474 buf = g_strdup_printf(_("Input _%d: %s"), i + COLOR_PROFILE_FILE, end);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
475 g_free(end);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
476
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
477 item = menu_item_add_radio(menu, item,
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
478 buf, (i + COLOR_PROFILE_FILE == input),
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
479 G_CALLBACK(layout_color_menu_input_cb), lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
480 g_free(buf);
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 390
diff changeset
481 g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(i + COLOR_PROFILE_FILE));
1362
b3156b2ec4c5 Improve file checks using is_readable_file().
zas_
parents: 1356
diff changeset
482 gtk_widget_set_sensitive(item, active && !from_image && is_readable_file(file));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
483 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
484
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
485 menu_item_add_divider(menu);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
486
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
487 item = menu_item_add_radio(menu, NULL,
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
488 _("Screen sRGB"), (screen == 0),
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
489 G_CALLBACK(layout_color_menu_screen_cb), lw);
878
1b14c0e177ad layout_color_button_press_cb(): tidy up, drop useless memory allocations, improve i18n.
zas_
parents: 837
diff changeset
490
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
491 g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(0));
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
492 gtk_widget_set_sensitive(item, active);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
493
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
494 item = menu_item_add_radio(menu, item,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
495 _("_Screen profile"), (screen == 1),
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
496 G_CALLBACK(layout_color_menu_screen_cb), lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
497 g_object_set_data(G_OBJECT(item), COLOR_MENU_KEY, GINT_TO_POINTER(1));
1362
b3156b2ec4c5 Improve file checks using is_readable_file().
zas_
parents: 1356
diff changeset
498 gtk_widget_set_sensitive(item, active && is_readable_file(options->color_profile.screen_file));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
499
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
500 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 281
diff changeset
501 #endif /* HAVE_LCMS */
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
502 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
503
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
504 static GtkWidget *layout_color_button(LayoutWindow *lw)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
505 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
506 GtkWidget *button;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
507 GtkWidget *image;
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
508 gboolean enable;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
509
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
510 button = gtk_button_new();
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
511 image = gtk_image_new_from_stock(GTK_STOCK_SELECT_COLOR, GTK_ICON_SIZE_MENU);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
512 gtk_container_add(GTK_CONTAINER(button), image);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
513 gtk_widget_show(image);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
514 g_signal_connect(G_OBJECT(button), "clicked",
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
515 G_CALLBACK(layout_color_button_press_cb), lw);
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
516 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
517
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
518 #ifdef HAVE_LCMS
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
519 enable = (lw->image) ? lw->image->color_profile_enable : FALSE;
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
520 #else
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
521 enable = FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
522 #endif
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
523 gtk_widget_set_sensitive(image, enable);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
524
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
525 return button;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
526 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
527
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
528 /*
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
529 *-----------------------------------------------------------------------------
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
530 * write button
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
531 *-----------------------------------------------------------------------------
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
532 */
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
533
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
534 static void layout_write_button_press_cb(GtkWidget *widget, gpointer data)
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
535 {
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
536 metadata_write_queue_confirm(NULL, NULL);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
537 }
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
538
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
539 static GtkWidget *layout_write_button(LayoutWindow *lw)
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
540 {
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
541 GtkWidget *button;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
542 GtkWidget *image;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
543
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
544 button = gtk_button_new();
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
545 image = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
546 gtk_container_add(GTK_CONTAINER(button), image);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
547 gtk_widget_show(image);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
548 g_signal_connect(G_OBJECT(button), "clicked",
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
549 G_CALLBACK(layout_write_button_press_cb), lw);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
550 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
551
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
552 gtk_widget_set_sensitive(button, metadata_queue_length() > 0);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
553
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
554 return button;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
555 }
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
556
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
557
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
558 /*
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
559 *-----------------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
560 * status bar
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
563
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
564 void layout_status_update_write(LayoutWindow *lw)
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
565 {
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
566 if (!layout_valid(&lw)) return;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
567 if (!lw->info_write) return;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
568
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
569 gtk_widget_set_sensitive(lw->info_write, metadata_queue_length() > 0);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
570 /* FIXME: maybe show also the number of files */
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
571 }
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
572
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
573 void layout_status_update_write_all(void)
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
574 {
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
575 GList *work;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
576
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
577 work = layout_window_list;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
578 while (work)
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
579 {
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
580 LayoutWindow *lw = work->data;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
581 work = work->next;
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
582
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
583 layout_status_update_write(lw);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
584 }
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
585 }
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
586
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
587
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
588 void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
589 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
590 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
591 if (!lw->info_progress_bar) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
592
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
593 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(lw->info_progress_bar), val);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
594 gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), (text) ? text : " ");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
595 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
596
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
597 void layout_status_update_info(LayoutWindow *lw, const gchar *text)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
598 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
599 gchar *buf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
600
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
601 if (!layout_valid(&lw)) return;
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 (!text)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
604 {
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 726
diff changeset
605 guint n;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
606 gint64 n_bytes = 0;
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
607
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
608 n = layout_list_count(lw, &n_bytes);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
609
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
610 if (n)
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
611 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
612 guint s;
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
613 gint64 s_bytes = 0;
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
614 const gchar *ss;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
615
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
616 if (layout_image_slideshow_active(lw))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
617 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
618 if (!layout_image_slideshow_paused(lw))
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
619 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
620 ss = _(" Slideshow");
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
621 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
622 else
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
623 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
624 ss = _(" Paused");
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
625 }
9
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
628 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
629 ss = "";
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
630 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
631
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
632 s = layout_selection_count(lw, &s_bytes);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
633
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
634 layout_bars_new_selection(lw, s);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
635
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
636 if (s > 0)
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
637 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
638 gchar *b = text_from_size_abrev(n_bytes);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
639 gchar *sb = text_from_size_abrev(s_bytes);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
640 buf = g_strdup_printf(_("%s, %d files (%s, %d)%s"), b, n, sb, s, ss);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
641 g_free(b);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
642 g_free(sb);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
643 }
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
644 else if (n > 0)
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
645 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
646 gchar *b = text_from_size_abrev(n_bytes);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
647 buf = g_strdup_printf(_("%s, %d files%s"), b, n, ss);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
648 g_free(b);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
649 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
650 else
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
651 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
652 buf = g_strdup_printf(_("%d files%s"), n, ss);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
653 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
654
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
655 text = buf;
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
656
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
657 image_osd_update(lw->image);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
658 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
659 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
660 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
661 text = "";
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
662 }
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
663 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
664
583
de3e2bc22336 Revert patch 675, and correctly fix gtk assertion failure.
zas_
parents: 574
diff changeset
665 if (lw->info_status) gtk_label_set_text(GTK_LABEL(lw->info_status), text);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
666 g_free(buf);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
669 void layout_status_update_image(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
670 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
671 guint64 n;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
672
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
673 if (!layout_valid(&lw) || !lw->image) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
674
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
675 n = layout_list_count(lw, NULL);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
676
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
677 if (!n)
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
678 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
679 gtk_label_set_text(GTK_LABEL(lw->info_zoom), "");
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
680 gtk_label_set_text(GTK_LABEL(lw->info_details), "");
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
681 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
682 else
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
683 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
684 gchar *text;
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
685 gchar *b;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
686
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
687 text = image_zoom_get_as_text(lw->image);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
688 gtk_label_set_text(GTK_LABEL(lw->info_zoom), text);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
689 g_free(text);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
690
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
691 b = image_get_fd(lw->image) ? text_from_size(image_get_fd(lw->image)->size) : g_strdup("0");
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
692
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
693 if (lw->image->unknown)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
694 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
695 if (image_get_path(lw->image) && !access_file(image_get_path(lw->image), R_OK))
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
696 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
697 text = g_strdup_printf(_("(no read permission) %s bytes"), b);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
698 }
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
699 else
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
700 {
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
701 text = g_strdup_printf(_("( ? x ? ) %s bytes"), b);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
702 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
703 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
704 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
705 {
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
706 gint width, height;
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
707
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
708 image_get_image_size(lw->image, &width, &height);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
709 text = g_strdup_printf(_("( %d x %d ) %s bytes"),
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
710 width, height, b);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
711 }
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
712
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
713 g_signal_emit_by_name (lw->image->pr, "update-pixel");
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
714
984
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
715 g_free(b);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
716
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
717 gtk_label_set_text(GTK_LABEL(lw->info_details), text);
bc73dc055cd0 Only display status if there is at least one file in the file list.
zas_
parents: 960
diff changeset
718 g_free(text);
9
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 }
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 void layout_status_update_all(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
723 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
724 layout_status_update_progress(lw, 0.0, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
725 layout_status_update_info(lw, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
726 layout_status_update_image(lw);
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
727 layout_status_update_write(lw);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
728 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
729
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1431
diff changeset
730 static GtkWidget *layout_status_label(gchar *text, GtkWidget *box, gboolean start, gint size, gboolean expand)
9
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 GtkWidget *label;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
733 GtkWidget *frame;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
734
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
735 frame = gtk_frame_new(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
736 if (size) gtk_widget_set_size_request(frame, size, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
737 gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
738 if (start)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
739 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
740 gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
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 else
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 gtk_box_pack_end(GTK_BOX(box), frame, expand, expand, 0);
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 gtk_widget_show(frame);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
747
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
748 label = gtk_label_new(text ? text : "");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
749 gtk_container_add(GTK_CONTAINER(frame), label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
750 gtk_widget_show(label);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
751
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
752 return label;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
753 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
754
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1431
diff changeset
755 static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small_format)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
756 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
757 GtkWidget *hbox;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
758
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
759 if (lw->info_box) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
760
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
761 if (small_format)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
762 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
763 lw->info_box = gtk_vbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
764 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
765 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
766 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
767 lw->info_box = gtk_hbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
768 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
769 gtk_box_pack_end(GTK_BOX(box), lw->info_box, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
770 gtk_widget_show(lw->info_box);
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 if (small_format)
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 hbox = gtk_hbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
775 gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
776 gtk_widget_show(hbox);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
779 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
780 hbox = lw->info_box;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
781 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
782 lw->info_progress_bar = gtk_progress_bar_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
783 gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
784 gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
785 gtk_widget_show(lw->info_progress_bar);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
786
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
787 lw->info_sort = layout_sort_button(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
788 gtk_box_pack_start(GTK_BOX(hbox), lw->info_sort, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
789 gtk_widget_show(lw->info_sort);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
790
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
791 lw->info_color = layout_color_button(lw);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
792 gtk_widget_show(lw->info_color);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
793
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
794 lw->info_write = layout_write_button(lw);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
795 gtk_widget_show(lw->info_write);
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
796
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
797 if (small_format) gtk_box_pack_end(GTK_BOX(hbox), lw->info_color, FALSE, FALSE, 0);
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
798 if (small_format) gtk_box_pack_end(GTK_BOX(hbox), lw->info_write, FALSE, FALSE, 0);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
799
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
800 lw->info_status = layout_status_label(NULL, lw->info_box, TRUE, 0, (!small_format));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
801
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
802 if (small_format)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
803 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
804 hbox = gtk_hbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
805 gtk_box_pack_start(GTK_BOX(lw->info_box), hbox, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
806 gtk_widget_show(hbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
807 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
808 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
809 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
810 hbox = lw->info_box;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
811 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
812 lw->info_details = layout_status_label(NULL, hbox, TRUE, 0, TRUE);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
813 if (!small_format) gtk_box_pack_start(GTK_BOX(hbox), lw->info_color, FALSE, FALSE, 0);
1240
30e207ac22e4 added a status bar button for writting metadata immediately
nadvornik
parents: 1231
diff changeset
814 if (!small_format) gtk_box_pack_start(GTK_BOX(hbox), lw->info_write, FALSE, FALSE, 0);
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
815 lw->info_pixel = layout_status_label(NULL, hbox, FALSE, PIXEL_LABEL_WIDTH, TRUE);
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
816 if (lw->options.info_pixel_hidden) gtk_widget_hide(gtk_widget_get_parent(lw->info_pixel));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
817 lw->info_zoom = layout_status_label(NULL, hbox, FALSE, ZOOM_LABEL_WIDTH, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
818 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
819
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
820 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
821 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
822 * views
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 */
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 static GtkWidget *layout_tools_new(LayoutWindow *lw)
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 lw->dir_view = layout_tool_setup(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
829 return lw->dir_view;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
830 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
831
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
832 static void layout_list_status_cb(ViewFile *vf, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
833 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
834 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
835
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
836 layout_status_update_info(lw, NULL);
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
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
839 static void layout_list_thumb_cb(ViewFile *vf, gdouble val, const gchar *text, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
840 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
841 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
842
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
843 layout_status_update_progress(lw, val, text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
844 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
845
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
846 static GtkWidget *layout_list_new(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
847 {
1412
5a534e1501e1 fixed saving of file_view_type
nadvornik
parents: 1403
diff changeset
848 lw->vf = vf_new(lw->options.file_view_type, NULL);
574
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
849 vf_set_layout(lw->vf, lw);
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
850
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
851 vf_set_status_func(lw->vf, layout_list_status_cb, lw);
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
852 vf_set_thumb_status_func(lw->vf, layout_list_thumb_cb, lw);
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
853
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
854 vf_marks_set(lw->vf, lw->options.show_marks);
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
855
1412
5a534e1501e1 fixed saving of file_view_type
nadvornik
parents: 1403
diff changeset
856 switch (lw->options.file_view_type)
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
857 {
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
858 case FILEVIEW_ICON:
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
859 break;
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
860 case FILEVIEW_LIST:
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
861 vf_thumb_set(lw->vf, lw->options.show_thumbnails);
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
862 break;
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
863 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
864
574
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
865 return lw->vf->widget;
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
868 static void layout_list_sync_thumb(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
869 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
870 if (lw->vf) vf_thumb_set(lw->vf, lw->options.show_thumbnails);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
871 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
872
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
873 static void layout_list_sync_marks(LayoutWindow *lw)
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
874 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
875 if (lw->vf) vf_marks_set(lw->vf, lw->options.show_marks);
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
876 }
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
877
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
878 static void layout_list_scroll_to_subpart(LayoutWindow *lw, const gchar *needle)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
879 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
880 if (!lw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
881 #if 0
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
882 if (lw->vf) vf_scroll_to_subpart(lw->vf, needle);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
883 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
884 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
885
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
886 GList *layout_list(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
887 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
888 if (!layout_valid(&lw)) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
889
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
890 if (lw->vf) return vf_get_list(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
891
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
892 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
893 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
894
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 726
diff changeset
895 guint layout_list_count(LayoutWindow *lw, gint64 *bytes)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
896 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
897 if (!layout_valid(&lw)) return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
898
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
899 if (lw->vf) return vf_count(lw->vf, bytes);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
900
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
901 return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
902 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
903
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
904 FileData *layout_list_get_fd(LayoutWindow *lw, gint index)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
905 {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
906 if (!layout_valid(&lw)) return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
907
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
908 if (lw->vf) return vf_index_get_data(lw->vf, index);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
909
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
910 return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
911 }
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
912
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
913 gint layout_list_get_index(LayoutWindow *lw, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
914 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
915 if (!layout_valid(&lw) || !fd) return -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
916
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
917 if (lw->vf) return vf_index_by_path(lw->vf, fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
918
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
919 return -1;
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
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
922 void layout_list_sync_fd(LayoutWindow *lw, FileData *fd)
9
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 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
925
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
926 if (lw->vf) vf_select_by_fd(lw->vf, fd);
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
929 static void layout_list_sync_sort(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
930 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
931 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
932
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
933 if (lw->vf) vf_sort_set(lw->vf, lw->sort_method, lw->sort_ascend);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
934 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
935
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
936 GList *layout_selection_list(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
937 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
938 if (!layout_valid(&lw)) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
939
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
940 if (layout_image_get_collection(lw, NULL))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
941 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
942 FileData *fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
943
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
944 fd = layout_image_get_fd(lw);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 132
diff changeset
945 if (fd) return g_list_append(NULL, file_data_ref(fd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
946 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
947 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
948
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
949 if (lw->vf) return vf_selection_get_list(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
950
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
951 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
952 }
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 GList *layout_selection_list_by_index(LayoutWindow *lw)
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 if (!layout_valid(&lw)) return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
957
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
958 if (lw->vf) return vf_selection_get_list_by_index(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
959
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
960 return NULL;
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
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 726
diff changeset
963 guint layout_selection_count(LayoutWindow *lw, gint64 *bytes)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
964 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
965 if (!layout_valid(&lw)) return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
966
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
967 if (lw->vf) return vf_selection_count(lw->vf, bytes);
9
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 return 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
970 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
971
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
972 void layout_select_all(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
973 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
974 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
975
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
976 if (lw->vf) vf_select_all(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
977 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
978
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
979 void layout_select_none(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
980 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
981 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
982
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
983 if (lw->vf) vf_select_none(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
984 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
985
601
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
986 void layout_select_invert(LayoutWindow *lw)
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
987 {
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
988 if (!layout_valid(&lw)) return;
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
989
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
990 if (lw->vf) vf_select_invert(lw->vf);
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
991 }
93c6dc4c537b Add a way to invert the current selection.
zas_
parents: 586
diff changeset
992
162
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
993 void layout_mark_to_selection(LayoutWindow *lw, gint mark, MarkToSelectionMode mode)
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
994 {
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
995 if (!layout_valid(&lw)) return;
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
996
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
997 if (lw->vf) vf_mark_to_selection(lw->vf, mark, mode);
162
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
998 }
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
999
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1000 void layout_selection_to_mark(LayoutWindow *lw, gint mark, SelectionToMarkMode mode)
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1001 {
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1002 if (!layout_valid(&lw)) return;
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1003
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
1004 if (lw->vf) vf_selection_to_mark(lw->vf, mark, mode);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
1005
162
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1006 layout_status_update_info(lw, NULL); /* osd in fullscreen mode */
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1007 }
1a42a2451575 created menu "Select" with selection and marks operations
nadvornik
parents: 138
diff changeset
1008
9
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 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1011 * access
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1012 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1013 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1014
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1015 const gchar *layout_get_path(LayoutWindow *lw)
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 (!layout_valid(&lw)) return NULL;
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1018 return lw->dir_fd ? lw->dir_fd->path : NULL;
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1021 static void layout_sync_path(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1022 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1023 if (!lw->dir_fd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1024
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1025 if (lw->path_entry) gtk_entry_set_text(GTK_ENTRY(lw->path_entry), lw->dir_fd->path);
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
1026
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1027 if (lw->vd) vd_set_fd(lw->vd, lw->dir_fd);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1028 if (lw->vf) vf_set_fd(lw->vf, lw->dir_fd);
9
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
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1031 gboolean layout_set_path(LayoutWindow *lw, const gchar *path)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1032 {
959
9791230f83d3 fixed crash in geeqie --blank
nadvornik
parents: 902
diff changeset
1033 FileData *fd;
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1034 gboolean ret;
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
1035
959
9791230f83d3 fixed crash in geeqie --blank
nadvornik
parents: 902
diff changeset
1036 if (!path) return FALSE;
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
1037
959
9791230f83d3 fixed crash in geeqie --blank
nadvornik
parents: 902
diff changeset
1038 fd = file_data_new_simple(path);
1372
4db89b602093 Random tidy up.
zas_
parents: 1365
diff changeset
1039 ret = layout_set_fd(lw, fd);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1040 file_data_unref(fd);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1041 return ret;
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1042 }
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1043
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1044
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1045 gboolean layout_set_fd(LayoutWindow *lw, FileData *fd)
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1046 {
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1047 gboolean have_file = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1048
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1049 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1050
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1051 if (!fd || !isname(fd->path)) return FALSE;
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1052 if (lw->dir_fd && fd == lw->dir_fd)
9
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 return TRUE;
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
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1057 if (isdir(fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1058 {
791
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1059 if (lw->dir_fd)
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1060 {
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1061 file_data_unregister_real_time_monitor(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1062 file_data_unref(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1063 }
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1064 lw->dir_fd = file_data_ref(fd);
791
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1065 file_data_register_real_time_monitor(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1066 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1067 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1068 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1069 gchar *base;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1070
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1071 base = remove_level_from_path(fd->path);
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1072 if (lw->dir_fd && strcmp(lw->dir_fd->path, base) == 0)
9
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 g_free(base);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1075 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1076 else if (isdir(base))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1077 {
791
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1078 if (lw->dir_fd)
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1079 {
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1080 file_data_unregister_real_time_monitor(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1081 file_data_unref(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1082 }
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1083 lw->dir_fd = file_data_new_simple(base);
791
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
1084 file_data_register_real_time_monitor(lw->dir_fd);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1085 g_free(base);
9
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1088 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1089 g_free(base);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1090 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1091 }
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1092 if (isfile(fd->path)) have_file = TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1093 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1094
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1095 if (lw->path_entry) tab_completion_append_to_history(lw->path_entry, lw->dir_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1096 layout_sync_path(lw);
1301
8c47a4f521ad Fix bug 2599857: file list sort order was wrong in many cases.
zas_
parents: 1296
diff changeset
1097 layout_list_sync_sort(lw);
8c47a4f521ad Fix bug 2599857: file list sort order was wrong in many cases.
zas_
parents: 1296
diff changeset
1098
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1099 if (have_file)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1100 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1101 gint row;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1102
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1103 row = layout_list_get_index(lw, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1104 if (row >= 0)
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 layout_image_set_index(lw, row);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1107 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1108 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1109 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1110 layout_image_set_fd(lw, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1111 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1112 }
320
c74af1cbd61a Move more options to ConfOptions.
zas_
parents: 318
diff changeset
1113 else if (!options->lazy_image_sync)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1114 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1115 layout_image_set_index(lw, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1116 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1117
1214
31402ecb2aed write metadata after timeout, image change or dir change
nadvornik
parents: 1177
diff changeset
1118 if (options->metadata.confirm_on_dir_change)
1231
ca8ccf0c3e81 added done callback to utilops
nadvornik
parents: 1214
diff changeset
1119 metadata_write_queue_confirm(NULL, NULL);
1214
31402ecb2aed write metadata after timeout, image change or dir change
nadvornik
parents: 1177
diff changeset
1120
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1121 return TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1124 static void layout_refresh_lists(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1125 {
390
39369521e263 Fix two errors made in revision 473.
zas_
parents: 380
diff changeset
1126 if (lw->vd) vd_refresh(lw->vd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1127
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
1128 if (lw->vf) vf_refresh(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1129 }
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 void layout_refresh(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1132 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1133 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1134
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 501
diff changeset
1135 DEBUG_1("layout refresh");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1136
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1137 layout_refresh_lists(lw);
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 if (lw->image) layout_image_refresh(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1140 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1141
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1142 void layout_thumb_set(LayoutWindow *lw, gboolean enable)
9
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 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1145
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1146 if (lw->options.show_thumbnails == enable) return;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1147
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1148 lw->options.show_thumbnails = enable;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1149
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1150 layout_util_sync_thumb(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1151 layout_list_sync_thumb(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1152 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1153
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1154 void layout_marks_set(LayoutWindow *lw, gboolean enable)
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1155 {
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1156 if (!layout_valid(&lw)) return;
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1157
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1158 if (lw->options.show_marks == enable) return;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1159
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1160 lw->options.show_marks = enable;
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1161
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1162 // layout_util_sync_marks(lw);
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1163 layout_list_sync_marks(lw);
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1164 }
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 127
diff changeset
1165
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1166 gboolean layout_thumb_get(LayoutWindow *lw)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1167 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1168 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1169
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1170 return lw->options.show_thumbnails;
9
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
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1173 gboolean layout_marks_get(LayoutWindow *lw)
433
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 432
diff changeset
1174 {
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 432
diff changeset
1175 if (!layout_valid(&lw)) return FALSE;
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 432
diff changeset
1176
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1177 return lw->options.show_marks;
433
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 432
diff changeset
1178 }
5ddcf93278c7 Save Show Marks state to rc file and display current state in menu.
zas_
parents: 432
diff changeset
1179
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1180 void layout_sort_set(LayoutWindow *lw, SortType type, gboolean ascend)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1181 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1182 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1183 if (lw->sort_method == type && lw->sort_ascend == ascend) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1184
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1185 lw->sort_method = type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1186 lw->sort_ascend = ascend;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1187
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1188 if (lw->info_sort) gtk_label_set_text(GTK_LABEL(GTK_BIN(lw->info_sort)->child),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1189 sort_type_get_text(type));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1190 layout_list_sync_sort(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1191 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1192
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1193 gboolean layout_sort_get(LayoutWindow *lw, SortType *type, gboolean *ascend)
9
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 if (!layout_valid(&lw)) return FALSE;
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 if (type) *type = lw->sort_method;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1198 if (ascend) *ascend = lw->sort_ascend;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1199
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1200 return TRUE;
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
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1203 gboolean layout_geometry_get(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1204 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1205 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1206
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1207 gdk_window_get_root_origin(lw->window->window, x, y);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1208 gdk_drawable_get_size(lw->window->window, w, h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1209
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1210 return TRUE;
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
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1213 gboolean layout_geometry_get_dividers(LayoutWindow *lw, gint *h, gint *v)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1214 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1215 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1216
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1217 if (lw->h_pane && GTK_PANED(lw->h_pane)->child1->allocation.x >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1218 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1219 *h = GTK_PANED(lw->h_pane)->child1->allocation.width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1220 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1221 else if (h != &lw->options.main_window.hdivider_pos)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1222 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1223 *h = lw->options.main_window.hdivider_pos;
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1226 if (lw->v_pane && GTK_PANED(lw->v_pane)->child1->allocation.x >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1227 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1228 *v = GTK_PANED(lw->v_pane)->child1->allocation.height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1229 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1230 else if (v != &lw->options.main_window.vdivider_pos)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1231 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1232 *v = lw->options.main_window.vdivider_pos;
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1235 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1236 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1237
556
fe675761d091 Replace Layout icon_view field by more generic file_view_type.
zas_
parents: 555
diff changeset
1238 void layout_views_set(LayoutWindow *lw, DirViewType dir_view_type, FileViewType file_view_type)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1239 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1240 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1241
1412
5a534e1501e1 fixed saving of file_view_type
nadvornik
parents: 1403
diff changeset
1242 if (lw->options.dir_view_type == dir_view_type && lw->options.file_view_type == file_view_type) return;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1243
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1244 lw->options.dir_view_type = dir_view_type;
1412
5a534e1501e1 fixed saving of file_view_type
nadvornik
parents: 1403
diff changeset
1245 lw->options.file_view_type = file_view_type;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1246
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1247 layout_style_set(lw, -1, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1248 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1249
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1250 gboolean layout_views_get(LayoutWindow *lw, DirViewType *dir_view_type, FileViewType *file_view_type)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1251 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1252 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1253
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1254 *dir_view_type = lw->options.dir_view_type;
1412
5a534e1501e1 fixed saving of file_view_type
nadvornik
parents: 1403
diff changeset
1255 *file_view_type = lw->options.file_view_type;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1256
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1257 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1258 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1259
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1260 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1261 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1262 * location utils
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1263 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1264 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1265
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1266 static gboolean layout_location_single(LayoutLocation l)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1267 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1268 return (l == LAYOUT_LEFT ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1269 l == LAYOUT_RIGHT ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1270 l == LAYOUT_TOP ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1271 l == LAYOUT_BOTTOM);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1272 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1273
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1274 static gboolean layout_location_vertical(LayoutLocation l)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1275 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1276 return (l & LAYOUT_TOP ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1277 l & LAYOUT_BOTTOM);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1278 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1279
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1280 static gboolean layout_location_first(LayoutLocation l)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1281 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1282 return (l & LAYOUT_TOP ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1283 l & LAYOUT_LEFT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1284 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1285
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1286 static LayoutLocation layout_grid_compass(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1287 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1288 if (layout_location_single(lw->dir_location)) return lw->dir_location;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1289 if (layout_location_single(lw->file_location)) return lw->file_location;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1290 return lw->image_location;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1291 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1292
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1293 static void layout_location_compute(LayoutLocation l1, LayoutLocation l2,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1294 GtkWidget *s1, GtkWidget *s2,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1295 GtkWidget **d1, GtkWidget **d2)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1296 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1297 LayoutLocation l;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1298
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1299 l = l1 & l2; /* get common compass direction */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1300 l = l1 - l; /* remove it */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1301
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1302 if (layout_location_first(l))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1303 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1304 *d1 = s1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1305 *d2 = s2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1306 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1307 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1308 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1309 *d1 = s2;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1310 *d2 = s1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1311 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1312 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1313
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1314 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1315 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1316 * tools window (for floating/hidden)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1317 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1318 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1319
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1320 gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w, gint *h, gint *divider_pos)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1321 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1322 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1323
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1324 if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1325 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1326 /* use the stored values (sort of breaks success return value) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1327
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1328 *divider_pos = lw->options.float_window.vdivider_pos;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1329
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1330 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1331 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1332
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1333 gdk_window_get_root_origin(lw->tools->window, x, y);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1334 gdk_drawable_get_size(lw->tools->window, w, h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1335
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1336 if (GTK_IS_VPANED(lw->tools_pane))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1337 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1338 *divider_pos = GTK_PANED(lw->tools_pane)->child1->allocation.height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1339 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1340 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1341 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1342 *divider_pos = GTK_PANED(lw->tools_pane)->child1->allocation.width;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1343 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1344
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1345 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1346 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1347
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1348 static void layout_tools_geometry_sync(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1349 {
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1350 layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.x,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1351 &lw->options.float_window.w, &lw->options.float_window.h, &lw->options.float_window.vdivider_pos);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1352 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1353
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1354 static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1355 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1356 if (!lw->tools) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1357
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1358 if (hide)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1359 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1360 if (GTK_WIDGET_VISIBLE(lw->tools))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1361 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1362 layout_tools_geometry_sync(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1363 gtk_widget_hide(lw->tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1364 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1365 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1366 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1367 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1368 if (!GTK_WIDGET_VISIBLE(lw->tools))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1369 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1370 gtk_widget_show(lw->tools);
574
3da75054d4e1 Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.
zas_
parents: 573
diff changeset
1371 if (lw->vf) vf_refresh(lw->vf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1372 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1373 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1374
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1375 lw->options.tools_hidden = hide;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1376 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1377
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1431
diff changeset
1378 static gboolean layout_tools_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1379 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1380 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1381
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1382 layout_tools_float_toggle(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1383
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1384 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1385 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1386
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1387 static void layout_tools_setup(LayoutWindow *lw, GtkWidget *tools, GtkWidget *files)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1388 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1389 GtkWidget *vbox;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1390 GtkWidget *w1, *w2;
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1431
diff changeset
1391 gboolean vertical;
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1392 gboolean new_window = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1393
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1394 vertical = (layout_location_single(lw->image_location) && !layout_location_vertical(lw->image_location)) ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1395 (!layout_location_single(lw->image_location) && layout_location_vertical(layout_grid_compass(lw)));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1396 #if 0
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1397 layout_location_compute(lw->dir_location, lw->file_location,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1398 tools, files, &w1, &w2);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1399 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1400 /* for now, tools/dir are always first in order */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1401 w1 = tools;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1402 w2 = files;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1403
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1404 if (!lw->tools)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1405 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1406 GdkGeometry geometry;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1407 GdkWindowHints hints;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1408
289
6a7298988a7a Simplify and unify gtk_window creation with the help of
zas_
parents: 288
diff changeset
1409 lw->tools = window_new(GTK_WINDOW_TOPLEVEL, "tools", PIXBUF_INLINE_ICON_TOOLS, NULL, _("Tools"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1410 g_signal_connect(G_OBJECT(lw->tools), "delete_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1411 G_CALLBACK(layout_tools_delete_cb), lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1412 layout_keyboard_init(lw, lw->tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1413
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1414 if (options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1415 {
41
6281cc38e5ca Wed Apr 27 15:17:57 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1416 hints = GDK_HINT_USER_POS;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1417 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1418 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1419 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1420 hints = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1421 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1422
1029
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1006
diff changeset
1423 geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
1a4b18c58556 Use a constant for minimal window size. Set it to 32 for all dialogs.
zas_
parents: 1006
diff changeset
1424 geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1425 geometry.base_width = TOOLWINDOW_DEF_WIDTH;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1426 geometry.base_height = TOOLWINDOW_DEF_HEIGHT;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1427 gtk_window_set_geometry_hints(GTK_WINDOW(lw->tools), NULL, &geometry,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1428 GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hints);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1429
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1430
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1431 gtk_window_set_resizable(GTK_WINDOW(lw->tools), TRUE);
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1432 gtk_container_set_border_width(GTK_CONTAINER(lw->tools), 0);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
1433
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1434 new_window = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1435 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1436 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1437 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1438 layout_tools_geometry_sync(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1439 /* dump the contents */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1440 gtk_widget_destroy(GTK_BIN(lw->tools)->child);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1441 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1442
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1443 layout_actions_add_window(lw, lw->tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1444
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1445 vbox = gtk_vbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1446 gtk_container_add(GTK_CONTAINER(lw->tools), vbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1447 gtk_widget_show(vbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1448
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1449 layout_status_setup(lw, vbox, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1450
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1451 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1452 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1453 lw->tools_pane = gtk_vpaned_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1454 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1455 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1456 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1457 lw->tools_pane = gtk_hpaned_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1458 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1459 gtk_box_pack_start(GTK_BOX(vbox), lw->tools_pane, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1460 gtk_widget_show(lw->tools_pane);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1461
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1462 gtk_paned_pack1(GTK_PANED(lw->tools_pane), w1, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1463 gtk_paned_pack2(GTK_PANED(lw->tools_pane), w2, TRUE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1464
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1465 gtk_widget_show(tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1466 gtk_widget_show(files);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1467
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1468 if (new_window)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1469 {
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1470 if (options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1471 {
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1472 gtk_window_set_default_size(GTK_WINDOW(lw->tools), lw->options.float_window.w, lw->options.float_window.h);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1473 gtk_window_move(GTK_WINDOW(lw->tools), lw->options.float_window.x, lw->options.float_window.y);
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1474 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1475 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1476 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1477 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1478 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1479 gtk_window_set_default_size(GTK_WINDOW(lw->tools),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1480 TOOLWINDOW_DEF_WIDTH, TOOLWINDOW_DEF_HEIGHT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1481 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1482 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1483 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1484 gtk_window_set_default_size(GTK_WINDOW(lw->tools),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1485 TOOLWINDOW_DEF_HEIGHT, TOOLWINDOW_DEF_WIDTH);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1486 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1487 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1488 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1489
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1490 if (!options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1491 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1492 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1493 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1494 lw->options.float_window.vdivider_pos = MAIN_WINDOW_DIV_VPOS;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1495 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1496 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1497 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1498 lw->options.float_window.vdivider_pos = MAIN_WINDOW_DIV_HPOS;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1499 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1500 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1501
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1502 gtk_paned_set_position(GTK_PANED(lw->tools_pane), lw->options.float_window.vdivider_pos);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1503 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1504
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1505 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1506 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1507 * glue (layout arrangement)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1508 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1509 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1510
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1511 static void layout_grid_compute(LayoutWindow *lw,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1512 GtkWidget *image, GtkWidget *tools, GtkWidget *files,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1513 GtkWidget **w1, GtkWidget **w2, GtkWidget **w3)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1514 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1515 /* heh, this was fun */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1516
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1517 if (layout_location_single(lw->dir_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1518 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1519 if (layout_location_first(lw->dir_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1520 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1521 *w1 = tools;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1522 layout_location_compute(lw->file_location, lw->image_location, files, image, w2, w3);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1523 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1524 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1525 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1526 *w3 = tools;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1527 layout_location_compute(lw->file_location, lw->image_location, files, image, w1, w2);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1528 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1529 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1530 else if (layout_location_single(lw->file_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1531 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1532 if (layout_location_first(lw->file_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1533 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1534 *w1 = files;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1535 layout_location_compute(lw->dir_location, lw->image_location, tools, image, w2, w3);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1536 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1537 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1538 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1539 *w3 = files;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1540 layout_location_compute(lw->dir_location, lw->image_location, tools, image, w1, w2);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1541 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1542 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1543 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1544 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1545 /* image */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1546 if (layout_location_first(lw->image_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1547 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1548 *w1 = image;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1549 layout_location_compute(lw->file_location, lw->dir_location, files, tools, w2, w3);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1550 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1551 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1552 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1553 *w3 = image;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1554 layout_location_compute(lw->file_location, lw->dir_location, files, tools, w1, w2);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1555 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1556 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1557 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1558
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1559 void layout_split_change(LayoutWindow *lw, ImageSplitMode mode)
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1560 {
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1561 GtkWidget *image;
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1562 gint i;
268
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1563
98268a6b8182 Tidy up, whitespaces and indentation fix.
zas_
parents: 254
diff changeset
1564 for (i = 0; i < MAX_SPLIT_IMAGES; i++)
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1565 {
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1566 if (lw->split_images[i])
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1567 {
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1568 gtk_widget_hide(lw->split_images[i]->widget);
1383
3c9abbc05792 use standard GtkHPaned for sidebar width
nadvornik
parents: 1375
diff changeset
1569 if (lw->split_images[i]->widget->parent != lw->utility_paned)
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1570 gtk_container_remove(GTK_CONTAINER(lw->split_images[i]->widget->parent), lw->split_images[i]->widget);
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1571 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1572 }
1383
3c9abbc05792 use standard GtkHPaned for sidebar width
nadvornik
parents: 1375
diff changeset
1573 gtk_container_remove(GTK_CONTAINER(lw->utility_paned), lw->split_image_widget);
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1574
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1575 image = layout_image_setup_split(lw, mode);
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1576
1383
3c9abbc05792 use standard GtkHPaned for sidebar width
nadvornik
parents: 1375
diff changeset
1577 // gtk_box_pack_start(GTK_BOX(lw->utility_box), image, TRUE, TRUE, 0);
3c9abbc05792 use standard GtkHPaned for sidebar width
nadvornik
parents: 1375
diff changeset
1578 // gtk_box_reorder_child(GTK_BOX(lw->utility_box), image, 0);
3c9abbc05792 use standard GtkHPaned for sidebar width
nadvornik
parents: 1375
diff changeset
1579 gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1580 gtk_widget_show(image);
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1581 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1582
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1583 static void layout_grid_setup(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1584 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1585 gint priority_location;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1586 GtkWidget *h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1587 GtkWidget *v;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1588 GtkWidget *w1, *w2, *w3;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1589
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1590 GtkWidget *image_sb; /* image together with sidebars in utility box */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1591 GtkWidget *tools;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1592 GtkWidget *files;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1593
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1594 layout_actions_setup(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1595 layout_actions_add_window(lw, lw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1596
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1597 lw->group_box = gtk_vbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1598 gtk_box_pack_start(GTK_BOX(lw->main_box), lw->group_box, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1599 gtk_widget_show(lw->group_box);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1600
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1601 priority_location = layout_grid_compass(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1602
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1603 if (lw->utility_box)
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1604 {
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1605 image_sb = lw->utility_box;
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1606 }
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1607 else
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1608 {
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1609 GtkWidget *image; /* image or split images together */
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1610 image = layout_image_setup_split(lw, lw->split_mode);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1611 image_sb = layout_bars_prepare(lw, image);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1612 }
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1613
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1614 tools = layout_tools_new(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1615 files = layout_list_new(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1616
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1617
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1618 if (lw->options.tools_float || lw->options.tools_hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1619 {
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1620 gtk_box_pack_start(GTK_BOX(lw->group_box), image_sb, TRUE, TRUE, 0);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1621 gtk_widget_show(image_sb);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1622
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1623 layout_tools_setup(lw, tools, files);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1624
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1625 gtk_widget_grab_focus(lw->image->widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1626
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1627 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1628 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1629 else if (lw->tools)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1630 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1631 layout_tools_geometry_sync(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1632 gtk_widget_destroy(lw->tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1633 lw->tools = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1634 lw->tools_pane = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1635 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1636
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1637 layout_status_setup(lw, lw->group_box, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1638
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1639 layout_grid_compute(lw, image_sb, tools, files, &w1, &w2, &w3);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1640
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1641 v = lw->v_pane = gtk_vpaned_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1642
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1643 h = lw->h_pane = gtk_hpaned_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1644
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1645 if (!layout_location_vertical(priority_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1646 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1647 GtkWidget *tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1648
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1649 tmp = v;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1650 v = h;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1651 h = tmp;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1652 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1653
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1654 gtk_box_pack_start(GTK_BOX(lw->group_box), v, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1655
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1656 if (!layout_location_first(priority_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1657 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1658 gtk_paned_pack1(GTK_PANED(v), h, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1659 gtk_paned_pack2(GTK_PANED(v), w3, TRUE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1660
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1661 gtk_paned_pack1(GTK_PANED(h), w1, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1662 gtk_paned_pack2(GTK_PANED(h), w2, TRUE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1663 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1664 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1665 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1666 gtk_paned_pack1(GTK_PANED(v), w1, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1667 gtk_paned_pack2(GTK_PANED(v), h, TRUE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1668
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1669 gtk_paned_pack1(GTK_PANED(h), w2, FALSE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1670 gtk_paned_pack2(GTK_PANED(h), w3, TRUE, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1671 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1672
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1673 gtk_widget_show(image_sb);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1674 gtk_widget_show(tools);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1675 gtk_widget_show(files);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1676
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1677 gtk_widget_show(v);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1678 gtk_widget_show(h);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1679
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1680 /* fix to have image pane visible when it is left and priority widget */
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1681 if (lw->options.main_window.hdivider_pos == -1 &&
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1682 w1 == image_sb &&
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1683 !layout_location_vertical(priority_location) &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1684 layout_location_first(priority_location))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1685 {
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1686 gtk_widget_set_size_request(image_sb, 200, -1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1687 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1688
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1689 gtk_paned_set_position(GTK_PANED(lw->h_pane), lw->options.main_window.hdivider_pos);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1690 gtk_paned_set_position(GTK_PANED(lw->v_pane), lw->options.main_window.vdivider_pos);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1691
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1692 gtk_widget_grab_focus(lw->image->widget);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1693 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1694
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1695 void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1696 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1697 FileData *dir_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1698
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1699 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1700
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1701 if (style != -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1702 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1703 LayoutLocation d, f, i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1704
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1705 layout_config_parse(style, order, &d, &f, &i);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1706
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1707 if (lw->dir_location == d &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1708 lw->file_location == f &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1709 lw->image_location == i) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1710
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1711 lw->dir_location = d;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1712 lw->file_location = f;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1713 lw->image_location = i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1714 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1715
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1716 /* remember state */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1717
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1718 layout_image_slideshow_stop(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1719 layout_image_full_screen_stop(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1720
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1721 dir_fd = lw->dir_fd;
960
37fdfe8f2ab1 fixed crash with float file list and geeqie --blank
nadvornik
parents: 959
diff changeset
1722 if (dir_fd) file_data_unregister_real_time_monitor(dir_fd);
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1723 lw->dir_fd = NULL;
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1724
1403
9274b3b4eaad fixed crash with certain layout configurations
nadvornik
parents: 1383
diff changeset
1725 layout_geometry_get_dividers(lw, &lw->options.main_window.hdivider_pos, &lw->options.main_window.vdivider_pos);
9274b3b4eaad fixed crash with certain layout configurations
nadvornik
parents: 1383
diff changeset
1726
1322
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1727 /* lw->image is preserved together with lw->utility_box */
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1728 if (lw->utility_box)
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1729 {
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1730 /* preserve utility_box (image + sidebars) to be reused later in layout_grid_setup */
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1731 gtk_widget_hide(lw->utility_box);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1732 g_object_ref(lw->utility_box);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1733 gtk_container_remove(GTK_CONTAINER(lw->utility_box->parent), lw->utility_box);
4370b90fa774 reuse original utility_box (image + sidebars) on layout change (switch
nadvornik
parents: 1320
diff changeset
1734 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1735
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1736 /* clear it all */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1737
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1738 lw->h_pane = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1739 lw->v_pane = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1740
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1741 lw->toolbar = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1742 lw->path_entry = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1743 lw->dir_view = NULL;
380
5afe77bb563a Introduce a new struct ViewDir to handle directory views common
zas_
parents: 368
diff changeset
1744 lw->vd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1745
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1746 lw->file_view = NULL;
573
2996f1bbc305 Drop ViewFileList, use ViewFile and ViewFileInfoList instead.
zas_
parents: 559
diff changeset
1747 lw->vf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1748
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1749 lw->info_box = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1750 lw->info_progress_bar = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1751 lw->info_sort = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 91
diff changeset
1752 lw->info_color = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1753 lw->info_status = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1754 lw->info_details = NULL;
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1755 lw->info_pixel = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1756 lw->info_zoom = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1757
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1758 if (lw->ui_manager) g_object_unref(lw->ui_manager);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1759 lw->ui_manager = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1760 lw->action_group = NULL;
1279
6248faa9e829 do not translate already translated texts from desktop files
nadvornik
parents: 1249
diff changeset
1761 lw->action_group_external = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1762
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1763 gtk_container_remove(GTK_CONTAINER(lw->main_box), lw->group_box);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1764 lw->group_box = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1765
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1766 /* re-fill */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1767
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1768 layout_grid_setup(lw);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1769 layout_tools_hide(lw, lw->options.tools_hidden);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1770
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1771 layout_util_sync(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1772 layout_status_update_all(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1773
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1774 /* sync */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1775
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1776 if (image_get_fd(lw->image))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1777 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1778 layout_set_fd(lw, image_get_fd(lw->image));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1779 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1780 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1781 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1782 layout_set_fd(lw, dir_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1783 }
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1784 image_top_window_set_sync(lw->image, (lw->options.tools_float || lw->options.tools_hidden));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1785
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1786 /* clean up */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1787
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
1788 file_data_unref(dir_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1789 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1790
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1791 void layout_colors_update(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1792 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1793 GList *work;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1794
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1795 work = layout_window_list;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1796 while (work)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1797 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1798 LayoutWindow *lw = work->data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1799 work = work->next;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
1800
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
1801 if (!lw->image) continue;
339
de1c2cd06fce Rename user_specified_window_background and window_background_color
zas_
parents: 338
diff changeset
1802 image_background_set_color(lw->image, options->image.use_custom_border_color ? &options->image.border_color : NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1803 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1804 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1805
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1806 void layout_tools_float_toggle(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1807 {
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1808 gboolean popped;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1809
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1810 if (!lw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1811
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1812 if (!lw->options.tools_hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1813 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1814 popped = !lw->options.tools_float;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1815 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1816 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1817 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1818 popped = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1819 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1820
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1821 if (lw->options.tools_float == popped)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1822 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1823 if (popped && lw->options.tools_hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1824 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1825 layout_tools_float_set(lw, popped, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1826 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1827 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1828 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1829 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1830 if (lw->options.tools_float)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1831 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1832 layout_tools_float_set(lw, FALSE, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1833 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1834 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1835 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1836 layout_tools_float_set(lw, TRUE, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1837 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1838 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1839 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1840
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1841 void layout_tools_hide_toggle(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1842 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1843 if (!lw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1844
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1845 layout_tools_float_set(lw, lw->options.tools_float, !lw->options.tools_hidden);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1846 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1847
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1848 void layout_tools_float_set(LayoutWindow *lw, gboolean popped, gboolean hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1849 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1850 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1851
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1852 if (lw->options.tools_float == popped && lw->options.tools_hidden == hidden) return;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1853
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1854 if (lw->options.tools_float == popped && lw->options.tools_float && lw->tools)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1855 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1856 layout_tools_hide(lw, hidden);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1857 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1858 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1859
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1860 lw->options.tools_float = popped;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1861 lw->options.tools_hidden = hidden;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1862
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1863 layout_style_set(lw, -1, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1864 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1865
1416
9fe2fede7ae5 Use gboolean pseudo type where applicable.
zas_
parents: 1415
diff changeset
1866 gboolean layout_tools_float_get(LayoutWindow *lw, gboolean *popped, gboolean *hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1867 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1868 if (!layout_valid(&lw)) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1869
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1870 *popped = lw->options.tools_float;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1871 *hidden = lw->options.tools_hidden;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1872
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1873 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1874 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1875
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1876 void layout_toolbar_toggle(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1877 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1878 if (!layout_valid(&lw)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1879 if (!lw->toolbar) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1880
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1881 lw->options.toolbar_hidden = !lw->options.toolbar_hidden;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1882
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
1883 if (lw->options.toolbar_hidden)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1884 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1885 if (GTK_WIDGET_VISIBLE(lw->toolbar)) gtk_widget_hide(lw->toolbar);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1886 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1887 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1888 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1889 if (!GTK_WIDGET_VISIBLE(lw->toolbar)) gtk_widget_show(lw->toolbar);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1890 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1891 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1892
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1893 void layout_info_pixel_toggle(LayoutWindow *lw)
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1894 {
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1895 GtkWidget *frame;
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1896
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1897 if (!layout_valid(&lw)) return;
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1898 if (!lw->info_pixel) return;
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1899
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1900 lw->options.info_pixel_hidden = !lw->options.info_pixel_hidden;
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1901
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1902 frame = gtk_widget_get_parent(lw->info_pixel);
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1903 if (lw->options.info_pixel_hidden)
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1904 {
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1905 if (GTK_WIDGET_VISIBLE(frame)) gtk_widget_hide(frame);
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1906 }
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1907 else
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1908 {
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1909 if (!GTK_WIDGET_VISIBLE(frame)) gtk_widget_show(frame);
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1910 }
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1911 }
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
1912
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1913 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1914 *-----------------------------------------------------------------------------
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1915 * configuration
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1916 *-----------------------------------------------------------------------------
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1917 */
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1918
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1919 #define CONFIG_WINDOW_DEF_WIDTH 600
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1920 #define CONFIG_WINDOW_DEF_HEIGHT 400
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1921
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1922 typedef struct _LayoutConfig LayoutConfig;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1923 struct _LayoutConfig
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1924 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1925 LayoutWindow *lw;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1926
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1927 GtkWidget *configwindow;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1928 GtkWidget *home_path_entry;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1929 GtkWidget *layout_widget;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1930
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1931 LayoutOptions options;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1932 };
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1933
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1934 static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1935
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1936 static void layout_config_close_cb(GtkWidget *widget, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1937 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1938 LayoutConfig *lc = data;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1939
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1940 gtk_widget_destroy(lc->configwindow);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1941 free_layout_options_content(&lc->options);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1942 g_free(lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1943 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1944
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1945 static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1946 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1947 layout_config_close_cb(w, data);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1948 return TRUE;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1949 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1950
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1951 static void layout_config_apply_cb(GtkWidget *widget, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1952 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1953 LayoutConfig *lc = data;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1954
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1955 g_free(lc->options.order);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1956 lc->options.order = layout_config_get(lc->layout_widget, &lc->options.style);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1957
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1958 config_entry_to_option(lc->home_path_entry, &lc->options.home_path, remove_trailing_slash);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1959
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1960 layout_apply_options(lc->lw, &lc->options);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1961 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1962
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1963 static void layout_config_ok_cb(GtkWidget *widget, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1964 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1965 LayoutConfig *lc = data;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1966 layout_config_apply_cb(widget, lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1967 layout_config_close_cb(widget, lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1968 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1969
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1970 static void home_path_set_current_cb(GtkWidget *widget, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1971 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1972 LayoutConfig *lc = data;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1973 gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1974 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1975
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1976 /*
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1977 static void layout_config_save_cb(GtkWidget *widget, gpointer data)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1978 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1979 layout_config_apply();
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1980 save_options(options);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1981 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1982 */
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1983
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1984 void layout_show_config_window(LayoutWindow *lw)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1985 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1986 LayoutConfig *lc;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1987 GtkWidget *win_vbox;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1988 GtkWidget *hbox;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1989 GtkWidget *vbox;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1990 GtkWidget *button;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1991 GtkWidget *ct_button;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1992 GtkWidget *group;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1993 GtkWidget *frame;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1994 GtkWidget *tabcomp;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1995
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1996 lc = g_new0(LayoutConfig, 1);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1997 lc->lw = lw;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1998 layout_sync_options_with_current_state(lw);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
1999 copy_layout_options(&lc->options, &lw->options);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2000
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2001 lc->configwindow = window_new(GTK_WINDOW_TOPLEVEL, "Layout", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Window options and layout"));
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2002 gtk_window_set_type_hint(GTK_WINDOW(lc->configwindow), GDK_WINDOW_TYPE_HINT_DIALOG);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2003
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2004 g_signal_connect(G_OBJECT(lc->configwindow), "delete_event",
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2005 G_CALLBACK(layout_config_delete_cb), lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2006
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2007 gtk_window_set_default_size(GTK_WINDOW(lc->configwindow), CONFIG_WINDOW_DEF_WIDTH, CONFIG_WINDOW_DEF_HEIGHT);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2008 gtk_window_set_resizable(GTK_WINDOW(lc->configwindow), TRUE);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2009 gtk_container_set_border_width(GTK_CONTAINER(lc->configwindow), PREF_PAD_BORDER);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2010
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2011 win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2012 gtk_container_add(GTK_CONTAINER(lc->configwindow), win_vbox);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2013 gtk_widget_show(win_vbox);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2014
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2015 hbox = gtk_hbutton_box_new();
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2016 gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2017 gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_BUTTON_GAP);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2018 gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2019 gtk_widget_show(hbox);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2020
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2021 button = pref_button_new(NULL, GTK_STOCK_OK, NULL, FALSE,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2022 G_CALLBACK(layout_config_ok_cb), lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2023 gtk_container_add(GTK_CONTAINER(hbox), button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2024 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2025 gtk_widget_grab_default(button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2026 gtk_widget_show(button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2027
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2028 ct_button = button;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2029 /*
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2030 button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2031 G_CALLBACK(layout_config_save_cb), NULL);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2032 gtk_container_add(GTK_CONTAINER(hbox), button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2033 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2034 gtk_widget_show(button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2035 */
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2036 button = pref_button_new(NULL, GTK_STOCK_APPLY, NULL, FALSE,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2037 G_CALLBACK(layout_config_apply_cb), lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2038 gtk_container_add(GTK_CONTAINER(hbox), button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2039 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2040 gtk_widget_show(button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2041
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2042 button = pref_button_new(NULL, GTK_STOCK_CANCEL, NULL, FALSE,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2043 G_CALLBACK(layout_config_close_cb), lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2044 gtk_container_add(GTK_CONTAINER(hbox), button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2045 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2046 gtk_widget_show(button);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2047
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2048 if (!generic_dialog_get_alternative_button_order(lc->configwindow))
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2049 {
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2050 gtk_box_reorder_child(GTK_BOX(hbox), ct_button, -1);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2051 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2052
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2053 frame = pref_frame_new(win_vbox, TRUE, NULL, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2054
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2055 vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2056 gtk_container_add(GTK_CONTAINER(frame), vbox);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2057 gtk_widget_show(vbox);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2058
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2059 group = pref_group_new(vbox, FALSE, _("General options"), GTK_ORIENTATION_VERTICAL);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2060
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2061 pref_label_new(group, _("Home button path (empty to use your home directory)"));
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2062 hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2063
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2064 tabcomp = tab_completion_new(&lc->home_path_entry, lc->options.home_path, NULL, NULL);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2065 tab_completion_add_select_button(lc->home_path_entry, NULL, TRUE);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2066 gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2067 gtk_widget_show(tabcomp);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2068
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2069 button = pref_button_new(hbox, NULL, _("Use current"), FALSE,
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2070 G_CALLBACK(home_path_set_current_cb), lc);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2071
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2072 group = pref_group_new(vbox, FALSE, _("Behavior"), GTK_ORIENTATION_VERTICAL);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2073
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2074 pref_checkbox_new_int(group, _("Show date in directories list view"),
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2075 lc->options.show_directory_date, &lc->options.show_directory_date);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2076
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2077 group = pref_group_new(vbox, FALSE, _("Layout"), GTK_ORIENTATION_VERTICAL);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2078
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2079 lc->layout_widget = layout_config_new();
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2080 layout_config_set(lc->layout_widget, lw->options.style, lw->options.order);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2081 gtk_box_pack_start(GTK_BOX(group), lc->layout_widget, TRUE, TRUE, 0);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2082
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2083 gtk_widget_show(lc->layout_widget);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2084 gtk_widget_show(lc->configwindow);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2085 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2086
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2087 /*
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2088 *-----------------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2089 * base
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2090 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2091 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2092
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2093 void layout_sync_options_with_current_state(LayoutWindow *lw)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2094 {
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2095 Histogram *histogram;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2096 if (!layout_valid(&lw)) return;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2097
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2098 lw->options.main_window.maximized = window_maximized(lw->window);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2099 if (!lw->options.main_window.maximized)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2100 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2101 layout_geometry_get(lw, &lw->options.main_window.x, &lw->options.main_window.y,
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2102 &lw->options.main_window.w, &lw->options.main_window.h);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2103 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2104
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2105 layout_geometry_get_dividers(lw, &lw->options.main_window.hdivider_pos, &lw->options.main_window.vdivider_pos);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2106
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2107 // layout_sort_get(NULL, &options->file_sort.method, &options->file_sort.ascending);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2108
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2109 layout_geometry_get_tools(lw, &lw->options.float_window.x, &lw->options.float_window.y,
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2110 &lw->options.float_window.w, &lw->options.float_window.h, &lw->options.float_window.vdivider_pos);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2111
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2112 lw->options.image_overlay.state = image_osd_get(lw->image);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2113 histogram = image_osd_get_histogram(lw->image);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2114
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2115 lw->options.image_overlay.histogram_channel = histogram->histogram_channel;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2116 lw->options.image_overlay.histogram_mode = histogram->histogram_mode;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2117
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2118 // if (options->startup.restore_path && options->startup.use_last_path)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2119 // {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2120 // g_free(options->startup.path);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2121 // options->startup.path = g_strdup(layout_get_path(NULL));
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2122 // }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2123 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2124
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2125 void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop)
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2126 {
1437
a3d3208b0c50 gint -> gboolean.
zas_
parents: 1436
diff changeset
2127 gboolean refresh_style;
a3d3208b0c50 gint -> gboolean.
zas_
parents: 1436
diff changeset
2128 gboolean refresh_lists;
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2129
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2130 if (!layout_valid(&lw)) return;
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2131 /* FIXME: add other options too */
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2132
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2133 refresh_style = (lop->style != lw->options.style || strcmp(lop->order, lw->options.order) != 0);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2134 refresh_lists = (lop->show_directory_date != lw->options.show_directory_date);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2135
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2136 copy_layout_options(&lw->options, lop);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2137
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2138 if (refresh_style) layout_style_set(lw, lw->options.style, lw->options.order);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2139 if (refresh_lists) layout_refresh(lw);
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2140 }
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2141
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2142
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2143 void layout_close(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2144 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2145 if (layout_window_list && layout_window_list->next)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2146 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2147 layout_free(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2148 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2149 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2150 {
278
04abf5b160eb exit_gqview() renamed to exit_program().
zas_
parents: 273
diff changeset
2151 exit_program();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2152 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2153 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2154
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2155 void layout_free(LayoutWindow *lw)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2156 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2157 if (!lw) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2158
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2159 layout_window_list = g_list_remove(layout_window_list, lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2160
1293
48e064b37ba6 separated "normal" and advanced exif, "Normal" exif is now in the
nadvornik
parents: 1291
diff changeset
2161 if (lw->exif_window) g_signal_handlers_disconnect_matched(G_OBJECT(lw->exif_window), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, lw);
48e064b37ba6 separated "normal" and advanced exif, "Normal" exif is now in the
nadvornik
parents: 1291
diff changeset
2162
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2163 layout_bars_close(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2164
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2165 gtk_widget_destroy(lw->window);
837
f8c22438376c use GtkSizeGroup to control initial size of split images
nadvornik
parents: 820
diff changeset
2166
f8c22438376c use GtkSizeGroup to control initial size of split images
nadvornik
parents: 820
diff changeset
2167 if (lw->split_image_sizegroup) g_object_unref(lw->split_image_sizegroup);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 433
diff changeset
2168
796
0be132a51f51 use new notification in layout and layout_image
nadvornik
parents: 791
diff changeset
2169 file_data_unregister_notify_func(layout_image_notify_cb, lw);
0be132a51f51 use new notification in layout and layout_image
nadvornik
parents: 791
diff changeset
2170
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 984
diff changeset
2171 if (lw->dir_fd)
791
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
2172 {
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
2173 file_data_unregister_real_time_monitor(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
2174 file_data_unref(lw->dir_fd);
6d65167764ea realtime file monitor
nadvornik
parents: 787
diff changeset
2175 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2176
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1334
diff changeset
2177 string_list_free(lw->toolbar_actions);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2178 free_layout_options_content(&lw->options);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2179 g_free(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2180 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2181
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1431
diff changeset
2182 static gboolean layout_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2183 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2184 LayoutWindow *lw = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2185
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2186 layout_close(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2187 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2188 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2189
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2190 LayoutWindow *layout_new(FileData *dir_fd, LayoutOptions *lop)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2191 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2192 return layout_new_with_geometry(dir_fd, lop, NULL);
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2193 }
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2194
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2195 LayoutWindow *layout_new_with_geometry(FileData *dir_fd, LayoutOptions *lop,
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2196 const gchar *geometry)
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2197 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2198 LayoutWindow *lw;
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2199 GdkGeometry hint;
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2200 GdkWindowHints hint_mask;
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2201 Histogram *histogram;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2202
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2203 lw = g_new0(LayoutWindow, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2204
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2205 if (lop)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2206 copy_layout_options(&lw->options, lop);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2207 else
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2208 init_layout_options(&lw->options);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2209
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2210 lw->sort_method = SORT_NAME;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2211 lw->sort_ascend = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2212
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2213 // lw->options.tools_float = popped;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2214 // lw->options.tools_hidden = hidden;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2215 // lw->bar_sort_enabled = options->panels.sort.enabled;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2216 // lw->bar_enabled = options->panels.info.enabled;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2217
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2218 /* default layout */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2219
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2220 layout_config_parse(lw->options.style, lw->options.order,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2221 &lw->dir_location, &lw->file_location, &lw->image_location);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2222 if (lw->options.dir_view_type >= VIEW_DIR_TYPES_COUNT) lw->options.dir_view_type = 0;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2223 if (lw->options.file_view_type >= VIEW_FILE_TYPES_COUNT) lw->options.file_view_type = 0;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2224
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2225 /* divider positions */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2226
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2227 if (!options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2228 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2229 lw->options.main_window.hdivider_pos = MAIN_WINDOW_DIV_HPOS;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2230 lw->options.main_window.vdivider_pos = MAIN_WINDOW_DIV_VPOS;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2231 lw->options.float_window.vdivider_pos = MAIN_WINDOW_DIV_VPOS;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2232 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2233
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2234 /* window */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2235
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: 1167
diff changeset
2236 lw->window = window_new(GTK_WINDOW_TOPLEVEL, GQ_APPNAME_LC, NULL, NULL, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2237 gtk_window_set_resizable(GTK_WINDOW(lw->window), TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2238 gtk_container_set_border_width(GTK_CONTAINER(lw->window), 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2239
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2240 if (options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2241 {
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2242 hint_mask = GDK_HINT_USER_POS;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2243 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2244 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2245 {
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2246 hint_mask = 0;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2247 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2248
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2249 hint.min_width = 32;
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2250 hint.min_height = 32;
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2251 hint.base_width = 0;
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2252 hint.base_height = 0;
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2253 gtk_window_set_geometry_hints(GTK_WINDOW(lw->window), NULL, &hint,
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2254 GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE | hint_mask);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2255
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2256 if (options->save_window_positions)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2257 {
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2258 gtk_window_set_default_size(GTK_WINDOW(lw->window), lw->options.main_window.w, lw->options.main_window.h);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2259 // if (!layout_window_list)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2260 // {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2261 gtk_window_move(GTK_WINDOW(lw->window), lw->options.main_window.x, lw->options.main_window.y);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2262 if (lw->options.main_window.maximized) gtk_window_maximize(GTK_WINDOW(lw->window));
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2263 // }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2264 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2265 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2266 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2267 gtk_window_set_default_size(GTK_WINDOW(lw->window), MAINWINDOW_DEF_WIDTH, MAINWINDOW_DEF_HEIGHT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2268 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2269
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2270 g_signal_connect(G_OBJECT(lw->window), "delete_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2271 G_CALLBACK(layout_delete_cb), lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2272
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2273 layout_keyboard_init(lw, lw->window);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2274
528
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
2275 #ifdef HAVE_LIRC
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
2276 layout_image_lirc_init(lw);
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
2277 #endif
bf9c9e37adf4 Added LIRC patch written by Matteo Beniamino
nadvornik
parents: 523
diff changeset
2278
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2279 lw->main_box = gtk_vbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2280 gtk_container_add(GTK_CONTAINER(lw->window), lw->main_box);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2281 gtk_widget_show(lw->main_box);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2282
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2283 layout_grid_setup(lw);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2284 image_top_window_set_sync(lw->image, (lw->options.tools_float || lw->options.tools_hidden));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2285
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2286 layout_util_sync(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2287 layout_status_update_all(lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2288
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
2289 if (dir_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2290 {
783
d6a7fb4b8e7c replaced directory path with FileData* dir_fd
nadvornik
parents: 774
diff changeset
2291 layout_set_fd(lw, dir_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2292 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2293 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2294 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2295 GdkPixbuf *pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2296
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2297 pixbuf = pixbuf_inline(PIXBUF_INLINE_LOGO);
1287
5fdf258f9c24 Start with "Fit to window" in "Leave Zoom at previous setting" mode
nadvornik
parents: 1284
diff changeset
2298
5fdf258f9c24 Start with "Fit to window" in "Leave Zoom at previous setting" mode
nadvornik
parents: 1284
diff changeset
2299 /* FIXME: the zoom value set here is the value, which is then copied again and again
5fdf258f9c24 Start with "Fit to window" in "Leave Zoom at previous setting" mode
nadvornik
parents: 1284
diff changeset
2300 in "Leave Zoom at previous setting" mode. This is not ideal. */
5fdf258f9c24 Start with "Fit to window" in "Leave Zoom at previous setting" mode
nadvornik
parents: 1284
diff changeset
2301 image_change_pixbuf(lw->image, pixbuf, 0.0, FALSE);
1043
5fc64d6252e7 Replaced gtk depreceated code.
bruclik
parents: 1029
diff changeset
2302 g_object_unref(pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2303 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2304
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2305 if (geometry)
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2306 {
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2307 if (!gtk_window_parse_geometry(GTK_WINDOW(lw->window), geometry))
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2308 {
694
a3218946bd2d Sort out log_printf() vs printf_term() mix up.
zas_
parents: 671
diff changeset
2309 log_printf("%s", _("Invalid geometry\n"));
81
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2310 }
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2311 }
0ef72a64930b Thu Oct 19 09:35:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
2312
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2313 gtk_widget_show(lw->window);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2314 layout_tools_hide(lw, lw->options.tools_hidden);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2315
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2316 image_osd_set(lw->image, lw->options.image_overlay.state);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2317 histogram = image_osd_get_histogram(lw->image);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2318
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2319 histogram->histogram_channel = lw->options.image_overlay.histogram_channel;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2320 histogram->histogram_mode = lw->options.image_overlay.histogram_mode;
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2321
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2322 layout_window_list = g_list_append(layout_window_list, lw);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2323
796
0be132a51f51 use new notification in layout and layout_image
nadvornik
parents: 791
diff changeset
2324 file_data_register_notify_func(layout_image_notify_cb, lw, NOTIFY_PRIORITY_LOW);
0be132a51f51 use new notification in layout and layout_image
nadvornik
parents: 791
diff changeset
2325
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2326 return lw;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2327 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
2328
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2329 void layout_write_attributes(LayoutOptions *layout, GString *outstr, gint indent)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2330 {
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2331 WRITE_NL(); WRITE_INT(*layout, style);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2332 WRITE_NL(); WRITE_CHAR(*layout, order);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2333 WRITE_NL(); WRITE_UINT(*layout, dir_view_type);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2334 WRITE_NL(); WRITE_UINT(*layout, file_view_type);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2335 WRITE_NL(); WRITE_BOOL(*layout, show_marks);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2336 WRITE_NL(); WRITE_BOOL(*layout, show_thumbnails);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2337 WRITE_NL(); WRITE_BOOL(*layout, show_directory_date);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2338 WRITE_NL(); WRITE_CHAR(*layout, home_path);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2339 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2340
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2341 WRITE_NL(); WRITE_INT(*layout, main_window.x);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2342 WRITE_NL(); WRITE_INT(*layout, main_window.y);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2343 WRITE_NL(); WRITE_INT(*layout, main_window.w);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2344 WRITE_NL(); WRITE_INT(*layout, main_window.h);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2345 WRITE_NL(); WRITE_BOOL(*layout, main_window.maximized);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2346 WRITE_NL(); WRITE_INT(*layout, main_window.hdivider_pos);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2347 WRITE_NL(); WRITE_INT(*layout, main_window.vdivider_pos);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2348 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2349
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2350 WRITE_NL(); WRITE_INT(*layout, float_window.x);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2351 WRITE_NL(); WRITE_INT(*layout, float_window.y);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2352 WRITE_NL(); WRITE_INT(*layout, float_window.w);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2353 WRITE_NL(); WRITE_INT(*layout, float_window.h);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2354 WRITE_NL(); WRITE_INT(*layout, float_window.vdivider_pos);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2355 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2356
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2357 WRITE_NL(); WRITE_INT(*layout, properties_window.w);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2358 WRITE_NL(); WRITE_INT(*layout, properties_window.h);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2359 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2360
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2361 WRITE_NL(); WRITE_BOOL(*layout, tools_float);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2362 WRITE_NL(); WRITE_BOOL(*layout, tools_hidden);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2363 WRITE_SEPARATOR();
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2364
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2365 WRITE_NL(); WRITE_BOOL(*layout, toolbar_hidden);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2366 WRITE_NL(); WRITE_BOOL(*layout, info_pixel_hidden);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2367
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2368 WRITE_NL(); WRITE_UINT(*layout, image_overlay.state);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2369 WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_channel);
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2370 WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_mode);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2371 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2372
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2373
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2374 void layout_write_config(LayoutWindow *lw, GString *outstr, gint indent)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2375 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2376 layout_sync_options_with_current_state(lw);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2377 WRITE_NL(); WRITE_STRING("<layout");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2378 layout_write_attributes(&lw->options, outstr, indent + 1);
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2379 WRITE_STRING(">");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2380
1320
055ed09d5a03 improved bar_sort configuration
nadvornik
parents: 1317
diff changeset
2381 bar_sort_write_config(lw->bar_sort, outstr, indent + 1);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2382 bar_write_config(lw->bar, outstr, indent + 1);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2383
1335
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1334
diff changeset
2384 layout_toolbar_write_config(lw, outstr, indent + 1);
588d96cda850 save and restore toolbar configuration
nadvornik
parents: 1334
diff changeset
2385
1461
e015b6573d36 improved config file formatting
nadvornik
parents: 1437
diff changeset
2386 WRITE_NL(); WRITE_STRING("</layout>");
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2387 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2388
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2389 void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names, const gchar **attribute_values)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2390 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2391
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2392 while (*attribute_names)
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2393 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2394 const gchar *option = *attribute_names++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2395 const gchar *value = *attribute_values++;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2396
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2397 /* layout options */
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2398
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2399 if (READ_INT(*layout, style)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2400 if (READ_CHAR(*layout, order)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2401
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2402 if (READ_UINT(*layout, dir_view_type)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2403 if (READ_UINT(*layout, file_view_type)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2404 if (READ_BOOL(*layout, show_marks)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2405 if (READ_BOOL(*layout, show_thumbnails)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2406 if (READ_BOOL(*layout, show_directory_date)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2407 if (READ_CHAR(*layout, home_path)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2408
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2409 /* window positions */
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2410
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2411 if (READ_INT(*layout, main_window.x)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2412 if (READ_INT(*layout, main_window.y)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2413 if (READ_INT(*layout, main_window.w)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2414 if (READ_INT(*layout, main_window.h)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2415 if (READ_BOOL(*layout, main_window.maximized)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2416 if (READ_INT(*layout, main_window.hdivider_pos)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2417 if (READ_INT(*layout, main_window.vdivider_pos)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2418
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2419 if (READ_INT(*layout, float_window.x)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2420 if (READ_INT(*layout, float_window.y)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2421 if (READ_INT(*layout, float_window.w)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2422 if (READ_INT(*layout, float_window.h)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2423 if (READ_INT(*layout, float_window.vdivider_pos)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2424
1315
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2425 if (READ_INT(*layout, properties_window.w)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2426 if (READ_INT(*layout, properties_window.h)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2427
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2428 if (READ_BOOL(*layout, tools_float)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2429 if (READ_BOOL(*layout, tools_hidden)) continue;
c1d108ab3388 Since READ_*() macros are now exported, do not hide
zas_
parents: 1314
diff changeset
2430 if (READ_BOOL(*layout, toolbar_hidden)) continue;
1375
df58e511d90e Display pixel coordinates and rgb - patch by Ruben Stein
nadvornik
parents: 1372
diff changeset
2431 if (READ_BOOL(*layout, info_pixel_hidden)) continue;
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2432
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2433 if (READ_UINT(*layout, image_overlay.state)) continue;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2434 if (READ_INT(*layout, image_overlay.histogram_channel)) continue;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2435 if (READ_INT(*layout, image_overlay.histogram_mode)) continue;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1335
diff changeset
2436
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2437 DEBUG_1("unknown attribute %s = %s", option, value);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2438 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2439
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2440 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2441
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2442 static void layout_config_commandline(LayoutOptions *lop, gchar **path)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2443 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2444 if (command_line->startup_blank)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2445 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2446 *path = NULL;
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2447 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2448 else if (command_line->file)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2449 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2450 *path = g_strdup(command_line->file);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2451 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2452 else if (command_line->path)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2453 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2454 *path = g_strdup(command_line->path);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2455 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2456 else if (options->startup.restore_path && options->startup.path && isdir(options->startup.path))
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2457 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2458 *path = g_strdup(options->startup.path);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2459 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2460 else
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2461 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2462 *path = get_current_dir();
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2463 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2464
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2465 if (command_line->tools_show)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2466 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2467 lop->tools_float = FALSE;
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2468 lop->tools_hidden = FALSE;
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2469 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2470 else if (command_line->tools_hide)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2471 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2472 lop->tools_hidden = TRUE;
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2473 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2474 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2475
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2476 LayoutWindow *layout_new_from_config(const gchar **attribute_names, const gchar **attribute_values, gboolean use_commandline)
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2477 {
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2478 LayoutOptions lop;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2479 LayoutWindow *lw;
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2480 gchar *path = NULL;
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2481
1436
d7a6fb7a90dd completely separated global and layout window options
nadvornik
parents: 1433
diff changeset
2482 init_layout_options(&lop);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2483
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2484 if (attribute_names) layout_load_attributes(&lop, attribute_names, attribute_values);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2485
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2486 if (use_commandline)
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2487 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2488 layout_config_commandline(&lop, &path);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2489 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2490 else if (options->startup.restore_path && options->startup.path && isdir(options->startup.path))
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2491 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2492 path = g_strdup(options->startup.path);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2493 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2494 else
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2495 {
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2496 path = get_current_dir();
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2497 }
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2498
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2499 lw = layout_new_with_geometry(NULL, &lop, use_commandline ? command_line->geometry : NULL);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2500 layout_sort_set(lw, options->file_sort.method, options->file_sort.ascending);
1313
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2501 layout_set_path(lw, path);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2502
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2503 if (use_commandline && command_line->startup_full_screen) layout_image_full_screen_start(lw);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2504 if (use_commandline && command_line->startup_in_slideshow) layout_image_slideshow_start(lw);
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2505
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2506
1ffa5222dc61 enabled commandline again
nadvornik
parents: 1309
diff changeset
2507 g_free(path);
1309
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2508 free_layout_options_content(&lop);
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2509 return lw;
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2510 }
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2511
55ea4962887a config file format changed to XML
nadvornik
parents: 1301
diff changeset
2512
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1045
diff changeset
2513 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */