goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The option to send path information is not tied to the option to allow browsing anymore. GitHub issue #78

auto-update
Zlatin Balevsky 2021-10-10 13:31:40 +01:00
parent a0b9aa3383
commit fdd34cb606
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
View File

@ -27,7 +27,6 @@ class OptionsModel {
@Observable boolean searchPaths @Observable boolean searchPaths
@Observable boolean browseFiles @Observable boolean browseFiles
@Observable boolean showPaths @Observable boolean showPaths
@Observable boolean showPathsCheckboxEnabled
@Observable boolean allowTracking @Observable boolean allowTracking
@Observable int speedSmoothSeconds @Observable int speedSmoothSeconds
@Observable int totalUploadSlots @Observable int totalUploadSlots
@ -116,7 +115,6 @@ class OptionsModel {
searchPaths = settings.searchPaths searchPaths = settings.searchPaths
browseFiles = settings.browseFiles browseFiles = settings.browseFiles
showPaths = settings.showPaths showPaths = settings.showPaths
setShowPathsCheckboxEnabled(browseFiles)
allowTracking = settings.allowTracking allowTracking = settings.allowTracking
speedSmoothSeconds = settings.speedSmoothSeconds speedSmoothSeconds = settings.speedSmoothSeconds
totalUploadSlots = settings.totalUploadSlots totalUploadSlots = settings.totalUploadSlots

8
gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
View File

@ -138,9 +138,9 @@ class OptionsView {
fill : GridBagConstraints.HORIZONTAL, weightx: 100)) fill : GridBagConstraints.HORIZONTAL, weightx: 100))
browseFilesCheckbox = checkBox(selected : bind {model.browseFiles}, constraints : gbc(gridx : 1, gridy : 3, browseFilesCheckbox = checkBox(selected : bind {model.browseFiles}, constraints : gbc(gridx : 1, gridy : 3,
anchor : GridBagConstraints.LINE_END, fill : GridBagConstraints.HORIZONTAL, weightx: 0)) 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)) 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)) 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, label(text : trans("OPTIONS_ALLOW_TRACKING"), constraints : gbc(gridx: 0, gridy: 5, anchor: GridBagConstraints.LINE_START,
fill : GridBagConstraints.HORIZONTAL, weightx: 100)) fill : GridBagConstraints.HORIZONTAL, weightx: 100))
@ -454,10 +454,6 @@ class OptionsView {
allowUntrustedCheckbox.addActionListener { allowUntrustedCheckbox.addActionListener {
model.searchExtraHopCheckboxEnabled = allowUntrustedCheckbox.model.isSelected() model.searchExtraHopCheckboxEnabled = allowUntrustedCheckbox.model.isSelected()
} }
browseFilesCheckbox.addActionListener {
model.showPathsCheckboxEnabled = browseFilesCheckbox.model.isSelected()
}
} }
boolean isAqua() { boolean isAqua() {