SideBar: Add ViewAction and ViewRemote objects

pieter · pieter · commit fb3a1705e35f · 2009-09-10T02:39:16.000+02:00
These two new classes can represent items in our SourceList
that refer to specific actions (such as comitting), or
specific Remotes.
diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
@@ -52,6 +52,8 @@
 		F513085B0E0740F2000C8BCD /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; };
 		F5140DC90E8A8EB20091E9F3 /* RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = F5140DC80E8A8EB20091E9F3 /* RoundedRectangle.m */; };
 		F523CEB60ED3399200DDD714 /* PBGitIndexController.m in Sources */ = {isa = PBXBuildFile; fileRef = F523CEB50ED3399200DDD714 /* PBGitIndexController.m */; };
+		F528210A1056A7C1001D1511 /* PBSourceViewRemote.m in Sources */ = {isa = PBXBuildFile; fileRef = F52821091056A7C1001D1511 /* PBSourceViewRemote.m */; };
+		F528210D1056A7EB001D1511 /* PBSourceViewAction.m in Sources */ = {isa = PBXBuildFile; fileRef = F528210C1056A7EB001D1511 /* PBSourceViewAction.m */; };
 		F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */; };
 		F52BCE070E84211300AA3741 /* PBGitHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = F52BCE060E84211300AA3741 /* PBGitHistoryController.m */; };
 		F53C4DF70E97FC630022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
@@ -213,6 +215,10 @@
 		F5140DC80E8A8EB20091E9F3 /* RoundedRectangle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoundedRectangle.m; sourceTree = "<group>"; };
 		F523CEB40ED3399100DDD714 /* PBGitIndexController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitIndexController.h; sourceTree = "<group>"; };
 		F523CEB50ED3399200DDD714 /* PBGitIndexController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitIndexController.m; sourceTree = "<group>"; };
+		F52821081056A7C1001D1511 /* PBSourceViewRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewRemote.h; sourceTree = "<group>"; };
+		F52821091056A7C1001D1511 /* PBSourceViewRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSourceViewRemote.m; sourceTree = "<group>"; };
+		F528210B1056A7EB001D1511 /* PBSourceViewAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewAction.h; sourceTree = "<group>"; };
+		F528210C1056A7EB001D1511 /* PBSourceViewAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBSourceViewAction.m; sourceTree = "<group>"; };
 		F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PBGitHistoryView.xib; sourceTree = "<group>"; };
 		F52BCE050E84211300AA3741 /* PBGitHistoryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitHistoryController.h; sourceTree = "<group>"; };
 		F52BCE060E84211300AA3741 /* PBGitHistoryController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitHistoryController.m; sourceTree = "<group>"; };
@@ -583,6 +589,10 @@
 				F58DB55810566D3500CFDF4A /* PBGitSidebarController.m */,
 				F58DB5E6105671B600CFDF4A /* PBSourceViewItem.h */,
 				F58DB5E7105671B600CFDF4A /* PBSourceViewItem.m */,
+				F52821081056A7C1001D1511 /* PBSourceViewRemote.h */,
+				F52821091056A7C1001D1511 /* PBSourceViewRemote.m */,
+				F528210B1056A7EB001D1511 /* PBSourceViewAction.h */,
+				F528210C1056A7EB001D1511 /* PBSourceViewAction.m */,
 			);
 			name = Sidebar;
 			sourceTree = "<group>";
@@ -900,6 +910,8 @@
 				F58DB55910566D3500CFDF4A /* PBGitSidebarController.m in Sources */,
 				F58DB5E8105671B600CFDF4A /* PBSourceViewItem.m in Sources */,
 				F567B88D1057FA9F000DB976 /* NSOutlineViewExt.m in Sources */,
+				F528210A1056A7C1001D1511 /* PBSourceViewRemote.m in Sources */,
+				F528210D1056A7EB001D1511 /* PBSourceViewAction.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/PBSourceViewAction.h b/PBSourceViewAction.h
@@ -0,0 +1,17 @@
+//
+//  PBSourceViewAction.h
+//  GitX
+//
+//  Created by Pieter de Bie on 9/8/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "PBSourceViewItem.h"
+
+@interface PBSourceViewAction : PBSourceViewItem {
+	NSImage *icon;
+}
+
+@property(retain) NSImage *icon;
+@end
diff --git a/PBSourceViewAction.m b/PBSourceViewAction.m
@@ -0,0 +1,15 @@
+//
+//  PBSourceViewAction.m
+//  GitX
+//
+//  Created by Pieter de Bie on 9/8/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "PBSourceViewAction.h"
+
+
+@implementation PBSourceViewAction
+@synthesize icon;
+
+@end
diff --git a/PBSourceViewItem.h b/PBSourceViewItem.h
@@ -20,9 +20,9 @@
 	BOOL isGroupItem;
 }
 
-+ (PBSourceViewItem *)groupItemWithTitle:(NSString *)title;
-+ (PBSourceViewItem *)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
-+ (PBSourceViewItem *)itemWithTitle:(NSString *)title;
++ (id)groupItemWithTitle:(NSString *)title;
++ (id)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
++ (id)itemWithTitle:(NSString *)title;
 
 - (void)addChild:(PBSourceViewItem *)child;
 
diff --git a/PBSourceViewItem.m b/PBSourceViewItem.m
@@ -21,25 +21,25 @@ - (id)init
 	return self;
 }
 
-+ (PBSourceViewItem *)groupItemWithTitle:(NSString *)title
++ (id)groupItemWithTitle:(NSString *)title
 {
-	PBSourceViewItem *item = [[PBSourceViewItem alloc] init];
+	PBSourceViewItem *item = [[[self class] alloc] init];
 	item.title = title;
 	item.isGroupItem = YES;
 	return item;
 }
 
-+ (PBSourceViewItem *)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier
++ (id)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier
 {
-	PBSourceViewItem *item = [[PBSourceViewItem alloc] init];
+	PBSourceViewItem *item = [[[self class] alloc] init];
 	item.revSpecifier = revSpecifier;
 
 	return item;	
 }
 
-+ (PBSourceViewItem *)itemWithTitle:(NSString *)title;
++ (id)itemWithTitle:(NSString *)title;
 {
-	PBSourceViewItem *item = [[PBSourceViewItem alloc] init];
+	PBSourceViewItem *item = [[[self class] alloc] init];
 	item.title = title;
 	return item;
 }
diff --git a/PBSourceViewRemote.h b/PBSourceViewRemote.h
@@ -0,0 +1,16 @@
+//
+//  PBSourceViewRemote.h
+//  GitX
+//
+//  Created by Pieter de Bie on 9/8/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "PBSourceViewItem.h"
+
+@interface PBSourceViewRemote : PBSourceViewItem {
+
+}
+
+@end
diff --git a/PBSourceViewRemote.m b/PBSourceViewRemote.m
@@ -0,0 +1,18 @@
+//
+//  PBSourceViewRemote.m
+//  GitX
+//
+//  Created by Pieter de Bie on 9/8/09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "PBSourceViewRemote.h"
+
+
+@implementation PBSourceViewRemote
+
+- (NSImage *)icon
+{
+	return [NSImage imageNamed:@"remote"];
+}
+@end

Original file line number	Diff line number	Diff line change
`@@ -21,25 +21,25 @@ - (id)init`
`21`	`21`	`return self;`
`22`	`22`	`}`
`23`	`23`
`24`		`-+ (PBSourceViewItem )groupItemWithTitle:(NSString )title`
	`24`	`++ (id)groupItemWithTitle:(NSString *)title`
`25`	`25`	`{`
`26`		`- PBSourceViewItem *item = [[PBSourceViewItem alloc] init];`
	`26`	`+ PBSourceViewItem *item = [[[self class] alloc] init];`
`27`	`27`	`item.title = title;`
`28`	`28`	`item.isGroupItem = YES;`
`29`	`29`	`return item;`
`30`	`30`	`}`
`31`	`31`
`32`		`-+ (PBSourceViewItem )itemWithRevSpec:(PBGitRevSpecifier )revSpecifier`
	`32`	`++ (id)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier`
`33`	`33`	`{`
`34`		`- PBSourceViewItem *item = [[PBSourceViewItem alloc] init];`
	`34`	`+ PBSourceViewItem *item = [[[self class] alloc] init];`
`35`	`35`	`item.revSpecifier = revSpecifier;`
`36`	`36`
`37`	`37`	`return item;`
`38`	`38`	`}`
`39`	`39`
`40`		`-+ (PBSourceViewItem )itemWithTitle:(NSString )title;`
	`40`	`++ (id)itemWithTitle:(NSString *)title;`
`41`	`41`	`{`
`42`		`- PBSourceViewItem *item = [[PBSourceViewItem alloc] init];`
	`42`	`+ PBSourceViewItem *item = [[[self class] alloc] init];`
`43`	`43`	`item.title = title;`
`44`	`44`	`return item;`
`45`	`45`	`}`