From 5433e53f24ce7f963e4007fbd945ffbc3a36d63a Mon Sep 17 00:00:00 2001
From: GOXR3PLUS STUDIO <crAlexcomp@gmail.com>
Date: Fri, 3 Aug 2018 02:13:46 +0300
Subject: [PATCH] UX improvements

---
 resources/fxml/TreeViewManager.fxml                          | 3 +--
 .../application/systemtreeview/TreeViewContextMenu.java      | 2 +-
 .../application/systemtreeview/TreeViewManager.java          | 5 ++++-
 .../smartcontroller/presenter/MediaTableViewer.java          | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/fxml/TreeViewManager.fxml b/resources/fxml/TreeViewManager.fxml
index 3a0c82e3..3abe8716 100644
--- a/resources/fxml/TreeViewManager.fxml
+++ b/resources/fxml/TreeViewManager.fxml
@@ -12,14 +12,13 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.kordamp.ikonli.javafx.FontIcon?>
 
-
 <fx:root minHeight="0.0" minWidth="0.0" prefHeight="487.0" prefWidth="275.0" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <VBox fx:id="vBox" alignment="CENTER" minHeight="0.0" minWidth="0.0" style="-fx-background-color: #202020;">
          <children>
             <HBox minHeight="0.0" minWidth="0.0">
                <children>
-                  <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" style="-fx-border-color: transparent; -fx-background-color: #151515;" styleClass="applicationSettingsLabel2" text=" System Explorer " HBox.hgrow="ALWAYS">
+                  <Label fx:id="topLabel" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="0.0" minWidth="0.0" style="-fx-border-color: transparent; -fx-background-color: #151515;" styleClass="applicationSettingsLabel2" text=" System Explorer " HBox.hgrow="ALWAYS">
                      <graphic>
                         <FontIcon iconColor="#ddaa33" iconLiteral="fas-sitemap" iconSize="24" />
                      </graphic>
diff --git a/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewContextMenu.java b/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewContextMenu.java
index 61f39025..8d4be77e 100644
--- a/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewContextMenu.java
+++ b/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewContextMenu.java
@@ -167,7 +167,7 @@ else if (source == copy)
 		else if (source == editFileInfo)
 			Main.tagWindow.openAudio(treeItem.getAbsoluteFilePath(), TagTabCategory.BASICINFO, true);
 		else if (source == rename)
-			treeItem.rename(Main.treeManager);
+			treeItem.rename(Main.topBar);
 	}
 	
 	/**
diff --git a/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewManager.java b/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewManager.java
index b850b340..1e7cf8e8 100644
--- a/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewManager.java
+++ b/src/main/java/com/goxr3plus/xr3player/application/systemtreeview/TreeViewManager.java
@@ -54,6 +54,9 @@ public class TreeViewManager extends StackPane {
 	@FXML
 	private VBox vBox;
 	
+	@FXML
+	private Label topLabel;
+	
 	@FXML
 	private Button collapseTree;
 	
@@ -118,7 +121,7 @@ private void initialize() {
 			} else if (key.getCode() == KeyCode.R) { //RENAME
 				
 				//Any selected TreeItem ?
-				Optional.ofNullable(treeView.getSelectionModel().getSelectedItem()).ifPresent(item -> ( (FileTreeItem) item ).rename(this));
+				Optional.ofNullable(treeView.getSelectionModel().getSelectedItem()).ifPresent(item -> ( (FileTreeItem) item ).rename(topLabel));
 				
 			} else if (key.getCode() == KeyCode.C) { //COPY
 				
diff --git a/src/main/java/com/goxr3plus/xr3player/smartcontroller/presenter/MediaTableViewer.java b/src/main/java/com/goxr3plus/xr3player/smartcontroller/presenter/MediaTableViewer.java
index 991044d2..47083c86 100644
--- a/src/main/java/com/goxr3plus/xr3player/smartcontroller/presenter/MediaTableViewer.java
+++ b/src/main/java/com/goxr3plus/xr3player/smartcontroller/presenter/MediaTableViewer.java
@@ -820,9 +820,9 @@ else if (key.isControlDown()) { //Short Cuts
 					if (code == KeyCode.F)
 						ActionTool.openFileInExplorer(getSelectionModel().getSelectedItem().getFilePath());
 					else if (code == KeyCode.Q)
-						getSelectionModel().getSelectedItem().updateStars(getTableView());
+						getSelectionModel().getSelectedItem().updateStars(smartController.getSearchFieldStackPane());
 					else if (code == KeyCode.R)
-						getSelectionModel().getSelectedItem().rename(getTableView());
+						getSelectionModel().getSelectedItem().rename(smartController.getSearchFieldStackPane());
 					else if (code == KeyCode.U) {
 						Media media = getSelectionModel().getSelectedItem();
 						if (!Main.playedSongs.containsFile(media.getFilePath())) {