Implement the 'standalone' window mode

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/actions/ContextMenuPVAlarmHistory.java

@@ -54,4 +54,9 @@ public Class<?> getSupportedType() {
     public Image getIcon() {
         return AlarmLogTableApp.icon;
     }
+
+    @Override
+    public boolean isOpenAction() {
+        return true;
+    }
 }

app/databrowser/src/main/java/org/csstudio/trends/databrowser3/ContextMenuDataBrowserLauncher.java

@@ -52,6 +52,12 @@ public Class<?> getSupportedType()
         return supportedType;
     }
 
+    @Override
+    public boolean isOpenAction()
+    {
+        return true;
+    }
+
     private volatile Duration time_span = Preferences.time_span;
 
     @Override

app/display/actions/src/main/java/org/csstudio/display/actions/OpenDisplayAction.java

@@ -63,10 +63,7 @@ public enum Target {
 
         /**
          * Open standalone window
-         *
-         * @deprecated Was only used in RCP version.
          */
-        @Deprecated
         STANDALONE(Messages.Target_Standalone);
 
         private final String name;
@@ -219,8 +216,6 @@ public List<MenuItem> getContextMenuItems(ExecutorService executorService, Widge
 
         // Add variant for all the available Target types: Replace, new Tab, ...
         for (OpenDisplayAction.Target target : OpenDisplayAction.Target.values()) {
-            if (target == OpenDisplayAction.Target.STANDALONE || target == this.target)
-                continue;
             // Mention non-default targets in the description
             MenuItem additionalItem = createMenuItem(widget, description + " (" + target + ")");
             OpenDisplayAction openDisplayAction = new OpenDisplayAction(description, file, macros, target);
@@ -237,7 +232,8 @@ private OpenDisplayAction.Target modeToTargetConvert(int mode) {
             case 0 -> Target.REPLACE;
             // 7 - NEW_WINDOW
             // 8 - NEW_SHELL
-            case 7, 8 -> Target.WINDOW;
+            case 7 -> Target.WINDOW;
+            case 8 -> Target.STANDALONE;
             // 1 - NEW_TAB
             // 2 - NEW_TAB_LEFT
             // 3 - NEW_TAB_RIGHT

app/display/actions/src/main/java/org/csstudio/display/actions/OpenDisplayActionController.java

@@ -37,6 +37,9 @@ public class OpenDisplayActionController extends ActionControllerBase {
     private RadioButton newWindowRadioButton;
     @SuppressWarnings("unused")
     @FXML
+    private RadioButton newStandaloneRadioButton;
+    @SuppressWarnings("unused")
+    @FXML
     private TextField displayPath;
     @SuppressWarnings("unused")
     @FXML
@@ -79,16 +82,10 @@ public void initialize() {
         replaceRadioButton.setUserData(OpenDisplayAction.Target.REPLACE);
         newTabRadioButton.setUserData(OpenDisplayAction.Target.TAB);
         newWindowRadioButton.setUserData(OpenDisplayAction.Target.WINDOW);
+        newStandaloneRadioButton.setUserData(OpenDisplayAction.Target.STANDALONE);
 
         ToggleGroup toggleGroup = new ToggleGroup();
-        toggleGroup.getToggles().addAll(replaceRadioButton, newTabRadioButton, newWindowRadioButton);
-
-        /*
-         * Standalone is a deprecated name for Window
-         */
-        if (target == OpenDisplayAction.Target.STANDALONE) {
-            target = OpenDisplayAction.Target.WINDOW;
-        }
+        toggleGroup.getToggles().addAll(replaceRadioButton, newTabRadioButton, newWindowRadioButton, newStandaloneRadioButton);
 
         toggleGroup.selectToggle(toggleGroup.getToggles().stream()
                 .filter(t -> t.getUserData().equals(target)).findFirst().get());

app/display/actions/src/main/resources/org/csstudio/display/actions/OpenDisplayAction.fxml

@@ -38,7 +38,11 @@
          <HBox.margin>
             <Insets right="10.0" />
          </HBox.margin></RadioButton>
-      <RadioButton fx:id="newWindowRadioButton" text="New Window" />
+      <RadioButton fx:id="newWindowRadioButton" text="New Window">
+          <HBox.margin>
+                <Insets right="10.0" />
+          </HBox.margin></RadioButton>
+      <RadioButton fx:id="newStandaloneRadioButton" text="New Standalone Window" />
       <GridPane.margin>
          <Insets bottom="5.0" top="5.0" />
       </GridPane.margin>

app/display/editor/src/main/java/org/csstudio/display/builder/editor/app/NewDisplayContextMenuEntry.java

@@ -63,6 +63,12 @@ public Image getIcon()
         return ImageCache.getImage(DisplayModel.class, "/icons/display.png");
     }
 
+    @Override
+    public boolean isOpenAction()
+    {
+        return true;
+    }
+
     @Override
     public void call(Selection selection){
         Optional<File> file =

app/display/model/src/main/java/org/csstudio/display/builder/model/DisplayModel.java

@@ -144,6 +144,7 @@
     private volatile WidgetProperty<Integer> gridStepX;
     private volatile WidgetProperty<Integer> gridStepY;
     private volatile ChildrenProperty children;
+    private boolean standalone;
 
     /** Create display model */
     public DisplayModel()
@@ -156,6 +157,16 @@
     {
         return VERSION;
     }
+
+    public boolean isStandalone()
+    {
+        return standalone;
+    }
+
+    public void setStandalone(boolean standalone)
+    {
+        this.standalone = standalone;
+    }
 
     /** Get display name
      *
@@ -206,7 +217,7 @@
         /*
          * setConfiguratorResult() might have already set it to true
          */
         if (this.clean != null && this.clean.booleanValue() == false)
             throw new RuntimeException("Cannot change cleanliness of DisplayModel");
 
         this.clean = Boolean.valueOf(modelReader.getNumberOfWidgetErrors() == 0);
@@ -223,7 +234,7 @@
         if (safe == null)
             return true;
 
         if (safe.booleanValue() == false)
             return false;
 
         // Check embedded displays and navigation tabs too

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/ContextMenuSupport.java

@@ -18,6 +18,8 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.image.ImageView;
+import javafx.stage.Stage;
+
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.Widget;
 import org.csstudio.display.builder.model.WidgetProperty;
@@ -91,7 +93,25 @@ public void handleContextMenu(final Widget widget, final int screen_x, final int
                     DisplayRuntimeInstance displayRuntimeInstance = DisplayRuntimeInstance.ofDisplayModel(displayModel);
                     DockItem dockItem = displayRuntimeInstance.getDockItem();
                     DockPane dockPane = dockItem.getDockPane();
-                    setFocus = () -> DockPane.setActiveDockPane(dockPane);
+                    if (dockPane.isStandaloneWindow()) {
+                        // If in a standalone window, set the active dock pane
+                        // to be the 'main' Phoebus pain instead of the current dock pane
+                        setFocus = () -> {
+                            DockPane.setActiveDockPane(DockPane.getMainDockPane());
+                            Stage stage = DockPane.getActiveStage();
+                            if (stage != null) {
+                                stage.requestFocus();
+                            }
+                        };
+                    } else {
+                        setFocus = () -> {
+                            DockPane.setActiveDockPane(dockPane);
+                            Stage stage = DockPane.getActiveStage();
+                            if (stage != null) {
+                                stage.requestFocus();
+                            }
+                        };
+                    }
                 }
 
                 fillMenu(setFocus, widget);
@@ -243,12 +263,14 @@ private void fillMenu(Runnable setFocus, final Widget widget) {
 
         items.add(new SeparatorMenuItem());
 
-        items.add(new DisplayToolbarAction(instance));
+        // Do not add the show/hide toolbar context menu item in a standalone window
+        if (!instance.getDockItem().getDockPane().isStandaloneWindow())
+            items.add(new DisplayToolbarAction(instance));
 
         // If the editor is available, add "Open in Editor"
         final AppResourceDescriptor editor = ApplicationService.findApplication("display_editor");
         if (editor != null && AuthorizationService.hasAuthorization("edit_display"))
-            items.add(new OpenInEditorAction(editor, widget));
+            items.add(new OpenInEditorAction(editor, widget, setFocus));
 
         items.add(new SeparatorMenuItem());
 

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayRuntimeInstance.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.FutureTask;
 import java.util.logging.Level;
 
+import javafx.stage.Window;
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.Preferences;
 import org.csstudio.display.builder.model.Widget;
@@ -68,6 +69,7 @@
     /** Memento tags */
     private static final String TAG_ZOOM = "ZOOM";
     private static final String TAG_TOOLBAR = "toolbar";
+    private static final String TAG_STANDALONE = "standalone";
 
     /** Global tracker of last user's decision to show toolbar.
      *  Used when opening new display
@@ -98,6 +100,8 @@
     /** Toolbar button for navigation */
     private ButtonBase navigate_backward, navigate_forward;
 
+    private Boolean auto_size_stage = false;
+
     public String getDisplayName() {
         return active_model.getDisplayName();
     }
@@ -117,21 +121,33 @@
         this(app, null);
     }
 
     DisplayRuntimeInstance(final AppDescriptor app, String prefTarget)
     {
         this.app = app;
 
         DockPane dock_pane = null;
         if (prefTarget != null)
         {
-            if (prefTarget.startsWith("window"))
+            if (prefTarget.startsWith("window") || prefTarget.startsWith("standalone"))
             {
+                boolean standalone = false;
+                if (prefTarget.startsWith("standalone"))
+                {
+                    standalone = true;
+                    auto_size_stage = true;
+                }
                 // Open new Stage in which this app will be opened, its DockPane is a new active one
                 final Stage new_stage = new Stage();
                 if (prefTarget.startsWith("window@"))
-                    DockStage.configureStage(new_stage, new Geometry(prefTarget.substring(7)));
+                    DockStage.configureStage(new_stage, new Geometry(prefTarget.substring(7)), standalone);
+                else if (prefTarget.startsWith("standalone@"))
+                {
+                    DockStage.configureStage(new_stage, new Geometry(prefTarget.substring(11)), standalone);
+                    // Do not autosize the stage to the screen size if the user has specified the dimensions
+                    auto_size_stage = false;
+                }
                 else
-                    DockStage.configureStage(new_stage);
+                    DockStage.configureStage(new_stage, new Geometry(null), standalone);
                 new_stage.show();
             }
             else
@@ -148,7 +164,7 @@
 
         new ContextMenuSupport(this);
 
-        if (last_toolbar_visible)
+        if (last_toolbar_visible && !dock_pane.isStandaloneWindow())
             layout.setTop(toolbar);
 
         layout.setCenter(representation.createModelRoot());
@@ -214,10 +230,10 @@
         navigate_backward = NavigationAction.createBackAction(this, navigation);
         navigate_forward = NavigationAction.createForewardAction(this, navigation);
         return new ToolBar(ToolbarHelper.createSpring(),
-                           zoom_action,
-                           navigate_backward,
-                           navigate_forward
-                           );
+                zoom_action,
+                navigate_backward,
+                navigate_forward
+        );
     }
 
     /** @return <code>true</code> if toolbar is visible */
@@ -262,6 +278,10 @@
             });
         });
         memento.getBoolean(TAG_TOOLBAR).ifPresent(this::showToolbar);
+        memento.getBoolean(TAG_STANDALONE).ifPresent(standalone ->
+        {
+            dock_item.getDockPane().setAsStandaloneWindow(standalone);
+        });
     }
 
     @Override
@@ -271,6 +291,8 @@
         if (! JFXRepresentation.DEFAULT_ZOOM_LEVEL.equals(zoom))
             memento.setString(TAG_ZOOM, zoom);
         memento.setBoolean(TAG_TOOLBAR, isToolbarVisible());
+        if (dock_item.getDockPane().isStandaloneWindow())
+            memento.setBoolean(TAG_STANDALONE, dock_item.getDockPane().isStandaloneWindow());
     }
 
     /** Handle Alt-left & right as navigation keys */
@@ -343,6 +365,17 @@
                 final Future<Void> represented = representation.submit(() -> representModel(model));
                 represented.get();
 
+                if (auto_size_stage)
+                {
+                    Window window = dock_item.getDockPane().getScene().getWindow();
+                    double xMargin = (int) (window.getWidth()
+                            - window.getScene().getWidth() + 2);
+                    double yMargin = (int) (window.getHeight()
+                            - window.getScene().getHeight() + 2);
+                    window.setWidth(model.propWidth().getValue() + xMargin);
+                    window.setHeight(model.propHeight().getValue() + yMargin);
+                }
+
                 // Start runtime for the model
                 RuntimeUtil.startRuntime(model);
 
@@ -413,8 +446,8 @@
     {
         monitor.beginTask(info.toString());
         final DisplayModel model = info.shouldResolve()
-            ? ModelLoader.resolveAndLoadModel(null, info.getPath())
-            : ModelLoader.loadModel(info.getPath());
+                ? ModelLoader.resolveAndLoadModel(null, info.getPath())
+                : ModelLoader.loadModel(info.getPath());
 
         // This code is called
         // 1) When opening a new display
@@ -476,8 +509,8 @@
         // or the new one has a different path,
         // or different macros _and_ there were original macros.
         if ( old_info == null  ||
-            !old_info.getPath().equals(info.getPath()) ||
-          ( !old_info.getMacros().isEmpty()  &&  !old_info.getMacros().equals(info.getMacros())))
+                !old_info.getPath().equals(info.getPath()) ||
+                ( !old_info.getMacros().isEmpty()  &&  !old_info.getMacros().equals(info.getMacros())))
         {
             display_info = Optional.of(info);
             dock_item.setInput(info.toURI());
@@ -570,4 +603,4 @@
         });
     }
 
-}
+}

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DockItemRepresentation.java

@@ -20,6 +20,7 @@
 import org.phoebus.ui.docking.DockItemWithInput;
 import org.phoebus.ui.docking.DockPane;
 import org.phoebus.ui.docking.DockStage;
+import org.phoebus.ui.docking.Geometry;
 
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -59,7 +60,7 @@
         final Stage new_stage = new Stage();
 
         // Configure for docking, i.e. with DockPane
-        DockStage.configureStage(new_stage);
+        DockStage.configureStage(new_stage, new Geometry(null), model.isStandalone());
 
         // Use location and size from model for the window
         double x = model.propX().getValue();
@@ -83,15 +84,30 @@
         // Size needs to account for the border and toolbar.
         // Using fixed numbers, exact size of border and toolbar unknown
         // at this time in the code
-        new_stage.setWidth(model.propWidth().getValue() + 18);
-        new_stage.setHeight(model.propHeight().getValue() + 105);
+        int width_margin = 18;
+        int height_margin = 105;
+        // Don't need to include space for toolbar in standalone
+        if (model.isStandalone())
+        {
+            width_margin = 5;
+            height_margin = 40;
+        }
+        new_stage.setWidth(model.propWidth().getValue() + width_margin);
+        new_stage.setHeight(model.propHeight().getValue() + height_margin);
 
         new_stage.show();
 
         // New DockPane is now the 'active' one,
         // model will be opened in it.
         return representModelInNewDockItem(model);
     }
+
+    @Override
+    public ToolkitRepresentation<Parent, Node> openStandaloneWindow(final DisplayModel model,
+                                                                    final Consumer<DisplayModel> close_handler)
+    {
+        return openNewWindow(model, close_handler);
+    }
 
     @Override
     public ToolkitRepresentation<Parent, Node> openPanel(final DisplayModel model,