diff --git a/owlplug-client/pom.xml b/owlplug-client/pom.xml
index 0f560b4a..069506d5 100644
--- a/owlplug-client/pom.xml
+++ b/owlplug-client/pom.xml
@@ -4,7 +4,7 @@
4.0.0
- 4.0.1
+ 4.1.0
5.20.0
12.4.0
diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/NodeInfoController.java b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/NodeInfoController.java
index 5bb71cc7..e77681d2 100644
--- a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/NodeInfoController.java
+++ b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/NodeInfoController.java
@@ -19,12 +19,16 @@
package com.owlplug.plugin.controllers;
import com.owlplug.core.controllers.BaseController;
+import com.owlplug.core.ui.SideBar;
import com.owlplug.plugin.model.Plugin;
import com.owlplug.plugin.model.PluginComponent;
import com.owlplug.plugin.model.PluginDirectory;
import com.owlplug.plugin.model.Symlink;
import javafx.fxml.FXML;
import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -40,6 +44,12 @@ public class NodeInfoController extends BaseController {
@Autowired
private ComponentInfoController componentInfoController;
+ @FXML
+ private HBox nodeInfoContainer;
+ @FXML
+ private AnchorPane nodeInfoContent;
+ @FXML
+ private Button closeButton;
@FXML
private Node pluginInfoView;
@FXML
@@ -49,17 +59,40 @@ public class NodeInfoController extends BaseController {
@FXML
private Node componentInfoView;
+ private SideBar sidebar;
+
/**
* FXML initialize.
*/
public void initialize() {
+ nodeInfoContainer.getChildren().remove(nodeInfoContent);
+ sidebar = new SideBar(500, nodeInfoContent);
+ nodeInfoContainer.getChildren().add(sidebar);
+
+ closeButton.setOnAction(e -> sidebar.collapse());
+ closeButton.visibleProperty().bind(pluginInfoView.visibleProperty());
+
pluginInfoView.setVisible(false);
directoryInfoView.setVisible(false);
symlinkInfoView.setVisible(false);
componentInfoView.setVisible(false);
}
+ public void show() {
+ if (sidebar.isCollapsed()) {
+ sidebar.expand();
+ }
+ }
+
+ public void hide() {
+ sidebar.collapse();
+ }
+
+ public void toggleVisibility() {
+ sidebar.toggle();
+ }
+
public void setNode(Object node) {
switch (node) {
diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java
index b0664d45..436d484d 100644
--- a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java
+++ b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java
@@ -92,8 +92,6 @@ public class PluginsController extends BaseController {
@FXML
private Button filterToggleButton;
@FXML
- private VBox pluginInfoPane;
- @FXML
private VBox pluginsContainer;
@FXML
private HBox filterContainer;
@@ -256,13 +254,15 @@ public void setSearch(String query) {
}
public void setInfoPaneDisplay(boolean display) {
- pluginInfoPane.setManaged(display);
- pluginInfoPane.setVisible(display);
+ if (display) {
+ nodeInfoController.show();
+ } else {
+ nodeInfoController.hide();
+ }
}
public void toggleInfoPaneDisplay() {
- pluginInfoPane.setManaged(!pluginInfoPane.isManaged());
- pluginInfoPane.setVisible(!pluginInfoPane.isVisible());
+ nodeInfoController.toggleVisibility();
}
@EventListener
diff --git a/owlplug-client/src/main/resources/fxml/plugins/NodeInfoView.fxml b/owlplug-client/src/main/resources/fxml/plugins/NodeInfoView.fxml
index 36f69010..abdd43b3 100644
--- a/owlplug-client/src/main/resources/fxml/plugins/NodeInfoView.fxml
+++ b/owlplug-client/src/main/resources/fxml/plugins/NodeInfoView.fxml
@@ -1,19 +1,29 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml b/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml
index 9c7eaf72..0a75310b 100644
--- a/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml
+++ b/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml
@@ -88,12 +88,10 @@
-
-
-
-
-
+
+
+