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