Merge remote-tracking branch 'github_caclark_geeqie/master'

[geeqie.git] / src / layout.c

diff --git a/src/layout.c b/src/layout.c
index 64579d6..1e4347f 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -292,8 +292,13 @@ static GtkWidget *layout_tool_setup(LayoutWindow *lw)
        gtk_box_pack_start(GTK_BOX(box), tabcomp, FALSE, FALSE, 0);
        gtk_widget_show(tabcomp);
 
+#if GTK_CHECK_VERSION(3,20,0)
+       g_signal_connect(G_OBJECT(gtk_widget_get_parent(gtk_widget_get_parent(lw->path_entry))), "changed",
+                        G_CALLBACK(layout_path_entry_changed_cb), lw);
+#else
        g_signal_connect(G_OBJECT(gtk_widget_get_parent(lw->path_entry)), "changed",
                         G_CALLBACK(layout_path_entry_changed_cb), lw);
+#endif
 
        lw->vd = vd_new(lw->options.dir_view_type, lw->dir_fd);
        vd_set_layout(lw->vd, lw);
@@ -602,14 +607,20 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                }
        lw->info_progress_bar = gtk_progress_bar_new();
        gtk_widget_set_size_request(lw->info_progress_bar, PROGRESS_WIDTH, -1);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(lw->info_progress_bar), "");
+       gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(lw->info_progress_bar), TRUE);
+#endif
        gtk_box_pack_start(GTK_BOX(hbox), lw->info_progress_bar, FALSE, FALSE, 0);
        gtk_widget_show(lw->info_progress_bar);
 
        lw->info_sort = layout_sort_button(lw);
+       gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_sort), _("Select sort order"));
        gtk_box_pack_start(GTK_BOX(hbox), lw->info_sort, FALSE, FALSE, 0);
        gtk_widget_show(lw->info_sort);
 
        lw->info_status = layout_status_label(NULL, lw->info_box, TRUE, 0, (!small_format));
+       gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_status), _("Folder contents (files selected)"));
 
        if (small_format)
                {
@@ -618,6 +629,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                gtk_widget_show(hbox);
                }
        lw->info_details = layout_status_label(NULL, hbox, TRUE, 0, TRUE);
+       gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_details), _("(Image dimensions) Image size"));
        toolbar = layout_actions_toolbar(lw, TOOLBAR_STATUS);
 
        toolbar_frame = gtk_frame_new(NULL);
@@ -627,6 +639,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
        gtk_widget_show(toolbar);
        gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
        lw->info_zoom = layout_status_label(NULL, hbox, FALSE, ZOOM_LABEL_WIDTH, FALSE);
+       gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Image zoom level"));
        if (small_format)
                {
                hbox = gtk_hbox_new(FALSE, 0);
@@ -634,6 +647,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
                gtk_widget_show(hbox);
                }
        lw->info_pixel = layout_status_label(NULL, hbox, FALSE, 0, small_format); /* expand only in small format */
+       gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_pixel), _("[Pixel x,y coord]: (Pixel R,G,B value)"));
        if (!lw->options.show_info_pixel) gtk_widget_hide(gtk_widget_get_parent(lw->info_pixel));
 }
 
@@ -1174,7 +1188,7 @@ gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w,
                return FALSE;
                }
 
-       window = gtk_widget_get_window(lw->window);
+       window = gtk_widget_get_window(lw->tools);
        gdk_window_get_root_origin(window, x, y);
        *w = gdk_window_get_width(window);
        *h = gdk_window_get_height(window);
@@ -2284,6 +2298,8 @@ void layout_write_attributes(LayoutOptions *layout, GString *outstr, gint indent
        WRITE_NL(); WRITE_UINT(*layout, image_overlay.state);
        WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_channel);
        WRITE_NL(); WRITE_INT(*layout, image_overlay.histogram_mode);
+
+       WRITE_NL(); WRITE_BOOL(*layout, animate);
 }
 
 
@@ -2353,6 +2369,8 @@ void layout_load_attributes(LayoutOptions *layout, const gchar **attribute_names
                if (READ_INT(*layout, image_overlay.histogram_channel)) continue;
                if (READ_INT(*layout, image_overlay.histogram_mode)) continue;
 
+               if (READ_BOOL(*layout, animate)) continue;
+
                log_printf("unknown attribute %s = %s\n", option, value);
                }
        if (id && strcmp(id, LAYOUT_ID_CURRENT) != 0)