From 0ec89f165c7bfc68bd053e8bf7d5bd665b395efa Mon Sep 17 00:00:00 2001 From: David Catmull Date: Mon, 13 Jun 2011 17:51:16 -0600 Subject: [PATCH] plug in PBWebStashController --- PBStashContentController.h | 2 +- PBStashContentView.xib | 226 +++++++------------------------------ PBWebDiffController.h | 1 + 3 files changed, 42 insertions(+), 187 deletions(-) diff --git a/PBStashContentController.h b/PBStashContentController.h index 3ec6061..5ce1510 100644 --- a/PBStashContentController.h +++ b/PBStashContentController.h @@ -15,7 +15,7 @@ // Controls the view displaying a stash diff @interface PBStashContentController : PBViewController { IBOutlet id webView; - IBOutlet PBWebHistoryController *webController; + IBOutlet PBWebStashController *webController; } - (void) showStash:(PBGitStash*)stash; diff --git a/PBStashContentView.xib b/PBStashContentView.xib index 5dfb786..5230212 100644 --- a/PBStashContentView.xib +++ b/PBStashContentView.xib @@ -109,7 +109,7 @@ NSView - PBWebHistoryController + PBWebStashController @@ -171,6 +171,14 @@ 10 + + + stashController + + + + 11 + @@ -268,7 +276,7 @@ - 10 + 11 @@ -280,158 +288,6 @@ NSApplication+GitXScripting.h - - PBGitHistoryController - PBViewController - - YES - - YES - cherryPick: - createBranch: - createTag: - merge: - openFilesAction: - openSelectedFile: - rebase: - refresh: - selectNext: - selectPrevious: - setBranchFilter: - setDetailedView: - setTreeView: - showAddRemoteSheet: - showCommitsFromTree: - showInFinderAction: - toggleQLPreviewPanel: - updateSearch: - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - cherryPick: - createBranch: - createTag: - merge: - openFilesAction: - openSelectedFile: - rebase: - refresh: - selectNext: - selectPrevious: - setBranchFilter: - setDetailedView: - setTreeView: - showAddRemoteSheet: - showCommitsFromTree: - showInFinderAction: - toggleQLPreviewPanel: - updateSearch: - - - YES - - cherryPick: - id - - - createBranch: - id - - - createTag: - id - - - merge: - id - - - openFilesAction: - id - - - openSelectedFile: - id - - - rebase: - id - - - refresh: - id - - - selectNext: - id - - - selectPrevious: - id - - - setBranchFilter: - id - - - setDetailedView: - id - - - setTreeView: - id - - - showAddRemoteSheet: - id - - - showCommitsFromTree: - id - - - showInFinderAction: - id - - - toggleQLPreviewPanel: - id - - - updateSearch: - id - - - - - IBProjectSource - PBGitHistoryController.h - - PBGitRepository NSDocument @@ -452,7 +308,7 @@ YES - PBWebHistoryController + PBWebStashController id @@ -467,7 +323,7 @@ YES webController - PBWebHistoryController + PBWebStashController webView @@ -499,6 +355,25 @@ PBViewController.h + + PBWebCommitController + PBWebController + + contextMenuDelegate + id + + + contextMenuDelegate + + contextMenuDelegate + id + + + + IBProjectSource + PBWebCommitController.h + + PBWebController NSObject @@ -540,43 +415,22 @@ - PBWebHistoryController - PBWebController + PBWebStashController + PBWebCommitController - YES - - YES - contextMenuDelegate - historyController - - - YES - id - PBGitHistoryController - + stashController + PBStashContentController - YES - - YES - contextMenuDelegate - historyController - - - YES - - contextMenuDelegate - id - - - historyController - PBGitHistoryController - + stashController + + stashController + PBStashContentController IBProjectSource - PBWebHistoryController.h + PBWebStashController.h diff --git a/PBWebDiffController.h b/PBWebDiffController.h index bda6014..67738d3 100644 --- a/PBWebDiffController.h +++ b/PBWebDiffController.h @@ -10,6 +10,7 @@ #import "PBWebController.h" #import "PBDiffWindowController.h" +// Instantiated in PBDiffWindow.xib, used by PBDiffWindowController @interface PBWebDiffController : PBWebController { IBOutlet PBDiffWindowController *diffController; }