diff --git a/GLFileView.m b/GLFileView.m index 1ff1ded..a35b3bf 100644 --- a/GLFileView.m +++ b/GLFileView.m @@ -125,7 +125,7 @@ } } -#if 1 +#ifdef DEBUG_BUILD NSString *dom=[[[[view mainFrame] DOMDocument] documentElement] outerHTML]; NSString *tmpFile=@"~/tmp/test.html"; [dom writeToFile:[tmpFile stringByExpandingTildeInPath] atomically:true encoding:NSUTF8StringEncoding error:nil]; diff --git a/PBGitHistoryView.xib b/PBGitHistoryView.xib index 105f342..1671ac9 100644 --- a/PBGitHistoryView.xib +++ b/PBGitHistoryView.xib @@ -3,7 +3,7 @@ 1050 10J567 - 788 + 762 1038.35 462.00 @@ -15,8 +15,8 @@ YES - 788 - 788 + 762 + 762 @@ -491,7 +491,7 @@ - d 'de' MMMM 'de' yyyy HH:mm + MMMM d, yyyy h:mm a NO @@ -981,7 +981,7 @@ YES 343014976 - 268698688 + 268698624 LucidaGrande @@ -3034,7 +3034,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.WebKitIBPlugin - {{1702, 241}, {955, 434}} + {{256, 24}, {955, 434}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3100,35 +3100,6 @@ MGScopeBar - - YES - - YES - accessoryView - fileListSplitView - historyController - typeBar - - - YES - - accessoryView - NSView - - - fileListSplitView - NSSplitView - - - historyController - PBGitHistoryController - - - typeBar - MGScopeBar - - - IBProjectSource GLFileView.h @@ -3149,13 +3120,6 @@ contextMenuDelegate id - - contextMenuDelegate - - contextMenuDelegate - id - - IBProjectSource GitXTextFieldCell.h @@ -3168,13 +3132,6 @@ delegate id - - delegate - - delegate - id - - IBProjectSource MGScopeBar/MGScopeBar.h @@ -3229,35 +3186,6 @@ WebView - - YES - - YES - controller - searchController - webController - webView - - - YES - - controller - PBGitHistoryController - - - searchController - PBHistorySearchController - - - webController - PBWebHistoryController - - - webView - WebView - - - IBProjectSource PBCommitList.h @@ -3327,105 +3255,6 @@ 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 - - - YES @@ -3475,115 +3304,6 @@ id - - YES - - YES - allBranchesFilterItem - cherryPickButton - commitController - commitList - fileBrowser - fileView - filesSearchField - historySplitView - localRemoteBranchesFilterItem - mergeButton - rebaseButton - refController - scopeBarView - searchController - searchField - selectedBranchFilterItem - treeController - upperToolbarView - webHistoryController - webView - - - YES - - allBranchesFilterItem - NSButton - - - cherryPickButton - NSButton - - - commitController - NSArrayController - - - commitList - PBCommitList - - - fileBrowser - NSOutlineView - - - fileView - GLFileView - - - filesSearchField - NSSearchField - - - historySplitView - PBCollapsibleSplitView - - - localRemoteBranchesFilterItem - NSButton - - - mergeButton - NSButton - - - rebaseButton - NSButton - - - refController - PBRefController - - - scopeBarView - PBGitGradientBarView - - - searchController - PBHistorySearchController - - - searchField - NSSearchField - - - selectedBranchFilterItem - NSButton - - - treeController - NSTreeController - - - upperToolbarView - PBGitGradientBarView - - - webHistoryController - PBWebHistoryController - - - webView - id - - - IBProjectSource PBGitHistoryController.h @@ -3613,25 +3333,6 @@ PBGitHistoryController - - YES - - YES - contextMenuDelegate - controller - - - YES - - contextMenuDelegate - id - - - controller - PBGitHistoryController - - - IBProjectSource PBGitRevisionCell.h @@ -3655,30 +3356,6 @@ id - - YES - - YES - selectSearchMode: - stepperPressed: - updateSearch: - - - YES - - selectSearchMode: - id - - - stepperPressed: - id - - - updateSearch: - id - - - YES @@ -3700,45 +3377,6 @@ NSSegmentedControl - - YES - - YES - commitController - historyController - numberOfMatchesField - progressIndicator - searchField - stepper - - - YES - - commitController - NSArrayController - - - historyController - PBGitHistoryController - - - numberOfMatchesField - NSTextField - - - progressIndicator - NSProgressIndicator - - - searchField - NSSearchField - - - stepper - NSSegmentedControl - - - IBProjectSource PBHistorySearchController.h @@ -3767,13 +3405,6 @@ controller PBGitHistoryController - - controller - - controller - PBGitHistoryController - - IBProjectSource PBQLOutlineView.h @@ -3821,90 +3452,6 @@ PBRefMenuItem - - YES - - YES - checkout: - cherryPick: - copyPatch: - copySHA: - createBranch: - createTag: - diffWithHEAD: - fetchRemote: - merge: - pullRemote: - pushDefaultRemoteForRef: - pushToRemote: - pushUpdatesToRemote: - rebaseHeadBranch: - showTagInfoSheet: - - - YES - - checkout: - PBRefMenuItem - - - cherryPick: - PBRefMenuItem - - - copyPatch: - PBRefMenuItem - - - copySHA: - PBRefMenuItem - - - createBranch: - PBRefMenuItem - - - createTag: - PBRefMenuItem - - - diffWithHEAD: - PBRefMenuItem - - - fetchRemote: - PBRefMenuItem - - - merge: - PBRefMenuItem - - - pullRemote: - PBRefMenuItem - - - pushDefaultRemoteForRef: - PBRefMenuItem - - - pushToRemote: - PBRefMenuItem - - - pushUpdatesToRemote: - PBRefMenuItem - - - rebaseHeadBranch: - PBRefMenuItem - - - showTagInfoSheet: - PBRefMenuItem - - - YES @@ -3922,35 +3469,6 @@ PBGitHistoryController - - YES - - YES - branchPopUp - commitController - commitList - historyController - - - YES - - branchPopUp - NSPopUpButton - - - commitController - NSArrayController - - - commitList - PBCommitList - - - historyController - PBGitHistoryController - - - IBProjectSource PBRefController.h @@ -3963,13 +3481,6 @@ refish id - - refish - - refish - id - - IBProjectSource PBRefMenuItem.h @@ -3982,13 +3493,6 @@ controller NSArrayController - - controller - - controller - NSArrayController - - IBProjectSource PBUnsortableTableHeader.h @@ -4001,13 +3505,6 @@ refresh: id - - refresh: - - refresh: - id - - IBProjectSource PBViewController.h @@ -4029,25 +3526,6 @@ WebView - - YES - - YES - repository - view - - - YES - - repository - id - - - view - WebView - - - IBProjectSource PBWebController.h @@ -4069,25 +3547,6 @@ PBGitHistoryController - - YES - - YES - contextMenuDelegate - historyController - - - YES - - contextMenuDelegate - id - - - historyController - PBGitHistoryController - - - IBProjectSource PBWebHistoryController.h @@ -4100,13 +3559,6 @@ view WebView - - view - - view - WebView - - IBUserSource @@ -4809,13 +4261,6 @@ view NSView - - view - - view - NSView - - IBFrameworkSource AppKit.framework/Headers/NSViewController.h @@ -4855,70 +4300,6 @@ id - - YES - - YES - goBack: - goForward: - makeTextLarger: - makeTextSmaller: - makeTextStandardSize: - reload: - reloadFromOrigin: - stopLoading: - takeStringURLFrom: - toggleContinuousSpellChecking: - toggleSmartInsertDelete: - - - YES - - goBack: - id - - - goForward: - id - - - makeTextLarger: - id - - - makeTextSmaller: - id - - - makeTextStandardSize: - id - - - reload: - id - - - reloadFromOrigin: - id - - - stopLoading: - id - - - takeStringURLFrom: - id - - - toggleContinuousSpellChecking: - id - - - toggleSmartInsertDelete: - id - - - IBFrameworkSource WebKit.framework/Headers/WebView.h diff --git a/PBGitRepository.h b/PBGitRepository.h index 63fb753..fe5369d 100644 --- a/PBGitRepository.h +++ b/PBGitRepository.h @@ -145,7 +145,6 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) { // for the scripting bridge - (void)findInModeScriptCommand:(NSScriptCommand *)command; --(NSNumber *)countCommintsOf:(NSString *)branchs; - (NSMenu *) menu; +(bool)isLocalBranch:(NSString *)branch branchNameInto:(NSString **)name; diff --git a/PBWebHistoryController.m b/PBWebHistoryController.m index f782a30..45ab3c4 100644 --- a/PBWebHistoryController.m +++ b/PBWebHistoryController.m @@ -120,7 +120,7 @@ [[view windowScriptObject] callWebScriptMethod:@"showCommit" withArguments:[NSArray arrayWithObject:html]]; -#if 1 +#ifdef DEBUG_BUILD NSString *dom=[[[[view mainFrame] DOMDocument] documentElement] outerHTML]; NSString *tmpFile=@"~/tmp/test2.html"; [dom writeToFile:[tmpFile stringByExpandingTildeInPath] atomically:true encoding:NSUTF8StringEncoding error:nil]; diff --git a/gitx_askpasswd_main.m b/gitx_askpasswd_main.m index 9c3a44f..b6a63ce 100644 --- a/gitx_askpasswd_main.m +++ b/gitx_askpasswd_main.m @@ -37,7 +37,7 @@ NSButton* rememberCheck; } --(NSPanel*) passwordPanel; +-(NSPanel*)passwordPanel:(NSString *)prompt remember:(BOOL)remember; -(IBAction) doOKButton: (id)sender; -(IBAction) doCancelButton: (id)sender;