25 Commits

Author SHA1 Message Date
David Catmull 8053f57fbc add PBWebStashController 2011-06-12 21:46:30 -06:00
David Catmull e1836bb02a plug the stuff in, not working yet 2011-06-03 17:38:05 -06:00
German Laullon e00f7343b1 Merge pull request #61 from Uncommon/helptags
Help tags for remotes and tags
2011-05-19 16:34:12 -07:00
German Laullon 94efa431a6 conditionalize usage of 10.6-only protocols
David Catmull (Uncommon)
Uncommon/gitx@e5b603f188

Conflicts:

	DBPrefsWindowController.h
	PBGitHistoryController.h
	PBGitSidebarController.h
	PBGitWindowController.h
2011-05-19 00:01:49 +02:00
David Catmull 7806e64990 help tags for remotes now work 2011-05-14 23:16:57 -06:00
Uwe Hees b1cd163c98 Comment out delegate declarations that are only present in 10.6 2011-04-27 23:13:46 +02:00
German Laullon f9ccf1fe8d Solved compilation warnings 2011-03-10 16:04:45 -08:00
German Laullom 2de41fd116 Merge remote branch 'refs/remotes/rastersize/master' into experimental
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
2011-01-27 16:45:11 -08:00
German Laullon 5c9d7163e1 badge system recoded 2011-01-07 12:10:44 -08:00
German Laullon 0151598af0 (inital) display if remotes need a fetch 2011-01-07 00:37:29 -08:00
Adi Luhung Suryadi 13a4fd693f merging krasnyk/stashes branch to soundevolution/svn
Merge branch 'refs/heads/stashes' into testing

Conflicts:
	GitX.xcodeproj/project.pbxproj
	PBGitHistoryView.xib
	PBGitSidebarView.xib
2011-01-06 01:48:19 +08:00
Adi Luhung Suryadi a3bba2e19c Merge commit '0a3b60066c0662c4097e2d1db22e95fb1080abb9' into testing
Conflicts:
	GitX.xcodeproj/project.pbxproj
2011-01-06 01:09:16 +08:00
Tomasz Krasnyk 7deb309dbb Merge branch 'refs/heads/experimental' into stashes
Conflicts:
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBRefController.m
2010-11-28 23:33:06 +01:00
Simeon Leifer d91ed3d8c3 set state (checkmark) on view menu items to reflect active view 2010-11-17 19:50:55 -07:00
Tomasz Krasnyk cc5c93c2b6 - stashes can be created with optional message
- added clearing all stashes
- added possibility to ignore files with given extension
- submodules are now showed
- submodules can be opened
2010-11-07 23:37:41 +01:00
krt 0a3b60066c Stashes are shown on in Side controlle 2010-11-06 13:20:13 +01:00
Matt Connolly be373b0ace Adding code to support SVN fetch,rebase,dcommit buttons and sensing of svn-remote configuration in repository. No implementation of git svn commands yet, just code for the buttons. 2010-10-22 07:01:55 +10: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 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 90f80f01b4 Add a new cell class for the source view items
The new cell handles:
    - showing contextual menus
    - drawing a badge for the checked out branch

Needed to add the reference to the ref controller to the history controller.
2010-03-13 22:14:49 -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 c36726b985 Update the GUI to be more iApp like
- In PBGitSidebarView.xib
        - change indentation to 12
        - change font size to 11
        - disable the editable behavior
        - disable autoresizing
        - disable user resizing (column should resize with view)
        - remove the window
        - remove the shared user defaults controller (not being used)
    - add a project item with the project's name
    - a "Stage" item to go to what has been called the commit view
    - new icons for branches, remote branches and tags (created by Nathan Kinsinger)
    - remove the old tiff icons, PBSourceViewRemote.h/m and PBSourceViewAction.h/m from the xcode project
    - uses system icon for folder
    - uses Network icon for remotes
    - capitalize group names
    - rename the Custom group to Other (you can't really customize items in the traditional sense)
    - create a class for each item type that takes care of it's image (instead of trying to guess the image from it or it's parent's name)
    - remove the branch menu toolbar item from the history view, it's redundant now
2010-03-13 22:13:06 -07:00
Pieter de Bie 468e6bbb40 Sidebar: add a new ref if it can't be found 2009-09-13 23:10:31 +02:00
Pieter de Bie 692a79c3ad Sidebar: Add "Commit" action
When this tree leaf is selected, the view switches
to the commit view.
2009-09-10 02:39:51 +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