From 922ce5ae36e09f62226cf6b9d542d47d1711535d Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 5 Feb 2010 17:05:00 +0100 Subject: [PATCH] Re-organized DirectoryPanel across editions in a saner way. --- cocoa/base/AppDelegate.h | 4 ++-- cocoa/base/AppDelegate.m | 8 +++++++- cocoa/base/DirectoryPanel.h | 2 +- cocoa/base/DirectoryPanel.m | 2 +- cocoa/base/xib/DirectoryPanel.xib | 6 +++--- cocoa/me/AppDelegate.m | 4 ++-- cocoa/me/DirectoryPanel.h | 2 +- cocoa/me/DirectoryPanel.m | 2 +- cocoa/pe/AppDelegate.m | 4 ++-- cocoa/pe/DirectoryPanel.h | 2 +- cocoa/pe/DirectoryPanel.m | 2 +- cocoa/se/AppDelegate.m | 7 ------- cocoa/se/DirectoryPanel.h | 15 --------------- cocoa/se/DirectoryPanel.m | 12 ------------ cocoa/se/dupeguru.xcodeproj/project.pbxproj | 6 ------ 15 files changed, 22 insertions(+), 56 deletions(-) delete mode 100644 cocoa/se/DirectoryPanel.h delete mode 100644 cocoa/se/DirectoryPanel.m diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h index dbc11206..08670e95 100644 --- a/cocoa/base/AppDelegate.h +++ b/cocoa/base/AppDelegate.h @@ -20,7 +20,7 @@ http://www.hardcoded.net/licenses/hs_license IBOutlet NSMenuItem *unlockMenuItem; IBOutlet ResultWindowBase *result; - DirectoryPanelBase *_directoryPanel; + DirectoryPanel *_directoryPanel; DetailsPanelBase *_detailsPanel; BOOL _savedResults; } @@ -28,7 +28,7 @@ http://www.hardcoded.net/licenses/hs_license - (PyDupeGuruBase *)py; - (RecentDirectories *)recentDirectories; -- (DirectoryPanelBase *)directoryPanel; // Virtual +- (DirectoryPanel *)directoryPanel; - (DetailsPanelBase *)detailsPanel; // Virtual - (void)saveResults; @end diff --git a/cocoa/base/AppDelegate.m b/cocoa/base/AppDelegate.m index e0c0672a..22ef5a0f 100644 --- a/cocoa/base/AppDelegate.m +++ b/cocoa/base/AppDelegate.m @@ -29,7 +29,13 @@ http://www.hardcoded.net/licenses/hs_license - (PyDupeGuruBase *)py { return py; } - (RecentDirectories *)recentDirectories { return recentDirectories; } -- (DirectoryPanelBase *)directoryPanel {return nil; } // Virtual +- (DirectoryPanel *)directoryPanel +{ + if (!_directoryPanel) + _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; + return _directoryPanel; +} + - (DetailsPanelBase *)detailsPanel { return nil; } // Virtual - (void)saveResults diff --git a/cocoa/base/DirectoryPanel.h b/cocoa/base/DirectoryPanel.h index 9de544f9..f6eccf6c 100644 --- a/cocoa/base/DirectoryPanel.h +++ b/cocoa/base/DirectoryPanel.h @@ -20,7 +20,7 @@ http://www.hardcoded.net/licenses/hs_license - (void)outlineView:(NSOutlineView *)outlineView addDirectory:(NSString *)directory; @end -@interface DirectoryPanelBase : NSWindowController +@interface DirectoryPanel : NSWindowController { IBOutlet NSPopUpButton *addButtonPopUp; IBOutlet DirectoryOutline *directories; diff --git a/cocoa/base/DirectoryPanel.m b/cocoa/base/DirectoryPanel.m index 594a6585..4e71ff80 100644 --- a/cocoa/base/DirectoryPanel.m +++ b/cocoa/base/DirectoryPanel.m @@ -53,7 +53,7 @@ http://www.hardcoded.net/licenses/hs_license @end -@implementation DirectoryPanelBase +@implementation DirectoryPanel - (id)initWithParentApp:(id)aParentApp { self = [super initWithWindowNibName:@"DirectoryPanel"]; diff --git a/cocoa/base/xib/DirectoryPanel.xib b/cocoa/base/xib/DirectoryPanel.xib index 90264859..6a79a718 100644 --- a/cocoa/base/xib/DirectoryPanel.xib +++ b/cocoa/base/xib/DirectoryPanel.xib @@ -836,7 +836,7 @@ DirectoryPanel - DirectoryPanelBase + NSWindowController IBProjectSource DirectoryPanel.h @@ -844,7 +844,7 @@ DirectoryPanel - DirectoryPanelBase + NSWindowController YES @@ -885,7 +885,7 @@ - DirectoryPanelBase + DirectoryPanel NSWindowController YES diff --git a/cocoa/me/AppDelegate.m b/cocoa/me/AppDelegate.m index 569b9f8f..716a66ad 100644 --- a/cocoa/me/AppDelegate.m +++ b/cocoa/me/AppDelegate.m @@ -74,10 +74,10 @@ http://www.hardcoded.net/licenses/hs_license return _detailsPanel; } -- (DirectoryPanelBase *)directoryPanel +- (DirectoryPanel *)directoryPanel { if (!_directoryPanel) - _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; + _directoryPanel = [[DirectoryPanelME alloc] initWithParentApp:self]; return _directoryPanel; } - (PyDupeGuru *)py { return (PyDupeGuru *)py; } diff --git a/cocoa/me/DirectoryPanel.h b/cocoa/me/DirectoryPanel.h index ccd0fcaf..b2f99e33 100644 --- a/cocoa/me/DirectoryPanel.h +++ b/cocoa/me/DirectoryPanel.h @@ -9,7 +9,7 @@ http://www.hardcoded.net/licenses/hs_license #import #import "../base/DirectoryPanel.h" -@interface DirectoryPanel : DirectoryPanelBase +@interface DirectoryPanelME : DirectoryPanel { } - (IBAction)addiTunes:(id)sender; diff --git a/cocoa/me/DirectoryPanel.m b/cocoa/me/DirectoryPanel.m index f7326bc2..ef47aa12 100644 --- a/cocoa/me/DirectoryPanel.m +++ b/cocoa/me/DirectoryPanel.m @@ -8,7 +8,7 @@ http://www.hardcoded.net/licenses/hs_license #import "DirectoryPanel.h" -@implementation DirectoryPanel +@implementation DirectoryPanelME - (IBAction)addiTunes:(id)sender { [self addDirectory:[@"~/Music/iTunes/iTunes Music" stringByExpandingTildeInPath]]; diff --git a/cocoa/pe/AppDelegate.m b/cocoa/pe/AppDelegate.m index af42f5c4..103bc00b 100644 --- a/cocoa/pe/AppDelegate.m +++ b/cocoa/pe/AppDelegate.m @@ -58,10 +58,10 @@ http://www.hardcoded.net/licenses/hs_license [[self directoryPanel] toggleVisible:sender]; } -- (DirectoryPanelBase *)directoryPanel +- (DirectoryPanel *)directoryPanel { if (!_directoryPanel) - _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; + _directoryPanel = [[DirectoryPanelPE alloc] initWithParentApp:self]; return _directoryPanel; } - (PyDupeGuru *)py { return (PyDupeGuru *)py; } diff --git a/cocoa/pe/DirectoryPanel.h b/cocoa/pe/DirectoryPanel.h index 2b1289d2..295b5b7c 100644 --- a/cocoa/pe/DirectoryPanel.h +++ b/cocoa/pe/DirectoryPanel.h @@ -9,7 +9,7 @@ http://www.hardcoded.net/licenses/hs_license #import #import "../base/DirectoryPanel.h" -@interface DirectoryPanel : DirectoryPanelBase +@interface DirectoryPanelPE : DirectoryPanel { } - (IBAction)addiPhoto:(id)sender; diff --git a/cocoa/pe/DirectoryPanel.m b/cocoa/pe/DirectoryPanel.m index e4865cb2..147b9e74 100644 --- a/cocoa/pe/DirectoryPanel.m +++ b/cocoa/pe/DirectoryPanel.m @@ -11,7 +11,7 @@ http://www.hardcoded.net/licenses/hs_license static NSString* jobAddIPhoto = @"jobAddIPhoto"; -@implementation DirectoryPanel +@implementation DirectoryPanelPE - (id)initWithParentApp:(id)aParentApp { self = [super initWithParentApp:aParentApp]; diff --git a/cocoa/se/AppDelegate.m b/cocoa/se/AppDelegate.m index 97c95bce..4e6b44fc 100644 --- a/cocoa/se/AppDelegate.m +++ b/cocoa/se/AppDelegate.m @@ -57,13 +57,6 @@ http://www.hardcoded.net/licenses/hs_license [[self directoryPanel] toggleVisible:sender]; } -- (DirectoryPanelBase *)directoryPanel -{ - if (!_directoryPanel) - _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; - return _directoryPanel; -} - - (DetailsPanelBase *)detailsPanel { if (!_detailsPanel) diff --git a/cocoa/se/DirectoryPanel.h b/cocoa/se/DirectoryPanel.h deleted file mode 100644 index e1b4d509..00000000 --- a/cocoa/se/DirectoryPanel.h +++ /dev/null @@ -1,15 +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/DirectoryPanel.h" - -@interface DirectoryPanel : DirectoryPanelBase -{ -} -@end diff --git a/cocoa/se/DirectoryPanel.m b/cocoa/se/DirectoryPanel.m deleted file mode 100644 index 51bb19bf..00000000 --- a/cocoa/se/DirectoryPanel.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 "DirectoryPanel.h" - -@implementation DirectoryPanel -@end diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 76745abd..53dc2c72 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ CE3A46FA109B212E002ABFD5 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE3A46F9109B212E002ABFD5 /* MainMenu.xib */; }; CE45579B0AE3BC2B005A9546 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; }; CE4557B40AE3BC50005A9546 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE45579A0AE3BC2B005A9546 /* Sparkle.framework */; }; - CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; }; 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 */; }; @@ -79,8 +78,6 @@ CE381CF509915304003581CE /* dg_cocoa.plugin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dg_cocoa.plugin; sourceTree = SOURCE_ROOT; }; CE3A46F9109B212E002ABFD5 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../base/xib/MainMenu.xib; sourceTree = ""; }; CE45579A0AE3BC2B005A9546 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = /Library/Frameworks/Sparkle.framework; sourceTree = ""; }; - 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; }; 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 = ""; }; @@ -146,8 +143,6 @@ CE381C9409914ACE003581CE /* AppDelegate.m */, CECA899A09DB132E00A3D774 /* DetailsPanel.h */, CECA899B09DB132E00A3D774 /* DetailsPanel.m */, - CE68EE6509ABC48000971085 /* DirectoryPanel.h */, - CE68EE6609ABC48000971085 /* DirectoryPanel.m */, CEFF18A009A4D387005E6321 /* PyDupeGuru.h */, CE381C9B09914ADF003581CE /* ResultWindow.h */, CE381C9A09914ADF003581CE /* ResultWindow.m */, @@ -381,7 +376,6 @@ 8D11072D0486CEB800E47090 /* main.m in Sources */, CE381C9609914ACE003581CE /* AppDelegate.m in Sources */, CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */, - CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */, CECA899D09DB132E00A3D774 /* DetailsPanel.m in Sources */, CEFC7F9E0FC9517500CD5728 /* Dialogs.m in Sources */, CEFC7F9F0FC9517500CD5728 /* HSErrorReportWindow.m in Sources */,