Skip to content

Commit

Permalink
XR3Player Update 67
Browse files Browse the repository at this point in the history
Beautiful update :) A better is coming soon !
  • Loading branch information
goxr3plus committed May 12, 2017
1 parent be846f3 commit 7a8ae97
Show file tree
Hide file tree
Showing 58 changed files with 1,848 additions and 1,025 deletions.
37 changes: 33 additions & 4 deletions XR3PlayerUpdatePage.html
Original file line number Diff line number Diff line change
Expand Up @@ -716,23 +716,52 @@
<p class="minJavaVersion">1.8.0_111</p>
</article>

<hr>

<article id="67">
<p class="about">
--Update 67-- Important update!<br>
</p>
<p>
<b>ChangeLog</b> :
</p>
<p class="changelog">
<br>*80% of application settings are being saved [ Until now only ~25% was being saved ]
<br>*Important Bug Fixes
<br>*User Interface Improvements
<br>*Maximum allowed characters for rename extended from 150 -> 250
<br>*More advanced settings have been added
<br>*Search Songs Using Countries and Tags is coming soon :)
</p>
<p>
<b>Released Date</b> :
</p>
<p class="releasedate">13/05/2017</p>
<p>
<b>Minimum Java[JRE] Version</b> :
</p>
<p class="minJavaVersion">1.8.0_111</p>
</article>

<hr>

<!-- Upcoming features -->
<section id="Upcoming Features">
<p id="info">
//TODO in next updates
<br>*Absolute Re-Implementation of Speech Recognition Mechanism which is not used until now
<br>*Ability to search media using different Countries [ Example. I want only English and Greek songs ]
<br>*Players must have history of played songs
<br>*Mechanism for saving all the application settings [ 70% implemented since 12/05/2017 using ->Properties + JSON]
<br>*Add bar charts about different topics [Example categories of music that user prefers to listen ]
<br>*Media needs to have an advanced information window
<br>*More advanced search on playlists [ More options ]
<br>*Updates must be queued on the PlayLists using an external Thread
<br>*User must be capable of downloading Files from WebBrowser
<br>*Web Browser must open new tabs when scroll is clicked
<br>*User must be capable of downloading Files using external URL's
<br>*Ability to search media using different Countries [ Example. I want only English and Greek songs ]
<br>*Players must have history of played songs
<br>*Players must have the ability to play songs in row using their own playlists
</p>
<p id="lastUpdated"> 02/05/2017 </p>
<p id="lastUpdated"> 13/05/2017 by Alex :)</p>
</section>


Expand Down
6 changes: 4 additions & 2 deletions resources/fxml/ApplicationSettingsController.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.StackPane?>

<fx:root prefHeight="400.0" prefWidth="600.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="464.0" prefWidth="678.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">
<center>
<TabPane style="-fx-background-color: transparent;" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<tabs>
<Tab fx:id="librariesTab" closable="false" text="Libraries" />
<Tab fx:id="generalTab" closable="false" text="General" />
<Tab fx:id="playListsTab" closable="false" text="PlayLists" />
<Tab fx:id="librariesTab" closable="false" text="Libraries" />
<Tab fx:id="shortCutsTab" closable="false" text="ShortCuts" />
<Tab closable="false" text="XPlayers" fx:id="xPlayersTab" />
</tabs>
</TabPane>
</center>
Expand Down
44 changes: 44 additions & 0 deletions resources/fxml/GeneralSettingsController.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXRadioButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ToggleGroup?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<fx:root prefHeight="400.0" prefWidth="600.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">
<center>
<VBox alignment="TOP_CENTER" spacing="15.0" BorderPane.alignment="CENTER">
<children>
<Label alignment="CENTER" layoutX="20.0" layoutY="20.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="settingsLabel" text="Side Bar Settings(?)">
<tooltip>
<Tooltip text="Side Bar Settings" />
</tooltip>
</Label>
<HBox alignment="CENTER">
<children>
<JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="LEFT (Default + Recommended )" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="The Side Bar will be at the left of the Window" />
</tooltip>
<toggleGroup>
<ToggleGroup fx:id="sideBarSideGroup" />
</toggleGroup>
</JFXRadioButton>
<JFXRadioButton focusTraversable="false" styleClass="settingsRadioButton" text="RIGHT (Experimental )" toggleGroup="$sideBarSideGroup" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="The Side Bar will be at the left of the Window" />
</tooltip>
</JFXRadioButton>
</children>
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
</padding>
</HBox>
</children>
</VBox>
</center>
</fx:root>
60 changes: 34 additions & 26 deletions resources/fxml/LoginScreenController.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<?import com.jfoenix.controls.JFXToggleButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.chart.PieChart?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
Expand All @@ -23,7 +24,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.web.WebView?>

<fx:root prefHeight="753.0" prefWidth="1031.0" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<fx:root prefHeight="811.0" prefWidth="1071.0" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<center>
<VBox alignment="CENTER" BorderPane.alignment="CENTER">
<children>
Expand Down Expand Up @@ -76,7 +77,7 @@
<graphic>
<ImageView fitWidth="24.0" pickOnBounds="true" preserveRatio="true" smooth="false">
<image>
<Image url="@../image/Plus-32.png" />
<Image url="@../image/Add%20User%20Group%20Woman%20Man-32.png" />
</image>
<cursor>
<Cursor fx:constant="HAND" />
Expand Down Expand Up @@ -174,11 +175,20 @@
<Label fx:id="usersInfoLabel" alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-background-color: rgb(0,0,0,0.85); -fx-background-radius: 0 0 45 45; -fx-border-color: transparent;" styleClass="settingsLabel" text="Users Info" BorderPane.alignment="CENTER" />
</top>
</BorderPane>
<Button fx:id="loginButton" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="71.0" prefWidth="199.0" style="-fx-font-size: 30;" text="Login">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<StackPane>
<children>
<PieChart fx:id="pieChart" legendVisible="false" maxWidth="-Infinity" prefHeight="248.0" prefWidth="264.0" style="-fx-background-color: black; -fx-border-color: white;" StackPane.alignment="CENTER_RIGHT">
<effect>
<DropShadow />
</effect>
</PieChart>
<Button fx:id="loginButton" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="71.0" prefWidth="199.0" style="-fx-font-size: 30;" text="Login" translateX="-25.0">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
</children>
</StackPane>
</children>
<BorderPane.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
Expand Down Expand Up @@ -239,22 +249,9 @@
</HBox>
</bottom>
<top>
<BorderPane BorderPane.alignment="CENTER">
<center>
<Label id="LoginScreenTopLabel" alignment="CENTER" contentDisplay="BOTTOM" graphicTextGap="5.0" prefHeight="42.0" prefWidth="276.0" style="-fx-background-color: rgb(0,0,0,0.9); -fx-font-size: 25; -fx-text-fill: white; -fx-font-weight: bold; -fx-background-radius: 0 0 15 15; -fx-border-color: transparent firebrick firebrick; -fx-border-radius: 0 0 10 10; -fx-border-width: 2;" text="~ XR3Player ~" BorderPane.alignment="CENTER" fx:id="xr3PlayerLabel">
<cursor>
<Cursor fx:constant="MOVE" />
</cursor>
<padding>
<Insets bottom="2.0" />
</padding>
</Label>
</center>
<BorderPane.margin>
<Insets right="5.0" />
</BorderPane.margin>
<right>
<VBox alignment="CENTER" spacing="5.0" style="-fx-background-color: #202020;" BorderPane.alignment="CENTER">
<StackPane BorderPane.alignment="CENTER">
<children>
<VBox alignment="CENTER" maxWidth="-Infinity" prefHeight="49.0" prefWidth="129.0" spacing="5.0" style="-fx-background-color: #202020;" StackPane.alignment="CENTER_RIGHT">
<children>
<HBox alignment="TOP_CENTER" spacing="5.0">
<children>
Expand Down Expand Up @@ -293,7 +290,7 @@
</Button>
</children>
</HBox>
<Button fx:id="changeBackground" maxWidth="1.7976931348623157E308" mnemonicParsing="false" style="-fx-font-size: 11;" text="Change Background" textAlignment="CENTER" wrapText="true">
<Button fx:id="changeBackground" mnemonicParsing="false" style="-fx-font-size: 11;" text="Change Background" textAlignment="CENTER" wrapText="true">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
Expand All @@ -302,8 +299,19 @@
</tooltip>
</Button>
</children>
<padding>
<Insets bottom="4.0" />
</padding>
</VBox>
</right>
</BorderPane>
<Label id="LoginScreenTopLabel" alignment="CENTER" contentDisplay="BOTTOM" graphicTextGap="5.0" prefHeight="42.0" prefWidth="298.0" style="-fx-background-color: rgb(0,0,0,0.9); -fx-font-size: 25; -fx-text-fill: white; -fx-font-weight: bold; -fx-background-radius: 0 0 15 15; -fx-border-color: transparent firebrick firebrick; -fx-border-radius: 0 0 10 10; -fx-border-width: 2;" text="~ XR3Player ~" fx:id="xr3PlayerLabel">
<cursor>
<Cursor fx:constant="MOVE" />
</cursor>
<padding>
<Insets bottom="2.0" />
</padding>
</Label>
</children>
</StackPane>
</top>
</fx:root>
30 changes: 24 additions & 6 deletions resources/fxml/PlayListsSettingsController.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<fx:root prefHeight="393.0" prefWidth="532.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="412.0" prefWidth="580.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">
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
</padding>
Expand All @@ -34,7 +34,10 @@
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
</padding>
<children>
<JFXCheckBox fx:id="instantSearch" checkedColor="#119c8c" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="Instant Search" unCheckedColor="#9c101b" />
<JFXCheckBox fx:id="instantSearch" checkedColor="#119c8c" focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="Instant Search" unCheckedColor="#9c101b">
<tooltip>
<Tooltip text="When you type inside PlayLists search fields the search will start immediatly without pressing enter" />
</tooltip></JFXCheckBox>
</children>
</HBox>
<Label alignment="CENTER" layoutX="20.0" layoutY="20.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="settingsLabel" text="File Search Using(?)">
Expand All @@ -48,8 +51,14 @@
<toggleGroup>
<ToggleGroup fx:id="fileSearchGroup" />
</toggleGroup>
<tooltip>
<Tooltip text="It will return Files that contain the typed letters into their absolute path [Example -&gt; C:/../a.mp3 ]" />
</tooltip>
</JFXRadioButton>
<JFXRadioButton focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="File Name( a.mp3)[ slower ]" toggleGroup="$fileSearchGroup" HBox.hgrow="ALWAYS" />
<JFXRadioButton focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="File Name( a.mp3)[ slower ]" toggleGroup="$fileSearchGroup" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="It will return only Files that have the typed letters inside their names [Example -&gt; a.mp3 ] " />
</tooltip></JFXRadioButton>
</children>
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
Expand All @@ -70,12 +79,18 @@
</Label>
<HBox alignment="BOTTOM_LEFT">
<children>
<JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" styleClass="settingsRadioButton" text="File Absolute Path" HBox.hgrow="ALWAYS">
<JFXRadioButton contentDisplay="BOTTOM" focusTraversable="false" styleClass="settingsRadioButton" text="Exact File Content ( More accurate )" HBox.hgrow="ALWAYS">
<toggleGroup>
<ToggleGroup fx:id="playedFilesDetectionGroup" />
</toggleGroup>
<tooltip>
<Tooltip text="Most accurate option but it is also consuming more Disk " />
</tooltip>
</JFXRadioButton>
<JFXRadioButton focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="File Name + File Size (Recommened)" toggleGroup="$playedFilesDetectionGroup" HBox.hgrow="ALWAYS" />
<JFXRadioButton focusTraversable="false" selected="true" styleClass="settingsRadioButton" text="File Name + File Size (Recommended)" toggleGroup="$playedFilesDetectionGroup" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="Not catching everything but it is not consuming too much disk" />
</tooltip></JFXRadioButton>
</children>
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
Expand Down Expand Up @@ -104,7 +119,10 @@
<Tooltip text="Clear the History of played files " />
</tooltip>
</Label>
<JFXButton fx:id="clearPlayedFilesHistory" styleClass="arrowButton" text="Press here to clear" />
<JFXButton fx:id="clearPlayedFilesHistory" styleClass="arrowButton" text="Press here to clear">
<tooltip>
<Tooltip text="All the history of played songs will be cleared [ Not from Players though..]" />
</tooltip></JFXButton>
</children>
</VBox>
</content>
Expand Down
6 changes: 3 additions & 3 deletions resources/fxml/TopBar.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<center>
<BorderPane BorderPane.alignment="CENTER">
<center>
<Label alignment="CENTER" contentDisplay="RIGHT" graphicTextGap="5.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-background-color: black; -fx-background-radius: 0 0 15 15; -fx-border-radius: 0 0 15 15; -fx-border-color: transparent firebrick; -fx-border-width: 2;" text="~~XR3Player~~" BorderPane.alignment="CENTER" fx:id="xr3Label">
<Label alignment="CENTER" contentDisplay="RIGHT" graphicTextGap="5.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-background-color: black; -fx-background-radius: 0 0 15 15; -fx-border-radius: 0 0 15 15; -fx-border-color: transparent firebrick; -fx-border-width: 2;" text="~~XR3Players~~" BorderPane.alignment="CENTER" fx:id="xr3Label">
<effect>
<DropShadow />
</effect>
Expand Down Expand Up @@ -126,7 +126,7 @@
<graphic>
<ImageView fitWidth="24.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/DJ-32.png" />
<Image url="@../image/MusicRecord-32.png" />
</image>
</ImageView>
</graphic>
Expand All @@ -138,7 +138,7 @@
<graphic>
<ImageView fitWidth="24.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/User%20Location-32.png" />
<Image url="@../image/UserGroupManWoman-32.png" />
</image>
</ImageView>
</graphic>
Expand Down
Loading

0 comments on commit 7a8ae97

Please sign in to comment.