Merge branch 'select_all'

Add select all on Ctrl+A if multiple selection is enabled

Author: j4321

README.rst

@@ -115,9 +115,11 @@ Documentation
 Changelog
 ---------
 
-- tkfilebrowser 2.1.2
+- tkfilebrowser 2.2.0
     * Use babel instead of locale in order not to change the locale globally
-    * Speed up (a little) folder content display
+    * Speed up (a little) folder content display (only python >= 3.5)
+    * Improve example: add comparison with default dialogs
+    * Add select all on Ctrl+A if multiple selection is enabled
 
 - tkfilebrowser 2.1.1
     * Fix error if LOCAL_PATH does not exists or is not writtable

changelog

@@ -1,14 +1,17 @@
+
 tkfilebrowser - Alternative to filedialog for Tkinter
 =====================================================
 Copyright 2017 Juliette Monsel <j_4321@protonmail.com>
 
 Changelog
 ---------
 
-- tkfilebrowser 2.1.2
+- tkfilebrowser 2.2.0
     * Use babel instead of locale in order not to change the locale globally
     * Speed up (a little) folder content display
-    
+    * Improve example: add comparison with default dialogs
+    * Add select all on Ctrl+A if multiple selection is enabled
+
 - tkfilebrowser 2.1.1
     * Fix error if LOCAL_PATH does not exists or is not writtable
 

setup.py

@@ -12,7 +12,7 @@
     long_description = f.read()
 
 setup(name='tkfilebrowser',
-      version='2.1.3',
+      version='2.2.0',
       description='File browser for Tkinter, alternative to tkinter.filedialog in linux with GTK bookmarks support.',
       long_description=long_description,
       url='https://github.com/j4321/tkFileBrowser',

tests/test_filebrowser.py

@@ -4,30 +4,104 @@
     import ttk
 except ImportError:
     from tkinter import ttk
+import os
 
 
 class TestFileBrowser(BaseWidgetTest):
-    def test_filebrowser(self):
+    def test_filebrowser_opendir(self):
+        # --- multiple selection
+        path = os.path.expanduser('~')
+        fb = FileBrowser(self.window, initialdir=path, initialfile="test", mode="opendir",
+                         multiple_selection=True, defaultext=".png",
+                         title="Test", filetypes=[],
+                         okbuttontext=None, cancelbuttontext="Cancel",
+                         foldercreation=False)
+        self.window.update()
+        fb.right_tree.focus_force()
+        self.window.update()
+        fb.event_generate('<Control-a>')
+        self.window.update()
+        self.window.update_idletasks()
+        fb.validate()
+        walk = os.walk(path)
+        root, dirs, _ = walk.send(None)
+        res = list(fb.get_result())
+        res.sort()
+        dirs = [os.path.realpath(os.path.join(root, d)) for d in dirs]
+        dirs.sort()
+        self.assertEqual(res, dirs)
+        # --- single selection
         fb = FileBrowser(self.window, initialdir=".", initialfile="test", mode="opendir",
+                         multiple_selection=False, defaultext=".png",
+                         title="Test", filetypes=[],
+                         okbuttontext=None, cancelbuttontext="Cancel",
+                         foldercreation=False)
+        self.window.update()
+        fb.validate()
+        self.assertTrue(os.path.isdir(fb.get_result()))
+
+    def test_filebrowser_openfile(self):
+        # --- multiple selection
+        path = os.path.expanduser('~')
+        fb = FileBrowser(self.window, initialdir=path, initialfile="test", mode="openfile",
                          multiple_selection=True, defaultext=".png",
                          title="Test", filetypes=[],
                          okbuttontext=None, cancelbuttontext="Cancel",
                          foldercreation=False)
         self.window.update()
-        fb.destroy()
+        fb.right_tree.focus_force()
+        self.window.update()
+        fb.event_generate('<Control-a>')
+        self.window.update()
+        self.window.update_idletasks()
+        fb.validate()
+        walk = os.walk(path)
+        root, _, files = walk.send(None)
+        res = list(fb.get_result())
+        res.sort()
+        files = [os.path.realpath(os.path.join(root, f)) for f in files]
+        files.sort()
+        self.assertEqual(res, files)
+        # --- single selection
         fb = FileBrowser(self.window, initialdir=".", initialfile="test", mode="openfile",
-                         multiple_selection=True, defaultext=".png",
+                         multiple_selection=False, defaultext="",
+                         title="Test", filetypes=[("PNG", '*.png'), ('ALL', '*')],
+                         okbuttontext=None, cancelbuttontext="Cancel",
+                         foldercreation=False)
+        self.window.update()
+        fb.validate()
+        self.assertEqual(fb.get_result(), '')
+        fb = FileBrowser(self.window, initialdir=".", initialfile="test", mode="openfile",
+                         multiple_selection=False, defaultext="",
+                         title="Test", filetypes=[("PNG", '*.png'), ('ALL', '*')],
+                         okbuttontext=None, cancelbuttontext="Cancel",
+                         foldercreation=False)
+        self.window.update()
+        fb.validate()
+        self.assertEqual(fb.get_result(), '')
+        fb = FileBrowser(self.window, initialdir=".", initialfile="test", mode="openfile",
+                         multiple_selection=False, defaultext="",
                          title="Test", filetypes=[],
                          okbuttontext=None, cancelbuttontext="Cancel",
                          foldercreation=False)
         self.window.update()
-        fb.destroy()
+        walk = os.walk(os.path.abspath("."))
+        root, _, files = walk.send(None)
+        files = fb.right_tree.tag_has('file')
+        if files:
+            fb.right_tree.selection_set(files[0])
+            fb.validate()
+            self.assertTrue(os.path.isfile(fb.get_result()))
+        else:
+            fb.validate()
+            self.assertEqual(fb.get_result(), '')
+
+    def test_filebrowser_save(self):
         fb = FileBrowser(self.window, initialdir="/", initialfile="test", mode="save",
                          multiple_selection=True, defaultext=".png",
                          title="Test", filetypes=[("PNG", '*.png'), ('ALL', '*')],
                          okbuttontext=None, cancelbuttontext="Cancel",
-                         foldercreation=False)
+                         foldercreation=True)
         self.window.update()
-        fb.destroy()
-
-
+        fb.validate()
+        self.assertEqual(fb.get_result(), '/test.png')

tkfilebrowser/filebrowser.py

@@ -407,6 +407,8 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         self.right_tree.bind("<Double-1>", self._select)
         self.right_tree.bind("<Return>", self._select)
         self.right_tree.bind("<Left>", self._go_left)
+        if multiple_selection:
+            self.right_tree.bind("<Control-a>", self._right_tree_select_all)
 
         if mode == "opendir":
             self.right_tree.bind("<<TreeviewSelect>>",
@@ -452,6 +454,15 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         self.update_idletasks()
         self.lift()
 
+    def _right_tree_select_all(self, event):
+        if self.mode == 'opendir':
+            tags = ['folder', 'folder_link']
+        else:
+            tags = ['file', 'file_link']
+        items = self.right_tree.tag_has(tags[0]) + self.right_tree.tag_has(tags[1])
+        self.right_tree.selection_clear()
+        self.right_tree.selection_set(items)
+
     def _select_all(self, event):
         """Select all entry content."""
         event.widget.selection_range(0, "end")