From 1a35f02ec6d43fad795bf397ea9e262be0a90452 Mon Sep 17 00:00:00 2001 From: David Catmull Date: Fri, 3 Jun 2011 15:51:10 -0600 Subject: [PATCH] rename & add to project --- GitX.xcodeproj/project.pbxproj | 6 +++++ PBGitStashController.m | 24 ------------------- ...ashController.h => PBStashViewController.h | 12 ++++++---- PBStashViewController.m | 23 ++++++++++++++++++ 4 files changed, 37 insertions(+), 28 deletions(-) delete mode 100644 PBGitStashController.m rename PBGitStashController.h => PBStashViewController.h (61%) create mode 100644 PBStashViewController.m diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj index 7cb0c81..fc0c36e 100644 --- a/GitX.xcodeproj/project.pbxproj +++ b/GitX.xcodeproj/project.pbxproj @@ -138,6 +138,7 @@ D8FDDA6F114335E8005647F6 /* PBGitSVStageItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA67114335E8005647F6 /* PBGitSVStageItem.m */; }; D8FDDA70114335E8005647F6 /* PBGitSVTagItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D8FDDA69114335E8005647F6 /* PBGitSVTagItem.m */; }; D8FDDBF41143F318005647F6 /* AddRemote.png in Resources */ = {isa = PBXBuildFile; fileRef = D8FDDBF31143F318005647F6 /* AddRemote.png */; }; + DDB8FE0113998CE2001A9EE2 /* PBStashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */; }; F50FE0E30E07BE9600854FCD /* PBGitRevisionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */; }; F513085B0E0740F2000C8BCD /* PBQLOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = F513085A0E0740F2000C8BCD /* PBQLOutlineView.m */; }; F5140DC90E8A8EB20091E9F3 /* RoundedRectangle.m in Sources */ = {isa = PBXBuildFile; fileRef = F5140DC80E8A8EB20091E9F3 /* RoundedRectangle.m */; }; @@ -425,6 +426,8 @@ D8FDDA69114335E8005647F6 /* PBGitSVTagItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitSVTagItem.m; sourceTree = ""; }; D8FDDA7311433634005647F6 /* PBSourceViewItems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBSourceViewItems.h; sourceTree = ""; }; D8FDDBF31143F318005647F6 /* AddRemote.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AddRemote.png; path = Images/AddRemote.png; sourceTree = ""; }; + DDB8FDFF13998CE2001A9EE2 /* PBStashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBStashViewController.h; sourceTree = ""; }; + DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBStashViewController.m; sourceTree = ""; }; F50FE0E10E07BE9600854FCD /* PBGitRevisionCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRevisionCell.h; sourceTree = ""; }; F50FE0E20E07BE9600854FCD /* PBGitRevisionCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRevisionCell.m; sourceTree = ""; }; F51308590E0740F2000C8BCD /* PBQLOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBQLOutlineView.h; sourceTree = ""; }; @@ -939,6 +942,8 @@ 77C8280C06725ACE000B614F /* ApplicationController.m */, 93CB42C00EAB7B2200530609 /* PBGitDefaults.h */, 93CB42C10EAB7B2200530609 /* PBGitDefaults.m */, + DDB8FDFF13998CE2001A9EE2 /* PBStashViewController.h */, + DDB8FE0013998CE2001A9EE2 /* PBStashViewController.m */, F57CC43F0E05E496000472E2 /* PBGitWindowController.h */, F57CC4400E05E496000472E2 /* PBGitWindowController.m */, 911111F60E594F3F00BF76B4 /* PBRepositoryDocumentController.h */, @@ -1447,6 +1452,7 @@ 217FF0BE12A1CB3E00785A65 /* PBRevealWithFinderCommand.m in Sources */, 65D58BC7132D48C2003F7290 /* PBResetSheet.m in Sources */, 31776089133569350025876E /* SearchWebView.m in Sources */, + DDB8FE0113998CE2001A9EE2 /* PBStashViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/PBGitStashController.m b/PBGitStashController.m deleted file mode 100644 index 8be1d96..0000000 --- a/PBGitStashController.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// PBGitHistoryView.h -// GitX -// -// Created by David Catmull on 20-06-11. -// Copyright 2011. All rights reserved. -// - -#import "PBGitStashController.h" - -@implementation PBGitStashController - - -- (void) awakeFromNib -{ -} - -- (void) showStash:(PBGitStash)stash -{ - // git stash show -p [stash stashSourceMessage] - [webController -} - -@end diff --git a/PBGitStashController.h b/PBStashViewController.h similarity index 61% rename from PBGitStashController.h rename to PBStashViewController.h index 0f04e3a..ca8b334 100644 --- a/PBGitStashController.h +++ b/PBStashViewController.h @@ -1,5 +1,5 @@ // -// PBGitHistoryView.h +// PBStashViewController.h // GitX // // Created by David Catmull on 20-06-11. @@ -7,14 +7,18 @@ // #import "PBViewController.h" +#import "PBWebController.h" + +@class PBGitStash; +@class PBWebStashController; // Controls the view displaying a stash diff -@interface PBGitStashController : PBViewController { +@interface PBStashViewController : PBViewController { IBOutlet id webView; - IBOutlet PBWebStashController *webHistoryController; + IBOutlet PBWebStashController *webController; } -- (void) c:(PBGitStash)stash; +- (void) showStash:(PBGitStash*)stash; @end diff --git a/PBStashViewController.m b/PBStashViewController.m new file mode 100644 index 0000000..e29b746 --- /dev/null +++ b/PBStashViewController.m @@ -0,0 +1,23 @@ +// +// PBStashViewController.h +// GitX +// +// Created by David Catmull on 20-06-11. +// Copyright 2011. All rights reserved. +// + +#import "PBStashViewController.h" +#import "PBGitStash.h" + +@implementation PBStashViewController + +- (void) awakeFromNib +{ +} + +- (void) showStash:(PBGitStash*)stash +{ + [webController changeContentTo:stash]; +} + +@end