diff -rNu ../GitX-0.7.1.orig/ApplicationController.m ./ApplicationController.m --- ../GitX-0.7.1.orig/ApplicationController.m 2011-08-04 22:32:07.000000000 +0200 +++ ./ApplicationController.m 2011-08-04 22:35:52.000000000 +0200 @@ -16,7 +16,6 @@ #import "PBPrefsWindowController.h" #import "PBNSURLPathUserDefaultsTransfomer.h" #import "PBGitDefaults.h" -#import "Sparkle/SUUpdater.h" @implementation ApplicationController @synthesize cliProxy; @@ -64,10 +63,6 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification { - [[SUUpdater sharedUpdater] setSendsSystemProfile:YES]; -#ifdef DEBUG_BUILD - [[SUUpdater sharedUpdater] setFeedURL:[NSURL URLWithString:@"http://gitx.frim.nl/Downloads/appcast_DEBUG.xml"]]; -#endif [self registerServices]; // Only try to open a default document if there are no documents open already. diff -rNu ../GitX-0.7.1.orig/English.lproj/MainMenu.xib ./English.lproj/MainMenu.xib --- ../GitX-0.7.1.orig/English.lproj/MainMenu.xib 2011-08-04 22:32:07.000000000 +0200 +++ ./English.lproj/MainMenu.xib 2011-08-04 22:39:05.000000000 +0200 @@ -87,14 +87,6 @@ - - - Q2hlY2sgZm9yIFVwZGF0ZXPigKY - - 2147483647 - - - YES @@ -836,9 +828,6 @@ YES - - SUUpdater - @@ -1125,14 +1114,6 @@ - checkForUpdates: - - - - 920 - - - setDetailedView: @@ -1273,7 +1254,6 @@ - @@ -1818,16 +1798,6 @@ - 918 - - - - - 919 - - - - 927 @@ -2477,29 +2477,6 @@ - - YES - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - delegate - id - - - - 0 ../GitX.xcodeproj diff -rNu ../GitX-0.7.1.orig/English.lproj/Preferences.xib ./English.lproj/Preferences.xib --- ../GitX-0.7.1.orig/English.lproj/Preferences.xib 2011-08-04 22:32:06.000000000 +0200 +++ ./English.lproj/Preferences.xib 2011-08-04 22:57:55.000000000 +0200 @@ -1,31 +1,37 @@ - + 1050 - 9J61 - 677 - 949.46 - 353.00 - + 11A511 + 1617 + 1138 + 566.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1617 + + YES - - - - + NSTextField + NSCustomObject + NSButton + NSCustomView + NSPathCell + NSButtonCell + NSPathControl + NSUserDefaultsController + NSTextFieldCell YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin YES - - YES - - + YES + YES @@ -48,6 +54,8 @@ 268 {{17, 54}, {99, 17}} + + YES 68288064 @@ -55,7 +63,7 @@ Git Executable: LucidaGrande - 1.300000e+01 + 13 1044 @@ -65,7 +73,7 @@ controlColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -84,7 +92,7 @@ 268 YES - + YES Apple URL pasteboard type NSFilenamesPboardType @@ -92,13 +100,15 @@ {{121, 50}, {179, 22}} + + YES 337772033 163840 LucidaGrande - 1.100000e+01 + 11 3100 @@ -114,6 +124,8 @@ 268 {{118, 0}, {192, 42}} + + YES 67239424 @@ -130,6 +142,8 @@ 268 {{306, 54}, {54, 14}} + + YES -2080244224 @@ -155,6 +169,8 @@ 268 {{18, 103}, {203, 18}} + + YES -2080244224 @@ -182,11 +198,13 @@ 268 {{18, 78}, {207, 18}} + + YES -2080244224 0 - U2hvdyAiT3BlbiIgcGFuZWwgb24gbGF1bmNoA + Show "Open" panel on launch 1211912703 @@ -202,214 +220,8 @@ {400, 139} - NSView - - - - 268 - - YES - - - 268 - {{39, 45}, {82, 14}} - - YES - - 68288064 - 272761856 - Last update: - - - - - - - - - 268 - {{18, 103}, {260, 18}} - - YES - - -2080244224 - 0 - Automatically check for updates - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 268 - {{130, 78}, {100, 22}} - - YES - - -2076049856 - 133120 - - - 109199615 - 129 - - - 400 - 75 - - - Monthly - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - 2629800 - - - YES - - OtherViews - - YES - - - Hourly - - 1048576 - 2147483647 - - - _popUpItemAction: - 3600 - - - - - Daily - - 1048576 - 2147483647 - - - _popUpItemAction: - 86400 - - - - - Weekly - - 1048576 - 2147483647 - - - _popUpItemAction: - 604800 - - - - - - 3 - 1 - YES - YES - 2 - - - - - 268 - {{39, 80}, {89, 17}} - - YES - - 68288064 - 272761856 - Update interval: - - - - - - - - - 268 - {{130, 45}, {251, 14}} - - YES - - 68288064 - -1874721792 - DATE ... - - - - YES - - YES - dateFormat_10_0 - dateStyle - formatterBehavior - timeStyle - - - YES - %m/%d/%y - - - - - - EEEE, MMMM d, yyyy h:mm:ss a - NO - - - - - - - - - 268 - {{128, 13}, {96, 28}} - - YES - - 67239424 - 134348800 - Check Now - - - -2038284033 - 129 - - - 200 - 25 - - - - {400, 139} - + + NSView @@ -444,14 +256,7 @@ NSView - - SUUpdater - - - YES - PBShowOpenPanelOnLaunch - YES @@ -468,7 +273,7 @@ -2080244224 0 - RW5hYmxlICdHaXN0IGl0Jw + Enable 'Gist it' 1211912703 @@ -558,14 +363,6 @@ YES - updatesPrefsView - - - - 7 - - - generalPrefsView @@ -573,86 +370,6 @@ 8 - - value: automaticallyChecksForUpdates - - - - - - value: automaticallyChecksForUpdates - value - automaticallyChecksForUpdates - 2 - - - 27 - - - - selectedTag: updateCheckInterval - - - - - - selectedTag: updateCheckInterval - selectedTag - updateCheckInterval - 2 - - - 31 - - - - enabled: automaticallyChecksForUpdates - - - - - - enabled: automaticallyChecksForUpdates - enabled - automaticallyChecksForUpdates - 2 - - - 33 - - - - enabled: automaticallyChecksForUpdates - - - - - - enabled: automaticallyChecksForUpdates - enabled - automaticallyChecksForUpdates - 2 - - - 36 - - - - value: values.SULastCheckTime - - - - - - value: values.SULastCheckTime - value - values.SULastCheckTime - 2 - - - 41 - - delegate @@ -662,14 +379,6 @@ - checkForUpdates: - - - - 55 - - - checkGitValidity: @@ -749,7 +458,7 @@ values.gitExecutable YES - + YES NSAllowsEditingMultipleValuesSelection NSNullPlaceholder @@ -909,28 +618,26 @@ YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -945,162 +652,13 @@ - + General - 4 - - - YES - - - - - - - - - Updates - - - 9 - - - YES - - - - - - 10 - - - - - 11 - - - YES - - - - - - 12 - - - - - 13 - - - YES - - - - - - 14 - - - YES - - - - - - 15 - - - YES - - - - - - - - - 16 - - - - - 17 - - - - - 18 - - - - - 19 - - - YES - - - - - - 20 - - - - - 21 - - - YES - - - - - - 22 - - - YES - - - - - - 23 - - - YES - - - - - - 24 - - - - - 25 - - - - - 26 - - - - 28 - - - - 42 - - + 43 @@ -1151,7 +709,7 @@ YES - + Open Panel Accessory @@ -1192,7 +750,7 @@ - + Integration @@ -1283,61 +841,34 @@ YES - + YES -1.IBPluginDependency -2.IBPluginDependency -3.IBPluginDependency - 1.IBEditorWindowLastContentRect 1.IBPluginDependency 1.IBUserGuides - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect - 10.IBPluginDependency 108.IBPluginDependency 109.IBPluginDependency - 11.IBPluginDependency 114.IBPluginDependency 115.IBPluginDependency 118.IBPluginDependency 119.IBPluginDependency - 12.IBPluginDependency - 13.IBPluginDependency - 14.IBPluginDependency - 15.IBEditorWindowLastContentRect - 15.IBPluginDependency - 16.IBPluginDependency - 17.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 4.IBEditorWindowLastContentRect - 4.IBPluginDependency - 4.IBUserGuides - 42.IBPluginDependency + 28.IBPluginDependency 43.IBPluginDependency 44.IBPluginDependency 45.IBPluginDependency 46.IBPluginDependency 47.IBPluginDependency 48.IBPluginDependency - 62.IBEditorWindowLastContentRect 62.IBPluginDependency 63.IBPluginDependency 64.IBPluginDependency 77.IBPluginDependency 78.IBPluginDependency - 87.IBEditorWindowLastContentRect 87.IBPluginDependency 88.IBPluginDependency 89.IBPluginDependency - 9.IBPluginDependency 90.IBPluginDependency 91.IBPluginDependency 97.IBPluginDependency @@ -1346,54 +877,22 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - {{477, 551}, {400, 139}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin YES - 1.210000e+02 + 121 0 - {628, 654} - {{217, 442}, {480, 272}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{514, 459}, {106, 71}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{324, 683}, {400, 139}} com.apple.InterfaceBuilder.CocoaPlugin - - YES - - - 4.200000e+01 - 0 - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1401,13 +900,11 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{474, 394}, {239, 54}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{474, 352}, {400, 116}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1420,22 +917,14 @@ YES - - YES - - - YES - + + YES - - YES - - - YES - + + 121 @@ -1448,7 +937,7 @@ NSWindowController IBProjectSource - DBPrefsWindowController.h + ./Classes/DBPrefsWindowController.h @@ -1456,7 +945,7 @@ DBPrefsWindowController YES - + YES checkGitValidity: resetGitPath: @@ -1469,9 +958,33 @@ id + + YES + + YES + checkGitValidity: + resetGitPath: + showHideAllFiles: + + + YES + + checkGitValidity: + id + + + resetGitPath: + id + + + showHideAllFiles: + id + + + YES - + YES badGitPathIcon generalPrefsView @@ -1490,45 +1003,76 @@ NSView - - IBProjectSource - PBPrefsWindowController.h + + YES + + YES + badGitPathIcon + generalPrefsView + gitPathController + gitPathOpenAccessory + integrationPrefsView + updatesPrefsView + + + YES + + badGitPathIcon + NSImageView + + + generalPrefsView + NSView + + + gitPathController + NSPathControl + + + gitPathOpenAccessory + NSView + + + integrationPrefsView + NSView + + + updatesPrefsView + NSView + + - - - - YES - - NSObject - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUAppcast.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - delegate - id + IBProjectSource + ./Classes/PBPrefsWindowController.h - 0 - ../GitX.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 + + YES + + YES + NSStopProgressFreestandingTemplate + NSSwitch + + + YES + {83, 83} + {15, 15} + + diff -rNu ../GitX-0.7.1.orig/PBPrefsWindowController.h ./PBPrefsWindowController.h --- ../GitX-0.7.1.orig/PBPrefsWindowController.h 2011-08-04 22:32:06.000000000 +0200 +++ ./PBPrefsWindowController.h 2011-08-04 22:58:15.000000000 +0200 @@ -13,7 +13,6 @@ /* Outlets for Preference Views */ IBOutlet NSView *generalPrefsView; IBOutlet NSView *integrationPrefsView; - IBOutlet NSView *updatesPrefsView; /* Variables for the Updates View */ IBOutlet NSPathControl *gitPathController; diff -rNu ../GitX-0.7.1.orig/PBPrefsWindowController.m ./PBPrefsWindowController.m --- ../GitX-0.7.1.orig/PBPrefsWindowController.m 2011-08-04 22:32:06.000000000 +0200 +++ ./PBPrefsWindowController.m 2011-08-04 22:58:24.000000000 +0200 @@ -19,8 +19,6 @@ [self addView:generalPrefsView label:@"General" image:[NSImage imageNamed:@"gitx"]]; // INTERGRATION [self addView:integrationPrefsView label:@"Integration" image:[NSImage imageNamed:NSImageNameNetwork]]; - // UPDATES - [self addView:updatesPrefsView label:@"Updates"]; } #pragma mark - diff -rNu ../GitX-0.7.1.orig/feed.xml ./feed.xml --- ../GitX-0.7.1.orig/feed.xml 2011-08-04 22:32:06.000000000 +0200 +++ ./feed.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ - - - - GitX - http://github.com/pieter/gitx/wikis - A more native clone of Gitk for OS X - - GitX 0.5 - Sun, 17 Now 2008 11:24:54 +0100 - - GitX Version 0.5 -
-

This feature release has several new smaller or larger features:

- -
    -
  • The current branch is now highlighted
  • -
  • In the commit view, there is an option to amend commits
  • -
  • The "Gist it" button now respects github.user/token
  • -
  • Display a gravatar of the committer
  • -
  • The commit message view now displays a vertical line at 50 characters
  • -
  • It is now possible to revert changes by using the context menu in the - commit view
  • -
  • You can now stage only parts of a file by using the "Stage Hunk" buttons - in the commit view
  • -
  • You can now use GitX to show a diff of anything, for example by using - 'gitx --diff HEAD^^' or 'git diff HEAD~3 | gitx --diff'
  • -
  • You can now drag and drop refs to move them and also create branches
  • -
- - -

In addition, the following bugs have been fixed:

- -
    -
  • Better detection of git version
  • -
  • Branch lines are no longer interspersed with half a pixel of whitespace
  • -
  • The toolbar keeps its state when switching views
  • -
-
- ]]> -
-
- - - GitX 0.4.1 - Sun, 06 Sep 2008 11:24:54 +0900 - - - GitX Version 0.4.1 -
-

This is a maintenance release

-

Changes since Version 0.4:

-
    -
  • The diff display is now much faster
  • -
  • More locations are now searched for a default git
  • -
  • Code pasted online is now private
  • -
-
- ]]> -
-
-
-