Skip to content

Commit

Permalink
Update 55 released
Browse files Browse the repository at this point in the history 
New capabilities!
  • Loading branch information
@goxr3plus
goxr3plus committed Mar 12, 2017
1 parent 124a9d4 commit 67e537f
Show file tree
Hide file tree
Showing 48 changed files with 1,127 additions and 612 deletions.
Binary file modified XR3Player Manual.odt
View file
Binary file not shown.
Binary file modified XR3Player Manual.pdf
View file
Binary file not shown.
27 changes: 27 additions & 0 deletions XR3PlayerUpdatePage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,5 +403,32 @@
</p>
<p class="minJavaVersion">1.8.0_111</p>
</article>

<hr>

<article id="55">
<p class="about">
--Update 55 Importing new layouts!-- <br>
</p>
<p>
<b>ChangeLog</b> :
</p>
<p class="changelog">
<br>*General Layout and Code Bug Fixes
<br>*New Spectrum Analyser mode [ Circle with Lines]
<br>*Changes Rozette Visualizer [ You need to check it :) ]
<br>*Added SnapShot tool to the application
<br>*Preparing for saving all application settings into JSON database
<br>*Preparing for implementing a new Layout for the application
</p>
<p>
<b>Release Date</b> :
</p>
<p class="releasedate">12/03/2017</p>
<p>
<b>Minimum Java[JRE] Version</b> :
</p>
<p class="minJavaVersion">1.8.0_111</p>
</article>
</body>
</html>
22 changes: 13 additions & 9 deletions resources/fxml/Library.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXBadge?>
<?import com.jfoenix.controls.JFXCheckBox?>
<?import de.jensd.fx.fontawesome.Icon?>
<?import javafx.geometry.Insets?>
<?import javafx.geometry.Rectangle2D?>
<?import javafx.scene.Cursor?>
Expand All @@ -16,20 +14,20 @@

<fx:root styleClass="library" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<children>
<ImageView fx:id="imageView" pickOnBounds="true" StackPane.alignment="CENTER">
<ImageView fx:id="imageView" nodeOrientation="INHERIT" pickOnBounds="true" StackPane.alignment="CENTER">
<image>
<Image url="@../image/library.png" />
</image>
<viewport>
<Rectangle2D />
</viewport>
</ImageView>
<Label fx:id="nameField" alignment="CENTER" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="30.0" styleClass="libraryNameLabel" text="oh damn null!" wrapText="true">
<Label fx:id="nameField" alignment="CENTER" contentDisplay="TEXT_ONLY" maxHeight="-Infinity" maxWidth="1.7976931348623157E308" prefHeight="30.0" styleClass="libraryNameLabel" text="oh damn null!" wrapText="true">
<tooltip>
<Tooltip />
</tooltip>
</Label>
<Label fx:id="goSettings" style="-fx-background-color: rgb(255,255,255,0.8); -fx-background-radius: 10;" textAlignment="CENTER" StackPane.alignment="TOP_RIGHT">
<Label fx:id="goSettings" contentDisplay="GRAPHIC_ONLY" style="-fx-background-color: white; -fx-background-radius: 10;" textAlignment="CENTER" StackPane.alignment="TOP_RIGHT">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -38,7 +36,7 @@
</ImageView>
</graphic>
</Label>
<Label fx:id="warningLabel" style="-fx-background-color: rgb(255,255,255,0.8);" textAlignment="CENTER" visible="false" StackPane.alignment="BOTTOM_RIGHT">
<Label fx:id="warningLabel" contentDisplay="GRAPHIC_ONLY" style="-fx-background-color: rgb(255,255,255,0.8);" textAlignment="CENTER" visible="false" StackPane.alignment="BOTTOM_RIGHT">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
Expand All @@ -50,9 +48,15 @@
<Tooltip text="Image is missing!" />
</tooltip>
</Label>
<JFXBadge fx:id="ratingLabel" maxHeight="20.0" maxWidth="60.0" style="-fx-background-color: rgb(255,255,255,0.8); -fx-background-radius: 45;" styleClass="icons-badge" text="0.5" StackPane.alignment="TOP_LEFT">
<Icon awesomeIcon="STAR" size="2em" style=";" styleClass="icon" />
</JFXBadge>
<Label fx:id="ratingLabel" alignment="CENTER" prefHeight="33.0" prefWidth="57.0" style="-fx-background-color: white; -fx-background-radius: 0 15 15 0; -fx-text-fill: black; -fx-font-size: bold; -fx-font-size: 18;" text="1" StackPane.alignment="TOP_LEFT">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/smallStar.png" />
</image>
</ImageView>
</graphic>
</Label>
<StackPane fx:id="progressBarStackPane" style="-fx-background-color: rgb(255,255,255,0.75);" visible="false">
<children>
<ProgressBar fx:id="progressBar" progress="0.0" />
Expand Down
2 changes: 1 addition & 1 deletion resources/fxml/LoginScreenController.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</ImageView>
</graphic>
<tooltip>
<Tooltip text="Create new Library" />
<Tooltip text="Create new User" />
</tooltip>
</Button>
</children>
Expand Down
2 changes: 1 addition & 1 deletion resources/fxml/RenameWindow.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</ImageView>
</graphic>
<tooltip>
<Tooltip text="Close" />
<Tooltip text="Cancel" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
Expand Down
242 changes: 158 additions & 84 deletions resources/fxml/SideBar.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<?import com.jfoenix.controls.JFXToggleButton?>
<?import javafx.geometry.Insets?>
<?import javafx.geometry.Rectangle2D?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuButton?>
Expand All @@ -22,71 +22,21 @@
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>

<fx:root id="sideBar" maxWidth="-Infinity" prefHeight="624.0" prefWidth="265.0" stylesheets="@../style/application.css" type="BorderPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<top>
<BorderPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<center>
<StackPane prefHeight="150.0" prefWidth="200.0" BorderPane.alignment="CENTER">
<children>
<ImageView fx:id="userImageView" fitHeight="170.0" fitWidth="170.0" pickOnBounds="true" preserveRatio="true" StackPane.alignment="CENTER">
<image>
<Image url="@../image/user.png" />
</image>
<StackPane.margin>
<Insets bottom="5.0" top="5.0" />
</StackPane.margin>
</ImageView>
<Label fx:id="userNameLabel" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;" text="Logged in : GOXR3PLUS STUDIO" translateY="-25.0" StackPane.alignment="TOP_CENTER" />
</children>
<BorderPane.margin>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</BorderPane.margin>
</StackPane>
</center>
<top>
<VBox prefHeight="144.0" prefWidth="257.0" spacing="15.0" BorderPane.alignment="CENTER">
<fx:root id="sideBar" maxWidth="-Infinity" prefHeight="624.0" prefWidth="62.0" style="-fx-background-color: rgb(42,42,42); -fx-border-width: 3; -fx-background-radius: 0 0 15 0;" 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>
<bottom>
<StackPane prefHeight="150.0" prefWidth="200.0" visible="false" BorderPane.alignment="CENTER">
<children>
<VBox prefHeight="144.0" prefWidth="257.0" spacing="15.0" visible="false">
<children>
<HBox spacing="52.0" VBox.vgrow="NEVER">
<children>
<JFXButton fx:id="hideSideBar" style="-fx-font-weight: bold;" text="Close" />
<MenuButton alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" popupSide="RIGHT" prefWidth="150.0" text="XR3" fx:id="xr3Settings">
<items>
<Menu mnemonicParsing="false" text="DataBase">
<items>
<MenuItem fx:id="importDataBase" mnemonicParsing="false" text="Import DataBase">
<graphic>
<ImageView pickOnBounds="true">
<image>
<Image url="@../image/database-import.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
<MenuItem fx:id="exportDataBase" mnemonicParsing="false" text="Export DataBase">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/database-export.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
<MenuItem fx:id="deleteDataBase" mnemonicParsing="false" text="Delete DataBase">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/database-delete.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
</items>
</Menu>
</items>
</MenuButton>
</children>
</HBox>
<ScrollPane prefWidth="200.0">
<ScrollPane fitToWidth="true" prefWidth="200.0">
<content>
<GridPane alignment="CENTER" prefHeight="80.0" prefWidth="253.0" style="-fx-border-color: white; -fx-border-radius: 5;">
<columnConstraints>
Expand Down Expand Up @@ -147,32 +97,156 @@
</content>
</ScrollPane>
</children>
<BorderPane.margin>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</BorderPane.margin>
</VBox>
</top>
<bottom>
<VBox alignment="CENTER" disable="true" prefHeight="200.0" prefWidth="100.0" spacing="20.0" BorderPane.alignment="CENTER">
<ImageView fx:id="userImageView" fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true" StackPane.alignment="CENTER">
<image>
<Image url="@../image/user.png" />
</image>
<StackPane.margin>
<Insets bottom="5.0" top="5.0" />
</StackPane.margin>
</ImageView>
<Label fx:id="userNameLabel" style="-fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 16;" text="Logged in : GOXR3PLUS STUDIO" translateY="-25.0" visible="false" StackPane.alignment="TOP_CENTER" />
<VBox alignment="CENTER" spacing="20.0" />
</children>
<BorderPane.margin>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</BorderPane.margin>
</StackPane>
</bottom>
<top>
<MenuButton alignment="CENTER" contentDisplay="GRAPHIC_ONLY" maxWidth="55.0" minWidth="55.0" mnemonicParsing="false" prefWidth="55.0" style="-fx-background-color: black;" BorderPane.alignment="CENTER" fx:id="xr3Settings">
<items>
<Menu mnemonicParsing="false" text="DataBase">
<items>
<MenuItem fx:id="importDataBase" mnemonicParsing="false" text="Import DataBase">
<graphic>
<ImageView pickOnBounds="true">
<image>
<Image url="@../image/database-import.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
<MenuItem fx:id="exportDataBase" mnemonicParsing="false" text="Export DataBase">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/database-export.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
<MenuItem fx:id="deleteDataBase" mnemonicParsing="false" text="Delete DataBase">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/database-delete.png" />
</image>
</ImageView>
</graphic>
</MenuItem>
</items>
</Menu>
</items>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Database-32.png" />
</image>
</ImageView>
</graphic>
</MenuButton>
</top>
<center>
<VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="50.0" BorderPane.alignment="CENTER">
<children>
<VBox alignment="CENTER" spacing="10.0">
<children>
<Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" style="-fx-font-weight: bold;" text="Settings">
<VBox.margin>
<Insets left="15.0" right="15.0" />
</VBox.margin>
</Button>
<Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" style="-fx-font-weight: bold;" text="Chat">
<VBox.margin>
<Insets left="15.0" right="15.0" />
</VBox.margin>
</Button>
<Button maxWidth="1.7976931348623157E308" mnemonicParsing="false" style="-fx-font-weight: bold;" text="Log Out">
<VBox.margin>
<Insets left="15.0" right="15.0" />
</VBox.margin>
</Button>
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-background-color: white; -fx-font-weight: bold;" text="Mode" />
<JFXButton fx:id="homeScreen" contentDisplay="GRAPHIC_ONLY" disable="true" style="-fx-background-color: black; -fx-background-radius: 0; -fx-border-color: transparent firebrick transparent transparent; -fx-border-width: 0 4 0 0;" text=" ">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Home-32.png" />
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Application Home Screen" />
</tooltip>
</JFXButton>
<JFXButton fx:id="userSettings" contentDisplay="GRAPHIC_ONLY" disable="true" style="-fx-background-color: black; -fx-background-radius: 0;" text=" ">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/User-32.png" />
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="User Settings" />
</tooltip>
</JFXButton>
</children>
</VBox>
</bottom>
</BorderPane>
</top>
<VBox alignment="CENTER" spacing="10.0">
<children>
<Label alignment="CENTER" maxWidth="1.7976931348623157E308" style="-fx-text-fill: black; -fx-background-color: white; -fx-font-weight: bold;" text="Tools" />
<JFXButton fx:id="applicationSettings" buttonType="RAISED" contentDisplay="GRAPHIC_ONLY" style="-fx-background-color: black; -fx-background-radius: 0;" text=" ">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Gears-32.png" />
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Application Settings" />
</tooltip>
</JFXButton>
<JFXButton fx:id="applicationConsole" buttonType="RAISED" contentDisplay="GRAPHIC_ONLY" style="-fx-background-color: black; -fx-background-radius: 0;" text=" ">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Console-32.png" />
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Application Console" />
</tooltip>
</JFXButton>
<JFXButton fx:id="snapshot" buttonType="RAISED" contentDisplay="GRAPHIC_ONLY" style="-fx-background-color: black; -fx-background-radius: 0;" text=" ">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Screenshot-32.png" />
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<tooltip>
<Tooltip text="Screen SnapShot" />
</tooltip>
</JFXButton>
</children>
</VBox>
</children>
</VBox>
</center>
</fx:root>
2 changes: 1 addition & 1 deletion resources/fxml/StarWindow.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<Canvas fx:id="canvas" height="33.0" style="-fx-cursor: hand;" width="160.0" />
<Button fx:id="close" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.halignment="CENTER">
<tooltip>
<Tooltip text="Close" />
<Tooltip text="Cancel" />
</tooltip>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true" style="-fx-cursor: hand;">
Expand Down
Loading

0 comments on commit 67e537f

Please sign in to comment.