mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental
Conflicts: ApplicationController.m GitX.xcodeproj/project.pbxproj PBGitCommitView.xib PBGitHistoryView.xib PBGitRevisionCell.m PBGitTree.m PBGitWindowController.m PBViewController.m html/views/history/history.js html/views/history/index.html
This commit is contained in:
@@ -23,8 +23,20 @@
|
||||
@property(assign) BOOL isBusy;
|
||||
|
||||
- (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGitWindowController *)controller;
|
||||
|
||||
/* removeView is called whenever the view is removed, either to be swapped
|
||||
* with a different view, or when the repository window will be destroyed
|
||||
*/
|
||||
- (void) removeView;
|
||||
|
||||
/* Updateview is called every time it is loaded into the main view */
|
||||
- (void) updateView;
|
||||
|
||||
/* Called after awakeFromNib:, and the view has been loaded into the main view.
|
||||
* Useful for resizing stuff after everything has been set in the right position
|
||||
*/
|
||||
- (void)viewLoaded;
|
||||
|
||||
- (NSResponder *)firstResponder;
|
||||
- (IBAction) refresh:(id)sender;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user