Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2366 from kivy/filechooser_multiselect_fix 

uix:FileChooser fix multiselect behavior consistent, honor dirselect.
This commit is contained in:
Gabriel Pettier 2014-08-03 22:24:45 +02:00
parent 4245b8a038 35be32378f
commit 4f7944ecf6
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kivy/uix/filechooser.py
View File

@ -435,20 +435,27 @@ class FileChooserController(FloatLayout):
'button' in touch.profile and touch.button in (
'scrollup', 'scrolldown', 'scrollleft', 'scrollright')):
return False
_dir = self.file_system.is_dir(entry.path)
dirselect = self.dirselect
if _dir and dirselect and touch.is_double_tap:
self.open_entry(entry)
return
if self.multiselect:
if self.file_system.is_dir(entry.path) and touch.is_double_tap:
self.open_entry(entry)
if entry.path in self.selection:
self.selection.remove(entry.path)
else:
if entry.path in self.selection:
self.selection.remove(entry.path)
else:
self.selection.append(entry.path)
if _dir and not self.dirselect:
self.open_entry(entry)
return
self.selection.append(entry.path)
else:
if self.file_system.is_dir(entry.path):
if self.dirselect:
self.selection = [entry.path, ]
else:
self.selection = [entry.path, ]
if _dir and not self.dirselect:
self.open_entry
return
self.selection = [entry.path, ]
def entry_released(self, entry, touch):
'''(internal) This method must be called by the template when an entry