From 0c805f5ebe57a56c7b5208d319e6485d84a7ae0c Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Tue, 2 Oct 2018 13:01:06 +0100 Subject: [PATCH] Simplify OSD settings in Preferences Move Overlay Screen Display settings in Preferences from the Windows tab to its own tab. Allow preformatted tags to be set by button click or drag-and-drop. --- doc/docbook/GuideOptionsMain.xml | 1 + doc/docbook/GuideOptionsOSD.xml | 237 +++++++++ doc/docbook/GuideOptionsWindow.xml | 232 --------- src/preferences.c | 231 ++++++++- web/help/GuideIndex.html | 21 +- web/help/GuideMainWindowImagePane.html | 2 +- web/help/GuideOptionsBehavior.html | 17 +- web/help/GuideOptionsColor.html | 1 + web/help/GuideOptionsFiltering.html | 13 +- web/help/GuideOptionsGeneral.html | 1 + web/help/GuideOptionsImage.html | 7 +- web/help/GuideOptionsKeyboard.html | 1 + web/help/GuideOptionsKeywords.html | 9 +- web/help/GuideOptionsMain.html | 22 +- web/help/GuideOptionsMetadata.html | 25 +- web/help/GuideOptionsOSD.html | 688 +++++++++++++++++++++++++ web/help/GuideOptionsStereo.html | 1 + web/help/GuideOptionsToolbar.html | 1 + web/help/GuideOptionsWindow.html | 239 +-------- web/help/GuideReferenceLua.html | 4 +- 20 files changed, 1219 insertions(+), 534 deletions(-) create mode 100644 doc/docbook/GuideOptionsOSD.xml create mode 100644 web/help/GuideOptionsOSD.html diff --git a/doc/docbook/GuideOptionsMain.xml b/doc/docbook/GuideOptionsMain.xml index 16ac3610..9b927ddc 100644 --- a/doc/docbook/GuideOptionsMain.xml +++ b/doc/docbook/GuideOptionsMain.xml @@ -23,6 +23,7 @@ + diff --git a/doc/docbook/GuideOptionsOSD.xml b/doc/docbook/GuideOptionsOSD.xml new file mode 100644 index 00000000..c90203cf --- /dev/null +++ b/doc/docbook/GuideOptionsOSD.xml @@ -0,0 +1,237 @@ + +
+ OverlayScreen Display + This section describes the options presented under the OSD Tab of the preferences dialog. +
+ Overlay Screen Display + The contents of the Overlay Screen Display is defined by the Image Overlay Template. This template is easily customised to display a wide range of data. + + The format of each entry is: + %tag[:max_length][:extra]% + + + + + + + Tag + + + Replaced by + + + + name + Filename of the picture + + + collection + Name of the collection + + + number + Current number of image in the list + + + total + Total number of images + + + date + File date + + + size + File size + + + width + Image width + + + height + Image height + + + res + Image resolution + + + keywords + Image keywords from metadata + + + comment + Image comment from XMP metadata + + + imagecomment + JPEG image comment + + + rating + Image rating + + + <meta_tag> + The Exif, XMP, or IPTC tag from metadata + + + lua/<lua_script>/ + The output of a Lua script file + + + lua//<lua_command> + The output of a Lua command + + + +
+ + As an aide, in addition to standard metadata tags, Geeqie provides a number of + pre-formatted tags + . + + Examples of usage are: + + + %keywords% + %Exif.Photo.DateTimeOriginal% + %lua/jpeg_comment.lua/:12% + %lua//return(os.date())% + + + + Refer to + Lua Extensions + for further information. + + + The length of displayed data can be limited by using the + :max_length + parameter. The following example will truncate the displayed data to 20 characters and will add 3 dots at the end to denote the truncation. + %formatted.Camera:20% + + + If two or more variables are connected with the + | + character, the variables are displayed with a separator. For example:: + %formatted.ShutterSpeed%|%formatted.ISOSpeedRating%|%formatted.FocalLength% + could show: + "1/20s - 400 - 80 mm" + Or, if there is no ISO information in the Exif data: + "1/200 - 80 mm" + + If there is no data for a requested tag, the line is not displayed. + + The + :extra + parameter may be used to format the output by prepending and appending a text string to the displayed item. + + + The special character + * + is used to mark the position of the Tag data item. If no + * + is present, the extra string is just appended to the standard data displayed. Any "\n" is replaced by a newline on display. + Pango mark up + is accepted in both left and right parts. If the data item is empty, nothing will be displayed. + + Examples: + + + + + + Template + + + Example display + + + + + %name: + <i>*</i>\n% + + + filename001.jpg + + + + %size:\n% + 123456 + + + %formatted.ISOSpeedRating:ISO *% + ISO 100 + + + + %collection:Collection: + <b>*</b> + \n% + + + Collection: + my_new_collection + + + + +
+ + + + + + + + + + Font + , + + + + + + Text + , + + + + + + Background + + The font used for the Overlay Screen Display, as well as the font colour and background colour, may be set via these buttons. Colour transparency can also be set. + + + + + + + + + + + Help + + + Show syntax help + + + + + + + Defaults + + + Restore default image overlay template + + + +
+
diff --git a/doc/docbook/GuideOptionsWindow.xml b/doc/docbook/GuideOptionsWindow.xml index b99c86a1..ce0f97ba 100644 --- a/doc/docbook/GuideOptionsWindow.xml +++ b/doc/docbook/GuideOptionsWindow.xml @@ -145,236 +145,4 @@ -
- Overlay Screen Display - The contents of the Overlay Screen Display is defined by the Image Overlay Template. This template is easily customised to display a wide range of data. - - The format of each entry is: - %tag[:max_length][:extra]% - - - - - - - Tag - - - Replaced by - - - - name - Filename of the picture - - - collection - Name of the collection - - - number - Current number of image in the list - - - total - Total number of images - - - date - File date - - - size - File size - - - width - Image width - - - height - Image height - - - res - Image resolution - - - keywords - Image keywords from metadata - - - comment - Image comment from XMP metadata - - - imagecomment - JPEG image comment - - - rating - Image rating - - - <meta_tag> - The Exif, XMP, or IPTC tag from metadata - - - lua/<lua_script>/ - The output of a Lua script file - - - lua//<lua_command> - The output of a Lua command - - - -
- - As an aide, in addition to standard metadata tags, Geeqie provides a number of - pre-formatted tags - . - - Examples of usage are: - - - %keywords% - %Exif.Photo.DateTimeOriginal% - %lua/jpeg_comment.lua/:12% - %lua//return(os.date())% - - - - Refer to - Lua Extensions - for further information. - - - The length of displayed data can be limited by using the - :max_length - parameter. The following example will truncate the displayed data to 20 characters and will add 3 dots at the end to denote the truncation. - %formatted.Camera:20% - - - If two or more variables are connected with the - | - character, the variables are displayed with a separator. For example:: - %formatted.ShutterSpeed%|%formatted.ISOSpeedRating%|%formatted.FocalLength% - could show: - "1/20s - 400 - 80 mm" - Or, if there is no ISO information in the Exif data: - "1/200 - 80 mm" - - If there is no data for a requested tag, the line is not displayed. - - The - :extra - parameter may be used to format the output by prepending and appending a text string to the displayed item. - - - The special character - * - is used to mark the position of the Tag data item. If no - * - is present, the extra string is just appended to the standard data displayed. Any "\n" is replaced by a newline on display. - Pango mark up - is accepted in both left and right parts. If the data item is empty, nothing will be displayed. - - Examples: - - - - - - Template - - - Example display - - - - - %name: - <i>*</i>\n% - - - filename001.jpg - - - - %size:\n% - 123456 - - - %formatted.ISOSpeedRating:ISO *% - ISO 100 - - - - %collection:Collection: - <b>*</b> - \n% - - - Collection: - my_new_collection - - - - -
- - - - - - - - - - Font - , - - - - - - Text - , - - - - - - Background - - The font used for the Overlay Screen Display, as well as the font colour and background colour, may be set via these buttons. Colour transparency can also be set. - - - - - - - - - - - Help - - - Show syntax help - - - - - - - Defaults - - - Restore default image overlay template - - - -
diff --git a/src/preferences.c b/src/preferences.c index 4fd9666c..ed989c0a 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -26,6 +26,7 @@ #include "bar_keywords.h" #include "cache.h" #include "cache_maint.h" +#include "dnd.h" #include "editors.h" #include "exif.h" #include "filedata.h" @@ -484,6 +485,7 @@ static void config_window_help_cb(GtkWidget *widget, gpointer data) { "GuideOptionsGeneral.html", "GuideOptionsImage.html", + "GuideOptionsOSD.html", "GuideOptionsWindow.html", "GuideOptionsKeyboard.html", "GuideOptionsFiltering.html", @@ -1231,7 +1233,7 @@ static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data) static void image_overlay_help_cb(GtkWidget *widget, gpointer data) { - help_window_show("GuideOptionsWindow.html#OverlayScreenDisplay"); + help_window_show("GuideOptionsOSD.html"); } static void image_overlay_set_font_cb(GtkWidget *widget, gpointer data) @@ -2005,9 +2007,6 @@ static void config_tab_windows(GtkWidget *notebook) GtkWidget *button; GtkWidget *ct_button; GtkWidget *spin; - GtkWidget *image_overlay_template_view; - GtkWidget *scrolled; - GtkTextBuffer *buffer; vbox = scrolled_notebook_page(notebook, _("Windows")); @@ -2054,35 +2053,183 @@ static void config_tab_windows(GtkWidget *notebook) options->fullscreen.clean_flip, &c_options->fullscreen.clean_flip); pref_checkbox_new_int(group, _("Disable screen saver"), options->fullscreen.disable_saver, &c_options->fullscreen.disable_saver); +} + +/* overlay screen display tab */ +static const gchar *predefined_tags[][2] = { + {"%name%", N_("Name")}, + {"%path:60%*", N_("Path")}, + {"%date%", N_("Date")}, + {"%size%", N_("Size")}, + {"%zoom%", N_("Zoom")}, + {"%dimensions%", N_("Dimensions")}, + {"%collection%", N_("Collection")}, + {"%number%", N_("Collection number")}, + {"%total%", N_("Collection total")}, + {"%file.ctime%", N_("File ctime")}, + {"%file.mode%", N_("File mode")}, + {"%file.owner%", N_("File owner")}, + {"%file.group%", N_("File group")}, + {"%file.link%", N_("File link")}, + {"%file.class%", N_("File class")}, + {"%formatted.DateTime%", N_("Image date")}, + {"%formatted.DateTimeDigitized%", N_("Date digitized")}, + {"%formatted.ShutterSpeed%", N_("ShutterSpeed")}, + {"%formatted.Aperture%", N_("Aperture")}, + {"%formatted.ExposureBias%", N_("Exposure bias")}, + {"%formatted.Resolution%", N_("Resolution")}, + {"%formatted.Camera%", N_("Camera")}, + {"%formatted.ShutterSpeed%", N_("Shutter speed")}, + {"%formatted.ISOSpeedRating%", N_("ISO")}, + {"%formatted.FocalLength%", N_("Focal length")}, + {"%formatted.FocalLength35mmFilm%", N_("Focal len. 35mm")}, + {"%formatted.SubjectDistance%", N_("Subject distance")}, + {"%formatted.Flash%", N_("Flash")}, + {"%formatted.ColorProfile%", N_("Color profile")}, + {"%formatted.GPSPosition%", N_("Lat, Long")}, + {"%formatted.GPSAltitude%", N_("Altitude")}, + {"%formatted.localtime%", N_("Local time")}, + {"%formatted.timezone%", N_("Timezone")}, + {"%formatted.countryname%", N_("Country name")}, + {"%formatted.countrycode%", N_("Country code")}, + {"%formatted.star_rating%", N_("Star rating")}, + {NULL, NULL}}; + +static GtkTargetEntry osd_drag_types[] = { + { "text/plain", GTK_TARGET_SAME_APP, TARGET_TEXT_PLAIN } +}; + +typedef struct _TagData TagData; +struct _TagData +{ + gchar *key; + gchar *title; +}; + +static void tag_button_cb(GtkWidget *widget, gpointer data) +{ + GtkTextView *image_overlay_template_view = data; + GtkTextBuffer *buffer; + TagData *td; + + buffer = gtk_text_view_get_buffer(image_overlay_template_view); + td = g_object_get_data(G_OBJECT(widget), "tag_data"); + gtk_text_buffer_insert_at_cursor(GTK_TEXT_BUFFER(buffer), td->key, -1); + + gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view)); +} + +static void osd_dnd_get_cb(GtkWidget *btn, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, + guint time, gpointer data) +{ + TagData *td; + GtkTextView *image_overlay_template_view = data; + + td = g_object_get_data(G_OBJECT(btn), "tag_data"); + gtk_selection_data_set_text(selection_data, td->key, -1); + + gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view)); +} + +static void osd_btn_destroy_cb(GtkWidget *btn, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, + guint time, gpointer data) +{ + TagData *td; + + td = g_object_get_data(G_OBJECT(btn), "tag_data"); + g_free(td->key); + g_free(td->title); +} + +static void set_osd_button(GtkWidget *widget, const gchar *key, const gchar *title, + GtkWidget *image_overlay_template_view) +{ + GtkWidget *new_button; + TagData *td; + + new_button = pref_button_new(widget, NULL, _(title), TRUE, + G_CALLBACK(tag_button_cb), image_overlay_template_view); + + td = g_new0(TagData, 1); + td->key = g_strdup(key); + td->title = g_strdup(title); + + g_object_set_data(G_OBJECT(new_button), "tag_data", td); + + gtk_drag_source_set(new_button, GDK_BUTTON1_MASK, osd_drag_types, 1, GDK_ACTION_COPY); + g_signal_connect(G_OBJECT(new_button), "drag_data_get", + G_CALLBACK(osd_dnd_get_cb), image_overlay_template_view); + g_signal_connect(G_OBJECT(new_button), "destroy", + G_CALLBACK(osd_btn_destroy_cb), new_button); +} + +static void config_tab_osd(GtkWidget *notebook) +{ + GtkWidget *hbox; + GtkWidget *vbox; + GtkWidget *vbox_buttons; + GtkWidget *group; + GtkWidget *button; + GtkWidget *image_overlay_template_view; + GtkWidget *scrolled; + GtkTextBuffer *buffer; + GtkWidget *label; + GtkWidget * subgroup; + gint i = 0; + gint rows = 0; + gint cols = 0; + vbox = scrolled_notebook_page(notebook, _("OSD")); + + image_overlay_template_view = gtk_text_view_new(); group = pref_group_new(vbox, FALSE, _("Overlay Screen Display"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + + pref_label_new(hbox, _("To include predefined tags in the template, click a button or drag-and-drop")); + + subgroup = pref_box_new(group, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(subgroup), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + + for (cols = 0; cols < 6; cols++) + { + vbox_buttons = gtk_vbox_new(FALSE, 0); + rows = 0; + + gtk_box_pack_start(GTK_BOX(hbox), vbox_buttons, FALSE, FALSE, 0); + + while (rows < 6 && predefined_tags[i][0]) + { + set_osd_button(vbox_buttons, predefined_tags[i][0], predefined_tags[i][1], image_overlay_template_view); + i = i + 1; + rows++; + } + gtk_widget_show(vbox_buttons); + } + + pref_line(group, PREF_PAD_GAP); + pref_label_new(group, _("Image overlay template")); scrolled = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(scrolled, 200, 150); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_box_pack_start(GTK_BOX(group), scrolled, TRUE, TRUE, 5); gtk_widget_show(scrolled); - image_overlay_template_view = gtk_text_view_new(); - gtk_widget_set_tooltip_markup(image_overlay_template_view, - _("%name% results in the filename of the picture.\n" - "Also available: %collection%, %number%, %total%, %date%,\n" - "%size% (filesize), %width%, %height%, %res% (resolution),\n" - "%rating%, %keywords%, %comment% (XMP), %imagecomment% (JPEG)\n" - "To access exif data use the exif name, e. g. %formatted.Camera% is the formatted camera name,\n" - "%Exif.Photo.DateTimeOriginal% the date of the original shot.\n" - "%formatted.Camera:20 notation will truncate the displayed data to 20 characters and will add 3 dots at the end to denote the truncation.\n" - "If two or more variables are connected with the |-sign, it prints available variables with a separator.\n" - "%formatted.ShutterSpeed%|%formatted.ISOSpeedRating%|%formatted.FocalLength% could show \"1/20s - 400 - 80 mm\" or \"1/200 - 80 mm\",\n" - "if there's no ISO information in the Exif data.\n" - "If a line is empty, it is removed. This allows one to add lines that totally disappear when no data is available.\n" - )); + _("Extensive formatting options are shown in the Help file")); + gtk_container_add(GTK_CONTAINER(scrolled), image_overlay_template_view); gtk_widget_show(image_overlay_template_view); @@ -2127,7 +2274,51 @@ static void config_tab_windows(GtkWidget *notebook) g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK(image_overlay_template_view_changed_cb), image_overlay_template_view); + pref_line(group, PREF_PAD_GAP); + + group = pref_group_new(vbox, FALSE, _("Exif, XMP or IPTC tags"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + label = gtk_label_new(_("%Exif.Image.Orientation%")); + gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0); + gtk_widget_show(label); + pref_spacer(group,TRUE); + + group = pref_group_new(vbox, FALSE, _("Field separators"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + label = gtk_label_new(_("Separator shown only if both fields are non-null:\n%formatted.ShutterSpeed%|%formatted.ISOSpeedRating%")); + gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0); + gtk_widget_show(label); + pref_spacer(group,TRUE); + + group = pref_group_new(vbox, FALSE, _("Field maximum length"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + label = gtk_label_new(_("%path:39%")); + gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0); + gtk_widget_show(label); + pref_spacer(group,TRUE); + + group = pref_group_new(vbox, FALSE, _("Pre- and post- text"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + label = gtk_label_new(_("Text shown only if the field is non-null:\n%formatted.Aperture:F no. * setting%\n %formatted.Aperture:10:F no. * setting%")); + gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0); + gtk_widget_show(label); + pref_spacer(group,TRUE); + group = pref_group_new(vbox, FALSE, _("Pango markup"), GTK_ORIENTATION_VERTICAL); + hbox = gtk_hbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + label = gtk_label_new(_("bold\nunderline\nitalic\nstrikethrough")); + gtk_box_pack_start(GTK_BOX(hbox),label, FALSE,FALSE,0); + gtk_widget_show(label); } static GtkTreeModel *create_class_model(void) @@ -3229,10 +3420,12 @@ static void config_window_create(void) notebook = gtk_notebook_new(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE); gtk_box_pack_start(GTK_BOX(win_vbox), notebook, TRUE, TRUE, 0); config_tab_general(notebook); config_tab_image(notebook); + config_tab_osd(notebook); config_tab_windows(notebook); config_tab_accelerators(notebook); config_tab_files(notebook); diff --git a/web/help/GuideIndex.html b/web/help/GuideIndex.html index 2e8e0c35..ad7a4eea 100644 --- a/web/help/GuideIndex.html +++ b/web/help/GuideIndex.html @@ -580,31 +580,34 @@ dd.answer div.label { float: left; } 11.2. Image Options
  • -11.3. Window Options +11.3. OverlayScreen Display
  • -11.4. Keyboard Options +11.4. Window Options
  • -11.5. Files Options +11.5. Keyboard Options
  • -11.6. Metadata +11.6. Files Options
  • -11.7. Keywords +11.7. Metadata
  • -11.8. Color management options +11.8. Keywords
  • -11.9. Stereo image management +11.9. Color management options
  • -11.10. Behavior Options +11.10. Stereo image management
  • -11.11. Toolbar +11.11. Behavior Options +
    • +
  • +11.12. Toolbar
    • diff --git a/web/help/GuideMainWindowImagePane.html b/web/help/GuideMainWindowImagePane.html index 8bdbeadb..93013c7d 100644 --- a/web/help/GuideMainWindowImagePane.html +++ b/web/help/GuideMainWindowImagePane.html @@ -516,7 +516,7 @@ dd.answer div.label { float: left; }

    Data the overlay displays is customizable through the - Image Overlay Template + Image Overlay Template option in the Windows tab in the Preferences dialog.

    diff --git a/web/help/GuideOptionsBehavior.html b/web/help/GuideOptionsBehavior.html index 4d52490d..feed769f 100644 --- a/web/help/GuideOptionsBehavior.html +++ b/web/help/GuideOptionsBehavior.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences
    • General Options
    • Image Options
      • +
    • OverlayScreen Display
    • Window Options
    • Keyboard Options
    • Files Options
      • @@ -460,20 +461,20 @@ dd.answer div.label { float: left; }

      This section describes the options presented under the Behavior Tab of the preferences dialog.

      -

      11.10.1. Delete

      +

      11.11.1. Delete

      Confirm file delete @@ -551,7 +552,7 @@ dd.answer div.label { float: left; }
      -

      11.10.2. Behavior

      +

      11.11.2. Behavior

      Descend folders in tree view @@ -629,7 +630,7 @@ dd.answer div.label { float: left; }
      -

      11.10.3. Navigation

      +

      11.11.3. Navigation

      Progressive keyboard scrolling @@ -670,7 +671,7 @@ dd.answer div.label { float: left; }
      -

      11.10.4. Debugging

      +

      11.11.4. Debugging

      Debug level diff --git a/web/help/GuideOptionsColor.html b/web/help/GuideOptionsColor.html index c2fe1ab1..7382dcfb 100644 --- a/web/help/GuideOptionsColor.html +++ b/web/help/GuideOptionsColor.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences
      • General Options
      • Image Options
        • +
      • OverlayScreen Display
      • Window Options
      • Keyboard Options
      • Files Options
        • diff --git a/web/help/GuideOptionsFiltering.html b/web/help/GuideOptionsFiltering.html index 5d7939cd..261026f4 100644 --- a/web/help/GuideOptionsFiltering.html +++ b/web/help/GuideOptionsFiltering.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences
        • General Options
        • Image Options
          • +
        • OverlayScreen Display
        • Window Options
        • Keyboard Options
        • Files Options
          • @@ -461,17 +462,17 @@ dd.answer div.label { float: left; }

          -

          11.5.1. Filters

          +

          11.6.1. Filters

          Show hidden files or folders @@ -518,7 +519,7 @@ dd.answer div.label { float: left; }

          -

          11.5.2. Grouping sidecar extensions

          +

          11.6.2. Grouping sidecar extensions

          This field defines which extensions will lead to file grouping. Grouped files will appear as a single entry in file views. This is useful, for example, when browsing directories containing two files for the same image (such as raw+jpeg files generated by some cameras).

          The group is represented by the first extension in the list for which a file exists.

          @@ -562,7 +563,7 @@ dd.answer div.label { float: left; }

          -

          11.5.3. File types

          +

          11.6.3. File types

          This list contains the image formats that are understood by Geeqie. To disable a specific file type from being displayed, uncheck it's corresponding check-box. Filters can be edited by first selecting the line containing the item to be changed, then clicking the filter or description field, making any changes, then pressing Enter diff --git a/web/help/GuideOptionsGeneral.html b/web/help/GuideOptionsGeneral.html index c31fedfa..d9aa53d9 100644 --- a/web/help/GuideOptionsGeneral.html +++ b/web/help/GuideOptionsGeneral.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences

          • General Options
          • Image Options
            • +
          • OverlayScreen Display
          • Window Options
          • Keyboard Options
          • Files Options
            • diff --git a/web/help/GuideOptionsImage.html b/web/help/GuideOptionsImage.html index 5124697a..bbbd9e01 100644 --- a/web/help/GuideOptionsImage.html +++ b/web/help/GuideOptionsImage.html @@ -4,7 +4,7 @@ Image Options - + + + +
            + + +
            Image OptionsWindow Options
            +
            +
            +

            OverlayScreen Display

            + +

            This section describes the options presented under the OSD Tab of the preferences dialog.

            +
            +
            +

            11.3.1. Overlay Screen Display

            +

            The contents of the Overlay Screen Display is defined by the Image Overlay Template. This template is easily customised to display a wide range of data.

            +

            + The format of each entry is: + 

            %tag[:max_length][:extra]%
            +

            +
            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
            + Tag + + Replaced by +
            nameFilename of the picture
            collectionName of the collection
            numberCurrent number of image in the list
            totalTotal number of images
            dateFile date
            sizeFile size
            widthImage width
            heightImage height
            resImage resolution
            keywordsImage keywords from metadata
            commentImage comment from XMP metadata
            imagecommentJPEG image comment
            ratingImage rating
            <meta_tag>The Exif, XMP, or IPTC tag from metadata
            lua/<lua_script>/The output of a Lua script file
            lua//<lua_command>The output of a Lua command
            +

            + As an aide, in addition to standard metadata tags, Geeqie provides a number of + pre-formatted tags + . +

            +

            Examples of usage are:

            +

            + 

                    %keywords%
+        %Exif.Photo.DateTimeOriginal%
+        %lua/jpeg_comment.lua/:12%
+        %lua//return(os.date())%
+
            +

            +

            + Refer to + Lua Extensions + for further information. +

            +

            + The length of displayed data can be limited by using the + :max_length + parameter. The following example will truncate the displayed data to 20 characters and will add 3 dots at the end to denote the truncation. + 

            %formatted.Camera:20%
            +

            +

            + If two or more variables are connected with the + | + character, the variables are displayed with a separator. For example:: + 

            %formatted.ShutterSpeed%|%formatted.ISOSpeedRating%|%formatted.FocalLength%
            + could show: + 
            "1/20s - 400 - 80 mm"
            + Or, if there is no ISO information in the Exif data: + 
            "1/200 - 80 mm"
            +

            +

            If there is no data for a requested tag, the line is not displayed.

            +

            + The + :extra + parameter may be used to format the output by prepending and appending a text string to the displayed item. +

            +

            + The special character + * + is used to mark the position of the Tag data item. If no + * + is present, the extra string is just appended to the standard data displayed. Any "\n" is replaced by a newline on display. + Pango mark up + is accepted in both left and right parts. If the data item is empty, nothing will be displayed. +

            +

            Examples:

            +
            + + + + + + + + + + + + + + + + + + + + +
            + Template + + Example display +
            + %name: + <i>*</i>\n% + + filename001.jpg +
            %size:\n%123456
            %formatted.ISOSpeedRating:ISO *%ISO 100
            + %collection:Collection: + <b>*</b> + \n% + + Collection: + my_new_collection +
            +

            +
            +
            + + + + + + Font + , + + + + + + Text + , + + + + + + Background +
            +
            The font used for the Overlay Screen Display, as well as the font colour and background colour, may be set via these buttons. Colour transparency can also be set.
            +
            +
            +
            + + + + + + Help +
            +
            +

            Show syntax help

            +
            +
            +
            +
            + Defaults +
            +
            +

            Restore default image overlay template

            +
            +
            +
            +
            +
            + + +
            Image OptionsWindow Options
            + + diff --git a/web/help/GuideOptionsStereo.html b/web/help/GuideOptionsStereo.html index fd4876a5..284756c1 100644 --- a/web/help/GuideOptionsStereo.html +++ b/web/help/GuideOptionsStereo.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences
            • General Options
            • Image Options
              • +
            • OverlayScreen Display
            • Window Options
            • Keyboard Options
            • Files Options
              • diff --git a/web/help/GuideOptionsToolbar.html b/web/help/GuideOptionsToolbar.html index b9b167c6..39324a63 100644 --- a/web/help/GuideOptionsToolbar.html +++ b/web/help/GuideOptionsToolbar.html @@ -431,6 +431,7 @@ dd.answer div.label { float: left; } Preferences
              • General Options
              • Image Options
                • +
              • OverlayScreen Display
              • Window Options
              • Keyboard Options
              • Files Options
                • diff --git a/web/help/GuideOptionsWindow.html b/web/help/GuideOptionsWindow.html index ee5984e5..36b5ab63 100644 --- a/web/help/GuideOptionsWindow.html +++ b/web/help/GuideOptionsWindow.html @@ -3,7 +3,7 @@ Window Options - +