From 75151e39dbc5f8037eece7e5d60223ed7d9fcefa Mon Sep 17 00:00:00 2001
From: Zlatin Balevsky <zlatinb@gmail.com>
Date: Tue, 5 Oct 2021 02:41:24 +0100
Subject: [PATCH] option to disable sending paths

---
 .../com/muwire/gui/OptionsController.groovy         |  4 ++++
 gui/griffon-app/i18n/messages.properties            |  1 +
 .../models/com/muwire/gui/OptionsModel.groovy       |  4 ++++
 .../views/com/muwire/gui/OptionsView.groovy         | 13 +++++++++++--
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
index e0eeccf1..6287ae05 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
@@ -126,6 +126,10 @@ class OptionsController {
         model.browseFiles = browseFiles
         settings.browseFiles = browseFiles
         
+        boolean showPaths = view.showPathsCheckbox.model.isSelected()
+        model.showPaths = showPaths
+        settings.showPaths = showPaths
+        
         boolean allowTracking = view.allowTrackingCheckbox.model.isSelected()
         model.allowTracking = allowTracking
         settings.allowTracking = allowTracking
diff --git a/gui/griffon-app/i18n/messages.properties b/gui/griffon-app/i18n/messages.properties
index fe423ebf..84d89446 100644
--- a/gui/griffon-app/i18n/messages.properties
+++ b/gui/griffon-app/i18n/messages.properties
@@ -289,6 +289,7 @@ OPTIONS_SEARCH_SETTINGS=Search Settings
 OPTIONS_SEARCH_IN_COMMENTS=Search in comments
 OPTIONS_SEARCH_IN_COLLECTIONS=Search in collections
 OPTIONS_ALLOW_BROWSING=Allow browsing
+OPTIONS_SHOW_PATHS=Send folder information with results
 OPTIONS_ALLOW_TRACKING=Allow tracking
 OPTIONS_DOWNLOAD_SETTINGS=Download Settings
 OPTIONS_RETRY_FAILED_DOWNLOADS=Retry failed downloads every (seconds)
diff --git a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
index 454d3f97..26589126 100644
--- a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
@@ -25,6 +25,8 @@ class OptionsModel {
     @Observable boolean searchComments
     @Observable boolean searchCollections
     @Observable boolean browseFiles
+    @Observable boolean showPaths
+    @Observable boolean showPathsCheckboxEnabled
     @Observable boolean allowTracking
     @Observable int speedSmoothSeconds
     @Observable int totalUploadSlots
@@ -111,6 +113,8 @@ class OptionsModel {
         searchComments = settings.searchComments
         searchCollections = settings.searchCollections
         browseFiles = settings.browseFiles
+        showPaths = settings.showPaths
+        setShowPathsCheckboxEnabled(browseFiles)
         allowTracking = settings.allowTracking
         speedSmoothSeconds = settings.speedSmoothSeconds
         totalUploadSlots = settings.totalUploadSlots
diff --git a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
index f5db63d2..cad63f9d 100644
--- a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
@@ -55,6 +55,7 @@ class OptionsView {
     def searchCommentsCheckbox
     def searchCollectionsCheckbox
     def browseFilesCheckbox
+    def showPathsCheckbox
     def allowTrackingCheckbox
     def speedSmoothSecondsField
     def totalUploadSlotsField
@@ -132,9 +133,13 @@ class OptionsView {
                     fill : GridBagConstraints.HORIZONTAL, weightx: 100))
                 browseFilesCheckbox = checkBox(selected : bind {model.browseFiles}, constraints : gbc(gridx : 1, gridy : 2,
                 anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx: 0))
-                label(text : trans("OPTIONS_ALLOW_TRACKING"), constraints : gbc(gridx: 0, gridy: 3, anchor: GridBagConstraints.LINE_START,
+                label(text : trans("OPTIONS_SHOW_PATHS"), enabled: bind{model.showPathsCheckboxEnabled}, constraints: gbc(gridx:0, gridy:3, anchor: GridBagConstraints.LINE_START,
+                        fill : GridBagConstraints.HORIZONTAL, weightx: 100))
+                showPathsCheckbox = checkBox(selected : bind {model.showPaths}, enabled : bind{model.showPathsCheckboxEnabled}, constraints : gbc(gridx: 1, gridy : 3,
+                        anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx : 0))
+                label(text : trans("OPTIONS_ALLOW_TRACKING"), constraints : gbc(gridx: 0, gridy: 4, anchor: GridBagConstraints.LINE_START,
                     fill : GridBagConstraints.HORIZONTAL, weightx: 100))
-                allowTrackingCheckbox = checkBox(selected : bind {model.allowTracking}, constraints : gbc(gridx: 1, gridy : 3,
+                allowTrackingCheckbox = checkBox(selected : bind {model.allowTracking}, constraints : gbc(gridx: 1, gridy : 4,
                     anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx : 0))
             }
             
@@ -444,6 +449,10 @@ class OptionsView {
         allowUntrustedCheckbox.addActionListener {
             model.searchExtraHopCheckboxEnabled = allowUntrustedCheckbox.model.isSelected()
         }
+        
+        browseFilesCheckbox.addActionListener {
+            model.showPathsCheckboxEnabled = browseFilesCheckbox.model.isSelected()
+        }
     }
 
     boolean isAqua() {