Include a Other Software section in Help file

[geeqie.git] / src / image-overlay.c

diff --git a/src/image-overlay.c b/src/image-overlay.c
index e94d752..90d4c78 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -202,7 +202,6 @@ gint image_osd_histogram_get_mode(ImageWindow *imd)
 void image_osd_toggle(ImageWindow *imd)
 {
        OsdShowFlags show;
-
        if (!imd) return;
 
        show = image_osd_get(imd);
@@ -307,6 +306,7 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
                osd_template_insert(vars, "number", g_strdup_printf("%d", n), OSDT_NO_DUP);
                osd_template_insert(vars, "total", g_strdup_printf("%d", t), OSDT_NO_DUP);
                osd_template_insert(vars, "name", (gchar *) name, OSDT_NONE);
+               osd_template_insert(vars, "path", (gchar *) image_get_path(imd), OSDT_NONE);
                osd_template_insert(vars, "date", imd->image_fd ? ((gchar *) text_from_time(imd->image_fd->date)) : "", OSDT_NONE);
                osd_template_insert(vars, "size", imd->image_fd ? (text_from_size_abrev(imd->image_fd->size)) : g_strdup(""), OSDT_FREE);
                osd_template_insert(vars, "zoom", image_zoom_get_as_text(imd), OSDT_FREE);
@@ -521,30 +521,32 @@ static GdkPixbuf *image_osd_guidelines_render(OverlayStateData *osd)
        GdkPixbuf *rectangles;
        ImageWindow *imd = osd->imd;
 
-       pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
-
-       if (width && height)
-               {
-               rectangles = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-               if (rectangles)
-                       {
-                       pixbuf_set_rect_fill(rectangles, 0, 0, width, height, 255, 255, 255, 0);
-                       pixbuf_set_rect(rectangles, 0, 0 + (height / 3), width, height / 3,
-                                                               0, 0, 0, 255,
-                                                               1, 1, 1, 1);
-                       pixbuf_set_rect(rectangles, 0, 0 + (height / 3 + 1), width, height / 3 - 2,
-                                                               255, 255, 255, 255,
-                                                               1, 1, 1, 1);
-
-                       pixbuf_set_rect(rectangles, 0 + width / 3, 0 , width / 3, height,
-                                                               0, 0, 0, 255,
-                                                               1, 1, 1, 1);
-                       pixbuf_set_rect(rectangles, 0 + width / 3 + 1, 0, width / 3 - 2, height,
-                                                               255, 255, 255, 255,
-                                                               1, 1, 1, 1);
-                       return rectangles;
-                       }
-               }
+/** @FIXME guidelines does not work with revised draw signal handling
+ */
+       //~ pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
+
+       //~ if (width && height)
+               //~ {
+               //~ rectangles = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+               //~ if (rectangles)
+                       //~ {
+                       //~ pixbuf_set_rect_fill(rectangles, 0, 0, width, height, 255, 255, 255, 0);
+                       //~ pixbuf_set_rect(rectangles, 0, 0 + (height / 3), width, height / 3,
+                                                               //~ 0, 0, 0, 255,
+                                                               //~ 1, 1, 1, 1);
+                       //~ pixbuf_set_rect(rectangles, 0, 0 + (height / 3 + 1), width, height / 3 - 2,
+                                                               //~ 255, 255, 255, 255,
+                                                               //~ 1, 1, 1, 1);
+
+                       //~ pixbuf_set_rect(rectangles, 0 + width / 3, 0 , width / 3, height,
+                                                               //~ 0, 0, 0, 255,
+                                                               //~ 1, 1, 1, 1);
+                       //~ pixbuf_set_rect(rectangles, 0 + width / 3 + 1, 0, width / 3 - 2, height,
+                                                               //~ 255, 255, 255, 255,
+                                                               //~ 1, 1, 1, 1);
+                       //~ return rectangles;
+                       //~ }
+               //~ }
 
        return NULL;
 }