Update 73.a

Fucking bugs everywhere!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! But i fix them with happiness :)
goxr3plus · Jun 4, 2017 · 6dc998f · 6dc998f
1 parent a02ce1f
commit 6dc998f
Show file tree

Hide file tree

Showing 44 changed files with 1,363 additions and 826 deletions.
diff --git a/libraries/jaudiotagger-2.2.6-SNAPSHOT.jar b/libraries/jaudiotagger-2.2.6-SNAPSHOT.jar
diff --git a/...s/fxml/ApplicationSettingsController.fxml → resources/fxml/ApplicationSettings.fxml b/...s/fxml/ApplicationSettingsController.fxml → resources/fxml/ApplicationSettings.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.StackPane?>
 
-<fx:root prefHeight="431.0" prefWidth="736.0" style="-fx-background-color: black;" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root prefHeight="462.0" prefWidth="688.0" style="-fx-background-color: #202020;" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
    <center>
       <TabPane id="SpecialTabPane" side="LEFT" style="-fx-background-color: transparent;" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
         <tabs>
@@ -17,6 +17,7 @@
             <Tab fx:id="librariesTab" closable="false" styleClass="sTab" text="Libraries &gt;" />
           <Tab fx:id="shortCutsTab" closable="false" styleClass="sTab" text="ShortCuts &gt;" />
             <Tab closable="false" styleClass="sTab" text="XPlayers &gt;" fx:id="xPlayersTab" />
+            <Tab fx:id="webBrowserTab" closable="false" styleClass="sTab" text="Web Browser &gt;" />
         </tabs>
       </TabPane>
    </center>
@@ -38,6 +39,6 @@
       </StackPane>
    </bottom>
    <padding>
-      <Insets top="15.0" />
+      <Insets top="2.0" />
    </padding>
 </fx:root>
diff --git a/resources/fxml/GeneralSettingsController.fxml b/resources/fxml/GeneralSettingsController.fxml
@@ -37,34 +37,34 @@
                   <Tooltip text="The Side Bar will be at the left of the Window" />
                </tooltip>
             </JFXRadioButton>
-            <JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="No " GridPane.columnIndex="1" GridPane.rowIndex="2">
+            <JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="No " GridPane.columnIndex="1" GridPane.rowIndex="1">
                <tooltip>
                   <Tooltip text="The Side Bar will be at the left of the Window" />
                </tooltip>
                <toggleGroup>
                   <ToggleGroup fx:id="libraryModeUpsideDown" />
                </toggleGroup>
             </JFXRadioButton>
-            <JFXRadioButton focusTraversable="false" styleClass="settingsRadioButton" text="Yes" toggleGroup="$libraryModeUpsideDown" GridPane.columnIndex="2" GridPane.rowIndex="2">
+            <JFXRadioButton focusTraversable="false" styleClass="settingsRadioButton" text="Yes" toggleGroup="$libraryModeUpsideDown" GridPane.columnIndex="2" GridPane.rowIndex="1">
                <tooltip>
                   <Tooltip text="The Side Bar will be at the left of the Window" />
                </tooltip>
             </JFXRadioButton>
-            <JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="No" GridPane.columnIndex="1" GridPane.rowIndex="1">
+            <JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="No" GridPane.columnIndex="1" GridPane.rowIndex="2">
                <tooltip>
                   <Tooltip text="The Side Bar will be at the left of the Window" />
                </tooltip>
                <toggleGroup>
                   <ToggleGroup fx:id="djModeUpsideDown" />
                </toggleGroup>
             </JFXRadioButton>
-            <JFXRadioButton focusTraversable="false" styleClass="settingsRadioButton" text="Yes" toggleGroup="$djModeUpsideDown" GridPane.columnIndex="2" GridPane.rowIndex="1">
+            <JFXRadioButton focusTraversable="false" styleClass="settingsRadioButton" text="Yes" toggleGroup="$djModeUpsideDown" GridPane.columnIndex="2" GridPane.rowIndex="2">
                <tooltip>
                   <Tooltip text="The Side Bar will be at the left of the Window" />
                </tooltip>
             </JFXRadioButton>
-            <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="applicationSettingsLabel" text="DJ Mode Upside Down" GridPane.rowIndex="1" />
-            <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="applicationSettingsLabel" text="Main Mode Upside Down" GridPane.rowIndex="2" />
+            <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="applicationSettingsLabel" text="DJ Mode Upside Down" GridPane.rowIndex="2" />
+            <Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="applicationSettingsLabel" text="Main Mode Upside Down" GridPane.rowIndex="1" />
          </children>
       </GridPane>
    </center>

diff --git a/resources/fxml/MediaTableViewer.fxml b/resources/fxml/MediaTableViewer.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 
-<fx:root tableMenuButtonVisible="true" type="TableView" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root prefHeight="433.0" prefWidth="718.0" tableMenuButtonVisible="true" type="TableView" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
   <columns>
       <TableColumn fx:id="hasBeenPlayed" maxWidth="32.0" minWidth="32.0" prefWidth="32.0" resizable="false" text="File Played?">
          <graphic>
@@ -34,22 +34,15 @@
             </ImageView>
          </graphic>
       </TableColumn>
-      <TableColumn fx:id="timesPlayed" maxWidth="90.0" minWidth="90.0" prefWidth="90.0" resizable="false" text="Played # -[Not implemented yet]" visible="false">
-         <graphic>
-            <ImageView pickOnBounds="true" preserveRatio="true">
-               <image>
-                  <Image url="@../image/timesPlayed.png" />
-               </image>
-            </ImageView>
-         </graphic></TableColumn>
       <TableColumn fx:id="stars" maxWidth="65.0" minWidth="65.0" prefWidth="65.0" resizable="false" text="Stars">
          <graphic>
             <ImageView pickOnBounds="true" preserveRatio="true">
                <image>
                   <Image url="@../image/smallStar.png" />
                </image>
             </ImageView>
-         </graphic></TableColumn>
+         </graphic>
+      </TableColumn>
       <TableColumn fx:id="fileType" maxWidth="90.0" minWidth="90.0" prefWidth="90.0" resizable="false" text="Extension">
          <graphic>
             <ImageView pickOnBounds="true" preserveRatio="true">
@@ -66,14 +59,15 @@
                </image>
             </ImageView>
          </graphic></TableColumn>
-      <TableColumn fx:id="drive" maxWidth="80.0" minWidth="80.0" text="Drive">
+      <TableColumn fx:id="drive" maxWidth="80.0" minWidth="80.0" text="Drive" visible="false">
          <graphic>
             <ImageView>
                <image>
                   <Image url="@../image/drive.png" />
                </image>
             </ImageView>
-         </graphic></TableColumn>
+         </graphic>
+      </TableColumn>
       <TableColumn fx:id="filePath" maxWidth="1.7976931348623157E308" minWidth="150.0" prefWidth="150.0" text="File Path" visible="false" />
       <TableColumn fx:id="fileName" maxWidth="1.7976931348623157E308" minWidth="150.0" prefWidth="150.0" text="File Name" visible="false" />
       <TableColumn fx:id="hourImported" maxWidth="1.7976931348623157E308" minWidth="150.0" prefWidth="150.0" text="Time Imported" visible="false">
@@ -108,6 +102,14 @@
                </image>
             </ImageView>
          </graphic></TableColumn>
+      <TableColumn fx:id="timesPlayed" maxWidth="90.0" minWidth="90.0" prefWidth="90.0" resizable="false" text="Played # -[Not implemented yet]" visible="false">
+         <graphic>
+            <ImageView pickOnBounds="true" preserveRatio="true">
+               <image>
+                  <Image url="@../image/timesPlayed.png" />
+               </image>
+            </ImageView>
+         </graphic></TableColumn>
       <TableColumn prefWidth="75.0" text="Artist-[Not implemented]" visible="false" />
       <TableColumn fx:id="remix" prefWidth="75.0" text="Remix-[Not implemented]" visible="false" />
       <TableColumn fx:id="album" prefWidth="75.0" text="Album-[Not implemented]" visible="false" />
@@ -124,7 +126,7 @@
       <TableColumn fx:id="bpm" prefWidth="75.0" text="Bpm-[Not implemented]" visible="false" />
       <TableColumn fx:id="key" prefWidth="75.0" text="Key-[Not implemented]" visible="false" />
       <TableColumn fx:id="harmonic" prefWidth="75.0" text="Harmonic-[Not implemented]" visible="false" />
-      <TableColumn fx:id="bitRate" prefWidth="75.0" text="Bit Rate-[Not implemented]" visible="false" />
+      <TableColumn fx:id="bitRate" maxWidth="65.0" minWidth="65.0" prefWidth="65.0" text="Bit Rate" />
       <TableColumn fx:id="year" prefWidth="75.0" text="Year-[Not implemented]" visible="false" />
       <TableColumn fx:id="albumArt" prefWidth="75.0" text="Album Art-[Not implemented]" visible="false" />
       <TableColumn fx:id="singer" prefWidth="75.0" text="Singer-[Not implemented]" visible="false" />

diff --git a/resources/fxml/WebBrowserSettings.fxml b/resources/fxml/WebBrowserSettings.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.BorderPane?>
+
+<fx:root xmlns:fx="http://javafx.com/fxml/1" type="BorderPane">
+	<!-- TODO Add Nodes -->
+</fx:root>
+
diff --git a/resources/fxml/XPlayerController.fxml b/resources/fxml/XPlayerController.fxml
@@ -132,23 +132,23 @@
                                        <children>
                                           <ToolBar maxWidth="1.7976931348623157E308" minWidth="5.0" orientation="VERTICAL" StackPane.alignment="CENTER">
                                              <items>
-                                                <JFXButton fx:id="openPlayerHistory" focusTraversable="false" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="25.0" style="-fx-font-size: 11; -fx-border-color: firebrick; -fx-border-radius: 15; -fx-border-width: 2;" styleClass="arrowButton2" text="Player History">
-                                                   <tooltip>
-                                                      <Tooltip text="See history of songs that have been played from this player" />
-                                                   </tooltip>
-                                                </JFXButton>
-                                                <StackPane fx:id="mediaFileStackPane" maxWidth="1.7976931348623157E308">
+                                                <HBox fx:id="mediaNameHBox" alignment="CENTER_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="2.0" style="-fx-background-color: #202020;">
                                                    <children>
-                                                      <Button fx:id="openMediaFileFolder" mnemonicParsing="false" prefHeight="1.0" prefWidth="34.0" text="-&gt;" visible="false" StackPane.alignment="CENTER_RIGHT">
+                                                      <Button fx:id="mediaTagImageButton" contentDisplay="GRAPHIC_ONLY" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="32.0" prefWidth="32.0" style="-fx-background-radius: 0; -fx-border-color: black;">
+                                                         <graphic>
+                                                            <ImageView fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" />
+                                                         </graphic>
                                                          <cursor>
                                                             <Cursor fx:constant="HAND" />
                                                          </cursor>
                                                       </Button>
                                                    </children>
-                                                   <cursor>
-                                                      <Cursor fx:constant="HAND" />
-                                                   </cursor>
-                                                </StackPane>
+                                                </HBox>
+                                                <JFXButton fx:id="openPlayerHistory" focusTraversable="false" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="25.0" style="-fx-font-size: 11; -fx-border-color: firebrick; -fx-border-radius: 15; -fx-border-width: 2;" styleClass="arrowButton2" text="Player History">
+                                                   <tooltip>
+                                                      <Tooltip text="See history of songs that have been played from this player" />
+                                                   </tooltip>
+                                                </JFXButton>
                                                 <HBox alignment="CENTER" maxWidth="1.7976931348623157E308" spacing="3.0">
                                                    <children>
                                                       <Button fx:id="openFileButton" alignment="CENTER" maxWidth="1.7976931348623157E308" mnemonicParsing="false" style="-fx-font-size: 12;" text="Open" textAlignment="CENTER" wrapText="true" HBox.hgrow="ALWAYS">
@@ -224,7 +224,8 @@
                         </GridPane>
                         <GridPane fx:id="bottomGridPane" GridPane.columnSpan="2" GridPane.rowIndex="1">
                           <columnConstraints>
-                            <ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="100.0" />
+                            <ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="50.0" />
+                              <ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="50.0" />
                           </columnConstraints>
                           <rowConstraints>
                             <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />

diff --git a/resources/fxml/XPlayerEqualizer.fxml b/resources/fxml/XPlayerEqualizer.fxml
@@ -1,37 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.JFXButton?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.MenuItem?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.TilePane?>
 
-<fx:root prefHeight="325.0" prefWidth="389.0" style="-fx-background-color: transparent;" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
-   <center>
-      <TilePane fx:id="tilePane" alignment="CENTER" hgap="5.0" prefColumns="8" prefRows="0" style="-fx-background-color: white;" vgap="5.0" BorderPane.alignment="CENTER" />
-   </center>
-   <padding>
-      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-   </padding>
+<fx:root minHeight="1.0" minWidth="1.0" prefHeight="375.0" prefWidth="460.0" style="-fx-background-color: rgb(255,255,255,0.9);" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
    <top>
-      <HBox fx:id="bottomHBox" alignment="CENTER" spacing="10.0" BorderPane.alignment="CENTER">
+      <HBox fx:id="bottomHBox" alignment="CENTER_LEFT" minHeight="1.0" minWidth="1.0" spacing="10.0">
          <children>
-            <JFXButton fx:id="resetFilters" focusTraversable="false" styleClass="arrowButton2" text="Reset Filters" />
-            <MenuButton fx:id="effects" mnemonicParsing="false" popupSide="RIGHT" text="Effects">
+            <Button fx:id="resetFilters" mnemonicParsing="false" text="Reset All">
+               <cursor>
+                  <Cursor fx:constant="HAND" />
+               </cursor>
+            </Button>
+            <MenuButton fx:id="presets" mnemonicParsing="false" popupSide="RIGHT" text="Presets">
               <items>
                 <MenuItem mnemonicParsing="false" text="Action 1" />
                 <MenuItem mnemonicParsing="false" text="Action 2" />
               </items>
             </MenuButton>
          </children>
          <BorderPane.margin>
-            <Insets bottom="10.0" top="5.0" />
+            <Insets />
          </BorderPane.margin>
          <padding>
-            <Insets bottom="5.0" top="5.0" />
+            <Insets bottom="5.0" left="5.0" top="2.0" />
          </padding>
       </HBox>
    </top>
+   <center>
+      <ScrollPane fitToHeight="true" fitToWidth="true" BorderPane.alignment="CENTER">
+         <content>
+            <TilePane fx:id="tilePane" alignment="TOP_CENTER" hgap="5.0" prefColumns="0" prefHeight="100.0" prefRows="0" prefWidth="100.0" style="-fx-background-color: #202020;" vgap="5.0" />
+         </content>
+      </ScrollPane>
+   </center>
 </fx:root>
diff --git a/resources/fxml/XPlayerExtraSettingsController.fxml b/resources/fxml/XPlayerExtraSettingsController.fxml
@@ -17,11 +17,6 @@
                         <ScrollPane />
                      </content>
                   </Tab>
-                  <Tab fx:id="equalizerTab" closable="false" text="Equalizer">
-                     <content>
-                        <ScrollPane fitToHeight="true" fitToWidth="true" style="-fx-background-color: rgb(0,0,0,0.85);" />
-                     </content>
-                  </Tab>
                </tabs>
             </TabPane>
          </children>

diff --git a/resources/style/application.css b/resources/style/application.css
@@ -533,7 +533,7 @@
     -fx-text-fill: white;    
     -fx-font-size: 13.0px;    
     -fx-font-weight:bold; 
-   -fx-padding:3.0em -1.0em 3.0em -1.0em; 
+   -fx-padding:3.0em -1.3em 3.0em -1.3em; 
    -fx-cursor:hand;	
 }
 

diff --git a/src/aaTester/DJDiscResizer.java → src/aaTesterOnlyCode/DJDiscResizer.java b/src/aaTester/DJDiscResizer.java → src/aaTesterOnlyCode/DJDiscResizer.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import application.presenter.custom.DJDisc;
 import javafx.application.Application;

diff --git a/src/aaTester/FXMLPrototype.java → src/aaTesterOnlyCode/FXMLPrototype.java b/src/aaTester/FXMLPrototype.java → src/aaTesterOnlyCode/FXMLPrototype.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import java.io.IOException;
 import java.util.logging.Level;

diff --git a/src/aaTester/Hello.java → src/aaTesterOnlyCode/Hello.java b/src/aaTester/Hello.java → src/aaTesterOnlyCode/Hello.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 import com.jfoenix.controls.JFXTabPane;
 
 import javafx.application.Application;

diff --git a/src/aaTester/InternetConnectionTester.java → ...terOnlyCode/InternetConnectionTester.java b/src/aaTester/InternetConnectionTester.java → ...terOnlyCode/InternetConnectionTester.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package aaTester;
+package aaTesterOnlyCode;
 
 import application.tools.InfoTool;
 

diff --git a/src/aaTester/JavaSoundRecorder.java → src/aaTesterOnlyCode/JavaSoundRecorder.java b/src/aaTester/JavaSoundRecorder.java → src/aaTesterOnlyCode/JavaSoundRecorder.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import javax.sound.sampled.*;
 import java.io.*;

diff --git a/src/aaTester/MemTester.java → src/aaTesterOnlyCode/MemTester.java b/src/aaTester/MemTester.java → src/aaTesterOnlyCode/MemTester.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package aaTester;
+package aaTesterOnlyCode;
 
 import com.jezhumble.javasysmon.JavaSysMon;
 

diff --git a/src/aaTester/PopupDemoTester.java → src/aaTesterOnlyCode/PopupDemoTester.java b/src/aaTester/PopupDemoTester.java → src/aaTesterOnlyCode/PopupDemoTester.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;

diff --git a/src/aaTester/PropertiesTesting.java → src/aaTesterOnlyCode/PropertiesTesting.java b/src/aaTester/PropertiesTesting.java → src/aaTesterOnlyCode/PropertiesTesting.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

diff --git a/src/aaTester/ServicePrototype.java → src/aaTesterOnlyCode/ServicePrototype.java b/src/aaTester/ServicePrototype.java → src/aaTesterOnlyCode/ServicePrototype.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package aaTester;
+package aaTesterOnlyCode;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;

diff --git a/src/aaTester/StackPaneResizer.java → src/aaTesterOnlyCode/StackPaneResizer.java b/src/aaTester/StackPaneResizer.java → src/aaTesterOnlyCode/StackPaneResizer.java
@@ -1,4 +1,4 @@
-package aaTester;
+package aaTesterOnlyCode;
 
 import javafx.application.Application;
 import javafx.scene.Scene;