Mercurial > geeqie.yaz

comparison src/preferences.c @ 1336:4179d41d1149

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed overlay configuration split overlay options between global and layout window
author nadvornik
date Sat, 28 Feb 2009 14:40:22 +0000
parents 15208b140481
children c9949c19a6d0
comparison
equal deleted inserted replaced
1335:588d96cda850 1336:4179d41d1149
315 315
316 options->fullscreen.screen = c_options->fullscreen.screen; 316 options->fullscreen.screen = c_options->fullscreen.screen;
317 options->fullscreen.clean_flip = c_options->fullscreen.clean_flip; 317 options->fullscreen.clean_flip = c_options->fullscreen.clean_flip;
318 options->fullscreen.disable_saver = c_options->fullscreen.disable_saver; 318 options->fullscreen.disable_saver = c_options->fullscreen.disable_saver;
319 options->fullscreen.above = c_options->fullscreen.above; 319 options->fullscreen.above = c_options->fullscreen.above;
320 options->image_overlay.common.show_at_startup = c_options->image_overlay.common.show_at_startup; 320 if (c_options->image_overlay.template_string)
321 if (c_options->image_overlay.common.template_string) 321 set_image_overlay_template_string(&options->image_overlay.template_string,
322 set_image_overlay_template_string(&options->image_overlay.common.template_string, 322 c_options->image_overlay.template_string);
323 c_options->image_overlay.common.template_string);
324 323
325 options->update_on_time_change = c_options->update_on_time_change; 324 options->update_on_time_change = c_options->update_on_time_change;
326 options->image.exif_rotate_enable = c_options->image.exif_rotate_enable; 325 options->image.exif_rotate_enable = c_options->image.exif_rotate_enable;
327 326
328 options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold; 327 options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold;
950 949
951 pTextBuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pTextView)); 950 pTextBuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pTextView));
952 gtk_text_buffer_get_start_iter(pTextBuffer, &iStart); 951 gtk_text_buffer_get_start_iter(pTextBuffer, &iStart);
953 gtk_text_buffer_get_end_iter(pTextBuffer, &iEnd); 952 gtk_text_buffer_get_end_iter(pTextBuffer, &iEnd);
954 953
955 set_image_overlay_template_string(&c_options->image_overlay.common.template_string, 954 set_image_overlay_template_string(&c_options->image_overlay.template_string,
956 gtk_text_buffer_get_text(pTextBuffer, &iStart, &iEnd, TRUE)); 955 gtk_text_buffer_get_text(pTextBuffer, &iStart, &iEnd, TRUE));
957 } 956 }
958 957
959 static void image_overlay_default_template_ok_cb(GenericDialog *gd, gpointer data) 958 static void image_overlay_default_template_ok_cb(GenericDialog *gd, gpointer data)
960 { 959 {
961 GtkTextView *text_view = data; 960 GtkTextView *text_view = data;
962 GtkTextBuffer *buffer; 961 GtkTextBuffer *buffer;
963 962
964 set_default_image_overlay_template_string(&options->image_overlay.common.template_string); 963 set_default_image_overlay_template_string(&options->image_overlay.template_string);
965 if (!configwindow) return; 964 if (!configwindow) return;
966 965
967 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view)); 966 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view));
968 gtk_text_buffer_set_text(buffer, options->image_overlay.common.template_string, -1); 967 gtk_text_buffer_set_text(buffer, options->image_overlay.template_string, -1);
969 } 968 }
970 969
971 static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data) 970 static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data)
972 { 971 {
973 GenericDialog *gd; 972 GenericDialog *gd;
1534 options->fullscreen.disable_saver, &c_options->fullscreen.disable_saver); 1533 options->fullscreen.disable_saver, &c_options->fullscreen.disable_saver);
1535 1534
1536 1535
1537 group = pref_group_new(vbox, FALSE, _("Overlay Screen Display"), GTK_ORIENTATION_VERTICAL); 1536 group = pref_group_new(vbox, FALSE, _("Overlay Screen Display"), GTK_ORIENTATION_VERTICAL);
1538 1537
1539 pref_checkbox_new_int(group, _("Always show image overlay at startup"),
1540 options->image_overlay.common.show_at_startup, &c_options->image_overlay.common.show_at_startup);
1541 pref_label_new(group, _("Image overlay template")); 1538 pref_label_new(group, _("Image overlay template"));
1542 1539
1543 scrolled = gtk_scrolled_window_new(NULL, NULL); 1540 scrolled = gtk_scrolled_window_new(NULL, NULL);
1544 gtk_widget_set_size_request(scrolled, 200, 150); 1541 gtk_widget_set_size_request(scrolled, 200, 150);
1545 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); 1542 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
1578 G_CALLBACK(image_overlay_help_cb), NULL); 1575 G_CALLBACK(image_overlay_help_cb), NULL);
1579 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); 1576 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1580 gtk_widget_show(button); 1577 gtk_widget_show(button);
1581 1578
1582 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(image_overlay_template_view)); 1579 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(image_overlay_template_view));
1583 if (options->image_overlay.common.template_string) gtk_text_buffer_set_text(buffer, options->image_overlay.common.template_string, -1); 1580 if (options->image_overlay.template_string) gtk_text_buffer_set_text(buffer, options->image_overlay.template_string, -1);
1584 g_signal_connect(G_OBJECT(buffer), "changed", 1581 g_signal_connect(G_OBJECT(buffer), "changed",
1585 G_CALLBACK(image_overlay_template_view_changed_cb), image_overlay_template_view); 1582 G_CALLBACK(image_overlay_template_view_changed_cb), image_overlay_template_view);
1586 1583
1587 group = pref_group_new(vbox, FALSE, _("Delete"), GTK_ORIENTATION_VERTICAL); 1584 group = pref_group_new(vbox, FALSE, _("Delete"), GTK_ORIENTATION_VERTICAL);
1588 1585