Skip to content

Commit

Permalink
Update 54 released!!
Browse files Browse the repository at this point in the history
  • Loading branch information
@goxr3plus
goxr3plus committed Mar 10, 2017
1 parent f2ccee5 commit 124a9d4
Show file tree
Hide file tree
Showing 14 changed files with 226 additions and 168 deletions.
1 change: 1 addition & 0 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
<classpathentry kind="lib" path="resources/libs/mp3agic-0.9.0.jar"/>
<classpathentry kind="lib" path="resources/libs/javasysmon-0.3.5.0.jar"/>
<classpathentry kind="lib" path="resources/libs/json-simple-2.1.2.jar" sourcepath="C:/Users/GOXR3PLUS/.sourceattacher/json-simple-2.1.2-sources.jar"/>
<classpathentry kind="lib" path="resources/libs/jnativehook-2.1.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
26 changes: 26 additions & 0 deletions XR3PlayerUpdatePage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,5 +377,31 @@
</p>
<p class="minJavaVersion">1.8.0_111</p>
</article>

<hr>

<article id="54">
<p class="about">
--Update 54 Native System KeyLogger!-- <br>
</p>
<p>
<b>ChangeLog</b> :
</p>
<p class="changelog">
<br>*Bug Fixes [Example:Starting the application doesn't refresh the selected playlist]
<br>*Wonderful Style Improvements
<br>*Native KeyLogger added
<br>*Small Speed Improvements
<br>*Preparing to add Screen Capture Capability in next version !
</p>
<p>
<b>Release Date</b> :
</p>
<p class="releasedate">10/03/2017</p>
<p>
<b>Minimum Java[JRE] Version</b> :
</p>
<p class="minJavaVersion">1.8.0_111</p>
</article>
</body>
</html>
2 changes: 1 addition & 1 deletion resources/fxml/LibraryMode.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<top>
<StackPane BorderPane.alignment="CENTER">
<children>
<Label alignment="CENTER" contentDisplay="RIGHT" prefHeight="17.0" prefWidth="161.0" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-background-color: black; -fx-background-radius: 15 15 0 0; -fx-border-color: firebrick; -fx-border-radius: 15 15 0 0; -fx-border-width: 2.5;" text="- Libraries -" StackPane.alignment="CENTER">
<Label alignment="CENTER" contentDisplay="RIGHT" prefHeight="17.0" prefWidth="161.0" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-background-color: black; -fx-background-radius: 15 15 0 0; -fx-border-color: firebrick; -fx-border-radius: 15 15 0 0; -fx-border-width: 2.5;" text="- Libraries -" StackPane.alignment="BOTTOM_CENTER">
<effect>
<DropShadow />
</effect>
Expand Down
9 changes: 4 additions & 5 deletions resources/fxml/NativeKeysController.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>


<fx:root prefHeight="470.0" prefWidth="552.0" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<center>
<HBox spacing="5.0" BorderPane.alignment="CENTER">
Expand All @@ -34,8 +33,8 @@
<Insets />
</VBox.margin>
</Label>
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Resume/Start" />
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Pause" />
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Resume/Start/Pause" />
<Label disable="true" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Pause" />
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Replay" />
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Seek Forward 10 sec" />
<Label maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="-&gt;Seek Backward 10 sec" />
Expand All @@ -57,8 +56,8 @@
<Insets />
</VBox.margin>
</Label>
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Pause/Resume Key" />
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Pause/Resume Key" />
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Play/Pause Key from Keyboard" />
<Label alignment="CENTER" disable="true" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Pause/Resume Key" />
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="SHIFT+R" />
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Right Key ( -&gt; )" />
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-font-weight: bold; -fx-background-color: white;" text="Left Key ( &lt;- )" />
Expand Down
37 changes: 37 additions & 0 deletions resources/fxml/XPlayerEqualizer.fxml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.TilePane?>


<fx:root 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: transparent;" vgap="5.0" BorderPane.alignment="CENTER" />
</center>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
<top>
<HBox fx:id="bottomHBox" alignment="CENTER" spacing="10.0" BorderPane.alignment="CENTER">
<children>
<Button fx:id="resetFilers" mnemonicParsing="false" text="Reset Filters">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<Button fx:id="effects" mnemonicParsing="false" text="Effects">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
</children>
<BorderPane.margin>
<Insets bottom="10.0" top="5.0" />
</BorderPane.margin>
</HBox>
</top>
</fx:root>
78 changes: 32 additions & 46 deletions resources/fxml/XPlayerSettingsController.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,48 @@
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>

<fx:root prefHeight="382.0" prefWidth="459.0" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<fx:root prefHeight="382.0" prefWidth="459.0" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<center>
<StackPane BorderPane.alignment="CENTER">
<children>
<TabPane style="-fx-background-color: rgb(255,255,255,0.95);;" tabClosingPolicy="UNAVAILABLE">
<tabs>
<Tab closable="false" text="Settings">
<content>
<ScrollPane styleClass="xPlayerSettingsTab">
<content>
<GridPane alignment="CENTER" hgap="10.0" vgap="10.0">
<columnConstraints>
<ColumnConstraints halignment="CENTER" hgrow="ALWAYS" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="0.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
</rowConstraints>
<children>
<JFXCheckBox fx:id="showFPS" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" selected="true" text="Show FPS " GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=It will show the frames per second into the visualizer" />
</tooltip>
</JFXCheckBox>
<JFXCheckBox fx:id="startImmediately" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" selected="true" text="Start at once" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=When you drop a song into the player it wil start immediately" />
</tooltip>
</JFXCheckBox>
<JFXCheckBox fx:id="askSecurityQuestion" layoutX="10.0" layoutY="50.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" selected="true" text="Ask Security Question" wrapText="true" GridPane.rowIndex="2">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=When you drop a song into the player it will ask security question" />
</tooltip>
</JFXCheckBox>
</children>
</GridPane>
</content>
<VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="25.0">
<children>
<JFXCheckBox fx:id="showFPS" alignment="CENTER" prefWidth="100.0" selected="true" text="Show FPS ">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=It will show the frames per second into the visualizer" />
</tooltip>
</JFXCheckBox>
<JFXCheckBox fx:id="startImmediately" alignment="CENTER" prefWidth="100.0" selected="true" text="Start at once">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=When you drop a song into the player it wil start immediately" />
</tooltip>
</JFXCheckBox>
<JFXCheckBox fx:id="askSecurityQuestion" alignment="CENTER" prefWidth="150.0" selected="true" text="Ask Security Question" wrapText="true">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Checked=When you drop a song into the player it will ask security question" />
</tooltip>
</JFXCheckBox>
</children>
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
<Insets bottom="5.0" left="5.0" right="5.0" top="15.0" />
</padding>
</ScrollPane>
</VBox>
</content>
</Tab>
<Tab fx:id="equalizerTab" closable="false" text="Equalizer">
Expand All @@ -79,7 +65,7 @@
</Tab>
</tabs>
</TabPane>
<Button fx:id="closeSettings" mnemonicParsing="false" text="X" StackPane.alignment="TOP_RIGHT">
<Button fx:id="closeSettings" mnemonicParsing="false" text="X" translateX="-2.0" StackPane.alignment="TOP_RIGHT">
<tooltip>
<Tooltip text="Close the Settings [!Tip -&gt; You can also press &gt;ESCAPE&lt; KEY]" />
</tooltip></Button>
Expand Down
2 changes: 1 addition & 1 deletion resources/style/application.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@
}

.library:opened .libraryNameLabel{
-fx-text-fill:magenta !important;
-fx-text-fill:lightgreen !important;
-fx-font-size:15.0;
}

Expand Down
34 changes: 20 additions & 14 deletions src/application/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;

import application.settings.ApplicationSettingsController;
import application.settings.window.ApplicationSettingsController;
import application.users.LoginMode;
import application.users.User;
import borderless.BorderlessScene;
Expand Down Expand Up @@ -159,11 +159,11 @@ public class Main extends Application {
/**
* The current update of XR3Player
*/
public final static int currentVersion = 53;
public final static int currentVersion = 54;
/**
* This application version release date
*/
public final static String releaseDate = "06/03/2017";
public final static String releaseDate = "10/03/2017";

/**
* The Thread which is responsible for the update check
Expand Down Expand Up @@ -256,9 +256,17 @@ public void start(Stage primaryStage) throws Exception {
window.setScene(scene);
window.show();

// Check if database folder exists
//InfoTool.DATABASE_FOLDER_NAME Exists?
if (!new File(InfoTool.ABSOLUTE_DATABASE_PATH_PLAIN).exists()) {
new File(InfoTool.ABSOLUTE_DATABASE_PATH_PLAIN).mkdir();
boolean dataBaseRootCreated = new File(InfoTool.ABSOLUTE_DATABASE_PATH_PLAIN).mkdir();

//If it can not be created [FATAL ERROR]
if (!dataBaseRootCreated) {
ActionTool.showNotification("Fatala Error!",
"Fatal Error Occured trying to create \n the root database folder [ XR3DataBase] \n Maybe the application has not the permission to create this folder.",
Duration.seconds(45), NotificationType.ERROR);
}

} else {
//Create the List with the Available Users
AtomicInteger counter = new AtomicInteger();
Expand All @@ -269,18 +277,15 @@ public void start(Stage primaryStage) throws Exception {
.collect(Collectors.toList()));

//avoid error
if (loginMode.userViewer.getItems().size() != 0)
if (!loginMode.userViewer.getItems().isEmpty())
loginMode.userViewer.setCenterIndex(loginMode.userViewer.getItems().size() / 2);
}

//Check Compatibility
checkJavaCombatibility();

// Check for updates on start
new Thread(() -> {
if (InfoTool.isReachableByPing("www.google.com"))
Main.checkForUpdates(false);
}).start();
//Check for updates
Main.checkForUpdates(false);

//Main.songsContextMenu.show(window)
// Main.songsContextMenu.hide()
Expand Down Expand Up @@ -550,9 +555,10 @@ public static void restartTheApplication(boolean askUser) {
/**
* This method is fetching data from github to check if the is a new update for XR3Player
*
* @param showIfNotUpdateAvailable
* @param showTheWindow
* If not update is available then don't show the window
*/
public static synchronized void checkForUpdates(boolean showIfNotUpdateAvailable) {
public static synchronized void checkForUpdates(boolean showTheWindow) {

// Not already running
if (updaterThread == null || !updaterThread.isAlive()) {
Expand All @@ -576,7 +582,7 @@ public static synchronized void checkForUpdates(boolean showIfNotUpdateAvailable

// Not disturb the user every time the application
// starts
if (Integer.valueOf(lastArticle.id()) <= currentVersion && !showIfNotUpdateAvailable)
if (Integer.valueOf(lastArticle.id()) <= currentVersion && !showTheWindow)
return;

// Update is available or not?
Expand Down
2 changes: 1 addition & 1 deletion ...ttings/ApplicationSettingsController.java → ...window/ApplicationSettingsController.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package application.settings;
package application.settings.window;

import java.io.IOException;
import java.util.logging.Level;
Expand Down
4 changes: 3 additions & 1 deletion ...cation/settings/NativeKeysController.java → ...settings/window/NativeKeysController.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
*
*/
package application.settings;
package application.settings.window;

import java.io.IOException;
import java.util.logging.Level;
Expand Down Expand Up @@ -81,6 +81,8 @@ public void nativeKeyReleased(NativeKeyEvent e) {
xPlayer.openFileChooser();
System.out.println("Opening File Chooser");

} else if (keyCode == NativeKeyEvent.VC_MEDIA_PLAY) { //PlayPause
xPlayer.reversePlayAndPause();
} else if (keyCode == NativeKeyEvent.VC_R && (e.getModifiers() == NativeKeyEvent.SHIFT_L_MASK
|| e.getModifiers() == NativeKeyEvent.SHIFT_R_MASK
|| e.getModifiers() == NativeKeyEvent.SHIFT_MASK
Expand Down
Loading

0 comments on commit 124a9d4

Please sign in to comment.