Merge branch 'master' into markdown-properties-docs

Author: shroffk

app/databrowser/src/main/java/org/csstudio/apputil/formula/ui/FormulaPane.java

@@ -10,6 +10,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.Priority;
 import org.csstudio.apputil.formula.Formula;
 import org.csstudio.apputil.formula.VariableNode;
 import org.csstudio.trends.databrowser3.Messages;
@@ -85,7 +87,13 @@ public FormulaPane(final String initial_formula, final List<InputItem> inputs)
         setHgap(5);
         setVgap(5);
 
-
+        ColumnConstraints column1 = new ColumnConstraints();
+        column1.setHgrow(Priority.ALWAYS);
+        ColumnConstraints column2 = new ColumnConstraints();
+        column2.setHgrow(Priority.NEVER);
+        ColumnConstraints column3 = new ColumnConstraints();
+        column3.setHgrow(Priority.NEVER);
+        getColumnConstraints().addAll(column1, column2, column3); // each get 50% of width
         add(formula_txt, 0, 0, 3, 1);
 
         final TableView<InputItem> input_pane = createInputs();

core/ui/src/main/java/org/phoebus/ui/Preferences.java

@@ -7,6 +7,10 @@
  *******************************************************************************/
 package org.phoebus.ui;
 
+import java.net.URI;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.phoebus.framework.preferences.AnnotatedPreferences;
 import org.phoebus.framework.preferences.Preference;
 
@@ -17,6 +21,8 @@
 
 public class Preferences
 {
+	public final static Logger logger = Logger.getLogger(Preferences.class.getPackageName());
+	
 	/** splash */
 	public static final String SPLASH = "splash";
     /** default_apps */
@@ -99,6 +105,8 @@ public class Preferences
     @Preference public static String window_title_format;
     /** default_window_title **/
     @Preference public static String default_window_title;
+    /** Custom stylings file */
+    @Preference public static String custom_css_styling;
 
     static
     {
@@ -108,5 +116,19 @@ public class Preferences
         // (PVASettings cannot use Preferences.max_array_formatting
         //  since the PVA library may be used standalone)
         System.setProperty("EPICS_PVA_MAX_ARRAY_FORMATTING", Integer.toString(max_array_formatting));
+        
+        // Check once if the custom style sheet is accessible
+        if (!custom_css_styling.isBlank())
+        {
+             try
+             {
+                 new URI(custom_css_styling).toURL().openStream().close();
+             }
+             catch (Exception ex)
+             {
+                 logger.log(Level.WARNING, custom_css_styling + " is inaccessible", ex);
+                 custom_css_styling = "";
+             }
+        }
     }
 }

core/ui/src/main/java/org/phoebus/ui/javafx/Styles.java

@@ -7,6 +7,8 @@
  ******************************************************************************/
 package org.phoebus.ui.javafx;
 
+import org.phoebus.ui.Preferences;
+
 import javafx.scene.Node;
 import javafx.scene.Scene;
 
@@ -24,6 +26,10 @@ public static void setSceneStyle(final Scene scene)
     {
         final String css = Styles.class.getResource("csstudio.css").toExternalForm();
         set(scene, css);
+        if (!Preferences.custom_css_styling.isEmpty())
+        {
+            set(scene, Preferences.custom_css_styling);
+        }
     }
 
     /** Apply style sheet to scene (but only once)

core/ui/src/main/resources/phoebus_ui_preferences.properties

@@ -242,3 +242,51 @@ alarm_area_panel_invalid_severity_background_color=255,0,255
 
 alarm_area_panel_undefined_severity_text_color=192,192,192
 alarm_area_panel_undefined_severity_background_color=200,0,200,200
+
+# When Picture- and/or Symbol widgets are present in an OPI,
+# zooming in under Windows using the D3D graphics library can
+# cause excessive VRAM usage. Setting a cache hint can work as
+# a workaround. Since it has been observed that the cache hints
+# also can cause graphical errors, the setting of a cache hint
+# is a configurable option, which must explicitly be set to
+# have effect.
+#
+# The setting defaults to the default caching behavior.
+#
+# Valid options are:
+#       "" (the empty string) or "NONE" - The default caching behavior: caching is DISABLED, and the cache hint is set to "CacheHint.DEFAULT".
+#       "DEFAULT"                       - Caching is ENABLED, and the cache hint is set to "CacheHint.DEFAULT".
+#       "SPEED"                         - Based on very limited testing, this option seems to work the best as a workaround for the excessive VRAM usage.
+#       "QUALITY"
+#       "SCALE"                         - This option has been observed to cause graphical errors on several systems: rotated widgets have been observed to be translated instead of rotated.
+#       "ROTATE"
+#       "SCALE_AND_ROTATE"
+#
+# If an invalid option is entered, a warning is logged, and the
+# default caching behavior is used (i.e., caching is DISABLED,
+# and the cache hint is set to "CacheHint.DEFAULT").
+cache_hint_for_picture_and_symbol_widgets=
+
+
+# Whether or not to save user credentials to file or memory so they only have to be entered once. Note that this
+# applies to all scopes/applications prompting for credentials.
+# See also setting org.phoebus.security/secure_store_target
+save_credentials=false
+
+# Location of the Phoebus documentation
+documentation_location=
+
+# How to format the window title.
+# The string is formatted with the current active tab as argument.
+# The default is "CS-Studio: %s", where %s is replaced by the name of the active tab.
+# Setting it to just "%s" will show only the active tab.
+# Omitting the %s will always show a static title.
+# When there is no active tab, the default_window_title is used instead.
+window_title_format=CS-Studio: %s
+default_window_title=CS-Studio
+
+# Custom stylings .css file allows users to override Phoebus and JavaFX
+# default stylings.Set the full path to the .css file
+# For a system file use syntax; 'file:</path/to/custom.css>'
+# For a file served over http use syntax: 'http://<address:port/custom.css>'
+custom_css_styling=