Merge pull request #3469 from Peyton-Hill-CLS/add_default_watermark_enabled

Added a preference for whether the watermark is enabled by default when you click on an attachment in the olog.

Author: shroffk

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/AttachmentsViewController.java

@@ -213,7 +213,7 @@ else if(attachments.isEmpty()){
      */
     private void showImageAttachment() {
         URI uri = selectedAttachment.get().getFile().toURI();
-        URI withWatermark = URI.create(uri + "?watermark=true");
+        URI withWatermark = URI.create(uri + "?watermark=" + LogbookUIPreferences.show_log_watermark);
         ApplicationLauncherService.openResource(withWatermark,
                 false, null);
     }

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogbookUIPreferences.java

@@ -47,6 +47,8 @@ public class LogbookUIPreferences {
     public static int query_list_size;
     @Preference
     public static String search_help;
+    @Preference
+    public static boolean show_log_watermark;
 
 
     static {

app/logbook/olog/ui/src/main/resources/log_olog_ui_preferences.properties

@@ -59,3 +59,6 @@ query_list_size=15
 
 # Name of the search help content.  Language resolution and file extension is handled on service.
 search_help=SearchHelp
+
+# Whether or not to show the watermark by default
+show_log_watermark=true