Include a Other Software section in Help file

[geeqie.git] / src / osd.c

diff --git a/src/osd.c b/src/osd.c
index a32c837..0b88aee 100644 (file)
--- a/src/osd.c
+++ b/src/osd.c
@@ -60,6 +60,7 @@ static const gchar *predefined_tags[][2] = {
        {"%formatted.ExposureBias%",            N_("Exposure bias")},
        {"%formatted.Resolution%",                      N_("Resolution")},
        {"%formatted.Camera%",                          N_("Camera")},
+       {"%lua.lensID%",                                        N_("Lens")},
        {"%formatted.ISOSpeedRating%",          N_("ISO")},
        {"%formatted.FocalLength%",                     N_("Focal length")},
        {"%formatted.FocalLength35mmFilm%",     N_("Focal len. 35mm")},
@@ -154,19 +155,11 @@ static void set_osd_button(GtkTable *table, const gint rows, const gint cols, co
 
 GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
 {
-       GtkWidget *hbox;
        GtkWidget *vbox;
-       GtkWidget *vbox_buttons;
-       GtkWidget *group;
-       GtkWidget *button;
        GtkWidget *scrolled;
-       GtkTextBuffer *buffer;
-       GtkWidget *label;
-       GtkWidget *     subgroup;
        gint i = 0;
        gint rows = 0;
        gint max_rows = 0;
-       gint col = 0;
        gint cols = 0;
        gdouble entries;
        GtkWidget *viewport;
@@ -180,7 +173,6 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
        gtk_container_set_border_width(GTK_CONTAINER(scrolled), PREF_PAD_BORDER);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       label = gtk_label_new("title");
        gtk_widget_show(scrolled);
        gtk_widget_set_size_request(scrolled, -1, 140);
 
@@ -281,7 +273,7 @@ gchar *image_osd_mkinfo(const gchar *str, FileData *fd, GHashTable *vars)
                if (!end)
                        break;
 
-               /* Search for optionnal modifiers
+               /* Search for optional modifiers
                 * %name:99:extra% -> name = "name", limit=99, extra = "extra"
                 */
                for (p = start + 1; p < end; p++)
@@ -379,8 +371,8 @@ gchar *image_osd_mkinfo(const gchar *str, FileData *fd, GHashTable *vars)
                                 * "\**\*"      -> prefix data with a star, and append a star (ie. "*100*")
                                 * "\\*"        -> prefix data with an anti slash (ie "\100")
                                 * "Collection <b>*</b>\n" -> display data in bold prefixed by "Collection " and a newline is appended
-                                *
-                                * FIXME: using background / foreground colors lead to weird results.
+                                */
+                               /** @FIXME using background / foreground colors lead to weird results.
                                 */
                                gchar *new_data;
                                gchar *left = NULL;