Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Cleanup; fixes

I work badly on my own.
  • Loading branch information...
commit cae8e4b22b8f169d6199449e9f6d8f3beb81e393 1 parent bc94512
@mxcl authored
Showing with 767 additions and 10,081 deletions.
  1. +2 −15 ApplicationController.h
  2. +78 −184 ApplicationController.m
  3. +0 −76 DBPrefsWindowController.h
  4. +0 −413 DBPrefsWindowController.m
  5. +56 −430 English.lproj/MainMenu.xib
  6. +29 −1 English.lproj/PBRemoteProgressSheet.xib
  7. +0 −1,710 English.lproj/Preferences.xib
  8. +91 −3 English.lproj/RepositoryWindow.xib
  9. BIN  GitTest_DataModel.xcdatamodel/elements
  10. BIN  GitTest_DataModel.xcdatamodel/layout
  11. +24 −110 GitX.xcodeproj/project.pbxproj
  12. +0 −20 GitXTesting-Info.plist
  13. BIN  Images/.DS_Store
  14. BIN  Images/Preferences/Updates.png
  15. BIN  Images/mainSplitterBar.tiff
  16. BIN  Images/mainSplitterDimple.tiff
  17. BIN  MGScopeBar/English.lproj/InfoPlist.strings
  18. +0 −3,278 MGScopeBar/English.lproj/MainMenu.xib
  19. +0 −28 MGScopeBar/Info.plist
  20. +0 −3  NSApplication+GitXScripting.h
  21. +0 −7 NSApplication+GitXScripting.m
  22. +0 −29 PBCollapsibleSplitView.h
  23. +0 −57 PBCollapsibleSplitView.m
  24. +1 −1  PBGitCommitController.h
  25. +0 −1  PBGitCommitController.m
  26. +0 −1  PBGitHistoryController.h
  27. +22 −27 PBGitHistoryView.xib
  28. +2 −1  PBGitRepository.m
  29. +448 −0 PBGitSidebarView.xib
  30. +3 −7 PBGitWindowController.m
  31. +0 −15 PBNiceSplitView.h
  32. +0 −45 PBNiceSplitView.m
  33. +0 −32 PBPrefsWindowController.h
  34. +0 −87 PBPrefsWindowController.m
  35. +1 −2  PBRepositoryDocumentController.h
  36. +7 −44 PBRepositoryDocumentController.m
  37. +3 −6 PBViewController.m
  38. +0 −1  Site/.gitignore
  39. +0 −67 Site/Rakefile
  40. +0 −1  Site/UserManual/.gitignore
  41. BIN  Site/UserManual/assets/images/branch-lanes.png
  42. BIN  Site/UserManual/assets/images/branchswitcher.png
  43. BIN  Site/UserManual/assets/images/commitview.png
  44. BIN  Site/UserManual/assets/images/detailswitcher.png
  45. BIN  Site/UserManual/assets/images/display_diff.png
  46. BIN  Site/UserManual/assets/images/gistie.png
  47. BIN  Site/UserManual/assets/images/gitx.png
  48. BIN  Site/UserManual/assets/images/historyview.png
  49. BIN  Site/UserManual/assets/images/left-right.png
  50. BIN  Site/UserManual/assets/images/menubar.png
  51. BIN  Site/UserManual/assets/images/quicklook.png
  52. BIN  Site/UserManual/assets/images/viewswitcher.png
  53. +0 −40 Site/UserManual/template.html
  54. +0 −18 Site/UserManual/text/01 - Introduction.markdown
  55. +0 −58 Site/UserManual/text/02 - Overview.markdown
  56. +0 −50 Site/UserManual/text/03 - Committing.markdown
  57. +0 −63 Site/UserManual/text/04 - Advance GitX usage.markdown
  58. +0 −255 Site/assets/css/master.css
  59. +0 −33 Site/assets/css/usermanual.css
  60. BIN  Site/assets/images/bg.png
  61. BIN  Site/assets/images/download.png
  62. BIN  Site/assets/images/favicon.png
  63. BIN  Site/assets/images/header.jpg
  64. BIN  Site/assets/images/qtime.png
  65. +0 −50 Site/lib/release_notes.rb
  66. +0 −55 Site/templates/site.html
  67. +0 −29 Site/templates/sparkle.xml
  68. +0 −9 Site/text/contact.markdown
  69. +0 −37 Site/text/contribute.markdown
  70. +0 −39 Site/text/index.markdown
  71. +0 −23 Site/text/links.markdown
  72. +0 −6 Site/text/release_history.markdown
  73. +0 −62 Site/text/seeit.markdown
  74. +0 −1  Sparkle.framework/Headers
  75. +0 −1  Sparkle.framework/Resources
  76. +0 −1  Sparkle.framework/Sparkle
  77. +0 −33 Sparkle.framework/Versions/A/Headers/SUAppcast.h
  78. +0 −47 Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
  79. +0 −118 Sparkle.framework/Versions/A/Headers/SUUpdater.h
  80. +0 −27 Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
  81. +0 −21 Sparkle.framework/Versions/A/Headers/Sparkle.h
  82. +0 −24 Sparkle.framework/Versions/A/Resources/Info.plist
  83. +0 −7 Sparkle.framework/Versions/A/Resources/License.txt
  84. +0 −174 Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist
  85. +0 −56 Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib
  86. +0 −20 Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib
  87. BIN  Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib
  88. +0 −50 Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  89. +0 −20 Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib
  90. BIN  Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  91. +0 −67 Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib
  92. +0 −20 Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib
  93. BIN  Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib
  94. +0 −59 Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  95. +0 −20 Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib
  96. BIN  Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  97. BIN  Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings
  98. +0 −50 Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  99. +0 −20 Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib
  100. BIN  Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  101. +0 −67 Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib
  102. +0 −20 Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib
  103. BIN  Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib
  104. +0 −59 Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  105. +0 −21 Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib
  106. BIN  Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  107. BIN  Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings
  108. +0 −50 Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  109. +0 −20 Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib
  110. BIN  Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  111. +0 −67 Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib
  112. +0 −20 Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib
  113. BIN  Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib
  114. +0 −59 Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  115. +0 −20 Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib
  116. BIN  Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  117. BIN  Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings
  118. +0 −50 Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  119. +0 −16 Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib
  120. BIN  Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  121. +0 −67 Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib
  122. +0 −16 Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib
  123. BIN  Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib
  124. +0 −59 Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  125. +0 −16 Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib
  126. BIN  Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  127. BIN  Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings
  128. +0 −1  Sparkle.framework/Versions/A/Resources/fr_CA.lproj
  129. +0 −50 Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  130. +0 −20 Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib
  131. BIN  Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  132. +0 −67 Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib
  133. +0 −20 Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib
  134. BIN  Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib
  135. +0 −59 Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  136. +0 −20 Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib
  137. BIN  Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  138. BIN  Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings
  139. +0 −50 Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  140. +0 −18 Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib
  141. BIN  Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  142. +0 −67 Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib
  143. +0 −16 Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib
  144. BIN  Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib
  145. +0 −59 Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  146. +0 −16 Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib
  147. BIN  Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  148. BIN  Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings
  149. BIN  Sparkle.framework/Versions/A/Resources/relaunch
  150. +0 −50 Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  151. +0 −20 Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib
  152. BIN  Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  153. +0 −67 Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib
  154. +0 −20 Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib
  155. BIN  Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib
  156. +0 −59 Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  157. +0 −18 Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib
  158. BIN  Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  159. BIN  Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
  160. +0 −50 Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib
  161. +0 −20 Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib
  162. BIN  Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib
  163. +0 −39 Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib
  164. +0 −18 Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib
  165. BIN  Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib
  166. +0 −59 Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib
  167. +0 −20 Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib
  168. BIN  Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib
  169. BIN  Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings
  170. BIN  Sparkle.framework/Versions/A/Sparkle
  171. +0 −1  Sparkle.framework/Versions/Current
  172. +0 −20 UpdateKey.pem
  173. +0 −52 build_libgit2.sh
  174. +0 −64 feed.xml
  175. +0 −49 gitx-cli.m
  176. 0  GitX_Prefix.pch → pc.h
  177. 0  { → speed_test}/SpeedTest-Info.plist
  178. 0  { → speed_test}/speedtest.h
  179. 0  { → speed_test}/speedtest.m
View
17 ApplicationController.h
@@ -7,28 +7,15 @@
//
#import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
-@interface ApplicationController : NSObject
-{
+
+@interface ApplicationController : NSObject {
IBOutlet NSWindow *window;
IBOutlet id firstResponder;
- NSPersistentStoreCoordinator *persistentStoreCoordinator;
- NSManagedObjectModel *managedObjectModel;
- NSManagedObjectContext *managedObjectContext;
}
-- (NSPersistentStoreCoordinator *)persistentStoreCoordinator;
-- (NSManagedObjectModel *)managedObjectModel;
-- (NSManagedObjectContext *)managedObjectContext;
-
-- (IBAction)openPreferencesWindow:(id)sender;
- (IBAction)showAboutPanel:(id)sender;
-
- (IBAction)installCliTool:(id)sender;
-
-- (IBAction)saveAction:sender;
- (IBAction)showHelp:(id)sender;
- (IBAction)reportAProblem:(id)sender;
-
@end
View
262 ApplicationController.m
@@ -7,12 +7,12 @@
//
#import "ApplicationController.h"
+#import "PBGitRepository.h"
#import "PBGitRevisionCell.h"
#import "PBGitWindowController.h"
#import "PBRepositoryDocumentController.h"
#import "PBServicesController.h"
#import "PBGitXProtocol.h"
-#import "PBPrefsWindowController.h"
#import "PBNSURLPathUserDefaultsTransfomer.h"
#import "PBGitDefaults.h"
@@ -20,7 +20,7 @@
@implementation ApplicationController
-- (ApplicationController *)init {
+- (id)init {
#ifdef DEBUG_BUILD
[NSApp activateIgnoringOtherApps:YES];
#endif
@@ -59,43 +59,16 @@ - (void)registerServices
- (void)applicationDidFinishLaunching:(NSNotification*)notification
{
// Make sure Git's SSH password requests get forwarded to our little UI tool:
- setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
+ setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource:@"gitx_askpasswd" ofType:@""] UTF8String], 1 );
setenv( "DISPLAY", "localhost:0", 1 );
[self registerServices];
- BOOL hasOpenedDocuments = NO;
- NSArray *launchedDocuments = [[[PBRepositoryDocumentController sharedDocumentController] documents] copy];
-
- // Only try to open a default document if there are no documents open already.
- // For example, the application might have been launched by double-clicking a .git repository,
- // or by dragging a folder to the app icon
- if ([launchedDocuments count])
- hasOpenedDocuments = YES;
-
- // Try to find the current directory, to open that as a repository
- if ([PBGitDefaults openCurDirOnLaunch] && !hasOpenedDocuments) {
- NSString *curPath = [[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"];
- NSURL *url = nil;
- if (curPath)
- url = [NSURL fileURLWithPath:curPath];
- // Try to open the found URL
- NSError *error = nil;
- if (url && [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error])
- hasOpenedDocuments = YES;
- }
+ NSArray *launchedDocuments = [[PBRepositoryDocumentController sharedDocumentController] documents];
// to bring the launched documents to the front
for (PBGitRepository *document in launchedDocuments)
[document showWindows];
-
- if (![[NSApplication sharedApplication] isActive])
- return;
-
- // The current directory was not enabled or could not be opened (most likely it’s not a git repository).
- // show an open panel for the user to select a repository to view
- if ([PBGitDefaults showOpenPanelOnLaunch] && !hasOpenedDocuments)
- [[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
}
- (void)windowWillClose:sender
@@ -103,11 +76,6 @@ - (void)windowWillClose:sender
[firstResponder terminate:sender];
}
-- (IBAction)openPreferencesWindow:(id)sender
-{
- [[PBPrefsWindowController sharedPrefsWindowController] showWindow:nil];
-}
-
- (IBAction)showAboutPanel:(id)sender
{
NSString *gitversion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleGitVersion"];
@@ -122,144 +90,87 @@ - (IBAction)showAboutPanel:(id)sender
[NSApp orderFrontStandardAboutPanelWithOptions:dict];
}
-- (IBAction)installCliTool:(id)sender;
-{
- BOOL success = NO;
- NSString* installationPath = @"/usr/local/bin/";
- NSString* installationName = @"gitx";
- NSString* toolPath = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
- if (toolPath) {
- AuthorizationRef auth;
- if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess) {
- char const* mkdir_arg[] = { "-p", [installationPath UTF8String], NULL};
- char const* mkdir = "/bin/mkdir";
- AuthorizationExecuteWithPrivileges(auth, mkdir, kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
- char const* arguments[] = { "-f", "-s", [toolPath UTF8String], [[installationPath stringByAppendingString: installationName] UTF8String], NULL };
- char const* helperTool = "/bin/ln";
- if (AuthorizationExecuteWithPrivileges(auth, helperTool, kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
- int status;
- int pid = wait(&status);
- if (pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0)
- success = true;
- else
- errno = WEXITSTATUS(status);
- }
-
- AuthorizationFree(auth, kAuthorizationFlagDefaults);
- }
- }
-
- if (success) {
- [[NSAlert alertWithMessageText:@"Installation Complete"
- defaultButton:nil
- alternateButton:nil
- otherButton:nil
- informativeTextWithFormat:@"The gitx tool has been installed to %@", installationPath] runModal];
- } else {
- [[NSAlert alertWithMessageText:@"Installation Failed"
- defaultButton:nil
- alternateButton:nil
- otherButton:nil
- informativeTextWithFormat:@"Installation to %@ failed", installationPath] runModal];
- }
-}
-
-- (NSString *)applicationSupportFolder {
-
- NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
- NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory();
- return [basePath stringByAppendingPathComponent:@"GitTest"];
-}
-
-- (NSManagedObjectModel *)managedObjectModel {
- return managedObjectModel ?: (managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil]);
-}
-
-- (NSPersistentStoreCoordinator *) persistentStoreCoordinator {
- if (!persistentStoreCoordinator) {
- NSFileManager *fileManager;
- NSString *applicationSupportFolder = nil;
- NSURL *url;
- NSError *error;
-
- fileManager = [NSFileManager defaultManager];
- applicationSupportFolder = [self applicationSupportFolder];
- if ( ![fileManager fileExistsAtPath:applicationSupportFolder isDirectory:NULL] ) {
- [fileManager createDirectoryAtPath:applicationSupportFolder withIntermediateDirectories:YES attributes:nil error:nil];
- }
-
- url = [NSURL fileURLWithPath: [applicationSupportFolder stringByAppendingPathComponent: @"GitTest.xml"]];
- persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel: [self managedObjectModel]];
- if (![persistentStoreCoordinator addPersistentStoreWithType:NSXMLStoreType configuration:nil URL:url options:nil error:&error]){
- [[NSApplication sharedApplication] presentError:error];
- }
- }
-
- return persistentStoreCoordinator;
-}
-
-- (NSManagedObjectContext *) managedObjectContext {
- if (!managedObjectContext) {
- managedObjectContext = [NSManagedObjectContext new];
- managedObjectContext.persistentStoreCoordinator = self.persistentStoreCoordinator;
+- (BOOL)needsRoot {
+ NSFileManager *fm = [NSFileManager defaultManager];
+
+ if ([fm fileExistsAtPath:@"/usr/local/bin/gitx"] && ![fm isWritableFileAtPath:@"/usr/local/bin/gitx"])
+ return YES;
+
+ if ([fm isWritableFileAtPath:@"/usr/local/bin"]) {
+ BOOL isdir;
+ if (![fm fileExistsAtPath:@"/usr/local/bin" isDirectory:&isdir] && !isdir)
+ @throw @"/usr/local/bin is not a directory.";
+ return NO;
}
- return managedObjectContext;
-}
-
-- (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)window {
- return self.managedObjectContext.undoManager;
-}
-
-- (IBAction) saveAction:(id)sender {
- id error = nil;
- if (![[self managedObjectContext] save:&error]) {
- [NSApp presentError:error];
+ if ([fm isWritableFileAtPath:@"/usr/local"]) {
+ BOOL isdir;
+ if (![fm fileExistsAtPath:@"/usr/local" isDirectory:&isdir] && !isdir)
+ @throw @"/usr/local is not a directory.";
+ return NO;
}
+
+ return YES;
}
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
- NSError *error;
- int reply = NSTerminateNow;
+- (IBAction)installCliTool:(id)sender {
+ id from = [[NSBundle mainBundle] pathForResource:@"gitx" ofType:@""];
+ id to = @"/usr/local/bin/gitx";
- if (managedObjectContext != nil) {
- if ([managedObjectContext commitEditing]) {
- if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
-
- // This error handling simply presents error information in a panel with an
- // "Ok" button, which does not include any attempt at error recovery (meaning,
- // attempting to fix the error.) As a result, this implementation will
- // present the information to the user and then follow up with a panel asking
- // if the user wishes to "Quit Anyway", without saving the changes.
-
- // Typically, this process should be altered to include application-specific
- // recovery steps.
-
- BOOL errorResult = [[NSApplication sharedApplication] presentError:error];
-
- if (errorResult == YES) {
- reply = NSTerminateCancel;
- }
-
- else {
-
- int alertReturn = NSRunAlertPanel(nil, @"Could not save changes while quitting. Quit anyway?" , @"Quit anyway", @"Cancel", nil);
- if (alertReturn == NSAlertAlternateReturn) {
- reply = NSTerminateCancel;
- }
- }
+ @try {
+ if (self.needsRoot) {
+ AuthorizationRef auth;
+ if (AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth) == errAuthorizationSuccess)
+ {
+ char const* mkdir_arg[] = { "-p", [[to stringByDeletingLastPathComponent] UTF8String], NULL};
+ AuthorizationExecuteWithPrivileges(auth, "/bin/mkdir", kAuthorizationFlagDefaults, (char**)mkdir_arg, NULL);
+
+ char const* arguments[] = { "-f", "-s", [from UTF8String], [to UTF8String], NULL };
+ if (AuthorizationExecuteWithPrivileges(auth, "/bin/ln", kAuthorizationFlagDefaults, (char**)arguments, NULL) == errAuthorizationSuccess) {
+ int status;
+ int pid = wait(&status);
+ if (!(pid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == 0))
+ @throw @"Could not create gitx symlink :(";
+ } else
+ @throw @"You canceled authorisation.";
+
+ AuthorizationFree(auth, kAuthorizationFlagDefaults);
}
- }
-
- else {
- reply = NSTerminateCancel;
+ } else {
+ //FIXME this is a hard link, root-route is symlink, should be same, hard links are better IMO
+
+ [[NSFileManager defaultManager] removeItemAtPath:to error:nil];
+
+ id error = nil;
+ [[NSFileManager defaultManager] linkItemAtPath:from toPath:to error:&error];
+ if (error)
+ @throw error;
}
+
+ [[NSAlert alertWithMessageText:@"Command Line Tool Installed Successfully"
+ defaultButton:nil
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:@"You now have: %@.", to] runModal];
+ }
+ @catch (id errmsg) {
+ if ([errmsg isKindOfClass:[NSError class]])
+ errmsg = [errmsg localizedFailureReason];
+
+ [[NSAlert alertWithMessageText:@"Could Not Install Command Line Tool"
+ defaultButton:nil
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:@"%@", errmsg] runModal];
}
-
- return reply;
}
-- (void)applicationWillTerminate:(NSNotification *)aNotification
-{
+- (NSString *)applicationSupportFolder {
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+ NSString *basePath = ([paths count] > 0) ? [paths objectAtIndex:0] : NSTemporaryDirectory();
+ return [basePath stringByAppendingPathComponent:@"GitTest"];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification {
[PBGitDefaults removePreviousDocumentPaths];
if ([PBGitDefaults openPreviousDocumentsOnLaunch]) {
@@ -274,29 +185,12 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
}
}
-/**
- Implementation of dealloc, to release the retained variables.
- */
-
-- (void) dealloc {
-
- managedObjectContext = nil;
- persistentStoreCoordinator = nil;
- managedObjectModel = nil;
-}
-
-#pragma mark Help menu
-
-- (IBAction)showHelp:(id)sender
-{
+- (IBAction)showHelp:(id)sender {
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.frim.nl/user_manual.html"]];
}
-- (IBAction)reportAProblem:(id)sender
-{
- [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://gitx.lighthouseapp.com/tickets"]];
+- (IBAction)reportAProblem:(id)sender {
+ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"mailto:mxcl@me.com"]];
}
-
-
@end
View
76 DBPrefsWindowController.h
@@ -1,76 +0,0 @@
-//
-// DBPrefsWindowController.h
-//
-// Created by Dave Batton
-// http://www.Mere-Mortal-Software.com/blog/
-//
-// Documentation for this class is available here:
-// http://www.mere-mortal-software.com/blog/details.php?d=2007-03-11
-//
-// Copyright 2007. Some rights reserved.
-// This work is licensed under a Creative Commons license:
-// http://creativecommons.org/licenses/by/3.0/
-//
-// 11 March 2007 : Initial 1.0 release
-// 15 March 2007 : Version 1.1
-// Resizing is now handled along with the cross-fade by
-// the NSViewAnimation routine.
-// Cut the fade time in half to speed up the window resize.
-// -setupToolbar is now called each time the window opens so
-// you can configure it differently each time if you want.
-// Holding down the shift key will now slow down the animation.
-// This can be disabled by using the new -setShiftSlowsAnimation:
-// method.
-// 23 March 2007 : Version 1.1.1
-// The initial first responder now gets set when the view is
-// swapped so that the user can tab to the objects displayed
-// in the window.
-// Also added a work-around to Cocoa's insistance on drawing
-// a focus ring around the first toolbar icon when going from
-// a view with a focusable item to a view without a focusable item.
-//
-// 31 May 2007 : Version 1.1.2
-// The window's title bar and toolbar heights are now calculated at
-// runtime, rather than being hard-coded.
-// Fixed a redraw problem and a window placement problem associated
-// with large preference windows.
-// Added some code to supress compiler warnings from unused parameters.
-// Fixed a couple of objects that weren't being properly released.
-//
-
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface DBPrefsWindowController : NSWindowController <NSAnimationDelegate, NSToolbarDelegate> {
- NSMutableArray *toolbarIdentifiers;
- NSMutableDictionary *toolbarViews;
- NSMutableDictionary *toolbarItems;
-
- BOOL _crossFade;
- BOOL _shiftSlowsAnimation;
-
- NSView *contentSubview;
- NSViewAnimation *viewAnimation;
-}
-
-
-+ (DBPrefsWindowController *)sharedPrefsWindowController;
-+ (NSString *)nibName;
-
-- (void)setupToolbar;
-- (void)addView:(NSView *)view label:(NSString *)label;
-- (void)addView:(NSView *)view label:(NSString *)label image:(NSImage *)image;
-
-- (BOOL)crossFade;
-- (void)setCrossFade:(BOOL)fade;
-- (BOOL)shiftSlowsAnimation;
-- (void)setShiftSlowsAnimation:(BOOL)slows;
-
-- (void)displayViewForIdentifier:(NSString *)identifier animate:(BOOL)animate;
-- (void)crossFadeView:(NSView *)oldView withView:(NSView *)newView;
-- (NSRect)frameForView:(NSView *)view;
-
-- (NSString *)defaultViewIdentifier;
-
-@end
View
413 DBPrefsWindowController.m
@@ -1,413 +0,0 @@
-//
-// DBPrefsWindowController.m
-//
-
-#import "DBPrefsWindowController.h"
-
-
-static DBPrefsWindowController *_sharedPrefsWindowController = nil;
-
-
-@implementation DBPrefsWindowController
-
-
-
-
-#pragma mark -
-#pragma mark Class Methods
-
-
-+ (DBPrefsWindowController *)sharedPrefsWindowController
-{
- if (!_sharedPrefsWindowController) {
- _sharedPrefsWindowController = [[self alloc] initWithWindowNibName:[self nibName]];
- }
- return _sharedPrefsWindowController;
-}
-
-
-
-
-+ (NSString *)nibName
- // Subclasses can override this to use a nib with a different name.
-{
- return @"Preferences";
-}
-
-
-
-
-#pragma mark -
-#pragma mark Setup & Teardown
-
-
-- (id)initWithWindow:(NSWindow *)window
- // -initWithWindow: is the designated initializer for NSWindowController.
-{
- self = [super initWithWindow:nil];
- if (self != nil) {
- // Set up an array and some dictionaries to keep track
- // of the views we'll be displaying.
- toolbarIdentifiers = [[NSMutableArray alloc] init];
- toolbarViews = [[NSMutableDictionary alloc] init];
- toolbarItems = [[NSMutableDictionary alloc] init];
-
- // Set up an NSViewAnimation to animate the transitions.
- viewAnimation = [[NSViewAnimation alloc] init];
- [viewAnimation setAnimationBlockingMode:NSAnimationNonblocking];
- [viewAnimation setAnimationCurve:NSAnimationEaseInOut];
- [viewAnimation setDelegate:self];
-
- [self setCrossFade:YES];
- [self setShiftSlowsAnimation:YES];
- }
- return self;
-
- (void)window; // To prevent compiler warnings.
-}
-
-
-
-
-- (void)windowDidLoad
-{
- // Create a new window to display the preference views.
- // If the developer attached a window to this controller
- // in Interface Builder, it gets replaced with this one.
- NSPanel *panel = [[NSPanel alloc] initWithContentRect:NSMakeRect(0,0,1000,1000)
- styleMask:(NSTitledWindowMask |
- NSClosableWindowMask |
- NSMiniaturizableWindowMask)
- backing:NSBackingStoreBuffered
- defer:YES];
- [self setWindow:panel];
- contentSubview = [[NSView alloc] initWithFrame:[[[self window] contentView] frame]];
- [contentSubview setAutoresizingMask:(NSViewMinYMargin | NSViewWidthSizable)];
- [[[self window] contentView] addSubview:contentSubview];
- [[self window] setShowsToolbarButton:NO];
-}
-
-
-
-
-
-
-
-
-#pragma mark -
-#pragma mark Configuration
-
-
-- (void)setupToolbar
-{
- // Subclasses must override this method to add items to the
- // toolbar by calling -addView:label: or -addView:label:image:.
-}
-
-
-
-
-- (void)addView:(NSView *)view label:(NSString *)label
-{
- [self addView:view
- label:label
- image:[NSImage imageNamed:label]];
-}
-
-
-
-
-- (void)addView:(NSView *)view label:(NSString *)label image:(NSImage *)image
-{
- NSAssert (view != nil,
- @"Attempted to add a nil view when calling -addView:label:image:.");
-
- NSString *identifier = [label copy];
-
- [toolbarIdentifiers addObject:identifier];
- [toolbarViews setObject:view forKey:identifier];
-
- NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:identifier];
- [item setLabel:label];
- [item setImage:image];
- [item setTarget:self];
- [item setAction:@selector(toggleActivePreferenceView:)];
-
- [toolbarItems setObject:item forKey:identifier];
-}
-
-
-
-
-#pragma mark -
-#pragma mark Accessor Methods
-
-
-- (BOOL)crossFade
-{
- return _crossFade;
-}
-
-
-
-
-- (void)setCrossFade:(BOOL)fade
-{
- _crossFade = fade;
-}
-
-
-
-
-- (BOOL)shiftSlowsAnimation
-{
- return _shiftSlowsAnimation;
-}
-
-
-
-
-- (void)setShiftSlowsAnimation:(BOOL)slows
-{
- _shiftSlowsAnimation = slows;
-}
-
-
-
-
-#pragma mark -
-#pragma mark Overriding Methods
-
-
-- (IBAction)showWindow:(id)sender
-{
- // This forces the resources in the nib to load.
- (void)[self window];
-
- // Clear the last setup and get a fresh one.
- [toolbarIdentifiers removeAllObjects];
- [toolbarViews removeAllObjects];
- [toolbarItems removeAllObjects];
- [self setupToolbar];
-
- NSAssert (([toolbarIdentifiers count] > 0),
- @"No items were added to the toolbar in -setupToolbar.");
-
- if ([[self window] toolbar] == nil) {
- NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:@"DBPreferencesToolbar"];
- [toolbar setAllowsUserCustomization:NO];
- [toolbar setAutosavesConfiguration:NO];
- [toolbar setSizeMode:NSToolbarSizeModeDefault];
- [toolbar setDisplayMode:NSToolbarDisplayModeIconAndLabel];
- [toolbar setDelegate:self];
- [[self window] setToolbar:toolbar];
- }
-
- NSString *identifier = [self defaultViewIdentifier];
- [[[self window] toolbar] setSelectedItemIdentifier:identifier];
- [self displayViewForIdentifier:identifier animate:NO];
-
- [[self window] center];
-
- [super showWindow:sender];
-}
-
-
-
-
-#pragma mark -
-#pragma mark Toolbar
-
-
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
-{
- return toolbarIdentifiers;
-
- (void)toolbar;
-}
-
-
-
-
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
-{
- return toolbarIdentifiers;
-
- (void)toolbar;
-}
-
-
-
-
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
-{
- return toolbarIdentifiers;
- (void)toolbar;
-}
-
-
-
-
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)identifier willBeInsertedIntoToolbar:(BOOL)willBeInserted
-{
- return [toolbarItems objectForKey:identifier];
- (void)toolbar;
- (void)willBeInserted;
-}
-
-
-
-
-- (void)toggleActivePreferenceView:(NSToolbarItem *)toolbarItem
-{
- [self displayViewForIdentifier:[toolbarItem itemIdentifier] animate:YES];
-}
-
-
-
-
-- (void)displayViewForIdentifier:(NSString *)identifier animate:(BOOL)animate
-{
- // Find the view we want to display.
- NSView *newView = [toolbarViews objectForKey:identifier];
-
- // See if there are any visible views.
- NSView *oldView = nil;
- if ([[contentSubview subviews] count] > 0) {
- // Get a list of all of the views in the window. Usually at this
- // point there is just one visible view. But if the last fade
- // hasn't finished, we need to get rid of it now before we move on.
- NSEnumerator *subviewsEnum = [[contentSubview subviews] reverseObjectEnumerator];
-
- // The first one (last one added) is our visible view.
- oldView = [subviewsEnum nextObject];
-
- // Remove any others.
- NSView *reallyOldView = nil;
- while ((reallyOldView = [subviewsEnum nextObject]) != nil) {
- [reallyOldView removeFromSuperviewWithoutNeedingDisplay];
- }
- }
-
- if (![newView isEqualTo:oldView]) {
- NSRect frame = [newView bounds];
- frame.origin.y = NSHeight([contentSubview frame]) - NSHeight([newView bounds]);
- [newView setFrame:frame];
- [contentSubview addSubview:newView];
- [[self window] setInitialFirstResponder:newView];
-
- if (animate && [self crossFade])
- [self crossFadeView:oldView withView:newView];
- else {
- [oldView removeFromSuperviewWithoutNeedingDisplay];
- [newView setHidden:NO];
- [[self window] setFrame:[self frameForView:newView] display:YES animate:animate];
- }
-
- [[self window] setTitle:[[toolbarItems objectForKey:identifier] label]];
- }
-}
-
-
-
-
-#pragma mark -
-#pragma mark Cross-Fading Methods
-
-
-- (void)crossFadeView:(NSView *)oldView withView:(NSView *)newView
-{
- [viewAnimation stopAnimation];
-
- if ([self shiftSlowsAnimation] && [[[self window] currentEvent] modifierFlags] & NSShiftKeyMask)
- [viewAnimation setDuration:1.25];
- else
- [viewAnimation setDuration:0.25];
-
- NSDictionary *fadeOutDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
- oldView, NSViewAnimationTargetKey,
- NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey,
- nil];
-
- NSDictionary *fadeInDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
- newView, NSViewAnimationTargetKey,
- NSViewAnimationFadeInEffect, NSViewAnimationEffectKey,
- nil];
-
- NSDictionary *resizeDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
- [self window], NSViewAnimationTargetKey,
- [NSValue valueWithRect:[[self window] frame]], NSViewAnimationStartFrameKey,
- [NSValue valueWithRect:[self frameForView:newView]], NSViewAnimationEndFrameKey,
- nil];
-
- NSArray *animationArray = [NSArray arrayWithObjects:
- fadeOutDictionary,
- fadeInDictionary,
- resizeDictionary,
- nil];
-
- [viewAnimation setViewAnimations:animationArray];
- [viewAnimation startAnimation];
-}
-
-
-
-
-- (void)animationDidEnd:(NSAnimation *)animation
-{
- NSView *subview;
-
- // Get a list of all of the views in the window. Hopefully
- // at this point there are two. One is visible and one is hidden.
- NSEnumerator *subviewsEnum = [[contentSubview subviews] reverseObjectEnumerator];
-
- // This is our visible view. Just get past it.
- [subviewsEnum nextObject];
-
- // Remove everything else. There should be just one, but
- // if the user does a lot of fast clicking, we might have
- // more than one to remove.
- while ((subview = [subviewsEnum nextObject]) != nil) {
- [subview removeFromSuperviewWithoutNeedingDisplay];
- }
-
- // This is a work-around that prevents the first
- // toolbar icon from becoming highlighted.
- [[self window] makeFirstResponder:nil];
-
- (void)animation;
-}
-
-
-
-
-- (NSRect)frameForView:(NSView *)view
- // Calculate the window size for the new view.
-{
- NSRect windowFrame = [[self window] frame];
- NSRect contentRect = [[self window] contentRectForFrameRect:windowFrame];
- float windowTitleAndToolbarHeight = NSHeight(windowFrame) - NSHeight(contentRect);
-
- windowFrame.size.height = NSHeight([view frame]) + windowTitleAndToolbarHeight;
- windowFrame.size.width = NSWidth([view frame]);
- windowFrame.origin.y = NSMaxY([[self window] frame]) - NSHeight(windowFrame);
-
- return windowFrame;
-}
-
-
-
-
-#pragma mark -
-#pragma mark Default View
-
-
-- (NSString *)defaultViewIdentifier
-{
- return [toolbarIdentifiers objectAtIndex:0];
-}
-
-
-
-
-@end
View
486 English.lproj/MainMenu.xib
@@ -84,23 +84,6 @@
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
</object>
- <object class="NSMenuItem" id="704355783">
- <reference key="NSMenu" ref="492995933"/>
- <string key="NSTitle">Preferences…</string>
- <string key="NSKeyEquiv">,</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="679871620">
- <reference key="NSMenu" ref="492995933"/>
- <string key="NSTitle">Check for Updates…</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
<object class="NSMenuItem" id="254129686">
<reference key="NSMenu" ref="492995933"/>
<bool key="NSIsDisabled">YES</bool>
@@ -205,15 +188,6 @@
<characters key="NS.bytes">File</characters>
</object>
<array class="NSMutableArray" key="NSMenuItems">
- <object class="NSMenuItem" id="968526216">
- <reference key="NSMenu" ref="310195297"/>
- <string key="NSTitle">New…</string>
- <string key="NSKeyEquiv">n</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
<object class="NSMenuItem" id="432647792">
<reference key="NSMenu" ref="310195297"/>
<string key="NSTitle">Open…</string>
@@ -223,14 +197,6 @@
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
</object>
- <object class="NSMenuItem" id="936887448">
- <reference key="NSMenu" ref="310195297"/>
- <string key="NSTitle">Clone…</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
<object class="NSMenuItem" id="255451250">
<reference key="NSMenu" ref="310195297"/>
<string key="NSTitle">Open Recent</string>
@@ -258,7 +224,7 @@
<string key="NSName">_NSRecentDocumentsMenu</string>
</object>
</object>
- <object class="NSMenuItem" id="703440894">
+ <object class="NSMenuItem" id="844339734">
<reference key="NSMenu" ref="310195297"/>
<bool key="NSIsDisabled">YES</bool>
<bool key="NSIsSeparator">YES</bool>
@@ -269,19 +235,40 @@
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
</object>
- <object class="NSMenuItem" id="912189939">
+ <object class="NSMenuItem" id="950917510">
<reference key="NSMenu" ref="310195297"/>
- <string key="NSTitle">Close</string>
- <string key="NSKeyEquiv">w</string>
+ <string key="NSTitle">Show in Finder</string>
+ <string key="NSKeyEquiv">F</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
</object>
- <object class="NSMenuItem" id="231313974">
+ <object class="NSMenuItem" id="298101952">
+ <reference key="NSMenu" ref="310195297"/>
+ <string key="NSTitle">Open in Terminal</string>
+ <string key="NSKeyEquiv">T</string>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="889736156"/>
+ <reference key="NSMixedImage" ref="37108609"/>
+ </object>
+ <object class="NSMenuItem" id="703440894">
<reference key="NSMenu" ref="310195297"/>
- <string key="NSTitle">Clone To…</string>
+ <bool key="NSIsDisabled">YES</bool>
+ <bool key="NSIsSeparator">YES</bool>
+ <string key="NSTitle"/>
<string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="889736156"/>
+ <reference key="NSMixedImage" ref="37108609"/>
+ </object>
+ <object class="NSMenuItem" id="912189939">
+ <reference key="NSMenu" ref="310195297"/>
+ <string key="NSTitle">Close</string>
+ <string key="NSKeyEquiv">w</string>
+ <int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
@@ -652,75 +639,6 @@
</array>
</object>
</object>
- <object class="NSMenuItem" id="571164270">
- <reference key="NSMenu" ref="25504806"/>
- <string key="NSTitle">Repository</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="944982980">
- <string key="NSTitle">Repository</string>
- <array class="NSMutableArray" key="NSMenuItems">
- <object class="NSMenuItem" id="416044880">
- <reference key="NSMenu" ref="944982980"/>
- <string key="NSTitle">Create Tag</string>
- <string key="NSKeyEquiv">t</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="81071151">
- <reference key="NSMenu" ref="944982980"/>
- <string key="NSTitle">Create Branch</string>
- <string key="NSKeyEquiv">b</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="173376826">
- <reference key="NSMenu" ref="944982980"/>
- <string key="NSTitle">Add Remote</string>
- <string key="NSKeyEquiv">r</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="255856917">
- <reference key="NSMenu" ref="944982980"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="298101952">
- <reference key="NSMenu" ref="944982980"/>
- <string key="NSTitle">Open in Terminal</string>
- <string key="NSKeyEquiv">T</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="950917510">
- <reference key="NSMenu" ref="944982980"/>
- <string key="NSTitle">Reveal in Finder</string>
- <string key="NSKeyEquiv">F</string>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- </array>
- </object>
- </object>
<object class="NSMenuItem" id="15213245">
<reference key="NSMenu" ref="25504806"/>
<string key="NSTitle">View</string>
@@ -733,35 +651,6 @@
<object class="NSMenu" key="NSSubmenu" id="245837913">
<string key="NSTitle">View</string>
<array class="NSMutableArray" key="NSMenuItems">
- <object class="NSMenuItem" id="644618837">
- <reference key="NSMenu" ref="245837913"/>
- <string key="NSTitle">Show Toolbar</string>
- <string key="NSKeyEquiv">t</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="332442271">
- <reference key="NSMenu" ref="245837913"/>
- <string key="NSTitle">Customize Toolbar…</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="820559771">
- <reference key="NSMenu" ref="245837913"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
<object class="NSMenuItem" id="638888442">
<reference key="NSMenu" ref="245837913"/>
<string key="NSTitle">History</string>
@@ -790,34 +679,6 @@
<reference key="NSOnImage" ref="889736156"/>
<reference key="NSMixedImage" ref="37108609"/>
</object>
- <object class="NSMenuItem" id="1062123434">
- <reference key="NSMenu" ref="245837913"/>
- <string key="NSTitle">Detail View</string>
- <string key="NSKeyEquiv">1</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="310106156">
- <reference key="NSMenu" ref="245837913"/>
- <string key="NSTitle">Tree View</string>
- <string key="NSKeyEquiv">2</string>
- <int key="NSKeyEquivModMask">1572864</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="552718495">
- <reference key="NSMenu" ref="245837913"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
<object class="NSMenuItem" id="554502465">
<reference key="NSMenu" ref="245837913"/>
<string key="NSTitle">Refresh</string>
@@ -909,15 +770,7 @@
</object>
<object class="NSMenuItem" id="669832662">
<reference key="NSMenu" ref="612917469"/>
- <string key="NSTitle">Report a problem</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="889736156"/>
- <reference key="NSMixedImage" ref="37108609"/>
- </object>
- <object class="NSMenuItem" id="480405559">
- <reference key="NSMenu" ref="612917469"/>
- <string key="NSTitle">Discuss GitX</string>
+ <string key="NSTitle">Report Bug</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="889736156"/>
@@ -1159,22 +1012,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">toggleToolbarShown:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="644618837"/>
- </object>
- <int key="connectionID">342</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">runToolbarCustomizationPalette:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="332442271"/>
- </object>
- <int key="connectionID">343</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">openDocument:</string>
<reference key="source" ref="954860085"/>
<reference key="destination" ref="432647792"/>
@@ -1207,27 +1044,27 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">newDocument:</string>
+ <string key="label">copySHA:</string>
<reference key="source" ref="954860085"/>
- <reference key="destination" ref="968526216"/>
+ <reference key="destination" ref="220492206"/>
</object>
- <int key="connectionID">934</int>
+ <int key="connectionID">966</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">createBranch:</string>
+ <string key="label">selectNext:</string>
<reference key="source" ref="954860085"/>
- <reference key="destination" ref="81071151"/>
+ <reference key="destination" ref="416521231"/>
</object>
- <int key="connectionID">941</int>
+ <int key="connectionID">967</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">openInTerminal:</string>
+ <string key="label">selectPrevious:</string>
<reference key="source" ref="954860085"/>
- <reference key="destination" ref="298101952"/>
+ <reference key="destination" ref="219112383"/>
</object>
- <int key="connectionID">944</int>
+ <int key="connectionID">968</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -1239,75 +1076,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">createTag:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="416044880"/>
- </object>
- <int key="connectionID">950</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showAddRemoteSheet:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="173376826"/>
- </object>
- <int key="connectionID">953</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">cloneTo:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="231313974"/>
- </object>
- <int key="connectionID">955</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">showCloneRepository:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="936887448"/>
- </object>
- <int key="connectionID">958</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">setDetailedView:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="1062123434"/>
- </object>
- <int key="connectionID">962</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">setTreeView:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="310106156"/>
- </object>
- <int key="connectionID">963</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">copySHA:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="220492206"/>
- </object>
- <int key="connectionID">966</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">selectNext:</string>
- <reference key="source" ref="954860085"/>
- <reference key="destination" ref="416521231"/>
- </object>
- <int key="connectionID">967</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">selectPrevious:</string>
+ <string key="label">openInTerminal:</string>
<reference key="source" ref="954860085"/>
- <reference key="destination" ref="219112383"/>
+ <reference key="destination" ref="298101952"/>
</object>
- <int key="connectionID">968</int>
+ <int key="connectionID">944</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -1318,14 +1091,6 @@
<int key="connectionID">142</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">saveAction:</string>
- <reference key="source" ref="859235683"/>
- <reference key="destination" ref="740351946"/>
- </object>
- <int key="connectionID">211</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">firstResponder</string>
<reference key="source" ref="859235683"/>
@@ -1351,28 +1116,12 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">openPreferencesWindow:</string>
- <reference key="source" ref="859235683"/>
- <reference key="destination" ref="704355783"/>
- </object>
- <int key="connectionID">933</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">reportAProblem:</string>
<reference key="source" ref="859235683"/>
<reference key="destination" ref="669832662"/>
</object>
<int key="connectionID">971</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">discussGitX:</string>
- <reference key="source" ref="859235683"/>
- <reference key="destination" ref="480405559"/>
- </object>
- <int key="connectionID">973</int>
- </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -1410,7 +1159,6 @@
<reference ref="79201380"/>
<reference ref="937798568"/>
<reference ref="15213245"/>
- <reference ref="571164270"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">MainMenu</string>
@@ -1428,7 +1176,6 @@
<reference key="object" ref="492995933"/>
<array class="NSMutableArray" key="children">
<reference ref="1039244063"/>
- <reference ref="704355783"/>
<reference ref="506423963"/>
<reference ref="273810574"/>
<reference ref="674626438"/>
@@ -1439,7 +1186,6 @@
<reference ref="950810233"/>
<reference ref="105066652"/>
<reference ref="332179816"/>
- <reference ref="679871620"/>
</array>
<reference key="parent" ref="859553509"/>
</object>
@@ -1449,11 +1195,6 @@
<reference key="parent" ref="492995933"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">129</int>
- <reference key="object" ref="704355783"/>
- <reference key="parent" ref="492995933"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">131</int>
<reference key="object" ref="506423963"/>
<array class="NSMutableArray" key="children">
@@ -1526,11 +1267,11 @@
<reference ref="520747322"/>
<reference ref="703440894"/>
<reference ref="968242847"/>
- <reference ref="968526216"/>
<reference ref="656100832"/>
<reference ref="255451250"/>
- <reference ref="231313974"/>
- <reference ref="936887448"/>
+ <reference ref="950917510"/>
+ <reference ref="298101952"/>
+ <reference ref="844339734"/>
</array>
<reference key="parent" ref="19371157"/>
</object>
@@ -1575,11 +1316,6 @@
<reference key="parent" ref="310195297"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">82</int>
- <reference key="object" ref="968526216"/>
- <reference key="parent" ref="310195297"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">112</int>
<reference key="object" ref="656100832"/>
<reference key="parent" ref="310195297"/>
@@ -1619,7 +1355,6 @@
<array class="NSMutableArray" key="children">
<reference ref="303385276"/>
<reference ref="669832662"/>
- <reference ref="480405559"/>
</array>
<reference key="parent" ref="180968013"/>
</object>
@@ -1897,13 +1632,7 @@
<int key="objectID">339</int>
<reference key="object" ref="245837913"/>
<array class="NSMutableArray" key="children">
- <reference ref="332442271"/>
- <reference ref="644618837"/>
- <reference ref="820559771"/>
- <reference ref="1062123434"/>
- <reference ref="310106156"/>
<reference ref="554502465"/>
- <reference ref="552718495"/>
<reference ref="638888442"/>
<reference ref="951501905"/>
<reference ref="888393319"/>
@@ -1911,37 +1640,12 @@
<reference key="parent" ref="15213245"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">340</int>
- <reference key="object" ref="332442271"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">341</int>
- <reference key="object" ref="644618837"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">205</int>
<reference key="object" ref="859235683"/>
<reference key="parent" ref="0"/>
<string key="objectName">ApplicationController</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">847</int>
- <reference key="object" ref="820559771"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">848</int>
- <reference key="object" ref="1062123434"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">852</int>
- <reference key="object" ref="310106156"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">908</int>
<reference key="object" ref="189246969"/>
<reference key="parent" ref="0"/>
@@ -1962,16 +1666,6 @@
<reference key="parent" ref="245837913"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">916</int>
- <reference key="object" ref="552718495"/>
- <reference key="parent" ref="245837913"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">919</int>
- <reference key="object" ref="679871620"/>
- <reference key="parent" ref="492995933"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">927</int>
<reference key="object" ref="638888442"/>
<reference key="parent" ref="245837913"/>
@@ -1987,80 +1681,29 @@
<reference key="parent" ref="245837913"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">936</int>
- <reference key="object" ref="571164270"/>
- <array class="NSMutableArray" key="children">
- <reference ref="944982980"/>
- </array>
- <reference key="parent" ref="25504806"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">937</int>
- <reference key="object" ref="944982980"/>
- <array class="NSMutableArray" key="children">
- <reference ref="81071151"/>
- <reference ref="298101952"/>
- <reference ref="255856917"/>
- <reference ref="950917510"/>
- <reference ref="416044880"/>
- <reference ref="173376826"/>
- </array>
- <reference key="parent" ref="571164270"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">938</int>
- <reference key="object" ref="81071151"/>
- <reference key="parent" ref="944982980"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">942</int>
- <reference key="object" ref="298101952"/>
- <reference key="parent" ref="944982980"/>
+ <int key="objectID">964</int>
+ <reference key="object" ref="220492206"/>
+ <reference key="parent" ref="227303002"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">943</int>
- <reference key="object" ref="255856917"/>
- <reference key="parent" ref="944982980"/>
+ <int key="objectID">969</int>
+ <reference key="object" ref="669832662"/>
+ <reference key="parent" ref="612917469"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">947</int>
<reference key="object" ref="950917510"/>
- <reference key="parent" ref="944982980"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">949</int>
- <reference key="object" ref="416044880"/>
- <reference key="parent" ref="944982980"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">951</int>
- <reference key="object" ref="173376826"/>
- <reference key="parent" ref="944982980"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">954</int>
- <reference key="object" ref="231313974"/>
<reference key="parent" ref="310195297"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">956</int>
- <reference key="object" ref="936887448"/>
+ <int key="objectID">942</int>
+ <reference key="object" ref="298101952"/>
<reference key="parent" ref="310195297"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">964</int>
- <reference key="object" ref="220492206"/>
- <reference key="parent" ref="227303002"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">969</int>
- <reference key="object" ref="669832662"/>
- <reference key="parent" ref="612917469"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">972</int>
- <reference key="object" ref="480405559"/>
- <reference key="parent" ref="612917469"/>
+ <int key="objectID">974</int>
+ <reference key="object" ref="844339734"/>
+ <reference key="parent" ref="310195297"/>
</object>
</array>
</object>
@@ -2075,7 +1718,6 @@
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="131.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="134.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2129,8 +1771,6 @@
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="340.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="341.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2143,39 +1783,25 @@
<string key="79.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="847.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="848.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="852.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="908.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="909.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="912.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="915.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="916.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="919.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="927.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="928.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="936.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="937.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="938.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="942.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="943.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="947.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="949.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="951.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="954.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="956.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="964.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="969.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="972.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="974.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">973</int>
+ <int key="maxID">974</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
View
30 English.lproj/PBRemoteProgressSheet.xib
@@ -53,6 +53,7 @@
<int key="NSvFlags">1314</int>
<string key="NSFrame">{{18, 16}, {361, 20}}</string>
<reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
<int key="NSpiFlags">16394</int>
<double key="NSMaxValue">100</double>
</object>
@@ -61,6 +62,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{17, 56}, {363, 17}}</string>
<reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="214375840"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="476186767">
@@ -97,6 +99,7 @@
</array>
<string key="NSFrameSize">{397, 93}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="939163389"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1366, 768}}</string>
@@ -213,7 +216,32 @@
<nil key="sourceID"/>
<int key="maxID">33</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">PBRemoteProgressSheet</string>
+ <string key="superclassName">NSWindowController</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="progressDescription">NSTextField</string>
+ <string key="progressIndicator">NSProgressIndicator</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="progressDescription">
+ <string key="name">progressDescription</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="progressIndicator">
+ <string key="name">progressIndicator</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/PBRemoteProgressSheet.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
View
1,710 English.lproj/Preferences.xib
@@ -1,1710 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>NSPopUpButton</string>
- <string>NSMenuItem</string>
- <string>NSMenu</string>
- <string>NSButtonCell</string>
- <string>NSButton</string>
- <string>NSTextFieldCell</string>
- <string>NSDateFormatter</string>
- <string>NSPathCell</string>
- <string>NSPathControl</string>
- <string>NSCustomObject</string>
- <string>NSCustomView</string>
- <string>NSPopUpButtonCell</string>
- <string>NSUserDefaultsController</string>
- <string>NSTextField</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <object class="NSCustomObject" id="1001">
- <string key="NSClassName">PBPrefsWindowController</string>
- </object>
- <object class="NSCustomObject" id="1003">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="1004">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomView" id="1005">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="63761450">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 22}, {166, 17}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="467740597">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents">Reset all dialog warnings:</string>
- <object class="NSFont" key="NSSupport" id="734450335">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="63761450"/>
- <object class="NSColor" key="NSBackgroundColor" id="124675276">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="716218002">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="367847822">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- </object>
- <object class="NSButton" id="83909567">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{182, 12}, {137, 32}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="265220935">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Reset Warnings</string>
- <reference key="NSSupport" ref="734450335"/>
- <reference key="NSControlView" ref="83909567"/>
- <int key="NSButtonFlags">-2038021889</int>
- <int key="NSButtonFlags2">129</int>