From fdd34cb6066abdceb34abd5b8444cdecbaa6bcdf Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Sun, 10 Oct 2021 13:31:40 +0100 Subject: [PATCH] The option to send path information is not tied to the option to allow browsing anymore. GitHub issue #78 --- gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy | 2 -- gui/griffon-app/views/com/muwire/gui/OptionsView.groovy | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy index 0804bfa3..203fa23a 100644 --- a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy +++ b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy @@ -27,7 +27,6 @@ class OptionsModel { @Observable boolean searchPaths @Observable boolean browseFiles @Observable boolean showPaths - @Observable boolean showPathsCheckboxEnabled @Observable boolean allowTracking @Observable int speedSmoothSeconds @Observable int totalUploadSlots @@ -116,7 +115,6 @@ class OptionsModel { searchPaths = settings.searchPaths 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 87df0b7e..b180ef1f 100644 --- a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy @@ -138,9 +138,9 @@ class OptionsView { fill : GridBagConstraints.HORIZONTAL, weightx: 100)) browseFilesCheckbox = checkBox(selected : bind {model.browseFiles}, constraints : gbc(gridx : 1, gridy : 3, anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx: 0)) - label(text : trans("OPTIONS_SHOW_PATHS"), enabled: bind{model.showPathsCheckboxEnabled}, constraints: gbc(gridx:0, gridy:4, anchor: GridBagConstraints.LINE_START, + label(text : trans("OPTIONS_SHOW_PATHS"), constraints: gbc(gridx:0, gridy:4, anchor: GridBagConstraints.LINE_START, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) - showPathsCheckbox = checkBox(selected : bind {model.showPaths}, enabled : bind{model.showPathsCheckboxEnabled}, constraints : gbc(gridx: 1, gridy : 4, + showPathsCheckbox = checkBox(selected : bind {model.showPaths}, constraints : gbc(gridx: 1, gridy : 4, anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx : 0)) label(text : trans("OPTIONS_ALLOW_TRACKING"), constraints : gbc(gridx: 0, gridy: 5, anchor: GridBagConstraints.LINE_START, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) @@ -454,10 +454,6 @@ class OptionsView { allowUntrustedCheckbox.addActionListener { model.searchExtraHopCheckboxEnabled = allowUntrustedCheckbox.model.isSelected() } - - browseFilesCheckbox.addActionListener { - model.showPathsCheckboxEnabled = browseFilesCheckbox.model.isSelected() - } } boolean isAqua() {