diff --git a/pe/cocoa/DetailsPanel.h b/pe/cocoa/DetailsPanel.h index 119e6cf6..d7dbcaa8 100644 --- a/pe/cocoa/DetailsPanel.h +++ b/pe/cocoa/DetailsPanel.h @@ -1,11 +1,8 @@ #import -#import "PyApp.h" -#import "Table.h" +#import "dgbase/DetailsPanel.h" - -@interface DetailsPanel : NSWindowController +@interface DetailsPanel : DetailsPanelBase { - IBOutlet TableView *detailsTable; IBOutlet NSImageView *dupeImage; IBOutlet NSProgressIndicator *dupeProgressIndicator; IBOutlet NSImageView *refImage; @@ -16,6 +13,4 @@ NSString *_dupePath; NSString *_refPath; } -- (id)initWithPy:(PyApp *)aPy; -- (void)refresh; @end \ No newline at end of file diff --git a/pe/cocoa/DetailsPanel.m b/pe/cocoa/DetailsPanel.m index 00845b33..acfd608f 100644 --- a/pe/cocoa/DetailsPanel.m +++ b/pe/cocoa/DetailsPanel.m @@ -8,9 +8,7 @@ @implementation DetailsPanel - (id)initWithPy:(PyApp *)aPy { - self = [super initWithWindowNibName:@"Details"]; - [self window]; //So the detailsTable is initialized. - [detailsTable setPy:aPy]; + self = [super initWithPy:aPy]; py = aPy; _needsRefresh = YES; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(duplicateSelectionChanged:) name:DuplicateSelectionChangedNotification object:nil]; diff --git a/pe/cocoa/dupeguru.xcodeproj/project.pbxproj b/pe/cocoa/dupeguru.xcodeproj/project.pbxproj index d8ffd079..05f0139d 100644 --- a/pe/cocoa/dupeguru.xcodeproj/project.pbxproj +++ b/pe/cocoa/dupeguru.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; }; CE381D0509915304003581CE /* dg_cocoa.plugin in Resources */ = {isa = PBXBuildFile; fileRef = CE381CF509915304003581CE /* dg_cocoa.plugin */; }; CE3AA46709DB207900DB3A21 /* Directories.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE3AA46509DB207900DB3A21 /* Directories.nib */; }; + CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; }; CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; }; CE80DB2E0FC192D60086DCA6 /* Dialogs.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1C0FC192D60086DCA6 /* Dialogs.m */; }; CE80DB2F0FC192D60086DCA6 /* HSErrorReportWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE80DB1E0FC192D60086DCA6 /* HSErrorReportWindow.m */; }; @@ -89,6 +90,8 @@ CE381C9B09914ADF003581CE /* ResultWindow.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = ResultWindow.h; sourceTree = SOURCE_ROOT; }; CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dg_cocoa.plugin; path = py/dist/dg_cocoa.plugin; sourceTree = SOURCE_ROOT; }; CE3AA46609DB207900DB3A21 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Directories.nib; sourceTree = ""; }; + CE6044EA0FE6796200B71262 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = dgbase/DetailsPanel.h; sourceTree = SOURCE_ROOT; }; + CE6044EB0FE6796200B71262 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = dgbase/DetailsPanel.m; sourceTree = SOURCE_ROOT; }; CE68EE6509ABC48000971085 /* DirectoryPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DirectoryPanel.h; sourceTree = SOURCE_ROOT; }; CE68EE6609ABC48000971085 /* DirectoryPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DirectoryPanel.m; sourceTree = SOURCE_ROOT; }; CE80DB1B0FC192D60086DCA6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = cocoalib/Dialogs.h; sourceTree = SOURCE_ROOT; }; @@ -293,6 +296,8 @@ CE80DB820FC1951C0086DCA6 /* AppDelegate.h */, CE80DB830FC1951C0086DCA6 /* AppDelegate.m */, CE80DB840FC1951C0086DCA6 /* Consts.h */, + CE6044EA0FE6796200B71262 /* DetailsPanel.h */, + CE6044EB0FE6796200B71262 /* DetailsPanel.m */, CE80DB850FC1951C0086DCA6 /* DirectoryPanel.h */, CE80DB860FC1951C0086DCA6 /* DirectoryPanel.m */, CE80DB870FC1951C0086DCA6 /* PyDupeGuru.h */, @@ -429,6 +434,7 @@ CE80DB8C0FC1951C0086DCA6 /* ResultWindow.m in Sources */, CEBAE4270FDA97E000B7887D /* BRSingleLineFormatter.m in Sources */, CEBAE4280FDA97E000B7887D /* NSCharacterSet_Extensions.m in Sources */, + CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };