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