Merge branch 'compatibility'

* Add compatibility with Tk < 8.6.0 (requires PIL.ImageTk)
* Add desktop icon in shortcuts

Author: j4321

changelog

@@ -6,6 +6,10 @@ Copyright 2017 Juliette Monsel <j_4321@protonmail.com>
 Changelog
 ---------
 
+- tkfilebrowser 2.2.5
+    * Add compatibility with Tk < 8.6.0 (requires PIL.ImageTk)
+    * Add desktop icon in shortcuts
+
 - tkfilebrowser 2.2.4
     * Fix bug in desktop folder identification
 

tkfilebrowser/constants.py

@@ -61,7 +61,13 @@
 RECENT_FILES = os.path.join(LOCAL_PATH, 'recent_files')
 
 # ---  images
+if tk.TkVersion < 8.6:
+    from PIL.ImageTk import PhotoImage
+else:
+    PhotoImage = tk.PhotoImage
+
 IM_HOME = os.path.join(PATH, "images", "home.png")
+IM_DESKTOP = os.path.join(PATH, "images", "desktop.png")
 IM_FOLDER = os.path.join(PATH, "images", "dossier.png")
 IM_FOLDER_LINK = os.path.join(PATH, "images", "dossier_link.png")
 IM_NEW = os.path.join(PATH, "images", "new_folder.png")
@@ -73,7 +79,10 @@
 
 
 # ---  translation
-LANG = locale.getdefaultlocale()[0]
+try:
+    LANG = locale.getdefaultlocale()[0]
+except ValueError:
+    LANG = 'en'
 
 EN = {}
 FR = {"B": "octets", "MB": "Mo", "kB": "ko", "GB": "Go", "TB": "To",

tkfilebrowser/filebrowser.py

@@ -166,15 +166,16 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
                         foreground='white')
 
         # ---  images
-        self.im_file = tk.PhotoImage(file=cst.IM_FILE, master=self)
-        self.im_folder = tk.PhotoImage(file=cst.IM_FOLDER, master=self)
-        self.im_file_link = tk.PhotoImage(file=cst.IM_FILE_LINK, master=self)
-        self.im_folder_link = tk.PhotoImage(file=cst.IM_FOLDER_LINK, master=self)
-        self.im_new = tk.PhotoImage(file=cst.IM_NEW, master=self)
-        self.im_drive = tk.PhotoImage(file=cst.IM_DRIVE, master=self)
-        self.im_home = tk.PhotoImage(file=cst.IM_HOME, master=self)
-        self.im_recent = tk.PhotoImage(file=cst.IM_RECENT, master=self)
-        self.im_recent_24 = tk.PhotoImage(file=cst.IM_RECENT_24, master=self)
+        self.im_file = cst.PhotoImage(file=cst.IM_FILE, master=self)
+        self.im_folder = cst.PhotoImage(file=cst.IM_FOLDER, master=self)
+        self.im_desktop = cst.PhotoImage(file=cst.IM_DESKTOP, master=self)
+        self.im_file_link = cst.PhotoImage(file=cst.IM_FILE_LINK, master=self)
+        self.im_folder_link = cst.PhotoImage(file=cst.IM_FOLDER_LINK, master=self)
+        self.im_new = cst.PhotoImage(file=cst.IM_NEW, master=self)
+        self.im_drive = cst.PhotoImage(file=cst.IM_DRIVE, master=self)
+        self.im_home = cst.PhotoImage(file=cst.IM_HOME, master=self)
+        self.im_recent = cst.PhotoImage(file=cst.IM_RECENT, master=self)
+        self.im_recent_24 = cst.PhotoImage(file=cst.IM_RECENT_24, master=self)
 
         # ---  filetypes
         self.filetype = tk.StringVar(self)
@@ -310,7 +311,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
             # but OSError in python2
             desktop = join(home, 'Desktop')
         if exists(desktop):
-            self.left_tree.insert("", "end", iid=desktop, image=self.im_folder,
+            self.left_tree.insert("", "end", iid=desktop, image=self.im_desktop,
                                   text=split(desktop)[-1])
             wrapper.add_tooltip(desktop, desktop)
 

tkfilebrowser/images/desktop.png

@@ -41,7 +41,7 @@ def __init__(self, filename, nbmax=30):
         self._files = []  # most recent files first
         try:
             with open(filename) as file:
-                self._files = file.read().split()
+                self._files = file.read().splitlines()
         except Exception:
             pass
 

tkfilebrowser/images/drive.png

@@ -33,7 +33,6 @@ def __init__(self, parent, **kwargs):
 
         Options:
             * parent: parent window
-            * image: PhotoImage/BitmapImage to display in the tooltip
             * text: text (str) to display in the tooltip
             * compound: relative orientation of the graphic relative to the text
             * alpha: opacity of the tooltip (0 for transparent, 1 for opaque),
@@ -49,8 +48,7 @@ def __init__(self, parent, **kwargs):
         bg = ttk.Style(self).lookup(style, 'background')
         self.configure(background=bg)
 
-        self.im = kwargs.get('image', None)
-        self.label = ttk.Label(self, text=kwargs.get('text', ''), image=self.im,
+        self.label = ttk.Label(self, text=kwargs.get('text', ''),
                                style=style, compound=kwargs.get('compound', 'left'),
                                padding=kwargs.get('padding', 4))
         self.label.pack()