kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

add PBWebStashController

Browse Source
This commit is contained in:
David Catmull
2011-06-12 21:46:30 -06:00
parent 60503ba19f
commit 8053f57fbc
8 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitX.xcodeproj/project.pbxproj
+16 -3
View File
@@ -81,6 +81,7 @@
770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 770B37EC0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel */; };
77C8280E06725ACE000B614F /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C8280C06725ACE000B614F /* ApplicationController.m */; };
89087CA613A3E46B00911503 /* PBWebCommitController.m in Sources */ = {isa = PBXBuildFile; fileRef = 89087CA513A3E46B00911503 /* PBWebCommitController.m */; };
8998B1C613A55B3500121729 /* PBWebStashController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8998B1C513A55B3500121729 /* PBWebStashController.m */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -338,6 +339,8 @@
77C8280C06725ACE000B614F /* ApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationController.m; sourceTree = "<group>"; };
89087CA413A3E46500911503 /* PBWebCommitController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebCommitController.h; sourceTree = "<group>"; };
89087CA513A3E46B00911503 /* PBWebCommitController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebCommitController.m; sourceTree = "<group>"; };
8998B1AC13A55AC100121729 /* PBWebStashController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBWebStashController.h; sourceTree = "<group>"; };
8998B1C513A55B3500121729 /* PBWebStashController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBWebStashController.m; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* GitX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GitX.app; sourceTree = BUILT_PRODUCTS_DIR; };
911111E10E58BD5A00BF76B4 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/RepositoryWindow.xib; sourceTree = "<group>"; };
@@ -849,6 +852,17 @@
name = Models;
sourceTree = "<group>";
};
8998B1AB13A55A9B00121729 /* Stash */ = {
isa = PBXGroup;
children = (
DDB8FDFF13998CE2001A9EE2 /* PBStashContentController.h */,
DDB8FE0013998CE2001A9EE2 /* PBStashContentController.m */,
8998B1AC13A55AC100121729 /* PBWebStashController.h */,
8998B1C513A55B3500121729 /* PBWebStashController.m */,
);
name = Stash;
sourceTree = "<group>";
};
913D5E420E5563FD00CECEA2 /* cli */ = {
isa = PBXGroup;
children = (
@@ -944,12 +958,11 @@
F5EF8C880E9D498F0050906B /* History */,
F5E927F90E883EF600056E75 /* Commit */,
D82F435F111B9C6D00A25A39 /* Sheets */,
8998B1AB13A55A9B00121729 /* Stash */,
77C8280B06725ACE000B614F /* ApplicationController.h */,
77C8280C06725ACE000B614F /* ApplicationController.m */,
93CB42C00EAB7B2200530609 /* PBGitDefaults.h */,
93CB42C10EAB7B2200530609 /* PBGitDefaults.m */,
DDB8FDFF13998CE2001A9EE2 /* PBStashContentController.h */,
DDB8FE0013998CE2001A9EE2 /* PBStashContentController.m */,
F57CC43F0E05E496000472E2 /* PBGitWindowController.h */,
F57CC4400E05E496000472E2 /* PBGitWindowController.m */,
911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */,
@@ -1209,7 +1222,6 @@
isa = PBXProject;
buildConfigurationList = 26FC0A880875C7B200E6366F /* Build configuration list for PBXProject "GitX" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -1463,6 +1475,7 @@
31776089133569350025876E /* SearchWebView.m in Sources */,
DDB8FE0113998CE2001A9EE2 /* PBStashContentController.m in Sources */,
89087CA613A3E46B00911503 /* PBWebCommitController.m in Sources */,
8998B1C613A55B3500121729 /* PBWebStashController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
PBGitSidebarController.h
+1 -1
View File
@@ -34,7 +34,7 @@
PBGitHistoryController *historyViewController;
PBGitCommitController *commitViewController;
PBStashContentController *stashViewController;
PBStashContentController *stashViewController;
}
- (void) selectStage;
PBGitWindowController.h
+1
View File
@@ -56,6 +56,7 @@
- (IBAction) cloneTo:(id)sender;
- (IBAction) refresh:(id)sender;
- (void)selectCommitForSha:(NSString*)sha;
- (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
@end
PBGitWindowController.m
+7
View File
@@ -234,6 +234,13 @@
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
- (void) selectCommitForSha:(NSString *)sha
{
if (contentController != sidebarController.historyViewController)
[sidebarController selectCurrentBranch];
[sidebarController.historyViewController selectCommit:sha];
}
- (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode
{
[sidebarController setHistorySearch:searchString mode:mode];
PBWebCommitController.h
+5
View File
@@ -29,8 +29,13 @@
- (void) openFileMerge:(NSString*)file sha:(NSString *)sha sha2:(NSString *)sha2;
- (void) didLoad;
// Called when a commit or parent link is clicked.
- (void)selectCommit:(NSString *)sha;
// HTML listing refs (branch name, etc) for the displayed commit.
- (NSString*) refsForCurrentCommit;
// Look up a PBGitRef based on its SHA.
- (PBGitRef*) refFromString:(NSString*)refString;
// Context menu items to be displayed for a file.
- (NSArray*) menuItemsForPath:(NSString*)path;
@property (readonly) NSString* diff;
PBWebHistoryController.h
-2
View File
@@ -11,8 +11,6 @@
@class PBGitHistoryController;
@class NSString;
@interface PBWebHistoryController : PBWebCommitController {
IBOutlet PBGitHistoryController* historyController;
}
PBWebStashController.h
+16
View File
@@ -0,0 +1,16 @@
//
// PBWebStashController.h
//
// Created by David Catmull on 12-06-11.
//
#import <Cocoa/Cocoa.h>
#import "PBWebCommitController.h"
@class PBStashContentController;
@interface PBWebStashController : PBWebCommitController {
IBOutlet PBStashContentController *stashController;
}
@end
PBWebStashController.m
+23
View File
@@ -0,0 +1,23 @@
//
// PBWebStashController.m
//
// Created by David Catmull on 12-06-11.
//
#import "PBWebStashController.h"
#import "PBStashContentController.h"
@implementation PBWebStashController
- (void)selectCommit:(NSString *)sha
{
[[stashController superController] selectCommitForSha:sha];
}
- (NSArray*) menuItemsForPath:(NSString*)path
{
// return [[stashController superController] menuItemsForPaths:[NSArray arrayWithObject:path]];
return nil;
}
@end