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