From e5da00a8a8c2a2b3f3640c5608b617fa6a2a00b5 Mon Sep 17 00:00:00 2001 From: tobias <tobias@thecodedev.de> Date: Sun, 15 Sep 2019 10:04:11 +0200 Subject: [PATCH] Improve playout log view buttons --- .../playout/viewcontroller/PlayoutLogViewController.java | 9 +++++++-- .../src/main/resources/lang/playoutlog_de.properties | 4 ++-- .../src/main/resources/view/dialog/PlayoutLogDialog.fxml | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java index 8f03b64a..dfc47800 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java @@ -46,6 +46,8 @@ public class PlayoutLogViewController extends NVC { @FXML private Button exportButton; @FXML + private Button exportCsvButton; + @FXML private Button deleteButton; @FXML private Button finishButton; @@ -81,8 +83,11 @@ public class PlayoutLogViewController extends NVC { SettingsProxy.getSettings(PlayoutLogSettings.class).autoStartLogging(newValue)); exportButton.setDisable(true); - logList.getSelectionModel().getSelectedItems().addListener((InvalidationListener) observable -> - exportButton.setDisable(logList.getSelectionModel().getSelectedItems().size() != 1)); + exportCsvButton.setDisable(true); + logList.getSelectionModel().getSelectedItems().addListener((InvalidationListener) observable -> { + exportButton.setDisable(logList.getSelectionModel().getSelectedItems().size() != 1); + exportCsvButton.setDisable(logList.getSelectionModel().getSelectedItems().isEmpty()); + }); deleteButton.disableProperty().bind(logList.getSelectionModel().selectedItemProperty().isNull()); } diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties index edec851f..b40da3c9 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/lang/playoutlog_de.properties @@ -5,6 +5,6 @@ PlayoutLogDialog.Label.Headline=PlayOut Log PlayoutLogDialog.Checkbox.AutoStart=Automatisch starten bei Programmstart PlayoutLogDialog.Button.Start=Starten PlayoutLogDialog.Button.Stop=Stoppen -PlayoutLogDialog.Button.Export=Exportieren... -PlayoutLogDialog.Button.ExportAll=Alle Exportieren... +PlayoutLogDialog.Button.Export=PDF Exportieren... +PlayoutLogDialog.Button.ExportAll=CSV Exportieren... PlayoutLogDialog.Button.Delete=L\u00F6schen... \ No newline at end of file diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/view/dialog/PlayoutLogDialog.fxml b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/view/dialog/PlayoutLogDialog.fxml index f1d29cdf..211b26b3 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/view/dialog/PlayoutLogDialog.fxml +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources/view/dialog/PlayoutLogDialog.fxml @@ -25,7 +25,7 @@ <Button fx:id="exportButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#exportButtonHandler" prefWidth="100.0" text="%PlayoutLogDialog.Button.Export" VBox.vgrow="ALWAYS"/> - <Button fx:id="exportAllButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false" + <Button fx:id="exportCsvButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#exportMultipleCsvHandler" prefWidth="100.0" text="%PlayoutLogDialog.Button.ExportAll" VBox.vgrow="ALWAYS"/> <Button fx:id="deleteButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false" -- GitLab