Compare commits

...

2 Commits

5 changed files with 29 additions and 4 deletions

View File

@ -90,7 +90,7 @@ def build_cocoa(dev):
os.mkdir(pydep_folder)
shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
tocopy = [
'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag',
'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'mutagen'
]
copy_packages(tocopy, pydep_folder, create_links=dev)
sys.path.insert(0, 'build')

View File

@ -31,7 +31,7 @@ class DupeGuru(DupeGuruBase):
def _get_fileclasses(self):
result = DupeGuruBase._get_fileclasses(self)
if self.app_mode == AppMode.Standard:
if self.app_mode == AppMode.STANDARD:
result = [Bundle] + result
return result

View File

@ -181,7 +181,7 @@ class PyTable(PyGUIObject):
#--- Cocoa --> Python
def columns(self) -> pyref:
return self.model.columns
return self.model._columns
def add(self):
self.model.add()

@ -1 +1 @@
Subproject commit bf7d720126525557d45d4293076553372cc78d34
Subproject commit 47dbe805bb563f3f4ffb90730fc8b1349448789e

25
patch-for-dupeguru.patch Normal file
View File

@ -0,0 +1,25 @@
From 5d193a4cccb619f5b66515e9465cc2188a52ed62 Mon Sep 17 00:00:00 2001
From: Andrew Senetar <arsenetar@voltaicideas.net>
Date: Wed, 25 Aug 2021 21:50:07 -0500
Subject: [PATCH] Patch for cocoa
---
core/app.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/app.py b/core/app.py
index 37921e94..02f45416 100644
--- a/core/app.py
+++ b/core/app.py
@@ -562,7 +562,7 @@ class DupeGuru(Broadcaster):
self.ignore_list_dialog.refresh()
p = op.join(self.appdata, "exclude_list.xml")
self.exclude_list.load_from_xml(p)
- self.exclude_list_dialog.refresh()
+ #self.exclude_list_dialog.refresh()
def load_directories(self, filepath):
# Clear out previous entries
--
2.30.1 (Apple Git-130)