Merge branch 'master' into devel

Author: andreberg

.gitmodules

@@ -1,3 +1,7 @@
 [submodule "libgit2"]
-	path = libgit2
-	url = git://repo.or.cz/libgit2.git
+    path = libgit2
+    url = git://github.com/pieter/libgit2.git
+
+# Please don't change the submodule link since we really need the
+# "saved" libgit2 from Pieter's repo as GitX uses a deprecated function 
+# to calculate the realSha

ApplicationController.h

@@ -7,10 +7,10 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <Quartz/Quartz.h> /* for QLPreviewPanel */
 #import "PBGitRepository.h"
 
 @class PBCLIProxy;
+@class PBCloneRepositoryPanel;
 
 @interface ApplicationController : NSObject
 {
@@ -21,6 +21,7 @@
 	NSManagedObjectContext *managedObjectContext;
 
 	PBCLIProxy *cliProxy;
+	PBCloneRepositoryPanel *cloneRepositoryPanel;
 }
 @property (retain) PBCLIProxy* cliProxy;
 
@@ -36,6 +37,5 @@
 - (IBAction)saveAction:sender;
 - (IBAction) showHelp:(id) sender;
 
-- (IBAction)togglePreviewPanel:(id)previewPanel;
-
+- (IBAction) showCloneRepository:(id)sender;
 @end

ApplicationController.m

@@ -16,6 +16,7 @@
 #import "PBPrefsWindowController.h"
 #import "PBNSURLPathUserDefaultsTransfomer.h"
 #import "PBGitDefaults.h"
+#import "PBCloneRepositoryPanel.h"
 
 @implementation ApplicationController
 @synthesize cliProxy;
@@ -27,11 +28,10 @@ - (ApplicationController*)init
 #endif
 
 	if(self = [super init]) {
-        /* Location of QuickLookUI.framework - it's public now */
-        if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load]) 
-        {
-            NSLog(@"Could not load QuickLook");
-        }
+        if(![[NSBundle bundleWithPath:@"/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"] load])
+			if(![[NSBundle bundleWithPath:@"/System/Library/PrivateFrameworks/QuickLookUI.framework"] load])
+				NSLog(@"Could not load QuickLook");
+
 		self.cliProxy = [PBCLIProxy new];
 	}
 
@@ -65,34 +65,53 @@ - (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( "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 ([[[PBRepositoryDocumentController sharedDocumentController] documents] count])
-		return;
-
-	if (![[NSApplication sharedApplication] isActive])
-		return;
-
-	NSURL *url = nil;
+	if ([launchedDocuments count])
+		hasOpenedDocuments = YES;
+
+    // open any documents that were open the last time the app quit
+    if ([PBGitDefaults openPreviousDocumentsOnLaunch]) {
+        for (NSString *path in [PBGitDefaults previousDocumentPaths]) {
+            NSURL *url = [NSURL fileURLWithPath:path isDirectory:YES];
+            NSError *error = nil;
+            if (url && [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error])
+                hasOpenedDocuments = YES;
+        }
+    }
 
 	// Try to find the current directory, to open that as a repository
-	if ([PBGitDefaults openCurDirOnLaunch]) {
+	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;
 	}
 
-	// Try to open the found URL
-	NSError *error = nil;
-	if (url && [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error])
+    // 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])
+	if ([PBGitDefaults showOpenPanelOnLaunch] && !hasOpenedDocuments)
 		[[PBRepositoryDocumentController sharedDocumentController] openDocument:self];
 }
 
@@ -120,6 +139,14 @@ - (IBAction)showAboutPanel:(id)sender
 	[NSApp orderFrontStandardAboutPanelWithOptions:dict];
 }
 
+- (IBAction) showCloneRepository:(id)sender
+{
+	if (!cloneRepositoryPanel)
+		cloneRepositoryPanel = [PBCloneRepositoryPanel panel];
+
+	[cloneRepositoryPanel showWindow:self];
+}
+
 - (IBAction)installCliTool:(id)sender;
 {
 	BOOL success               = NO;
@@ -193,7 +220,7 @@ - (NSManagedObjectModel *)managedObjectModel {
         return managedObjectModel;
     }
 
-    managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil];    
+    managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
     return managedObjectModel;
 }
 
@@ -270,12 +297,14 @@ - (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)window {
  */
 
 - (IBAction) saveAction:(id)sender {
+
     NSError *error = nil;
     if (![[self managedObjectContext] save:&error]) {
         [[NSApplication sharedApplication] presentError:error];
     }
 }
 
+
 /**
     Implementation of the applicationShouldTerminate: method, used here to
     handle the saving of changes in the application managed object context
@@ -324,24 +353,20 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
     return reply;
 }
 
-// QuickLook preview panel
-
-- (IBAction)togglePreviewPanel:(id)previewPanel
+- (void)applicationWillTerminate:(NSNotification *)aNotification
 {
-    if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
-        [[QLPreviewPanel sharedPreviewPanel] orderOut:nil];
-    } else {
-        [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
-    }
-}
+	[PBGitDefaults removePreviousDocumentPaths];
 
-- (BOOL) validateMenuItem:(NSMenuItem *)item {
-    if ([item action] == @selector(saveAction:)) {
-        // disable the Save menu item if there is no repository document open
-        return ([[PBRepositoryDocumentController sharedDocumentController] currentDocument] != nil);
-    } else {
-        return [NSApp validateMenuItem:item];
-    }
+	if ([PBGitDefaults openPreviousDocumentsOnLaunch]) {
+		NSArray *documents = [[PBRepositoryDocumentController sharedDocumentController] documents];
+		if ([documents count] > 0) {
+			NSMutableArray *paths = [NSMutableArray array];
+			for (PBGitRepository *repository in documents)
+				[paths addObject:[repository workingDirectory]];
+
+			[PBGitDefaults setPreviousDocumentPaths:paths];
+		}
+	}
 }
 
 /**

CWQuickLook.h

@@ -1,5 +1,12 @@
 @interface QLPreviewPanel : NSPanel
 + (id)sharedPreviewPanel;
+
+// part of the public QL API
++ (BOOL)sharedPreviewPanelExists;
+- (void)reloadData;
+- (void)setDataSource:(id)source;
+
+// the private QL API
 + (id)_previewPanel;
 + (BOOL)isSharedPreviewPanelLoaded;
 - (id)initWithContentRect:(struct _NSRect)fp8 styleMask:(unsigned int)fp24 backing:(unsigned int)fp28 defer:(BOOL)fp32;

DBPrefsWindowController.h

@@ -42,7 +42,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController <NSAnimationDelegate, NSToolbarDelegate> {
+@interface DBPrefsWindowController : NSWindowController {
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;
@@ -71,5 +71,6 @@
 - (void)crossFadeView:(NSView *)oldView withView:(NSView *)newView;
 - (NSRect)frameForView:(NSView *)view;
 
+- (NSString *)defaultViewIdentifier;
 
 @end

DBPrefsWindowController.m

@@ -211,9 +211,9 @@ - (IBAction)showWindow:(id)sender
 		[toolbar release];
 	}
 
-	NSString *firstIdentifier = [toolbarIdentifiers objectAtIndex:0];
-	[[[self window] toolbar] setSelectedItemIdentifier:firstIdentifier];
-	[self displayViewForIdentifier:firstIdentifier animate:NO];
+	NSString *identifier = [self defaultViewIdentifier];
+	[[[self window] toolbar] setSelectedItemIdentifier:identifier];
+	[self displayViewForIdentifier:identifier animate:NO];
 
 	[[self window] center];
 
@@ -406,4 +406,16 @@ - (NSRect)frameForView:(NSView *)view
 
 
 
+#pragma mark -
+#pragma mark Default View
+
+
+- (NSString *)defaultViewIdentifier
+{
+	return [toolbarIdentifiers objectAtIndex:0];
+}
+
+
+
+
 @end