diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h index 08670e95..755fe178 100644 --- a/cocoa/base/AppDelegate.h +++ b/cocoa/base/AppDelegate.h @@ -21,7 +21,7 @@ http://www.hardcoded.net/licenses/hs_license IBOutlet ResultWindowBase *result; DirectoryPanel *_directoryPanel; - DetailsPanelBase *_detailsPanel; + DetailsPanel *_detailsPanel; BOOL _savedResults; } - (IBAction)unlockApp:(id)sender; @@ -29,6 +29,6 @@ http://www.hardcoded.net/licenses/hs_license - (PyDupeGuruBase *)py; - (RecentDirectories *)recentDirectories; - (DirectoryPanel *)directoryPanel; -- (DetailsPanelBase *)detailsPanel; // Virtual +- (DetailsPanel *)detailsPanel; - (void)saveResults; @end diff --git a/cocoa/base/AppDelegate.m b/cocoa/base/AppDelegate.m index 22ef5a0f..4d114b07 100644 --- a/cocoa/base/AppDelegate.m +++ b/cocoa/base/AppDelegate.m @@ -36,7 +36,12 @@ http://www.hardcoded.net/licenses/hs_license return _directoryPanel; } -- (DetailsPanelBase *)detailsPanel { return nil; } // Virtual +- (DetailsPanel *)detailsPanel +{ + if (!_detailsPanel) + _detailsPanel = [[DetailsPanel alloc] initWithPy:py]; + return _detailsPanel; +} - (void)saveResults { diff --git a/cocoa/base/DetailsPanel.h b/cocoa/base/DetailsPanel.h index fba831cc..9e54ed8a 100644 --- a/cocoa/base/DetailsPanel.h +++ b/cocoa/base/DetailsPanel.h @@ -11,7 +11,7 @@ http://www.hardcoded.net/licenses/hs_license #import "Table.h" -@interface DetailsPanelBase : NSWindowController +@interface DetailsPanel : NSWindowController { IBOutlet TableView *detailsTable; } diff --git a/cocoa/base/DetailsPanel.m b/cocoa/base/DetailsPanel.m index 58ac80e4..cef08865 100644 --- a/cocoa/base/DetailsPanel.m +++ b/cocoa/base/DetailsPanel.m @@ -9,7 +9,7 @@ http://www.hardcoded.net/licenses/hs_license #import "DetailsPanel.h" #import "Consts.h" -@implementation DetailsPanelBase +@implementation DetailsPanel - (id)initWithPy:(PyApp *)aPy { self = [super initWithWindowNibName:@"DetailsPanel"]; diff --git a/cocoa/base/xib/DetailsPanel.xib b/cocoa/base/xib/DetailsPanel.xib index 3b00ffa6..ee489ddb 100644 --- a/cocoa/base/xib/DetailsPanel.xib +++ b/cocoa/base/xib/DetailsPanel.xib @@ -516,7 +516,7 @@ YES DetailsPanel - DetailsPanelBase + NSWindowController IBProjectSource DetailsPanel.h @@ -524,7 +524,7 @@ DetailsPanel - DetailsPanelBase + NSWindowController detailsTable NSTableView @@ -535,7 +535,7 @@ - DetailsPanelBase + DetailsPanel NSWindowController detailsTable diff --git a/cocoa/me/AppDelegate.m b/cocoa/me/AppDelegate.m index 716a66ad..81209634 100644 --- a/cocoa/me/AppDelegate.m +++ b/cocoa/me/AppDelegate.m @@ -66,14 +66,6 @@ http://www.hardcoded.net/licenses/hs_license [[self directoryPanel] toggleVisible:sender]; } - -- (DetailsPanelBase *)detailsPanel -{ - if (!_detailsPanel) - _detailsPanel = [[DetailsPanel alloc] initWithPy:py]; - return _detailsPanel; -} - - (DirectoryPanel *)directoryPanel { if (!_directoryPanel) diff --git a/cocoa/me/DetailsPanel.h b/cocoa/me/DetailsPanel.h deleted file mode 100644 index f82a319e..00000000 --- a/cocoa/me/DetailsPanel.h +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2010 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "HS" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/hs_license -*/ - -#import -#import "../base/DetailsPanel.h" - - -@interface DetailsPanel : DetailsPanelBase -@end \ No newline at end of file diff --git a/cocoa/me/DetailsPanel.m b/cocoa/me/DetailsPanel.m deleted file mode 100644 index cda8489e..00000000 --- a/cocoa/me/DetailsPanel.m +++ /dev/null @@ -1,12 +0,0 @@ -/* -Copyright 2010 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "HS" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/hs_license -*/ - -#import "DetailsPanel.h" - -@implementation DetailsPanel -@end diff --git a/cocoa/me/dupeguru.xcodeproj/project.pbxproj b/cocoa/me/dupeguru.xcodeproj/project.pbxproj index ffaed2e0..366eac2d 100644 --- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj @@ -51,8 +51,6 @@ CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE848A1809DD85810004CB44 /* Consts.h */; }; CE900AD2109B238600754048 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD1109B238600754048 /* Preferences.xib */; }; CE900AD7109B2A9B00754048 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE900AD6109B2A9B00754048 /* MainMenu.xib */; }; - CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; }; - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; }; CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; }; CEFC294609C89E3D00D9F998 /* folder32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC294509C89E3D00D9F998 /* folder32.png */; }; CEFC295509C89FF200D9F998 /* details32.png in Resources */ = {isa = PBXBuildFile; fileRef = CEFC295309C89FF200D9F998 /* details32.png */; }; @@ -67,7 +65,6 @@ dstSubfolderSpec = 10; files = ( CE14259F0AFB719300BD5167 /* Sparkle.framework in CopyFiles */, - CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */, CE848A1909DD85810004CB44 /* Consts.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; @@ -402,7 +399,6 @@ CE381C9609914ACE003581CE /* AppDelegate.m in Sources */, CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */, CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */, - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */, CE515DF30FC6C12E00EC695D /* Dialogs.m in Sources */, CE515DF40FC6C12E00EC695D /* HSErrorReportWindow.m in Sources */, CE515DF50FC6C12E00EC695D /* Outline.m in Sources */, diff --git a/cocoa/pe/AppDelegate.m b/cocoa/pe/AppDelegate.m index 103bc00b..abc51358 100644 --- a/cocoa/pe/AppDelegate.m +++ b/cocoa/pe/AppDelegate.m @@ -41,10 +41,10 @@ http://www.hardcoded.net/licenses/hs_license return self; } -- (DetailsPanelBase *)detailsPanel +- (DetailsPanel *)detailsPanel { if (!_detailsPanel) - _detailsPanel = [[DetailsPanel alloc] initWithPy:py]; + _detailsPanel = [[DetailsPanelPE alloc] initWithPy:py]; return _detailsPanel; } diff --git a/cocoa/pe/DetailsPanel.h b/cocoa/pe/DetailsPanel.h index c5941f99..9061cadf 100644 --- a/cocoa/pe/DetailsPanel.h +++ b/cocoa/pe/DetailsPanel.h @@ -9,7 +9,7 @@ http://www.hardcoded.net/licenses/hs_license #import #import "../base/DetailsPanel.h" -@interface DetailsPanel : DetailsPanelBase +@interface DetailsPanelPE : DetailsPanel { IBOutlet NSImageView *dupeImage; IBOutlet NSProgressIndicator *dupeProgressIndicator; diff --git a/cocoa/pe/DetailsPanel.m b/cocoa/pe/DetailsPanel.m index 2c7c50a0..4e9fc89e 100644 --- a/cocoa/pe/DetailsPanel.m +++ b/cocoa/pe/DetailsPanel.m @@ -13,7 +13,7 @@ http://www.hardcoded.net/licenses/hs_license #import "DetailsPanel.h" #import "Consts.h" -@implementation DetailsPanel +@implementation DetailsPanelPE - (id)initWithPy:(PyApp *)aPy { self = [super initWithPy:aPy]; diff --git a/cocoa/pe/xib/DetailsPanel.xib b/cocoa/pe/xib/DetailsPanel.xib index cab70b29..75d522e9 100644 --- a/cocoa/pe/xib/DetailsPanel.xib +++ b/cocoa/pe/xib/DetailsPanel.xib @@ -30,7 +30,7 @@ YES - DetailsPanel + DetailsPanelPE FirstResponder @@ -854,8 +854,8 @@ YES - DetailsPanel - DetailsPanelBase + DetailsPanelPE + DetailsPanel YES @@ -879,8 +879,8 @@ - DetailsPanel - DetailsPanelBase + DetailsPanelPE + DetailsPanel detailsTable NSTableView @@ -891,7 +891,7 @@ - DetailsPanelBase + DetailsPanel NSWindowController detailsTable diff --git a/cocoa/se/AppDelegate.m b/cocoa/se/AppDelegate.m index 4e6b44fc..f22fabcf 100644 --- a/cocoa/se/AppDelegate.m +++ b/cocoa/se/AppDelegate.m @@ -57,12 +57,5 @@ http://www.hardcoded.net/licenses/hs_license [[self directoryPanel] toggleVisible:sender]; } -- (DetailsPanelBase *)detailsPanel -{ - if (!_detailsPanel) - _detailsPanel = [[DetailsPanel alloc] initWithPy:py]; - return _detailsPanel; -} - - (PyDupeGuru *)py { return (PyDupeGuru *)py; } @end diff --git a/cocoa/se/DetailsPanel.h b/cocoa/se/DetailsPanel.h deleted file mode 100644 index 623f5784..00000000 --- a/cocoa/se/DetailsPanel.h +++ /dev/null @@ -1,13 +0,0 @@ -/* -Copyright 2010 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "HS" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/hs_license -*/ - -#import -#import "../base/DetailsPanel.h" - -@interface DetailsPanel : DetailsPanelBase -@end \ No newline at end of file diff --git a/cocoa/se/DetailsPanel.m b/cocoa/se/DetailsPanel.m deleted file mode 100644 index cda8489e..00000000 --- a/cocoa/se/DetailsPanel.m +++ /dev/null @@ -1,12 +0,0 @@ -/* -Copyright 2010 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "HS" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/hs_license -*/ - -#import "DetailsPanel.h" - -@implementation DetailsPanel -@end diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 53dc2c72..6da2c61a 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -21,8 +21,6 @@ CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; }; CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; }; CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; }; - CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = CECA899A09DB132E00A3D774 /* DetailsPanel.h */; }; - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CECA899B09DB132E00A3D774 /* DetailsPanel.m */; }; CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; }; CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; }; CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; }; @@ -53,7 +51,6 @@ dstSubfolderSpec = 10; files = ( CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */, - CECA899C09DB132E00A3D774 /* DetailsPanel.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -80,8 +77,6 @@ CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = ""; }; CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = ""; }; CEAC6810109B0B7E00B43C85 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Preferences.xib; path = xib/Preferences.xib; sourceTree = ""; }; - CECA899A09DB132E00A3D774 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = DetailsPanel.h; sourceTree = ""; }; - CECA899B09DB132E00A3D774 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = DetailsPanel.m; sourceTree = ""; }; CEDD92D60FDD01640031C7B7 /* BRSingleLineFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BRSingleLineFormatter.h; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.h; sourceTree = SOURCE_ROOT; }; CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BRSingleLineFormatter.m; path = ../../cocoalib/brsinglelineformatter/BRSingleLineFormatter.m; sourceTree = SOURCE_ROOT; }; CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; }; @@ -141,8 +136,6 @@ children = ( CE381C9509914ACE003581CE /* AppDelegate.h */, CE381C9409914ACE003581CE /* AppDelegate.m */, - CECA899A09DB132E00A3D774 /* DetailsPanel.h */, - CECA899B09DB132E00A3D774 /* DetailsPanel.m */, CEFF18A009A4D387005E6321 /* PyDupeGuru.h */, CE381C9B09914ADF003581CE /* ResultWindow.h */, CE381C9A09914ADF003581CE /* ResultWindow.m */, @@ -376,7 +369,6 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */, CE381C9609914ACE003581CE /* AppDelegate.m in Sources */, CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */, - CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */, CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */, CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */, CEFC7FA00FC9517500CD5728 /* Outline.m in Sources */,