Merge branch 'fix_style'

Author: j4321

setup.py

@@ -12,7 +12,7 @@
     long_description = f.read()
 
 setup(name='tkfilebrowser',
-      version='2.2.4',
+      version='2.2.5',
       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_tooltip.py

@@ -9,10 +9,9 @@
 
 class TestTooltip(BaseWidgetTest):
     def test_tooltip(self):
-        t = Tooltip(self.window, background='white', foreground='black')
+        t = Tooltip(self.window)
         self.window.update()
-        t.configure(text='Hello', background='black', foreground='white',
-                    image=None, alpha=0.75)
+        t.configure(text='Hello', image=None, alpha=0.75)
 
 
 class TestTooltipTreeWrapper(BaseWidgetTest):
@@ -22,7 +21,7 @@ def test_tooltiptreewrapper(self):
         tree.insert("", "end", "1", text="item 1")
         tree.insert("", "end", "2", text="item 2")
         self.window.update()
-        tw = TooltipTreeWrapper(tree, background='white', foreground='black')
+        tw = TooltipTreeWrapper(tree)
         tw.add_tooltip("1", "tooltip 1")
         tw.add_tooltip("2", "tooltip 2")
         self.window.update()

tkfilebrowser/filebrowser.py

@@ -135,7 +135,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         style.configure("left.tkfilebrowser.Treeview.Heading",
                         font="TkDefaultFont")
         style.configure("left.tkfilebrowser.Treeview.Item", padding=2)
-        style.configure("listbox.TFrame", background="white", relief="sunken")
+        style.configure("listbox.tkfilebrowser.TFrame", background="white", relief="sunken")
         field_bg = style.lookup("TEntry", "fieldbackground", default='white')
         tree_field_bg = style.lookup("ttk.Treeview", "fieldbackground",
                                      default='white')
@@ -145,22 +145,25 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         sel_fg = style.lookup('Treeview', 'foreground', ('selected',))
         self.option_add('*TCombobox*Listbox.selectBackground', sel_bg)
         self.option_add('*TCombobox*Listbox.selectForeground', sel_fg)
-        style.map('types.TCombobox', foreground=[], fieldbackground=[])
-        style.configure('types.TCombobox', lightcolor=bg,
+        style.map('types.tkfilebrowser.TCombobox', foreground=[], fieldbackground=[])
+        style.configure('types.tkfilebrowser.TCombobox', lightcolor=bg,
                         fieldbackground=bg)
-        style.configure('types.TCombobox.Item', background='red')
+        style.configure('types.tkfilebrowser.TCombobox.Item', background='red')
         style.configure("left.tkfilebrowser.Treeview", background=active_bg,
                         font="TkDefaultFont",
                         fieldbackground=active_bg)
         self.configure(background=bg)
         # path button style
-        style.configure("path.TButton", padding=2)
+        style.configure("path.tkfilebrowser.TButton", padding=2)
         selected_bg = style.lookup("TButton", "background", ("pressed",))
         map_bg = style.map("TButton", "background")
         map_bg.append(("selected", selected_bg))
-        style.map("path.TButton",
+        style.map("path.tkfilebrowser.TButton",
                   background=map_bg,
                   font=[("selected", "TkDefaultFont 9 bold")])
+        # tooltip style
+        style.configure('tooltip.tkfilebrowser.TLabel', background='black',
+                        foreground='white')
 
         # ---  images
         self.im_file = tk.PhotoImage(file=cst.IM_FILE, master=self)
@@ -185,7 +188,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
             w = max([len(f) for f in values] + [5])
             b_filetype = ttk.Combobox(self, textvariable=self.filetype,
                                       state='readonly',
-                                      style='types.TCombobox',
+                                      style='types.tkfilebrowser.TCombobox',
                                       values=values,
                                       width=w)
             b_filetype.grid(row=3, sticky="e", padx=10, pady=(4, 0))
@@ -203,7 +206,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         # ---  path completion
         self.complete = self.register(self._completion)
         self.listbox_var = tk.StringVar(self)
-        self.listbox_frame = ttk.Frame(self, style="listbox.TFrame", borderwidth=1)
+        self.listbox_frame = ttk.Frame(self, style="listbox.tkfilebrowser.TFrame", borderwidth=1)
         self.listbox = tk.Listbox(self.listbox_frame,
                                   listvariable=self.listbox_var,
                                   highlightthickness=0,
@@ -265,8 +268,7 @@ def __init__(self, parent, initialdir="", initialfile="", mode="openfile",
         paned.add(left_pane, weight=0)
         self.left_tree = ttk.Treeview(left_pane, selectmode="browse",
                                       style="left.tkfilebrowser.Treeview")
-        wrapper = TooltipTreeWrapper(self.left_tree, background='black',
-                                     foreground='white')
+        wrapper = TooltipTreeWrapper(self.left_tree)
         self.left_tree.column("#0", width=150)
         self.left_tree.heading("#0", text=_("Shortcuts"), anchor="w")
         self.left_tree.grid(row=0, column=0, sticky="sewn")
@@ -926,7 +928,7 @@ def _update_path_bar(self, path):
             b = PathButton(self.path_bar, self.path_var, p, text=folder,
                            width=len(folder) + 1,
                            command=lambda f=p: self.display_folder(f),
-                           style="path.TButton")
+                           style="path.tkfilebrowser.TButton")
             self.path_bar_buttons.append(b)
             b.grid(row=0, column=i + 2, sticky="ns")
 

tkfilebrowser/path_button.py

@@ -42,7 +42,7 @@ def __init__(self, parent, variable, value, **kwargs):
                      to value
             * all ttk.Button options
         """
-        kwargs["style"] = "path.TButton"
+        kwargs["style"] = "path.tkfilebrowser.TButton"
         ttk.Button.__init__(self, parent, **kwargs)
         self.variable = variable
         self.value = value

tkfilebrowser/tooltip.py

@@ -33,8 +33,6 @@ def __init__(self, parent, **kwargs):
 
         Options:
             * parent: parent window
-            * background: background color
-            * foreground: foreground color
             * 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
@@ -46,33 +44,22 @@ def __init__(self, parent, **kwargs):
         self.attributes('-type', 'tooltip')
         self.attributes('-alpha', kwargs.get('alpha', 0.8))
         self.overrideredirect(True)
-        self.configure(padx=kwargs.get('padx', 4))
-        self.configure(pady=kwargs.get('pady', 4))
+        style = kwargs.get('style', 'tooltip.tkfilebrowser.TLabel')
 
-        self.style = ttk.Style(self)
-        if 'background' in kwargs:
-            bg = kwargs['background']
-            self.configure(background=bg)
-            self.style.configure('tooltip.TLabel', background=bg)
-        if 'foreground' in kwargs:
-            self.style.configure('tooltip.TLabel', foreground=kwargs['foreground'])
+        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,
-                               style='tooltip.TLabel',
-                               compound=kwargs.get('compound', 'left'))
+                               style=style, compound=kwargs.get('compound', 'left'),
+                               padding=kwargs.get('padding', 4))
         self.label.pack()
 
     def configure(self, **kwargs):
         if 'text' in kwargs:
             self.label.configure(text=kwargs.pop('text'))
         if 'image' in kwargs:
             self.label.configure(image=kwargs.pop('image'))
-        if 'background' in kwargs:
-            self.style.configure('tooltip.TLabel', background=kwargs['background'])
-        if 'foreground' in kwargs:
-            fg = kwargs.pop('foreground')
-            self.style.configure('tooltip.TLabel', foreground=fg)
         if 'alpha' in kwargs:
             self.attributes('-alpha', kwargs.pop('alpha'))
         tk.Toplevel.configure(self, **kwargs)