From e4ebf5a20b9626fd8adb198330cc2d9c2009f124 Mon Sep 17 00:00:00 2001
From: aj <andrewjpack@gmail.com>
Date: Wed, 1 May 2019 14:04:18 +0100
Subject: [PATCH] changed scrobble line chart to bar, moved current track to
 lookup

---
 .../fx/controller/ScrobbleChartPaneController.java        | 8 ++++----
 .../sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml       | 4 ++--
 src/main/resources/sarsoo/fmframework/fx/ui/main.fxml     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
index ac8ec02..6e40fbe 100644
--- a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
+++ b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java
@@ -11,7 +11,7 @@ import javafx.fxml.FXML;
 import sarsoo.fmframework.fm.FmUserNetwork;
 import sarsoo.fmframework.music.Album;
 import sarsoo.fmframework.net.Key;
-import javafx.scene.chart.LineChart;
+import javafx.scene.chart.BarChart;
 import javafx.scene.chart.XYChart;
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
@@ -28,7 +28,7 @@ public class ScrobbleChartPaneController {
 	private ChoiceBox<String> dropDownTimeRange;
 
 	@FXML
-	private LineChart lineChartScrobbles;
+	private BarChart barChartScrobbles;
 
 	@FXML
 	private BorderPane chartBorderPane;
@@ -95,8 +95,8 @@ public class ScrobbleChartPaneController {
 							@Override
 							public void run() {
 								try {
-									lineChartScrobbles.getData().clear();
-									lineChartScrobbles.getData().add(series);
+									barChartScrobbles.getData().clear();
+									barChartScrobbles.getData().add(series);
 
 								} finally {
 									latch.countDown();
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml
index 2d27d64..8879753 100644
--- a/src/main/resources/sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/ScrobbleChartPane.fxml
@@ -20,14 +20,14 @@
                                     </ToolBar>
                                  </bottom>
          <center>
-            <LineChart fx:id="lineChartScrobbles" legendVisible="false" BorderPane.alignment="CENTER">
+            <BarChart fx:id="barChartScrobbles" legendVisible="false" BorderPane.alignment="CENTER">
               <xAxis>
                 <CategoryAxis side="BOTTOM" />
               </xAxis>
               <yAxis>
                 <NumberAxis side="LEFT" />
               </yAxis>
-            </LineChart>
+            </BarChart>
          </center>
                               </BorderPane>
    </children>
diff --git a/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml b/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
index 150614c..da40ad5 100644
--- a/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
+++ b/src/main/resources/sarsoo/fmframework/fx/ui/main.fxml
@@ -18,6 +18,7 @@
             </Menu>
           <Menu fx:id="menuLookup" mnemonicParsing="false" text="lookup">
             <items>
+                  <MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
               <MenuItem fx:id="menuItemTrack" mnemonicParsing="false" onAction="#handleLookupTrack" text="track" />
                   <MenuItem fx:id="menuItemAlbum" mnemonicParsing="false" onAction="#handleLookupAlbum" text="album" />
                   <MenuItem fx:id="menuItemArtist" mnemonicParsing="false" onAction="#handleLookupArtist" text="artist" />
@@ -33,7 +34,6 @@
             <Menu fx:id="menuUtil" mnemonicParsing="false" text="util">
               <items>
                 <MenuItem fx:id="menuItemScrobble" mnemonicParsing="false" onAction="#handleScrobble" text="scrobble" />
-                  <MenuItem fx:id="menuItemCurrentTrack" mnemonicParsing="false" onAction="#handleCurrentTrack" text="current track" />
                   <MenuItem fx:id="menuItemOpenConsole" mnemonicParsing="false" onAction="#handleOpenConsole" text="open console" />
                   <MenuItem mnemonicParsing="false" onAction="#handleChangeUsername" text="set username" />
               </items>