mirror of
				https://github.com/arsenetar/dupeguru.git
				synced 2025-09-11 17:58:17 +00:00 
			
		
		
		
	Extracted ResultWindow.xib from MainMenu.xib.
This commit is contained in:
		
							parent
							
								
									3ef118c9fa
								
							
						
					
					
						commit
						50b6948250
					
				| @ -17,20 +17,31 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| @interface AppDelegateBase : NSObject | ||||
| { | ||||
|     IBOutlet PyDupeGuruBase *py; | ||||
|     IBOutlet ResultWindowBase *result; | ||||
|     IBOutlet NSMenu *recentResultsMenu; | ||||
|     IBOutlet NSMenu *columnsMenu; | ||||
|      | ||||
|     ResultWindowBase *_resultWindow; | ||||
|     DirectoryPanel *_directoryPanel; | ||||
|     DetailsPanel *_detailsPanel; | ||||
|     HSAboutBox *_aboutBox; | ||||
|     HSRecentFiles *_recentResults; | ||||
| } | ||||
| 
 | ||||
| /* Virtual */ | ||||
| - (PyDupeGuruBase *)py; | ||||
| - (ResultWindowBase *)createResultWindow; | ||||
| - (DirectoryPanel *)createDirectoryPanel; | ||||
| - (DetailsPanel *)createDetailsPanel; | ||||
| - (NSString *)homepageURL; | ||||
| 
 | ||||
| /* Public */ | ||||
| - (ResultWindowBase *)resultWindow; | ||||
| - (DirectoryPanel *)directoryPanel; | ||||
| - (DetailsPanel *)detailsPanel; | ||||
| - (HSRecentFiles *)recentResults; | ||||
| - (NSString *)homepageURL; | ||||
| - (NSMenu *)columnsMenu; | ||||
| 
 | ||||
| /* Actions */ | ||||
| - (IBAction)showAboutBox:(id)sender; | ||||
| - (IBAction)openWebsite:(id)sender; | ||||
| - (IBAction)openHelp:(id)sender; | ||||
|  | ||||
| @ -17,22 +17,57 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| @implementation AppDelegateBase | ||||
| - (void)awakeFromNib | ||||
| { | ||||
|     _resultWindow = nil; | ||||
|     _directoryPanel = nil; | ||||
|     _detailsPanel = nil; | ||||
|     _aboutBox = nil; | ||||
|     _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu]; | ||||
|     [_recentResults setDelegate:self]; | ||||
| } | ||||
| 
 | ||||
| /* Virtual */ | ||||
| 
 | ||||
| - (PyDupeGuruBase *)py { return py; } | ||||
| 
 | ||||
| - (ResultWindowBase *)createResultWindow | ||||
| { | ||||
|     return nil; // must be overriden by all editions | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)createDirectoryPanel | ||||
| { | ||||
|     return [[DirectoryPanel alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (DetailsPanel *)createDetailsPanel | ||||
| { | ||||
|     return [[DetailsPanel alloc] initWithPy:py]; | ||||
| } | ||||
| 
 | ||||
| - (NSString *)homepageURL | ||||
| { | ||||
|     return @""; // must be overriden by all editions | ||||
| } | ||||
| 
 | ||||
| /* Public */ | ||||
| - (ResultWindowBase *)resultWindow | ||||
| { | ||||
|     if (!_resultWindow) | ||||
|         _resultWindow = [self createResultWindow]; | ||||
|     return _resultWindow; | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)directoryPanel | ||||
| { | ||||
|     if (!_directoryPanel) | ||||
|         _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; | ||||
|         _directoryPanel = [self createDirectoryPanel]; | ||||
|     return _directoryPanel; | ||||
| } | ||||
| 
 | ||||
| - (DetailsPanel *)detailsPanel | ||||
| { | ||||
|     if (!_detailsPanel) | ||||
|         _detailsPanel = [[DetailsPanel alloc] initWithPy:py]; | ||||
|         _detailsPanel = [self createDetailsPanel]; | ||||
|     return _detailsPanel; | ||||
| } | ||||
| 
 | ||||
| @ -41,11 +76,9 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     return _recentResults; | ||||
| } | ||||
| 
 | ||||
| - (NSString *)homepageURL | ||||
| { | ||||
|     return @""; // Virtual | ||||
| } | ||||
| - (NSMenu *)columnsMenu { return columnsMenu; } | ||||
| 
 | ||||
| /* Actions */ | ||||
| - (IBAction)showAboutBox:(id)sender | ||||
| { | ||||
|     if (_aboutBox == nil) { | ||||
| @ -81,17 +114,17 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"]; | ||||
|     NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"]; | ||||
|     if ([columnsOrder count]) | ||||
|         [result restoreColumnsPosition:columnsOrder widths:columnsWidth]; | ||||
|         [[self resultWindow] restoreColumnsPosition:columnsOrder widths:columnsWidth]; | ||||
|     else | ||||
|         [result resetColumnsToDefault:nil]; | ||||
|         [[self resultWindow] resetColumnsToDefault:nil]; | ||||
|     [HSFairwareReminder showNagWithApp:[self py]]; | ||||
|     [py loadSession]; | ||||
| } | ||||
| 
 | ||||
| - (void)applicationWillBecomeActive:(NSNotification *)aNotification | ||||
| { | ||||
|     if (![[result window] isVisible]) | ||||
|         [result showWindow:NSApp]; | ||||
|     if (![[[self resultWindow] window] isVisible]) | ||||
|         [[self resultWindow] showWindow:NSApp]; | ||||
| } | ||||
| 
 | ||||
| - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender | ||||
| @ -108,8 +141,8 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| - (void)applicationWillTerminate:(NSNotification *)aNotification | ||||
| { | ||||
|     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; | ||||
|     [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"]; | ||||
|     [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"]; | ||||
|     [ud setObject: [[self resultWindow] getColumnsOrder] forKey:@"columnsOrder"]; | ||||
|     [ud setObject: [[self resultWindow] getColumnsWidth] forKey:@"columnsWidth"]; | ||||
|     NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"]; | ||||
|     if (sc >= 10) { | ||||
|         sc = -1; | ||||
|  | ||||
| @ -13,23 +13,26 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "HSTableView.h" | ||||
| #import "PyDupeGuru.h" | ||||
| 
 | ||||
| @class AppDelegateBase; | ||||
| 
 | ||||
| @interface ResultWindowBase : NSWindowController | ||||
| { | ||||
| @protected | ||||
|     IBOutlet PyDupeGuruBase *py; | ||||
|     IBOutlet id app; | ||||
|     IBOutlet NSSegmentedControl *optionsSwitch; | ||||
|     IBOutlet HSTableView *matches; | ||||
| 	IBOutlet NSTextField *stats; | ||||
| 	IBOutlet NSMenu *columnsMenu; | ||||
| 	IBOutlet NSSearchField *filterField; | ||||
|     IBOutlet NSTextField *stats; | ||||
|     IBOutlet NSSearchField *filterField; | ||||
|      | ||||
|     AppDelegateBase *app; | ||||
|     PyDupeGuruBase *py; | ||||
|     NSMenu *columnsMenu; | ||||
|     NSMutableArray *_resultColumns; | ||||
|     NSWindowController *preferencesPanel; | ||||
|     ResultTable *table; | ||||
|     StatsLabel *statsLabel; | ||||
|     ProblemDialog *problemDialog; | ||||
| } | ||||
| - (id)initWithParentApp:(AppDelegateBase *)app; | ||||
| /* Helpers */ | ||||
| - (void)fillColumnsMenu; | ||||
| - (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn; | ||||
|  | ||||
| @ -14,9 +14,12 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "Consts.h" | ||||
| 
 | ||||
| @implementation ResultWindowBase | ||||
| - (void)awakeFromNib | ||||
| - (id)initWithParentApp:(AppDelegateBase *)aApp; | ||||
| { | ||||
|     [self window]; | ||||
|     self = [super initWithWindowNibName:@"ResultWindow"]; | ||||
|     app = aApp; | ||||
|     py = [app py]; | ||||
|     columnsMenu = [app columnsMenu]; | ||||
|     /* Put a cute iTunes-like bottom bar */ | ||||
|     [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge]; | ||||
|     preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"]; | ||||
| @ -31,6 +34,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil]; | ||||
|     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil]; | ||||
|     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil]; | ||||
|     return self; | ||||
| } | ||||
| 
 | ||||
| - (void)dealloc | ||||
| @ -147,7 +151,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| 
 | ||||
| - (void)updateOptionSegments | ||||
| { | ||||
|     [optionsSwitch setSelected:[[(AppDelegateBase *)app detailsPanel] isVisible] forSegment:0]; | ||||
|     [optionsSwitch setSelected:[[app detailsPanel] isVisible] forSegment:0]; | ||||
|     [optionsSwitch setSelected:[table powerMarkerMode] forSegment:1]; | ||||
|     [optionsSwitch setSelected:[table deltaValuesMode] forSegment:2]; | ||||
| } | ||||
| @ -254,7 +258,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     if ([op runModal] == NSOKButton) { | ||||
|         NSString *filename = [[op filenames] objectAtIndex:0]; | ||||
|         [py loadResultsFrom:filename]; | ||||
|         [[(AppDelegateBase *)app recentResults] addFile:filename]; | ||||
|         [[app recentResults] addFile:filename]; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| @ -357,7 +361,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     [sp setTitle:@"Select a file to save your results to"]; | ||||
|     if ([sp runModal] == NSOKButton) { | ||||
|         [py saveResultsAs:[sp filename]]; | ||||
|         [[(AppDelegateBase *)app recentResults] addFile:[sp filename]]; | ||||
|         [[app recentResults] addFile:[sp filename]]; | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| @ -393,7 +397,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| 
 | ||||
| - (IBAction)toggleDetailsPanel:(id)sender | ||||
| { | ||||
|     [[(AppDelegateBase *)app detailsPanel] toggleVisibility]; | ||||
|     [[app detailsPanel] toggleVisibility]; | ||||
|     [self updateOptionSegments]; | ||||
| } | ||||
| 
 | ||||
|  | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										2864
									
								
								cocoa/base/xib/ResultWindow.xib
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										2864
									
								
								cocoa/base/xib/ResultWindow.xib
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -13,6 +13,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "../../cocoalib/Dialogs.h" | ||||
| #import "DetailsPanel.h" | ||||
| #import "DirectoryPanel.h" | ||||
| #import "ResultWindow.h" | ||||
| #import "Consts.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| @ -58,15 +59,19 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| 
 | ||||
| - (NSString *)homepageURL | ||||
| { | ||||
|     return @"http://www.hardcoded.net/dupeguru_me/" | ||||
|     return @"http://www.hardcoded.net/dupeguru_me/"; | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)directoryPanel | ||||
| - (ResultWindowBase *)createResultWindow | ||||
| { | ||||
|     if (!_directoryPanel) | ||||
|         _directoryPanel = [[DirectoryPanelME alloc] initWithParentApp:self]; | ||||
|     return _directoryPanel; | ||||
|     return [[ResultWindow alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)createDirectoryPanel | ||||
| { | ||||
|     return [[DirectoryPanelME alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (PyDupeGuru *)py { return (PyDupeGuru *)py; } | ||||
| 
 | ||||
| //Delegate | ||||
| @ -76,7 +81,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     // index 3 is just after "Export Results to XHTML" | ||||
|     NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Remove Dead Tracks in iTunes"  | ||||
|         action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3]; | ||||
|     [mi setTarget:result]; | ||||
|     [mi setTarget:[self resultWindow]]; | ||||
|     [super applicationDidFinishLaunching:aNotification]; | ||||
| } | ||||
| @end | ||||
|  | ||||
| @ -63,6 +63,7 @@ | ||||
| 		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 */; }; | ||||
| 		CEAF803712E07DF000A988DF /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAF803612E07DF000A988DF /* ResultWindow.xib */; }; | ||||
| 		CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB14D28124DFC2800FA7481 /* ResultTable.m */; }; | ||||
| 		CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; }; | ||||
| 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; }; | ||||
| @ -170,6 +171,7 @@ | ||||
| 		CE848A1809DD85810004CB44 /* Consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Consts.h; sourceTree = "<group>"; }; | ||||
| 		CE900AD1109B238600754048 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; }; | ||||
| 		CE900AD6109B2A9B00754048 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = ../../base/xib/MainMenu.xib; sourceTree = "<group>"; }; | ||||
| 		CEAF803612E07DF000A988DF /* ResultWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ResultWindow.xib; path = ../base/xib/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEB14D26124DFC2800FA7481 /* PyResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PyResultTable.h; path = ../base/PyResultTable.h; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEB14D27124DFC2800FA7481 /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEB14D28124DFC2800FA7481 /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; }; | ||||
| @ -331,6 +333,7 @@ | ||||
| 			isa = PBXGroup; | ||||
| 			children = ( | ||||
| 				CE900AD6109B2A9B00754048 /* MainMenu.xib */, | ||||
| 				CEAF803612E07DF000A988DF /* ResultWindow.xib */, | ||||
| 				CE3FBDD11094637800B72D77 /* DetailsPanel.xib */, | ||||
| 				CE3FBDD21094637800B72D77 /* DirectoryPanel.xib */, | ||||
| 				CE900AD1109B238600754048 /* Preferences.xib */, | ||||
| @ -502,6 +505,7 @@ | ||||
| 				CE0A0C061175A24800DCA3C6 /* ProblemDialog.xib in Resources */, | ||||
| 				CE74A12712537F2E008A8DF0 /* FairwareReminder.xib in Resources */, | ||||
| 				CE4F934612CCA9470067A3AE /* about.xib in Resources */, | ||||
| 				CEAF803712E07DF000A988DF /* ResultWindow.xib in Resources */, | ||||
| 			); | ||||
| 			runOnlyForDeploymentPostprocessing = 0; | ||||
| 		}; | ||||
|  | ||||
| @ -11,7 +11,5 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "PyDupeGuru.h" | ||||
| 
 | ||||
| @interface AppDelegate : AppDelegateBase {} | ||||
| - (IBAction)openWebsite:(id)sender; | ||||
| 
 | ||||
| - (PyDupeGuru *)py; | ||||
| @end | ||||
|  | ||||
| @ -13,6 +13,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "Consts.h" | ||||
| #import "DetailsPanel.h" | ||||
| #import "DirectoryPanel.h" | ||||
| #import "ResultWindow.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| + (void)initialize | ||||
| @ -34,31 +35,26 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     [ud registerDefaults:d]; | ||||
| } | ||||
| 
 | ||||
| - (id)init | ||||
| { | ||||
|     self = [super init]; | ||||
|     _directoryPanel = nil; | ||||
|     return self; | ||||
| } | ||||
| 
 | ||||
| - (DetailsPanel *)detailsPanel | ||||
| { | ||||
|     if (!_detailsPanel) | ||||
|         _detailsPanel = [[DetailsPanelPE alloc] initWithPy:py]; | ||||
|     return _detailsPanel; | ||||
| } | ||||
| 
 | ||||
| - (NSString *)homepageURL | ||||
| { | ||||
|     return @"http://www.hardcoded.net/dupeguru_pe/" | ||||
|     return @"http://www.hardcoded.net/dupeguru_pe/"; | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)directoryPanel | ||||
| - (ResultWindowBase *)createResultWindow | ||||
| { | ||||
|     if (!_directoryPanel) | ||||
|         _directoryPanel = [[DirectoryPanelPE alloc] initWithParentApp:self]; | ||||
|     return _directoryPanel; | ||||
|     return [[ResultWindow alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (DirectoryPanel *)createDirectoryPanel | ||||
| { | ||||
|     return [[DirectoryPanelPE alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (DetailsPanel *)createDetailsPanel | ||||
| { | ||||
|     return [[DetailsPanelPE alloc] initWithPy:py]; | ||||
| } | ||||
| 
 | ||||
| - (PyDupeGuru *)py { return (PyDupeGuru *)py; } | ||||
| 
 | ||||
| //Delegate | ||||
| @ -67,7 +63,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu]; | ||||
|     // index 2 is just after "Clear Ingore List" | ||||
|     NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Clear Picture Cache" action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2]; | ||||
|     [mi setTarget:result]; | ||||
|     [mi setTarget:[self resultWindow]]; | ||||
|     [mi setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask]; | ||||
|     [super applicationDidFinishLaunching:aNotification]; | ||||
| } | ||||
|  | ||||
| @ -26,6 +26,7 @@ | ||||
| 		CE6044EC0FE6796200B71262 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6044EB0FE6796200B71262 /* DetailsPanel.m */; }; | ||||
| 		CE68EE6809ABC48000971085 /* DirectoryPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE68EE6609ABC48000971085 /* DirectoryPanel.m */; }; | ||||
| 		CE6E0F3D1054EC62008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */; }; | ||||
| 		CE7360AC12E07DD000A0888D /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7360AB12E07DD000A0888D /* ResultWindow.xib */; }; | ||||
| 		CE77C89E10946C6D0078B0DB /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */; }; | ||||
| 		CE77C8A810946CE20078B0DB /* DetailsPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE77C8A710946CE20078B0DB /* DetailsPanel.xib */; }; | ||||
| 		CE7AC9181119911200D02F6C /* ErrorReportWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */; }; | ||||
| @ -115,6 +116,7 @@ | ||||
| 		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; }; | ||||
| 		CE6E0F3C1054EC62008D9390 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = ../base/dsa_pub.pem; sourceTree = "<group>"; }; | ||||
| 		CE7360AB12E07DD000A0888D /* ResultWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ResultWindow.xib; path = ../base/xib/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; | ||||
| 		CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = DirectoryPanel.xib; path = ../../base/xib/DirectoryPanel.xib; sourceTree = "<group>"; }; | ||||
| 		CE77C8A710946CE20078B0DB /* DetailsPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DetailsPanel.xib; sourceTree = "<group>"; }; | ||||
| 		CE7AC9151119911200D02F6C /* ErrorReportWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ErrorReportWindow.xib; sourceTree = "<group>"; }; | ||||
| @ -291,6 +293,7 @@ | ||||
| 			isa = PBXGroup; | ||||
| 			children = ( | ||||
| 				CE031753109B345200517EE6 /* MainMenu.xib */, | ||||
| 				CE7360AB12E07DD000A0888D /* ResultWindow.xib */, | ||||
| 				CE77C8A710946CE20078B0DB /* DetailsPanel.xib */, | ||||
| 				CE77C89C10946C6D0078B0DB /* DirectoryPanel.xib */, | ||||
| 				CE031750109B340A00517EE6 /* Preferences.xib */, | ||||
| @ -510,6 +513,7 @@ | ||||
| 				CE0C2AC81177021600BC749F /* ProblemDialog.xib in Resources */, | ||||
| 				CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */, | ||||
| 				CEC9DB4712CCAA6B003102F0 /* about.xib in Resources */, | ||||
| 				CE7360AC12E07DD000A0888D /* ResultWindow.xib in Resources */, | ||||
| 			); | ||||
| 			runOnlyForDeploymentPostprocessing = 0; | ||||
| 		}; | ||||
|  | ||||
| @ -12,6 +12,7 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
| #import "../../cocoalib/ValueTransformers.h" | ||||
| #import "DetailsPanel.h" | ||||
| #import "DirectoryPanel.h" | ||||
| #import "ResultWindow.h" | ||||
| #import "Consts.h" | ||||
| 
 | ||||
| @implementation AppDelegate | ||||
| @ -52,5 +53,10 @@ http://www.hardcoded.net/licenses/bsd_license | ||||
|     return @"http://www.hardcoded.net/dupeguru/"; | ||||
| } | ||||
| 
 | ||||
| - (ResultWindowBase *)createResultWindow | ||||
| { | ||||
|     return [[ResultWindow alloc] initWithParentApp:self]; | ||||
| } | ||||
| 
 | ||||
| - (PyDupeGuru *)py { return (PyDupeGuru *)py; } | ||||
| @end | ||||
|  | ||||
| @ -39,6 +39,7 @@ | ||||
| 		CEAC6811109B0B7E00B43C85 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEAC6810109B0B7E00B43C85 /* Preferences.xib */; }; | ||||
| 		CEBE4D74111F0EE1009AAC6D /* HSWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */; }; | ||||
| 		CEDD92DA0FDD01640031C7B7 /* BRSingleLineFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDD92D70FDD01640031C7B7 /* BRSingleLineFormatter.m */; }; | ||||
| 		CEE7B60712E0711D00E01BEA /* ResultWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEE7B60612E0711D00E01BEA /* ResultWindow.xib */; }; | ||||
| 		CEE7EA130FE675C80004E467 /* DetailsPanel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEE7EA120FE675C80004E467 /* DetailsPanel.m */; }; | ||||
| 		CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; }; | ||||
| 		CEEFC0F810945D9F001F3A39 /* DirectoryPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEEFC0F710945D9F001F3A39 /* DirectoryPanel.xib */; }; | ||||
| @ -132,6 +133,7 @@ | ||||
| 		CEBE4D73111F0EE1009AAC6D /* HSWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSWindowController.m; sourceTree = "<group>"; }; | ||||
| 		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; }; | ||||
| 		CEE7B60612E0711D00E01BEA /* ResultWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ResultWindow.xib; path = ../base/xib/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEE7EA110FE675C80004E467 /* DetailsPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailsPanel.h; path = ../base/DetailsPanel.h; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEE7EA120FE675C80004E467 /* DetailsPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailsPanel.m; path = ../base/DetailsPanel.m; sourceTree = SOURCE_ROOT; }; | ||||
| 		CEEB135109C837A2004D2330 /* dupeguru.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = dupeguru.icns; sourceTree = "<group>"; }; | ||||
| @ -319,6 +321,7 @@ | ||||
| 		CEEFC0CA10943849001F3A39 /* xib */ = { | ||||
| 			isa = PBXGroup; | ||||
| 			children = ( | ||||
| 				CEE7B60612E0711D00E01BEA /* ResultWindow.xib */, | ||||
| 				CE647E581173026F006D28BA /* ProblemDialog.xib */, | ||||
| 				CE3A46F9109B212E002ABFD5 /* MainMenu.xib */, | ||||
| 				CEAC6810109B0B7E00B43C85 /* Preferences.xib */, | ||||
| @ -469,6 +472,7 @@ | ||||
| 				CE647E591173026F006D28BA /* ProblemDialog.xib in Resources */, | ||||
| 				CE79638612536C94008D405B /* FairwareReminder.xib in Resources */, | ||||
| 				CE27D3C112CCA42500859E67 /* about.xib in Resources */, | ||||
| 				CEE7B60712E0711D00E01BEA /* ResultWindow.xib in Resources */, | ||||
| 			); | ||||
| 			runOnlyForDeploymentPostprocessing = 0; | ||||
| 		}; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user