options->image.max_window_size = c_options->image.max_window_size;
options->image.limit_autofit_size = c_options->image.limit_autofit_size;
options->image.max_autofit_size = c_options->image.max_autofit_size;
+ options->image.max_enlargement_size = c_options->image.max_enlargement_size;
options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
options->progressive_key_scrolling = c_options->progressive_key_scrolling;
options->keyboard_scroll_step = c_options->keyboard_scroll_step;
options->stereo.fixed_x2 = c_options->stereo.fixed_x2;
options->stereo.fixed_y2 = c_options->stereo.fixed_y2;
+ options->info_keywords.height = c_options->info_keywords.height;
+ options->info_title.height = c_options->info_title.height;
+ options->info_comment.height = c_options->info_comment.height;
+
#ifdef DEBUG
set_debug_level(debug_c);
#endif
static void config_tab_general(GtkWidget *notebook)
{
GtkWidget *vbox;
+ GtkWidget *hbox;
GtkWidget *group;
GtkWidget *subgroup;
GtkWidget *button;
pref_checkbox_new_int(group, _("Refresh on file change"),
options->update_on_time_change, &c_options->update_on_time_change);
+
+ group = pref_group_new(vbox, FALSE, _("Info sidebar heights"), GTK_ORIENTATION_VERTICAL);
+ pref_label_new(group, _("NOTE! Geeqie must be restarted for changes to take effect"));
+ hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+ pref_spin_new_int(hbox, _("Keywords:"), NULL,
+ 1, 9999, 1,
+ options->info_keywords.height, &c_options->info_keywords.height);
+ pref_spin_new_int(hbox, _("Title:"), NULL,
+ 1, 9999, 1,
+ options->info_title.height, &c_options->info_title.height);
+ pref_spin_new_int(hbox, _("Comment:"), NULL,
+ 1, 9999, 1,
+ options->info_comment.height, &c_options->info_comment.height);
}
/* image tab */
GtkWidget *group;
GtkWidget *button;
GtkWidget *ct_button;
+ GtkWidget *enlargement_button;
GtkWidget *table;
GtkWidget *spin;
pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
options->image.zoom_2pass, &c_options->image.zoom_2pass);
- pref_checkbox_new_int(group, _("Allow enlargement of image for zoom to fit"),
+ hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
+ enlargement_button = pref_checkbox_new_int(hbox, _("Allow enlargement of image for zoom to fit (max. size in %)"),
options->image.zoom_to_fit_allow_expand, &c_options->image.zoom_to_fit_allow_expand);
+ spin = pref_spin_new_int(hbox, NULL, NULL,
+ 100, 999, 1,
+ options->image.max_enlargement_size, &c_options->image.max_enlargement_size);
+ pref_checkbox_link_sensitivity(enlargement_button, spin);
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- ct_button = pref_checkbox_new_int(hbox, _("Limit image size when autofitting (%):"),
+ ct_button = pref_checkbox_new_int(hbox, _("Limit image size when autofitting (% of window):"),
options->image.limit_autofit_size, &c_options->image.limit_autofit_size);
spin = pref_spin_new_int(hbox, NULL, NULL,
10, 150, 1,
G_CALLBACK(zoom_increment_cb), NULL);
gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(spin), GTK_UPDATE_ALWAYS);
- group = pref_group_new(vbox, FALSE, _("When new image is selected:"), GTK_ORIENTATION_HORIZONTAL);
-
- vbox2 = pref_box_new(group, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
- c_options->image.zoom_mode = options->image.zoom_mode;
- button = pref_radiobutton_new(vbox2, NULL, _("Zoom to original size"),
- (options->image.zoom_mode == ZOOM_RESET_ORIGINAL),
- G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_ORIGINAL));
- button = pref_radiobutton_new(vbox2, button, _("Fit image to window"),
- (options->image.zoom_mode == ZOOM_RESET_FIT_WINDOW),
- G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_FIT_WINDOW));
- button = pref_radiobutton_new(vbox2, button, _("Leave Zoom at previous setting"),
- (options->image.zoom_mode == ZOOM_RESET_NONE),
- G_CALLBACK(zoom_mode_cb), GINT_TO_POINTER(ZOOM_RESET_NONE));
-
- vbox2 = pref_box_new(group, TRUE, GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
- c_options->image.scroll_reset_method = options->image.scroll_reset_method;
- button = pref_radiobutton_new(vbox2, NULL, _("Scroll to top left corner"),
- (options->image.scroll_reset_method == SCROLL_RESET_TOPLEFT),
- G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_TOPLEFT));
- button = pref_radiobutton_new(vbox2, button, _("Scroll to image center"),
- (options->image.scroll_reset_method == SCROLL_RESET_CENTER),
- G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_CENTER));
- button = pref_radiobutton_new(vbox2, button, _("Keep the region from previous image"),
- (options->image.scroll_reset_method == SCROLL_RESET_NOCHANGE),
- G_CALLBACK(scroll_reset_cb), GINT_TO_POINTER(SCROLL_RESET_NOCHANGE));
-
-
group = pref_group_new(vbox, FALSE, _("Appearance"), GTK_ORIENTATION_VERTICAL);
pref_checkbox_new_int(group, _("Use custom border color in window mode"),
label = pref_label_new(group, _("Metadata are written in the following order. The process ends after first success."));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- ct_button = pref_checkbox_new_int(group, _("1) Save metadata in image files, resp. sidecar files, according to the XMP standard"),
+ ct_button = pref_checkbox_new_int(group, _("1) Save metadata in image files, or sidecar files, according to the XMP standard"),
options->metadata.save_in_image_file, &c_options->metadata.save_in_image_file);
#ifndef HAVE_EXIV2
gtk_widget_set_sensitive(ct_button, FALSE);
projects / geeqie.git / blobdiff