Skip to content
Snippets Groups Projects
Commit e90f46a3 authored by tobias's avatar tobias
Browse files

Style Auto Update Dialog

parent 62bfad9a
No related branches found
No related tags found
No related merge requests found
......@@ -209,7 +209,10 @@ CartAction.Mode.PLAY_HOLD=Play/Hold
#UI - Dialog -AutoUpdate
UI.Dialog.AutoUpdate.Header=Updates
UI.Dialog.AutoUpdate.Content=Es sind Updates verfügbar. Möchten Sie diese jetzt installieren?\n{}
UI.Dialog.AutoUpdate.Title=Updates
UI.Dialog.AutoUpdate.Checkbox=Dieses Update nicht mehr anzeigen.
UI.Dialog.AutoUpdate.Butto.Update=Jetzt updaten
UI.Dialog.AutoUpdate.Butto.Cancel=Jetzt nicht updaten
# Update Channel - BaseName
UpdateChannel.STABLE=Stabil
......@@ -220,6 +223,7 @@ Error.Layout.Load=Es gab einen Fehler beim Laden des Layouts ({})
# UI - Dialog - Update
UI.Dialog.Update.Cell={}: Installiert: {} - Neu: {}
UI.Dialog.Update.Info=Die Aktualisierung wird vorbereitet. Bitte schließen Sie nicht das Programm. \nDieser Vorgang kann wenige Minuten dauern.
UI.Window.Settings.Updates.CurrentVersion={} (Build {})
# Error - Update - Downlaod
......
......@@ -34,6 +34,7 @@ import javafx.application.Platform;
import javafx.scene.control.ButtonType;
import javafx.scene.image.Image;
import javafx.stage.Stage;
import javafx.stage.Window;
/*
* TODOS
......@@ -161,17 +162,18 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
}
}
// Zeigt Launch Stage
ViewController.create(LaunchDialog.class, stage);
// Check Updates
checkUpdates(impl.globalSettings);
checkUpdates(impl.globalSettings, stage);
} catch (Exception e) {
e.printStackTrace();
}
}
private void checkUpdates(GlobalSettings globalSettings) {
private void checkUpdates(GlobalSettings globalSettings, Window owner) {
if (globalSettings.isAutoUpdate() && !globalSettings.isIgnoreUpdate()) {
Worker.runLater(() ->
{
......@@ -179,7 +181,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
if (!UpdateRegistery.getAvailableUpdates().isEmpty()) {
Platform.runLater(() ->
{
AutoUpdateDialog autoUpdateDialog = new AutoUpdateDialog();
AutoUpdateDialog autoUpdateDialog = new AutoUpdateDialog(owner);
autoUpdateDialog.showAndWait().filter(item -> item == ButtonType.OK).ifPresent(result ->
{
try {
......
......@@ -200,6 +200,9 @@ public class Strings {
public static final String UI_Dialog_AutoUpdate_Header = "UI.Dialog.AutoUpdate.Header";
public static final String UI_Dialog_AutoUpdate_Content = "UI.Dialog.AutoUpdate.Content";
public static final String UI_Dialog_AutoUpdate_Checkbox = "UI.Dialog.AutoUpdate.Checkbox";
public static final String UI_Dialog_AutoUpdate_Title= "UI.Dialog.AutoUpdate.Title";
public static final String UI_Dialog_AutoUpdate_Butto_Update = "UI.Dialog.AutoUpdate.Butto.Update";
public static final String UI_Dialog_AutoUpdate_Butto_Cancel = "UI.Dialog.AutoUpdate.Butto.Cancel";
// Update Channel - Basename
public static final String Update_Channel_BaseName = "UpdateChannel.";
......@@ -209,6 +212,7 @@ public class Strings {
// UI - Dialog - Update
public static final String UI_Dialog_Update_Cell = "UI.Dialog.Update.Cell";
public static final String UI_Dialog_Update_Info = "UI.Dialog.Update.Info";
public static final String UI_Window_Settings_Updates_CurrentVersion = "UI.Window.Settings.Updates.CurrentVersion";
// Error - Update - Downlaod
......
......@@ -2,21 +2,26 @@ package de.tobias.playpad.viewcontroller.dialog;
import java.util.List;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
import de.tobias.playpad.update.Updatable;
import de.tobias.playpad.update.UpdateRegistery;
import de.tobias.utils.util.Localization;
import javafx.scene.control.ButtonBar.ButtonData;
import javafx.scene.control.ButtonType;
import javafx.scene.control.CheckBox;
import javafx.scene.control.Dialog;
import javafx.scene.control.Label;
import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.Window;
public class AutoUpdateDialog extends Dialog<ButtonType> {
private CheckBox checkBox;
public AutoUpdateDialog() {
public AutoUpdateDialog(Window owner) {
List<Updatable> updates = UpdateRegistery.getAvailableUpdates();
StringBuilder builder = new StringBuilder();
......@@ -33,8 +38,17 @@ public class AutoUpdateDialog extends Dialog<ButtonType> {
setHeaderText(Localization.getString(Strings.UI_Dialog_AutoUpdate_Header));
ButtonType updateButton = new ButtonType(Localization.getString(Strings.UI_Dialog_AutoUpdate_Butto_Update), ButtonData.APPLY);
ButtonType cancelButton = new ButtonType(Localization.getString(Strings.UI_Dialog_AutoUpdate_Butto_Cancel), ButtonData.CANCEL_CLOSE);
getDialogPane().setContent(vBox);
getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
getDialogPane().getButtonTypes().addAll(updateButton, cancelButton);
initOwner(owner);
initModality(Modality.WINDOW_MODAL);
setTitle(Localization.getString(Strings.UI_Dialog_AutoUpdate_Title));
Stage dialogStage = (Stage) getDialogPane().getScene().getWindow();
PlayPadMain.stageIcon.ifPresent(dialogStage.getIcons()::add);
}
public boolean isIgnoreUpdate() {
......
package de.tobias.playpad.viewcontroller.dialog;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
import de.tobias.utils.util.Localization;
import javafx.scene.control.Dialog;
import javafx.scene.control.Label;
import javafx.scene.image.ImageView;
......@@ -13,8 +15,7 @@ public class UpdaterDialog extends Dialog<Void> {
public UpdaterDialog(Window owner) {
setGraphic(new ImageView("org/controlsfx/dialog/dialog-information.png"));
Label textLabel = new Label(
"Die Aktualisierung wird vorbereitet. Bitte schließen Sie nicht das Programm. \nDieser Vorgang kann wenige Minuten dauern.");
Label textLabel = new Label(Localization.getString(Strings.UI_Dialog_Update_Info));
textLabel.setWrapText(true);
textLabel.setMaxWidth(450);
getDialogPane().setContent(textLabel);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment