Merge pull request #13 from turbolocust/ui-improvements

Properly disabling UI elements if needed

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.gzipper</groupId>
     <artifactId>GZipper</artifactId>
-    <version>2.1.0</version><!-- also update constants in AboutViewController if new version -->
+    <version>2.2.0</version><!-- also update constants in AboutViewController if new version -->
     <packaging>jar</packaging>
 
     <name>GZipper</name>

src/main/java/org/gzipper/java/presentation/controller/AboutViewController.java

@@ -56,12 +56,12 @@ public final class AboutViewController extends BaseController {
     /**
      * The version of this application.
      */
-    private static final String APP_VERSION = "2.1.0";
+    private static final String APP_VERSION = "2.2.0";
 
     /**
      * The build date of this application (mm/dd/yyyy).
      */
-    private static final String APP_BUILD_DATE = "10/26/2023";
+    private static final String APP_BUILD_DATE = "03/31/2024";
 
     /**
      * The author of this application.

src/main/java/org/gzipper/java/presentation/controller/DropViewController.java

@@ -48,9 +48,9 @@ public final class DropViewController extends BaseController {
     private final Set<String> _addresses;
 
     /**
-     * If true, then {@link #_putIntoSeparateArchivesCheckBox} is enabled initially.
+     * Options to customize the set-up of this DropView.
      */
-    private final boolean _enablePutIntoSeparateArchivesCheckBox;
+    private final ViewControllersOptions.DropViewOptions _options;
 
     @FXML
     private TextArea _textArea;
@@ -68,14 +68,13 @@ public final class DropViewController extends BaseController {
     /**
      * Constructs a controller for Drop View with the specified CSS theme.
      *
-     * @param theme                                 the {@link CSS} theme to be applied.
-     * @param enablePutIntoSeparateArchivesCheckBox true to enable the checkbox which tells
-     *                                              to put selected files into separate archives.
+     * @param theme   the {@link CSS} theme to be applied.
+     * @param options used to customize the set-up of the DropView.
      */
-    public DropViewController(CSS.Theme theme, boolean enablePutIntoSeparateArchivesCheckBox) {
+    public DropViewController(CSS.Theme theme, ViewControllersOptions.DropViewOptions options) {
         super(theme);
         _addresses = new LinkedHashSet<>();
-        _enablePutIntoSeparateArchivesCheckBox = enablePutIntoSeparateArchivesCheckBox;
+        _options = options;
     }
 
     @FXML
@@ -150,6 +149,7 @@ public boolean isPutInSeparateArchives() {
     public void initialize(URL location, ResourceBundle resources) {
         _titleText.setFont(Font.font("System", FontWeight.BOLD, -1));
         _appendAddressesCheckBox.setTooltip(new Tooltip(I18N.getString("appendAddressesTooltip.text")));
-        _putIntoSeparateArchivesCheckBox.setSelected(_enablePutIntoSeparateArchivesCheckBox);
+        _putIntoSeparateArchivesCheckBox.setSelected(_options.getPreSelectUiElementsForPuttingFilesIntoSeparateArchives());
+        _putIntoSeparateArchivesCheckBox.setVisible(!_options.getDisableUiElementsForPuttingFilesIntoSeparateArchives());
     }
 }

src/main/java/org/gzipper/java/presentation/controller/ViewControllers.java

@@ -88,29 +88,16 @@ public static void showAboutView(CSS.Theme theme, Image icon, HostServices hostS
     /**
      * Shows the drop view in a separate window.
      *
-     * @param theme the theme to be applied.
-     * @param icon  the icon to be used in the view
-     * @return the controller for the view.
-     */
-    public static DropViewController showDropView(CSS.Theme theme, Image icon) {
-        final boolean preSelectPutIntoSeparateArchivesElements = false;
-        return showDropView(theme, icon, preSelectPutIntoSeparateArchivesElements);
-    }
-
-    /**
-     * Shows the drop view in a separate window.
-     *
-     * @param theme                                                  the theme to be applied.
-     * @param icon                                                   the icon to be used in the view
-     * @param preSelectUiElementsForPuttingFilesIntoSeparateArchives true to pre-select UI elements, which allow to
-     *                                                               put selected files into separate archives.
+     * @param theme   the theme to be applied.
+     * @param icon    the icon to be used in the view
+     * @param options used to customize the set-up of the DropView.
      * @return the controller for the view.
      */
     public static DropViewController showDropView(CSS.Theme theme, Image icon,
-                                                  boolean preSelectUiElementsForPuttingFilesIntoSeparateArchives) {
+                                                  ViewControllersOptions.DropViewOptions options) {
 
         final FXMLLoader fxmlLoader = initFXMLLoader(DROP_VIEW_RES);
-        var controller = new DropViewController(theme, preSelectUiElementsForPuttingFilesIntoSeparateArchives);
+        var controller = new DropViewController(theme, options);
         fxmlLoader.setController(controller);
 
         final Stage dropView = new Stage();

src/main/java/org/gzipper/java/presentation/controller/ViewControllersOptions.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2024 Matthias Fussenegger
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.gzipper.java.presentation.controller
+
+class ViewControllersOptions private constructor() {
+
+    class DropViewOptions internal constructor(
+        val preSelectUiElementsForPuttingFilesIntoSeparateArchives: Boolean,
+        val disableUiElementsForPuttingFilesIntoSeparateArchives: Boolean
+    )
+}

src/main/java/org/gzipper/java/presentation/controller/main/MainViewController.java

@@ -39,6 +39,7 @@
 import org.gzipper.java.presentation.controller.BaseController;
 import org.gzipper.java.presentation.controller.DropViewController;
 import org.gzipper.java.presentation.controller.ViewControllers;
+import org.gzipper.java.presentation.controller.ViewControllersOptions;
 import org.gzipper.java.presentation.handler.TextAreaHandler;
 import org.gzipper.java.util.Log;
 import org.gzipper.java.util.Settings;
@@ -296,7 +297,14 @@ void handleStartOperationMenuItemAction(ActionEvent evt) {
     @FXML
     void handleAddManyFilesMenuItemAction(ActionEvent evt) {
         if (evt.getSource().equals(_addManyFilesMenuItem)) {
-            final var dropViewController = ViewControllers.showDropView(theme, iconImage);
+            final boolean preSelectUiElementsForPuttingFilesIntoSeparateArchives = false;
+            final boolean disableUiElementsForPuttingFilesIntoSeparateArchives = _decompressRadioButton.isSelected();
+
+            final var options = new ViewControllersOptions.DropViewOptions(
+                    preSelectUiElementsForPuttingFilesIntoSeparateArchives,
+                    disableUiElementsForPuttingFilesIntoSeparateArchives);
+
+            final var dropViewController = ViewControllers.showDropView(theme, iconImage, options);
             performShowDropViewPostAction(dropViewController);
         }
     }
@@ -305,8 +313,13 @@ void handleAddManyFilesMenuItemAction(ActionEvent evt) {
     void handleAddManyFilesSeparateArchiveMenuItemAction(ActionEvent evt) {
         if (evt.getSource().equals(_addManyFilesSeparateArchiveMenuItem)) {
             final boolean preSelectUiElementsForPuttingFilesIntoSeparateArchives = true;
-            final var dropViewController = ViewControllers.showDropView(
-                    theme, iconImage, preSelectUiElementsForPuttingFilesIntoSeparateArchives);
+            final boolean disableUiElementsForPuttingFilesIntoSeparateArchives = false;
+
+            final var options = new ViewControllersOptions.DropViewOptions(
+                    preSelectUiElementsForPuttingFilesIntoSeparateArchives,
+                    disableUiElementsForPuttingFilesIntoSeparateArchives);
+
+            final var dropViewController = ViewControllers.showDropView(theme, iconImage, options);
             performShowDropViewPostAction(dropViewController);
         }
     }
@@ -505,6 +518,7 @@ private File pickFileToBeSaved() {
 
     private void performModeRadioButtonAction(boolean compress, String selectFilesButtonText, String saveAsButtonText) {
         _state = compress ? new CompressState(this) : new DecompressState(this);
+        _addManyFilesSeparateArchiveMenuItem.setDisable(!compress);
         _selectFilesButton.setText(I18N.getString(selectFilesButtonText));
         _saveAsButton.setText(I18N.getString(saveAsButtonText));
     }
@@ -596,9 +610,9 @@ void disableUIControlsAsLongAsAnyTaskIsActive() {
         _saveAsButton.disableProperty().bind(runningProperty);
         _selectFilesButton.disableProperty().bind(runningProperty);
         _addManyFilesMenuItem.disableProperty().bind(runningProperty);
-        _addManyFilesSeparateArchiveMenuItem.disableProperty().bind(runningProperty);
         _progressBar.visibleProperty().bind(runningProperty);
         _progressText.visibleProperty().bind(runningProperty);
+        _addManyFilesSeparateArchiveMenuItem.setDisable(true);
     }
 
     /**
@@ -614,6 +628,7 @@ void enableUIControls() {
         _saveAsButton.disableProperty().unbind();
         _addManyFilesMenuItem.disableProperty().unbind();
         _addManyFilesSeparateArchiveMenuItem.disableProperty().unbind();
+        _addManyFilesSeparateArchiveMenuItem.setDisable(_decompressRadioButton.isSelected());
         _progressBar.visibleProperty().unbind();
         _progressText.visibleProperty().unbind();
     }