Skip to content

Commit

Permalink
Fixed problems with new updates and releases window
Browse files Browse the repository at this point in the history
  • Loading branch information
@goxr3plus
goxr3plus committed Apr 11, 2018
1 parent ad8e46b commit 3f8ee85
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 83 deletions.
Binary file removed XR3Player Etc Files/images/spashScreen.bmp
View file
Binary file not shown.
114 changes: 107 additions & 7 deletions XR3Player New Release Files/XR3Player Install4J.install4j
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="7.0.3" transformSequenceNumber="7">
<directoryPresets config="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J/Images" />
<application name="XR3Player" distributionSourceDir="" applicationId="8282-0762-8339-5307" mediaDir="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="XR3Player" publisher="GOXR3PLUS STUDIO" publisherWeb="http://www.goxr3plus.co.nf" version="3.0.0" allPathsRelative="false" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="e75eb469510ca3ab" javaMinVersion="1.8.0.141" javaMaxVersion="1.8.0.900" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
<application name="XR3Player" distributionSourceDir="" applicationId="8282-0762-8339-5307" mediaDir="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="true" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="XR3Player" publisher="GOXR3PLUS STUDIO" publisherWeb="http://www.goxr3plus.co.nf" version="3.0.0" allPathsRelative="false" backupOnSave="false" autoSave="true" convertDotsToUnderscores="true" macSignature="????" macVolumeId="e75eb469510ca3ab" javaMinVersion="1.8.0.141" javaMaxVersion="1.8.0.900" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
<languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
<principalLanguage id="en" customLocalizationFile="" />
<additionalLanguages />
Expand Down Expand Up @@ -29,11 +29,11 @@
<components />
</files>
<launchers>
<launcher name="XR3Player Launcher" id="152" customizedId="ID999" external="false" excludeFromMenu="false" unixMode="755" unixAutoStart="true" menuName="" icnsFile="" customMacBundleIdentifier="false" macBundleIdentifier="" swtApp="false" fileset="" macBundleBinary="JavaApplicationStub" addMacEntitlements="false" macEntitlementsFile="" useCustomMacosExecutableName="false" customMacosExecutableName="" useJavaMinVersionOverride="false" javaMinVersionOverride="" useJavaMaxVersionOverride="false" javaMaxVersionOverride="" checkUpdater="false" updateExecutionMode="unattendedProgress" unattendedUpdateTitle="${i18n:updater.WindowTitle(&quot;${compiler:sys.fullName}&quot;)}">
<executable name="XR3Player" type="1" iconSet="true" iconFile="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J/Images/xr3player.ico" executableDir="." redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="false" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="highestAvailable" checkConsoleParameter="true" globalSingleInstance="false" singleInstanceActivate="true" dpiAware="true">
<launcher name="XR3Player Launcher" id="152" customizedId="ID999" external="false" excludeFromMenu="false" unixMode="755" unixAutoStart="true" menuName="" icnsFile="" customMacBundleIdentifier="false" macBundleIdentifier="" swtApp="false" fileset="" macBundleBinary="JavaApplicationStub" addMacEntitlements="false" macEntitlementsFile="" useCustomMacosExecutableName="false" customMacosExecutableName="" useJavaMinVersionOverride="false" javaMinVersionOverride="1.8.0_141" useJavaMaxVersionOverride="false" javaMaxVersionOverride="1.8.0_900" checkUpdater="false" updateExecutionMode="unattendedProgress" unattendedUpdateTitle="${i18n:updater.WindowTitle(&quot;${compiler:sys.fullName}&quot;)}">
<executable name="XR3Player" type="1" iconSet="true" iconFile="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J/Images/xr3player.ico" executableDir="." redirectStderr="true" stderrFile="error.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="1" changeWorkingDirectory="true" workingDirectory="." singleInstance="true" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="highestAvailable" checkConsoleParameter="true" globalSingleInstance="false" singleInstanceActivate="true" dpiAware="true">
<versionInfo include="true" fileVersion="3.0.0.0" fileDescription="XR3Player" legalCopyright="Open Source JavaFX Project" internalName="XR3Player" productName="XR3Player" />
</executable>
<splashScreen show="false" width="0" height="0" bitmapFile="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3Player_Installer_Files/Images/goxr3plus logo.png" textOverlay="false">
<splashScreen show="true" width="0" height="0" bitmapFile="C:/Users/GOXR3PLUSSTUDIO/Desktop/XR3P Install 4J/Images/splash.png" textOverlay="false">
<text>
<statusLine x="20" y="20" text="" fontSize="8" fontColor="0,0,0" bold="false" />
<versionLine x="20" y="40" text="version ${compiler:sys.version}" fontSize="8" fontColor="0,0,0" bold="false" />
Expand Down Expand Up @@ -377,13 +377,69 @@ return console.askOkCancel(message, true);
</formComponent>
</formComponents>
</screen>
<screen name="" id="20" customizedId="" beanClass="com.install4j.runtime.beans.screens.FinishedScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="41" rollbackBarrier="false" rollbackBarrierExitCode="0" backButton="2" finishScreen="true" wizardIndexChangeType="unchanged" wizardIndexKey="">
<screen name="" id="20" customizedId="" beanClass="com.install4j.runtime.beans.screens.FinishedScreen" enabled="true" commentSet="false" comment="" actionElevationType="inherit" styleId="41" rollbackBarrier="false" rollbackBarrierExitCode="0" backButton="2" finishScreen="false" wizardIndexChangeType="unchanged" wizardIndexKey="">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.screens.FinishedScreen" />
</java>
</serializedBean>
<styleOverrides />
<styleOverrides>
<styleOverride name="Customize banner image" enabled="true">
<group name="" id="260" customizedId="" beanClass="com.install4j.runtime.beans.groups.VerticalFormComponentGroup" enabled="true" commentSet="false" comment="" actionElevationType="inherit" useExternalParametrization="true" externalParametrizationName="Customize banner image" externalParametrizationMode="include">
<serializedBean>
<java class="java.beans.XMLDecoder">
<object class="com.install4j.runtime.beans.groups.VerticalFormComponentGroup">
<void property="backgroundColor">
<object class="java.awt.Color">
<int>255</int>
<int>255</int>
<int>255</int>
<int>255</int>
</object>
</void>
<void property="borderSides">
<object class="com.install4j.runtime.beans.formcomponents.BorderSides">
<void property="bottom">
<boolean>true</boolean>
</void>
</object>
</void>
<void property="imageEdgeBackgroundColor">
<object class="java.awt.Color">
<int>25</int>
<int>143</int>
<int>220</int>
<int>255</int>
</object>
</void>
<void property="imageEdgeBorder">
<boolean>true</boolean>
</void>
<void property="imageFile">
<object class="com.install4j.api.beans.ExternalFile">
<string>${compiler:sys.install4jHome}/resource/styles/wizard.png</string>
</object>
</void>
<void property="insets">
<object class="java.awt.Insets">
<int>5</int>
<int>10</int>
<int>10</int>
<int>10</int>
</object>
</void>
</object>
</java>
</serializedBean>
<beans />
<externalParametrizationPropertyNames>
<propertyName>imageAnchor</propertyName>
<propertyName>imageEdgeBackgroundColor</propertyName>
<propertyName>imageFile</propertyName>
</externalParametrizationPropertyNames>
</group>
</styleOverride>
</styleOverrides>
<condition />
<validation />
<preActivation />
Expand Down Expand Up @@ -1052,7 +1108,51 @@ return console.askYesNo(message, true);
<customAttributes />
</autoUpdate>
</windows>
<unixInstaller name="Unix Installer" id="251" customizedId="" mediaFileName="XR3Player" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1">
<excludedComponents />
<includedDownloadableComponents />
<excludedLaunchers />
<excludedBeans />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude />
<variables />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
<commentFiles />
<customAttributes />
</autoUpdate>
<installerScript mode="1" file="">
<content />
</installerScript>
</unixInstaller>
<unixArchive name="Unix Archive" id="256" customizedId="" mediaFileName="XR3Player" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="" manualJREEntry="false">
<excludedComponents />
<includedDownloadableComponents />
<excludedLaunchers />
<excludedBeans />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude />
<variables />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
<commentFiles />
<customAttributes />
</autoUpdate>
</unixArchive>
<windowsArchive name="Windows Archive" id="257" customizedId="" mediaFileName="XR3Player" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="windows-amd64-1.8.0_152" manualJREEntry="false">
<excludedComponents />
<includedDownloadableComponents />
<excludedLaunchers />
<excludedBeans />
<overriddenPrincipalLanguage id="en" customLocalizationFile="" />
<exclude />
<variables />
<autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
<commentFiles />
<customAttributes />
</autoUpdate>
</windowsArchive>
</mediaSets>
<buildIds buildAll="true" />
<buildIds buildAll="false">
<mediaSet refId="154" />
</buildIds>
<buildOptions verbose="true" faster="false" disableSigning="false" disableJreBundling="false" debug="false" />
</install4j>
73 changes: 25 additions & 48 deletions resources/fxml/UpdateWindow.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXTabPane?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Accordion?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.Tooltip?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>

<fx:root prefHeight="556.0" prefWidth="754.0" style="-fx-background-color: #202020;" stylesheets="@../style/application.css" type="StackPane" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1">
<children>
<BorderPane>
<bottom>
<StackPane style="-fx-border-color: firebrick transparent transparent transparent;" BorderPane.alignment="CENTER">
<StackPane prefHeight="55.0" style="-fx-border-color: firebrick transparent transparent transparent;" BorderPane.alignment="CENTER">
<children>
<Button fx:id="gitHubButton" layoutX="961.0" layoutY="24.0" mnemonicParsing="false" text="GitHub " StackPane.alignment="CENTER_LEFT">
<JFXButton fx:id="closeWindow" focusTraversable="false" maxHeight="1.7976931348623157E308" text="Close" StackPane.alignment="CENTER_RIGHT">
<tooltip>
<Tooltip text="Download the latest version" />
<Tooltip text="Close the Window" />
</tooltip>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/x.png" />
</image>
</ImageView>
</graphic>
</JFXButton>
<JFXButton fx:id="viewOnGithub" focusTraversable="false" layoutX="682.0" layoutY="11.0" maxHeight="1.7976931348623157E308" text="GitHub Page" StackPane.alignment="CENTER_LEFT">
<tooltip>
<Tooltip text="View XR3Player on Github" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/GitHub-32.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="closeWindow" mnemonicParsing="false" text="Close" StackPane.alignment="CENTER_RIGHT">
</JFXButton>
<JFXButton fx:id="automaticUpdate" focusTraversable="false" layoutX="11.0" layoutY="11.0" maxHeight="1.7976931348623157E308" text="Download Latest Version">
<tooltip>
<Tooltip text="Close the Window" />
<Tooltip text="Download the latest XR3Player Version" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/x.png" />
<Image url="@../image/Installing%20Updates-32.png" />
</image>
</ImageView>
</graphic>
</Button>
<HBox alignment="CENTER" pickOnBounds="false" spacing="5.0">
<children>
<Button fx:id="automaticUpdate" mnemonicParsing="false" text="Automatic Update">
<tooltip>
<Tooltip text="Automatic Update Download" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
<graphic>
<ImageView pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../image/Installing%20Updates-32.png" />
</image>
</ImageView>
</graphic>
</Button>
<Button fx:id="download" mnemonicParsing="false" text="Manual Download">
<tooltip>
<Tooltip text="Download the latest version" />
</tooltip>
<cursor>
<Cursor fx:constant="HAND" />
</cursor>
</Button>
</children>
<padding>
<Insets bottom="7.0" top="7.0" />
</padding>
</HBox>
</JFXButton>
</children>
<BorderPane.margin>
<Insets left="3.0" right="3.0" top="5.0" />
<Insets top="5.0" />
</BorderPane.margin>
<padding>
<Insets bottom="2.0" left="2.0" right="2.0" top="2.0" />
</padding>
</StackPane>
</bottom>
<center>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/goxr3plus/xr3player/application/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public class Main extends Application {
public static final PropertiesDb applicationProperties = new PropertiesDb(InfoTool.getAbsoluteDatabasePathWithSeparator() + "ApplicationProperties.properties", true);
public static final Logger logger = Logger.getGlobal();
public static final Properties internalInformation = new Properties();
public static final int APPLICATION_VERSION = 99;
public static final int APPLICATION_VERSION = 12;
static {
//Important for Web Browser allowing xss
//System.setProperty("sun.net.http.allowRestrictedHeaders", "true")
Expand Down
Loading

0 comments on commit 3f8ee85

Please sign in to comment.