From 2eb2e25d8187f28ea168f822a66abb2f1809a172 Mon Sep 17 00:00:00 2001 From: Robert Kyriakis Date: Sat, 31 Dec 2011 17:33:36 +0100 Subject: [PATCH] Bugfix Show hidden Files --- English.lproj/MainMenu.xib | 25 +- English.lproj/PBChangeRemoteUrlSheet.xib | 106 +++- English.lproj/PBCloneRepositoryPanel.xib | 135 +++- English.lproj/PBCloneRepsitoryToSheet.xib | 713 +++++----------------- PBAddRemoteSheet.m | 4 +- PBChangeRemoteUrlSheet.h | 2 + PBChangeRemoteUrlSheet.m | 8 + PBCloneRepositoryPanel.h | 7 +- PBCloneRepositoryPanel.m | 17 +- PBCloneRepsitoryToSheet.h | 3 + PBCloneRepsitoryToSheet.m | 9 +- PBPrefsWindowController.m | 5 +- PBRepositoryDocumentController.m | 2 + 13 files changed, 416 insertions(+), 620 deletions(-) diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib index 8e41cc5db..eb77e3019 100644 --- a/English.lproj/MainMenu.xib +++ b/English.lproj/MainMenu.xib @@ -1315,14 +1315,6 @@ 931 - - - newDocument: - - - - 934 - createBranch: @@ -1523,6 +1515,14 @@ 971 + + + newDocument: + + + + 994 + checkForUpdates: @@ -2570,7 +2570,7 @@ - 993 + 994 @@ -3084,6 +3084,7 @@ cherryPick: createBranch: createTag: + loadAllCommits: merge: openSelectedFile: rebase: @@ -3114,6 +3115,7 @@ id id id + id @@ -3123,6 +3125,7 @@ cherryPick: createBranch: createTag: + loadAllCommits: merge: openSelectedFile: rebase: @@ -3150,6 +3153,10 @@ createTag: id + + loadAllCommits: + id + merge: id diff --git a/English.lproj/PBChangeRemoteUrlSheet.xib b/English.lproj/PBChangeRemoteUrlSheet.xib index ff149a309..995667cf1 100644 --- a/English.lproj/PBChangeRemoteUrlSheet.xib +++ b/English.lproj/PBChangeRemoteUrlSheet.xib @@ -16,6 +16,7 @@ NSView NSWindowTemplate NSTextFieldCell + NSCustomView NSButtonCell NSButton NSCustomObject @@ -246,6 +247,45 @@ PBChangeRemoteUrlSheet YES + + + 268 + + YES + + + 268 + {{53, 18}, {133, 18}} + + + YES + + 67239424 + 0 + Show hidden files + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + {239, 54} + + + NSView + @@ -306,6 +346,22 @@ 52 + + + browseAccessoryView + + + + 56 + + + + showHideHiddenFiles: + + + + 57 + @@ -459,6 +515,30 @@ + + 53 + + + YES + + + + Open Panel Accessory + + + 54 + + + YES + + + + + + 55 + + + @@ -483,6 +563,9 @@ 45.IBPluginDependency 46.IBPluginDependency 5.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 55.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency @@ -520,6 +603,9 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -534,7 +620,7 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvA - 52 + 57 @@ -549,12 +635,14 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAbrowseRepository: cancelOperation: changeOperation: + showHideHiddenFiles: YES id id id + id @@ -564,6 +652,7 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAbrowseRepository: cancelOperation: changeOperation: + showHideHiddenFiles: YES @@ -579,6 +668,10 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAchangeOperation: id + + showHideHiddenFiles: + id + @@ -587,12 +680,14 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAYES RemoteNameTextField RemoteUrlTextField + browseAccessoryView errorMessageTextField YES NSTextField NSTextField + NSView NSTextField @@ -602,6 +697,7 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAYES RemoteNameTextField RemoteUrlTextField + browseAccessoryView errorMessageTextField @@ -614,6 +710,10 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvARemoteUrlTextField NSTextField + + browseAccessoryView + NSView + errorMessageTextField NSTextField @@ -635,5 +735,9 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvA YES 3 + + NSSwitch + {15, 15} + diff --git a/English.lproj/PBCloneRepositoryPanel.xib b/English.lproj/PBCloneRepositoryPanel.xib index 54051c8c7..ba5561d44 100644 --- a/English.lproj/PBCloneRepositoryPanel.xib +++ b/English.lproj/PBCloneRepositoryPanel.xib @@ -303,14 +303,14 @@ - {{0, 0}, {2560, 1578}} + {{0, 0}, {1920, 1058}} {488, 207} {2000, 207} PBCloneRepositoryPanel YES - + 268 YES @@ -319,6 +319,7 @@ 268 {{53, 18}, {133, 18}} + YES 67239424 @@ -338,6 +339,8 @@ {239, 54} + + NSView @@ -350,7 +353,7 @@ - + 274 YES @@ -360,6 +363,7 @@ {{35, 16}, {344, 20}} + 16394 100 @@ -368,6 +372,7 @@ 274 {{17, 44}, {363, 34}} + YES 67239424 @@ -385,11 +390,48 @@ {397, 98} + + - {{0, 0}, {2560, 1578}} + {{0, 0}, {1920, 1058}} {10000000000000, 10000000000000} YES + + + 268 + + YES + + + 268 + {{53, 18}, {133, 18}} + + + 1 + YES + + 67239424 + 0 + Show hidden files + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {239, 54} + + + NSView + @@ -410,14 +452,6 @@ 29 - - - repositoryAccessoryView - - - - 31 - clone: @@ -482,6 +516,30 @@ 45 + + + browseRepositoryPanelAccessoryView + + + + 46 + + + + showHideHiddenFiles: + + + + 54 + + + + browseDestinationPanelAccessoryView + + + + 55 + @@ -744,6 +802,30 @@ + + 51 + + + YES + + + + Open Panel Accessory + + + 52 + + + YES + + + + + + 53 + + + @@ -785,6 +867,9 @@ 42.IBPluginDependency 43.IBPluginDependency 5.IBPluginDependency + 51.IBPluginDependency + 52.IBPluginDependency + 53.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency @@ -843,6 +928,9 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAcom.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -857,7 +945,7 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvA - 45 + 55 @@ -929,16 +1017,18 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAYES YES + browseDestinationPanelAccessoryView + browseRepositoryPanelAccessoryView destinationPath errorMessage - repositoryAccessoryView repositoryURL YES + NSView + NSView NSTextField NSTextField - NSView NSTextField @@ -946,13 +1036,22 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAYES YES + browseDestinationPanelAccessoryView + browseRepositoryPanelAccessoryView destinationPath errorMessage - repositoryAccessoryView repositoryURL YES + + browseDestinationPanelAccessoryView + NSView + + + browseRepositoryPanelAccessoryView + NSView + destinationPath NSTextField @@ -961,10 +1060,6 @@ dGgvdG8vcmVwby5naXQvCnNzaDovL1t1c2VyQF1ob3N0Lnh6L3BhdGgvdG8vcmVwby5naXQvAerrorMessage NSTextField - - repositoryAccessoryView - NSView - repositoryURL NSTextField diff --git a/English.lproj/PBCloneRepsitoryToSheet.xib b/English.lproj/PBCloneRepsitoryToSheet.xib index 85fac3974..98763e991 100644 --- a/English.lproj/PBCloneRepsitoryToSheet.xib +++ b/English.lproj/PBCloneRepsitoryToSheet.xib @@ -1,31 +1,31 @@ - 1050 - 10C540 - 759 - 1038.25 - 458.00 + 1070 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 759 + 1938 - + YES - + NSCustomView + NSTextField + NSButtonCell + NSTextFieldCell + NSButton + NSCustomObject YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -43,21 +43,50 @@ 268 YES - + 268 - {{17, 36}, {283, 17}} + {{77, 13}, {133, 18}} + YES - - 68288064 - 138413056 - Select a folder to clone into + + 67239424 + 0 + Show hidden files LucidaGrande 13 1044 + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 268 + {{17, 62}, {283, 17}} + + + YES + + 68288064 + 138413056 + Select a folder to clone into + 6 @@ -82,8 +111,9 @@ 269 - {{77, 12}, {163, 18}} + {{77, 38}, {163, 18}} + YES -2080244224 @@ -93,13 +123,8 @@ 1211912703 2 - - NSImage - NSSwitch - - - NSSwitch - + + 200 @@ -107,8 +132,9 @@ - {317, 63} + {317, 89} + NSView @@ -123,6 +149,22 @@ 6 + + + message + + + + 11 + + + + showHideHiddenFiles: + + + + 14 + value: isBare @@ -139,21 +181,15 @@ 8 - - - message - - - - 11 - YES 0 - + + YES + @@ -182,6 +218,7 @@ YES + @@ -213,14 +250,32 @@ + + 12 + + + YES + + + + + + 13 + + + YES YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency 10.IBPluginDependency - 3.IBEditorWindowLastContentRect + 12.IBPluginDependency + 13.IBPluginDependency 3.IBPluginDependency 4.IBPluginDependency 5.IBPluginDependency @@ -229,7 +284,11 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{758, 1074}, {317, 63}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -239,20 +298,16 @@ YES - - YES - + YES - - YES - + - 11 + 14 @@ -260,6 +315,17 @@ PBCloneRepsitoryToSheet NSWindowController + + showHideHiddenFiles: + id + + + showHideHiddenFiles: + + showHideHiddenFiles: + id + + YES @@ -273,546 +339,43 @@ NSTextField - - IBProjectSource - PBCloneRepsitoryToSheet.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebDownload.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebEditingDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebFrameLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebJavaPlugIn.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPlugin.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPluginContainer.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebPolicyDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebResourceLoadDelegate.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebScriptObject.h - - - - NSObject - - IBFrameworkSource - WebKit.framework/Headers/WebUIDelegate.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - NSWindowController - NSResponder - - showWindow: - id + + YES + + YES + cloneToAccessoryView + message + + + YES + + cloneToAccessoryView + NSView + + + message + NSTextField + + - IBFrameworkSource - AppKit.framework/Headers/NSWindowController.h + IBProjectSource + ./Classes/PBCloneRepsitoryToSheet.h 0 IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 YES - ../GitX.xcodeproj 3 + + NSSwitch + {15, 15} + diff --git a/PBAddRemoteSheet.m b/PBAddRemoteSheet.m index 8b6917f85..2af59cb27 100644 --- a/PBAddRemoteSheet.m +++ b/PBAddRemoteSheet.m @@ -132,9 +132,7 @@ - (IBAction) orderOutAddRemoteSheet:(id)sender - (IBAction) showHideHiddenFiles:(id)sender { - // This uses undocumented OpenPanel features to show hidden files (required for 10.5 support) - NSNumber *showHidden = [NSNumber numberWithBool:[sender state] == NSOnState]; - [[self.browseSheet valueForKey:@"_navView"] setValue:showHidden forKey:@"showsHiddenFiles"]; + [self.browseSheet setShowsHiddenFiles:[sender state]]; } diff --git a/PBChangeRemoteUrlSheet.h b/PBChangeRemoteUrlSheet.h index b778952e9..5ce43c752 100644 --- a/PBChangeRemoteUrlSheet.h +++ b/PBChangeRemoteUrlSheet.h @@ -15,6 +15,7 @@ IBOutlet NSTextField *RemoteNameTextField; IBOutlet NSTextField *RemoteUrlTextField; IBOutlet NSTextField *errorMessageTextField; + IBOutlet NSView *browseAccessoryView; NSOpenPanel *browseRemoteUrlPanel; NSString *remoteUrl; } @@ -24,5 +25,6 @@ - (IBAction) cancelOperation:(id)sender; - (IBAction) changeOperation:(id)sender; - (IBAction) browseRepository:(id)sender; +- (IBAction) showHideHiddenFiles:(id)sender; @end diff --git a/PBChangeRemoteUrlSheet.m b/PBChangeRemoteUrlSheet.m index f620b961c..709b28e72 100644 --- a/PBChangeRemoteUrlSheet.m +++ b/PBChangeRemoteUrlSheet.m @@ -83,6 +83,13 @@ - (IBAction)browseRepository:(id)sender } +- (IBAction) showHideHiddenFiles:(id)sender +{ + [browseRemoteUrlPanel setShowsHiddenFiles:[sender state]]; +} + + + #pragma mark - Extension methods - (void)showChangeRemoteUrlSheetAtRefish:(id )ref inRepository:(PBGitRepository *)repo { @@ -116,6 +123,7 @@ - (void)showChangeRemoteUrlSheetAtRefish:(id )ref inRepository:(PBG [browseRemoteUrlPanel setCanChooseDirectories:YES]; [browseRemoteUrlPanel setAllowsMultipleSelection:NO]; [browseRemoteUrlPanel setCanCreateDirectories:NO]; + [browseRemoteUrlPanel setAccessoryView:browseAccessoryView]; [NSApp beginSheet:[self window] modalForWindow:[self.repository.windowController window] diff --git a/PBCloneRepositoryPanel.h b/PBCloneRepositoryPanel.h index bdf5af847..2d8b6d1a1 100644 --- a/PBCloneRepositoryPanel.h +++ b/PBCloneRepositoryPanel.h @@ -13,7 +13,9 @@ NSTextField *repositoryURL; NSTextField *destinationPath; NSTextField *errorMessage; - NSView *repositoryAccessoryView; + + NSView *browseRepositoryPanelAccessoryView; + NSView *browseDestinationPanelAccessoryView; NSOpenPanel *browseRepositoryPanel; NSOpenPanel *browseDestinationPanel; @@ -38,7 +40,8 @@ @property (strong) IBOutlet NSTextField *repositoryURL; @property (strong) IBOutlet NSTextField *destinationPath; @property (strong) IBOutlet NSTextField *errorMessage; -@property (strong) IBOutlet NSView *repositoryAccessoryView; +@property (strong) IBOutlet NSView *browseRepositoryPanelAccessoryView; +@property (strong) IBOutlet NSView *browseDestinationPanelAccessoryView; @property (assign) BOOL isBare; diff --git a/PBCloneRepositoryPanel.m b/PBCloneRepositoryPanel.m index e9053dac1..a70193bbc 100644 --- a/PBCloneRepositoryPanel.m +++ b/PBCloneRepositoryPanel.m @@ -19,7 +19,8 @@ @implementation PBCloneRepositoryPanel @synthesize repositoryURL; @synthesize destinationPath; @synthesize errorMessage; -@synthesize repositoryAccessoryView; +@synthesize browseRepositoryPanelAccessoryView; +@synthesize browseDestinationPanelAccessoryView; @synthesize isBare; @@ -65,7 +66,7 @@ - (void) awakeFromNib [browseRepositoryPanel setCanChooseDirectories:YES]; [browseRepositoryPanel setAllowsMultipleSelection:NO]; [browseRepositoryPanel setCanCreateDirectories:NO]; - [browseRepositoryPanel setAccessoryView:repositoryAccessoryView]; + [browseRepositoryPanel setAccessoryView:browseRepositoryPanelAccessoryView]; browseDestinationPanel = [NSOpenPanel openPanel]; [browseDestinationPanel setTitle:@"Browse clone destination"]; @@ -75,6 +76,7 @@ - (void) awakeFromNib [browseDestinationPanel setCanChooseDirectories:YES]; [browseDestinationPanel setAllowsMultipleSelection:NO]; [browseDestinationPanel setCanCreateDirectories:YES]; + [browseDestinationPanel setAccessoryView:browseDestinationPanelAccessoryView]; } @@ -154,9 +156,14 @@ - (IBAction) browseRepository:(id)sender - (IBAction) showHideHiddenFiles:(id)sender { - // This uses undocumented OpenPanel features to show hidden files (required for 10.5 support) - NSNumber *showHidden = [NSNumber numberWithBool:[sender state] == NSOnState]; - [[browseRepositoryPanel valueForKey:@"_navView"] setValue:showHidden forKey:@"showsHiddenFiles"]; + if ([sender tag] == 0) + { + [browseRepositoryPanel setShowsHiddenFiles:[sender state]]; + } + else + { + [browseDestinationPanel setShowsHiddenFiles:[sender state]]; + } } diff --git a/PBCloneRepsitoryToSheet.h b/PBCloneRepsitoryToSheet.h index df2bdfa8f..67ddd1d14 100644 --- a/PBCloneRepsitoryToSheet.h +++ b/PBCloneRepsitoryToSheet.h @@ -16,6 +16,7 @@ BOOL isBare; NSTextField *message; NSView *cloneToAccessoryView; + NSOpenPanel *cloneToSheet; } + (void) beginCloneRepsitoryToSheetForRepository:(PBGitRepository *)repo; @@ -26,4 +27,6 @@ @property(strong) IBOutlet NSTextField *message; @property(strong) IBOutlet NSView *cloneToAccessoryView; +- (IBAction) showHideHiddenFiles:(id)sender; + @end diff --git a/PBCloneRepsitoryToSheet.m b/PBCloneRepsitoryToSheet.m index 82694993a..3b1217c16 100644 --- a/PBCloneRepsitoryToSheet.m +++ b/PBCloneRepsitoryToSheet.m @@ -44,7 +44,7 @@ - (void) beginCloneRepsitoryToSheetForRepository:(PBGitRepository *)repo self.repository = repo; [self window]; - NSOpenPanel *cloneToSheet = [NSOpenPanel openPanel]; + cloneToSheet = [NSOpenPanel openPanel]; [cloneToSheet setTitle:@"Clone Repository To"]; [cloneToSheet setPrompt:@"Clone"]; @@ -72,4 +72,11 @@ - (void) beginCloneRepsitoryToSheetForRepository:(PBGitRepository *)repo ]; } +#pragma mark - IBAction methods +- (IBAction) showHideHiddenFiles:(id)sender +{ + [cloneToSheet setShowsHiddenFiles:[sender state]]; +} + + @end diff --git a/PBPrefsWindowController.m b/PBPrefsWindowController.m index 7b8eca045..1ad0a5c85 100644 --- a/PBPrefsWindowController.m +++ b/PBPrefsWindowController.m @@ -64,7 +64,6 @@ - (void)pathCell:(NSPathCell *)pathCell willDisplayOpenPanel:(NSOpenPanel *)open [openPanel setTreatsFilePackagesAsDirectories:YES]; [openPanel setAccessoryView:gitPathOpenAccessory]; [openPanel setResolvesAliases:NO]; - //[[openPanel _navView] setShowsHiddenFiles:YES]; gitPathOpenPanel = openPanel; } @@ -79,9 +78,7 @@ - (IBAction)resetAllDialogWarnings:(id)sender - (IBAction) showHideAllFiles: sender { - /* FIXME: This uses undocumented OpenPanel features to show hidden files! */ - NSNumber *showHidden = [NSNumber numberWithBool:[sender state] == NSOnState]; - [[gitPathOpenPanel valueForKey:@"_navView"] setValue:showHidden forKey:@"showsHiddenFiles"]; + [gitPathOpenPanel setShowsHiddenFiles:[sender state]]; } @end diff --git a/PBRepositoryDocumentController.m b/PBRepositoryDocumentController.m index 58467cf6c..b4d56f354 100644 --- a/PBRepositoryDocumentController.m +++ b/PBRepositoryDocumentController.m @@ -19,6 +19,7 @@ - (NSInteger)runModalOpenPanel:(NSOpenPanel *)openPanel forTypes:(NSArray *)exte [openPanel setCanChooseDirectories:YES]; [openPanel setDirectoryURL:Nil]; [openPanel setAllowedFileTypes:[NSArray arrayWithObject: @"git"]]; + [openPanel setShowsHiddenFiles:YES]; return [openPanel runModal]; } @@ -67,6 +68,7 @@ - (IBAction)newDocument:(id)sender [op setCanChooseFiles:NO]; [op setCanChooseDirectories:YES]; [op setAllowsMultipleSelection:NO]; + [op setShowsHiddenFiles:YES]; [op setMessage:@"Initialize a repository here:"]; [op setTitle:@"New Repository"]; if ([op runModal] == NSFileHandlingPanelOKButton)