imdiff 0.2.8__tar.gz → 0.2.10__tar.gz

{imdiff-0.2.8 → imdiff-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.8
+Version: 0.2.10
 Summary: Compare image files in different directories
 Author-email: "John T. Goetz" <theodore.goetz@gmail.com>
 Project-URL: homepage, https://gitlab.com/johngoetz/imdiff

{imdiff-0.2.8 → imdiff-0.2.10}/imdiff/gui/dir_diff_main_window.py

@@ -25,11 +25,7 @@ class DirDiffMainWindow(ttk.Window):
             right_label=right_label,
         )
         self.image_frame = ImageFrame(self.pane_window, update_item=self.update_item)
-        self.image_frame.add_operate_buttons(
-            ttk.Button(self.image_frame, text='Delete', command=self.delete),
-            ttk.Button(self.image_frame, text='⟵', command=self.copy_right_to_left),
-            ttk.Button(self.image_frame, text='⟶', command=self.copy_left_to_right),
-        )
+        self.image_frame.add_standard_operate_buttons()
         self.status_bar = StatusBar(self)
         self.layout()
         self.bind_events()
@@ -55,7 +51,6 @@ class DirDiffMainWindow(ttk.Window):
 
     def bind_events(self):
         self.bind_all('<Control-q>', self.destroy)
-        self.bind_all('<Control-c>', self.destroy)
         self.bind_all('<Down>', self.file_list_frame.on_down)
         self.bind_all(
             '<Shift-Down>', lambda evt: self.file_list_frame.on_down(evt, add=True)
@@ -89,6 +84,21 @@ class DirDiffMainWindow(ttk.Window):
         self.file_list_frame.leftdir = leftdir
         self.file_list_frame.rightdir = rightdir
         if leftdir and rightdir:
+
+            # find first unique path component starting from the end
+            for i in range(len(leftdir.parts)):
+                try:
+                    l = leftdir.parts[-i]
+                    r = rightdir.parts[-i]
+                    if l != r:
+                        self.image_frame.left_label.set(l)
+                        self.image_frame.right_label.set(r)
+                        break
+                except IndexError:
+                    # just give up, defaults to "left" and "right"
+                    break
+
+
             self.file_list_frame.after_idle(self.file_list_frame.load_files)
 
     def delete(self, evt=None):

{imdiff-0.2.8 → imdiff-0.2.10}/imdiff/gui/file_list_frame.py

@@ -83,14 +83,14 @@ class FileListFrame(ttk.Frame):
             self.treeview_frame, orient=tk.HORIZONTAL, variable=self.progress_var
         )
         self.file_treeview = ttk.Treeview(self.treeview_frame, columns=('stat',))
-        self.file_treeview.heading('#0', text='File')
+        self.file_treeview.heading('#0', text='File (▲)')
         self.file_treeview.heading('stat', text='Stat')
         w = tk.font.Font().measure(' Stat (▲) ')
         self.file_treeview.column(
             'stat', width=w, minwidth=w, stretch=False, anchor='center'
         )
 
-        self.file_treeview.tag_configure('identical', foreground='black')
+        self.file_treeview.tag_configure('identical', foreground='gray')
         self.file_treeview.tag_configure('missing', foreground='orange')
         self.file_treeview.tag_configure('not-found', foreground='violet')
         self.file_treeview.tag_configure('failed-to-load', foreground='violet')

{imdiff-0.2.8 → imdiff-0.2.10}/imdiff/gui/image_frame.py

@@ -24,8 +24,8 @@ class ImageFrame(ttk.Frame):
     ):
         super().__init__(parent)
         self.update_item_command = update_item
-        self.left_label = left_label
-        self.right_label = right_label
+        self.left_label = tk.StringVar(value=left_label)
+        self.right_label = tk.StringVar(value=right_label)
 
         self.high_contrast = tk.BooleanVar()
         self.high_contrast.set(False)
@@ -99,10 +99,14 @@ class ImageFrame(ttk.Frame):
         self.layout()
 
     def add_standard_operate_buttons(self):
+        self.left_text_label = ttk.Label(self, textvariable=self.left_label)
+        self.right_text_label = ttk.Label(self, textvariable=self.right_label)
         self.add_operate_buttons(
-            ttk.Button(self, text='Delete', command=self.delete),
+            ttk.Button(self, text='Delete', command=self.delete, bootstyle=ttk.DANGER),
+            self.left_text_label,
             ttk.Button(self, text='⟵', command=self.copy_right_to_left),
             ttk.Button(self, text='⟶', command=self.copy_left_to_right),
+            self.right_text_label,
         )
 
     def layout(self):

{imdiff-0.2.8 → imdiff-0.2.10}/imdiff/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.2.8'
+__version__ = '0.2.10'
 version_info = __version__.split('.')

{imdiff-0.2.8 → imdiff-0.2.10}/imdiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.8
+Version: 0.2.10
 Summary: Compare image files in different directories
 Author-email: "John T. Goetz" <theodore.goetz@gmail.com>
 Project-URL: homepage, https://gitlab.com/johngoetz/imdiff