Skip to content

Commit

Permalink
Update 71.b2
Browse files Browse the repository at this point in the history
  • Loading branch information
@goxr3plus
goxr3plus committed May 30, 2017
1 parent 201c9ef commit 9a77be4
Show file tree
Hide file tree
Showing 20 changed files with 1,811 additions and 1,690 deletions.
310 changes: 161 additions & 149 deletions resources/fxml/LoginMode.fxml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/fxml/RenameWindow.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<children>
<Label fx:id="titleLabel" alignment="CENTER" maxWidth="-Infinity" prefHeight="27.0" prefWidth="220.0" style="-fx-text-fill: white; -fx-font-size: 14; -fx-font-weight: bold; -fx-border-color: transparent white;" text="Rename the Library" HBox.hgrow="ALWAYS" />
<Label fx:id="charsField" alignment="CENTER" prefHeight="19.0" prefWidth="58.0" style="-fx-font-weight: bold; -fx-font-size: 13; -fx-text-fill: white; -fx-background-color: firebrick; -fx-background-radius: 35;" text="150" HBox.hgrow="ALWAYS" />
<Button fx:id="okButton" minHeight="25.0" minWidth="45.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="45.0" style="-fx-background-color: black; -fx-background-radius: 10; -fx-text-fill: white; -fx-font-weight: bold;" text="OK">
<Button fx:id="okButton" minHeight="25.0" minWidth="45.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="45.0" text="OK">
<tooltip>
<Tooltip text="Save+Close" />
</tooltip>
Expand All @@ -27,7 +27,7 @@
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<Button fx:id="closeButton" cancelButton="true" mnemonicParsing="false" style="-fx-background-color: black; -fx-background-radius: 10;">
<Button fx:id="closeButton" cancelButton="true" mnemonicParsing="false">
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
Expand Down
23 changes: 18 additions & 5 deletions resources/fxml/StarWindow.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.canvas.Canvas?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>

<fx:root prefHeight="44.0" prefWidth="253.0" style="-fx-background-color: rgb(16,26,24);" type="GridPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<fx:root prefHeight="72.0" prefWidth="211.0" styleClass="starWindow" stylesheets="@../style/application.css" type="GridPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="192.0" minWidth="10.0" prefWidth="166.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="-Infinity" prefWidth="166.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="137.0" minWidth="10.0" prefWidth="42.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="111.0" minWidth="10.0" prefWidth="44.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="30.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button fx:id="ok" alignment="CENTER" mnemonicParsing="false" style="-fx-font-weight: bold;" text="Ok" GridPane.columnIndex="1" GridPane.halignment="CENTER">
<tooltip>
<Tooltip text="Save+Close" />
</tooltip></Button>
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor></Button>
<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">
<Button fx:id="close" mnemonicParsing="false" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1">
<tooltip>
<Tooltip text="Cancel" />
</tooltip>
Expand All @@ -35,6 +41,13 @@
</image>
</ImageView>
</graphic>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<Label fx:id="starsLabel" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="shortCutKey" text="Perfect!" GridPane.rowIndex="1" />
</children>
<padding>
<Insets bottom="2.0" left="2.0" />
</padding>
</fx:root>
24 changes: 1 addition & 23 deletions resources/fxml/WebBrowserController.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@

<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>

<fx:root prefHeight="400.0" prefWidth="600.0" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<children>
Expand All @@ -35,7 +29,7 @@
</Tab>
</tabs>
</TabPane>
<JFXButton fx:id="addTab" layoutX="12.0" layoutY="8.0" styleClass="arrowButton2" text="+" AnchorPane.leftAnchor="2.0" AnchorPane.topAnchor="-5.0">
<JFXButton fx:id="addTab" layoutX="12.0" layoutY="8.0" styleClass="arrowButton" text="+" AnchorPane.leftAnchor="2.0" AnchorPane.topAnchor="-1.0">
<tooltip>
<Tooltip text="New Tab" />
</tooltip>
Expand All @@ -50,21 +44,5 @@
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</padding>
</BorderPane>
<VBox fx:id="errorPane" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="15.0" style="-fx-background-color: rgb(255,255,255,0.9);">
<children>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/warning.png" />
</image>
</ImageView>
<Label styleClass="sideBarSectionLabel" text="Server not found" textAlignment="CENTER" wrapText="true" />
<TextArea editable="false" focusTraversable="false" maxHeight="-Infinity" maxWidth="-Infinity" mouseTransparent="true" prefHeight="156.0" prefWidth="587.0" text="&#10;1.Check the address for typing errors such as ww.example.com instead of www.example.com&#10;&#10;2.If you are unable to load any pages, check your computer’s network connection.&#10;&#10;3.If your computer or network is protected by a firewall or proxy, make sure that XR3Player is permitted to access the Web." wrapText="true" />
<JFXButton fx:id="tryAgain" buttonType="RAISED" ripplerFill="#fa0c0c" text="Try Again">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</JFXButton>
</children>
</VBox>
</children>
</fx:root>
119 changes: 71 additions & 48 deletions resources/fxml/WebBrowserTabController.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.effect.InnerShadow?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
Expand All @@ -15,71 +17,76 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.web.WebView?>

<fx:root prefHeight="466.0" prefWidth="519.0" style="-fx-background-color: rgb(0,0,0,0.85);" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<fx:root prefHeight="448.0" prefWidth="667.0" style="-fx-background-color: rgb(0,0,0,0.85);" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<children>
<BorderPane fx:id="borderPane">
<top>
<VBox spacing="5.0" BorderPane.alignment="CENTER">
<children>
<HBox spacing="5.0">
<children>
<JFXButton fx:id="backwardButton" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="30.0" prefWidth="37.0" styleClass="arrowButton2" text=" ">
<graphic>
<ImageView fitWidth="20.0" nodeOrientation="RIGHT_TO_LEFT" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/right.png" />
</image>
</ImageView>
</graphic>
<effect>
<InnerShadow />
</effect>
<HBox alignment="CENTER" HBox.hgrow="ALWAYS">
<children>
<Button fx:id="backwardButton" mnemonicParsing="false" style="-fx-background-radius: 45 0 0 45;">
<graphic>
<ImageView fitWidth="20.0" nodeOrientation="RIGHT_TO_LEFT" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/right.png" />
</image>
</ImageView>
</graphic>
<tooltip>
<Tooltip text="Back" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<Button fx:id="forwardButton" mnemonicParsing="false" style="-fx-background-radius: 0 45 45 0;">
<graphic>
<ImageView fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/right.png" />
</image>
</ImageView>
</graphic>
<tooltip>
<Tooltip text="Forward" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<JFXTextField fx:id="searchBar" focusColor="#dd0f0f" promptText="search..." style="-fx-text-fill: white; -fx-font-weight: bold;" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="Search" />
</tooltip>
</JFXTextField>
</children>
</HBox>
<Button fx:id="goButton" mnemonicParsing="false" text="Go">
<tooltip>
<Tooltip text="Back" />
<Tooltip text="Load the Web Site" />
</tooltip>
</JFXButton>
<JFXButton fx:id="forwardButton" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="30.0" prefWidth="37.0" styleClass="arrowButton2" text=" ">
<graphic>
<ImageView fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/right.png" />
</image>
</ImageView>
</graphic>
<effect>
<InnerShadow />
</effect>
<tooltip>
<Tooltip text="Forward" />
</tooltip>
</JFXButton>
<JFXTextField fx:id="searchBar" focusColor="#dd0f0f" promptText="search..." style="-fx-text-fill: white; -fx-font-weight: bold;" HBox.hgrow="ALWAYS">
<tooltip>
<Tooltip text="Search" />
</tooltip></JFXTextField>
<JFXButton fx:id="goButton" layoutX="339.0" layoutY="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="30.0" prefWidth="43.0" styleClass="arrowButton2" text="GO">
<effect>
<InnerShadow />
</effect>
<tooltip>
<Tooltip text="Go" />
</tooltip>
</JFXButton>
<JFXButton fx:id="reloadButton" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="30.0" prefWidth="37.0" styleClass="arrowButton2" text=" ">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<Button fx:id="reloadButton" mnemonicParsing="false">
<graphic>
<ImageView fitWidth="20.0" nodeOrientation="INHERIT" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/reload.png" />
</image>
</ImageView>
</graphic>
<effect>
<InnerShadow />
</effect>
<tooltip>
<Tooltip text="Reload" />
<Tooltip text="Reload Web Site" />
</tooltip>
</JFXButton>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
<ComboBox fx:id="searchEngineComboBox" prefHeight="31.0" prefWidth="152.0" promptText="search engine">
<cursor>
<Cursor fx:constant="HAND" />
Expand All @@ -96,6 +103,22 @@
<WebView fx:id="webView" minHeight="-1.0" minWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" BorderPane.alignment="CENTER" />
</center>
</BorderPane>
<VBox fx:id="errorPane" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="15.0" style="-fx-background-color: rgb(255,255,255,0.9);" visible="false">
<children>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/warning.png" />
</image>
</ImageView>
<Label styleClass="sideBarSectionLabel" text="Server not found" textAlignment="CENTER" wrapText="true" />
<TextArea editable="false" focusTraversable="false" maxHeight="-Infinity" maxWidth="-Infinity" mouseTransparent="true" prefHeight="156.0" prefWidth="587.0" text="&#10;1.Check the address for typing errors such as ww.example.com instead of www.example.com&#10;&#10;2.If you are unable to load any pages, check your computer’s network connection.&#10;&#10;3.If your computer or network is protected by a firewall or proxy, make sure that XR3Player is permitted to access the Web." wrapText="true" />
<JFXButton fx:id="tryAgain" buttonType="RAISED" ripplerFill="#fa0c0c" text="Try Again">
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</JFXButton>
</children>
</VBox>
</children>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
Expand Down
9 changes: 6 additions & 3 deletions resources/style/application.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
******************************************************************************/

.split-pane{
-fx-background-color:transparent ;
}

.split-pane .split-pane-divider{
-fx-background-color:
-darkest-black,
Expand Down Expand Up @@ -1091,7 +1095,7 @@


.librarySettings .text-area:focused{
-fx-background-color: orange, white;
-fx-background-color: firebrick, white;
-fx-background-insets: -0.1, 2.0;
}

Expand Down Expand Up @@ -1175,8 +1179,7 @@
******************************************************************************/

.starWindow{
-fx-background-color:white;
-fx-background-radius:10.0;
-fx-background-color:rgb(16.0,26.0,24.0);
}

/*******************************************************************************
Expand Down
28 changes: 14 additions & 14 deletions src/application/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import javafx.beans.binding.Bindings;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType;
import javafx.scene.control.Tab;
Expand Down Expand Up @@ -92,7 +93,7 @@ public class Main extends Application {
public static Properties applicationProperties = new Properties();
static {
//----------Properties-------------
applicationProperties.put("Version", 32);
applicationProperties.put("Version", 71);
applicationProperties.put("ReleasedDate", "30/05/2017");

System.out.println("Outside of Application Start Method");
Expand Down Expand Up @@ -345,9 +346,15 @@ private void startPart2() {
.then("Click here to create a library...").otherwise("Click here to open the first available library..."));
libraryMode.librariesSearcher.registerListeners(window);

//----Do this trick for songsContextMenu
songsContextMenu.show(window, 0, 0);
songsContextMenu.hide();
//----Do this trick for different context menus
// songsContextMenu.show(window, 0, 0);
// songsContextMenu.hide();
//
// libraryMode.librariesContextMenu.show(window, 0, 0);
// libraryMode.librariesContextMenu.hide();
//
// loginMode.userContextMenu.show(window, 0, 0);
// loginMode.userContextMenu.hide();

// --- SearchWindow-----
searchWindow.getWindow().getScene().getStylesheets().addAll(scene.getStylesheets());
Expand Down Expand Up @@ -422,6 +429,7 @@ private void loadTheUsers() {
public static void startAppWithUser(User u) {

//Close the LoginMode
loginMode.userSearchBox.getSearchBoxWindow().close();
loginMode.setVisible(false);
updateScreen.getProgressBar().setProgress(-1);
updateScreen.getLabel().setText("--Starting--");
Expand Down Expand Up @@ -541,18 +549,10 @@ public static void confirmApplicationExit() {
ButtonType exit = new ButtonType("Exit", ButtonData.OK_DONE);
ButtonType vacuum = new ButtonType("Vacuum + Exit", ButtonData.OK_DONE);
ButtonType cancel = new ButtonType("Cancel", ButtonData.CANCEL_CLOSE);

// alert.getDialogPane()
// .getScene()
// .setFill(Color.TRANSPARENT)
// alert.getDialogPane()
// .getStylesheets()
// .add(Main.class.getResource(InfoTool.styLes +
// InfoTool.applicationCss)
// ((Button) alert.getDialogPane()
// .lookupButton(ButtonType.CANCEL)).setDefaultButton(true)
( (Button) alert.getDialogPane().lookupButton(ButtonType.CANCEL) ).setDefaultButton(true);
alert.getButtonTypes().setAll(vacuum, exit, cancel);

//Pick the answer
alert.showAndWait().ifPresent(answer -> {
if (answer == exit)
terminate(false);
Expand Down
Loading

0 comments on commit 9a77be4

Please sign in to comment.