65 Commits

Author SHA1 Message Date
David Catmull 4a2c139fb9 menus for files in stash view 2011-06-15 21:16:02 -06:00
David Catmull 8053f57fbc add PBWebStashController 2011-06-12 21:46:30 -06:00
Alex Brand 1490db8396 Merge branch 'master' into gui-refresh 2011-04-29 22:01:03 +02:00
German Laullon f6e69682d1 better hide/show splitviews 2011-04-22 15:48:19 -07:00
German Laullon 656cb824a3 NSLog => Dlog (Log only on debug build) 2011-04-05 11:39:01 -07:00
Leszek Ślażyński f0f5c916dd Workaround for 'refresh' not refreshing everything 2011-03-30 06:38:18 +08:00
Ole Zorn dcb3bd8abe Removed logs 2011-03-30 06:38:15 +08:00
German Laullon f9ccf1fe8d Solved compilation warnings 2011-03-10 16:04:45 -08:00
Alex Brand b785abb574 Merge branch 'master' into gui-refresh 2011-03-09 12:15:57 +01:00
German Laullon a60dfa3d99 Animation 2011-03-02 16:12:12 -08:00
German Laullon 10b9fa08a3 working 2011-03-02 14:40:08 -08:00
German Laullon fb956111f6 ToolBar, icons and selector. 2011-03-02 13:33:07 -08:00
Alex Brand df4c7d30e9 Using iTerm2 as an option 2011-03-01 11:28:04 +01:00
Aron Cedercrantz 1820973e70 Fixed automatic refresh (broken by merge). 2011-01-19 13:50:01 +01:00
Aron Cedercrantz 80b84eedab Merge remote branch laullon/master into integration 2011-01-19 13:22:30 +01:00
Simeon Leifer d91ed3d8c3 set state (checkmark) on view menu items to reflect active view 2010-11-17 19:50:55 -07:00
Sebastian Staudt 21d1f3989f Added a dialog for failing commit hooks
This enables the user to force a commit (i.e. --no-verify) when either pre-commit or
commit-msg hook fails.
2010-09-13 20:25:42 +02:00
Nathan Kinsinger e56ca103ca Add search commands to the gitx cli
-s or --search= for searching in subject, author or SHA
-S or --Search= for git's pickaxe string matching
-r or --regex= for git's pickaxe regex matching
2010-09-12 19:32:47 -06:00
Nathan Kinsinger 549f2c1d6a Show long messages and errors in a scroll view
This stops really long sheets when the output from git is very long.
2010-07-05 09:26:50 -06:00
Nathan Kinsinger 53d92fb73e Cleanup the views when the repository window closes and stop memory leaks.
- make sure to remove themselves from KV and notification center observers
    - add the PBWebHistoryController to PBHistoryController so it can be told to close
    - replaced the -removeView methods with -closeView (-removeView was not being used)
    - clear any obj-c objects set in web scripting objects

This last item seems to be the reason that the web controllers and the current commit did not get collected which then held the repository document from being collected as well.
2010-07-04 09:46:22 -06:00
Nathan Kinsinger e0a3422439 Bugfix: Index not refreshing on manual refresh
The window controller should be calling the content controller's refresh and not the repository's.
2010-03-20 18:45:45 -06:00
Nathan Kinsinger ef26909d75 Add a Refresh button to the main window toolbar 2010-03-13 23:05:28 -07:00
Nathan Kinsinger 446dd540da Add Terminal, Reveal and Clone To to the toolbar
The clone icon is by André Berg (in 4396081c07)
2010-03-13 22:15:28 -07:00
Nathan Kinsinger 1b41171d92 Add a bottom content border/toolbar to the repository window
- add an action menu for the selected ref in the source view
    - add Add Remote, Fetch, Pull and Push buttons to the bottom bar
        - Add Remote icon by Nathan Kinsinger
        - Fetch, Pull and Push icons are modified versions of André Berg's icons (from 4396081c07) made a bit smaller to fit in the UI better.
    - move the status message for both the history view and the commit/stage view
        - all PBViewControllers now have status and isBusy properties and can use those to put a message in the bottom bar when they are the active content controller of the window
2010-03-13 22:15:13 -07:00
Nathan Kinsinger 64f4276e21 Delete old toolbars and create new ones
- remove the separate window toolbars from the history and commit views and create a new window toolbar in the repository window
    - add new toolbars inside the history view
        - new class to draw a gradient in the background of a view
        - moved the search field from the main toolbar to the scope bar
2010-03-13 22:14:36 -07:00
Nathan Kinsinger b1e632cf6f Move the sidebar to the window controller
Remove the sidebar from the history controller and put it under the control of the window controller.
    - the window controller is the delegate of the split view and controls resizing so the source list stays the same width as the window resizes
    - the sidebar controller tells the window controller which content view to show
    - removed the view selector from the toolbars of the history and commit xibs (the menu and keyboard shortcuts command-1 and command-2 still switch between the views)
    - added horizontal lines to the history and commit xibs to delineate the bottom toolbar area
2010-03-13 22:13:12 -07:00
Nathan Kinsinger eff7dab6b2 Merge branch 'refs/heads/pb/sidebar'
Conflicts:
	GitX.xcodeproj/project.pbxproj
	PBGitHistoryController.m
	PBGitWindowController.m
2010-03-13 22:11:47 -07:00
Nathan Kinsinger d3d700a138 Add Clone To… to the File menu
Will clone an open repository to a folder. Opens a sheet with a custom accessory view that has a checkbox to allow creating a bare repo.
2010-03-13 12:52:44 -07:00
Nathan Kinsinger 509de29091 Add Reveal in Finder item to the Repository menu. 2010-03-06 16:31:51 -07:00
Nathan Kinsinger db0bb87340 Add Open in Terminal to the Repository menu.
Code came from B. Ohr at: http://groups.google.com/group/gitx/browse_thread/thread/a103df7ef7c1f037

Added quotes to workingDirectory path to support paths with spaces.
2010-03-06 16:31:16 -07:00
Nathan Kinsinger 69c9c57397 Add convenience method for showing an error sheet. 2010-03-06 15:59:16 -07:00
Aron Cedercrantz 68ea0b1afd Merge branch 'stable' of git://github.com/pieter/gitx
Conflicts:
	PBViewController.m
2009-09-23 20:05:39 +02:00
Pieter de Bie acfa464eb4 PBViewController: add a method that is called when a view is loaded for the first time 2009-09-21 22:09:33 +02:00
Pieter de Bie ff1d30571b WIP: Move the sidebar to the history view instead
I'm not sure what we should do with the commit stuff, but
this seems more reasonable
2009-09-13 22:44:26 +02:00
Pieter de Bie c8cfe7acaa Add start of a sourceview list
This shows in a separate window for now, so we don't
mess up the xibs. Once I'm satisfied with the result,
I can put it into the main view with a single change :)
2009-09-10 01:25:49 +02:00
Aron Cedercrantz 4e0871c2e2 Add on window selection refresh.
The changes in PBViewController is only there to
supress a compiler warning.
2009-07-23 23:51:28 +02:00
Nicholas Riley f2a37df9f5 Set keyboard focus reasonably when switching between views.
When you switch to the commit view, the commit message gets focus;
when you switch to the history view, the commit list gets focus.
2009-07-07 11:56:40 +01:00
Johannes Gilger 13746a5a6b PBGitWindowController: Use beginSheetModalForWindow instead of runModal
Introduce a new showMessageSheet/showErrorSheet-method for
PBGitWindowController which uses the beginSheetModalForWindow method of
NSAlert whereever possible. This has the advantage over runModal as it
doesn't block the other instances of GitX and is generally more
unobstrusive for simple status-messages.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-06-09 18:33:02 +02:00
Johannes Gilger 06f675b899 PBGitWindowController: Default to historyViewController for bare repo
If the repository we're working on is bare and through some default
value we are asked to display the commit-view, we simply change it back
to history.
2009-02-06 21:09:03 +01:00
Owen Yamauchi 82b6efc1d7 Fix ticket #84: disable commit view for bare repos 2009-02-06 21:09:03 +01:00
Owen Yamauchi 64dfd99089 Make finding the history/commit selector more robust.
Shouldn't assume that the selector is the first item in the toolbar; the user
could have moved it.
2009-02-06 21:09:03 +01:00
Pieter de Bie cd4ee1b993 Update views when switching 2008-12-22 20:47:36 +01:00
Pieter de Bie 4dd7a46b86 Allow Toolbar customization
This allows both toolbars to be customized.
2008-12-01 13:50:51 +01:00
Pieter de Bie 0a2ddc36f7 GitWindowController: Store multiple views
This keeps the subviews in memory, which means that switching views will
be faster if a view has already been opened. This also allows you to type
a commit message, switch to the history view, and then switch back to
continue typing.
2008-11-26 17:44:25 +01:00
Pieter de Bie 3dd6385440 Fix memory leaks 2008-11-26 17:44:24 +01:00
Pieter de Bie edf4822e34 CLI: Show history view if necessary 2008-11-19 02:21:02 +01:00
Pieter de Bie 5cb842ca6b PBGitRepositoryWindow: keep toolbar DisplayMode when switching views 2008-10-16 14:58:28 +02:00
Pieter de Bie b2cd87cb72 GitWindow: Don't try to be smart with the view selector
Previously, we would try to copy the view selector from within
the RepositoryWindow, so we could reuse it and change it if we
need to.

However, that causes problems if you have another window open:
if we try to add an item using the insertItemWithIdentifier:atIndex:
method, the item will be added to _all_ toolbars with the same
identifier, even if those toolbars already have the item!

As I see no easy way to fix that, we completely avoid the issue
by not inserting any objects and just copying the view selector
from view to view.
2008-10-04 23:00:11 +02:00
Pieter de Bie e329493154 Move toolbar to view xib 2008-10-03 17:18:26 +02:00
Ciarán Walsh e1704729f9 Adding view-specific toolbars. 2008-09-30 23:14:02 +01:00