From 1ebd1e5db200a4cda7d79c76fc00d41e63fbe9aa Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Tue, 30 Aug 2016 22:56:52 +0200
Subject: [PATCH] Update Version to 5.1.0
Fixed build script and auto update dialog
---
PlayWall/build.xml | 2 +-
PlayWall/src/application.yml | 4 ++--
PlayWall/src/de/tobias/playpad/PlayPadMain.java | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/PlayWall/build.xml b/PlayWall/build.xml
index 943ff80e..9f70f6da 100644
--- a/PlayWall/build.xml
+++ b/PlayWall/build.xml
@@ -31,7 +31,7 @@
<upload username="p35947554-pw" password="${password}" host="p35947554.1and1-data.host">
<file type="program" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.jar" remotePath="/stable" remoteFileName="PlayWall.jar" />
- <file type="exe" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/PlayWall.exe" remotePath="/stable" remoteFileName="PlayWall.exe" />
+ <file type="exe" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/dist/PlayWall.exe" remotePath="/stable" remoteFileName="PlayWall.exe" />
<file type="plugin" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/ActionPlugin.jar" remotePath="/stable/plugins" remoteFileName="ActionPlugin.jar" />
<file type="plugin" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/AwakePlugin.jar" remotePath="/stable/plugins" remoteFileName="AwakePlugin.jar" />
<file type="plugin" localPath="/Users/tobias/Documents/Programmieren/Java/eclipse/PlayWall/build/EqualizerPlugin.jar" remotePath="/stable/plugins" remoteFileName="EqualizerPlugin.jar" />
diff --git a/PlayWall/src/application.yml b/PlayWall/src/application.yml
index 9211e227..4ed0bd37 100644
--- a/PlayWall/src/application.yml
+++ b/PlayWall/src/application.yml
@@ -1,6 +1,6 @@
name: PlayWall
-version: b5.1.0
-build: 34
+version: 5.1.0
+build: 35
identifier: de.tobias.playpad
main: de.tobias.playpad.PlayPadMain
author: Tobias Ullerich
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 4a2cfbb9..924c2c8f 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -29,7 +29,6 @@ import de.tobias.utils.util.Localization.LocalizationDelegate;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.OS.OSType;
import de.tobias.utils.util.Worker;
-import de.tobias.utils.util.win.User32X;
import javafx.application.Application;
import javafx.application.Platform;
import javafx.scene.control.ButtonType;
@@ -166,7 +165,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
Platform.runLater(() ->
{
AutoUpdateDialog autoUpdateDialog = new AutoUpdateDialog(owner);
- autoUpdateDialog.showAndWait().filter(item -> item == ButtonType.OK).ifPresent(result ->
+ autoUpdateDialog.showAndWait().filter(item -> item == ButtonType.APPLY).ifPresent(result ->
{
try {
Updates.startUpdate();
--
GitLab