Make logviewer menubar available (#39)

Make menubar available outside the logviewer, as clients might wish to * set the system menubar property * remove the menubar * add items to the menubar
qupath · Jun 22, 2023 · 577f3b9 · 577f3b9
1 parent 2e625ac
commit 577f3b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/log-viewer/src/main/java/qupath/ui/logviewer/LogViewer.java b/log-viewer/src/main/java/qupath/ui/logviewer/LogViewer.java
@@ -37,6 +37,8 @@ public class LogViewer extends BorderPane {
     private static final DateFormat TIMESTAMP_FORMAT = new SimpleDateFormat(System.getProperty("timestamp.format", "HH:mm:ss"));
     private final static ResourceBundle resources = ResourceBundle.getBundle("qupath.ui.logviewer.strings");
 
+    @FXML
+    private MenuBar menubar;
     @FXML
     private Menu threadFilterMenu;
     @FXML
@@ -94,6 +96,14 @@ public LogViewer() throws IOException {
         loader.load();
     }
 
+    /**
+     * Get the default menubar associated with the log viewer.
+     * @return the menubar
+     */
+    public MenuBar getMenubar() {
+        return menubar;
+    }
+
     @FXML
     private void initialize() {
         setUpDisplayedLogLevels();

diff --git a/log-viewer/src/main/resources/qupath/ui/logviewer/log-viewer.fxml b/log-viewer/src/main/resources/qupath/ui/logviewer/log-viewer.fxml
@@ -21,7 +21,7 @@
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 
-<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@css/styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@css/styles.css" type="BorderPane" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <center>
       <BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
          <center>
@@ -62,7 +62,7 @@
       </BorderPane>
    </center>
    <top>
-       <MenuBar BorderPane.alignment="CENTER">
+       <MenuBar fx:id="menubar" BorderPane.alignment="CENTER">
            <Menu mnemonicParsing="false" text="%Menu.File">
                <MenuItem mnemonicParsing="false" onAction="#close" text="%Action.File.close">
                <accelerator>