kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'laullon/master'

Browse Source
This commit is contained in:
Uwe Hees
2011-05-02 09:18:17 +02:00
parent bb46584b56 d609816789
commit 636068cb33
7 changed files with 341 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
English.lproj/Preferences.xib
+259 -108
View File
@@ -3,16 +3,18 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10J567</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.InterfaceBuilderVersion">823</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">462.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string>
<string key="NS.object.0">823</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="62"/>
<integer value="1"/>
<integer value="87"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -140,7 +142,7 @@
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="25030403"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor">
<object class="NSColor" key="NSBackgroundColor" id="521622403">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
@@ -528,7 +530,7 @@
<integer value="2"/>
</object>
</object>
<string key="NS.format">EEEE, dd MMMM, yyyy HH:mm:ss </string>
<string key="NS.format">EEEE, d. MMMM yyyy HH:mm:ss</string>
<bool key="NS.natural">NO</bool>
</object>
<reference key="NSControlView" ref="1045127964"/>
@@ -561,7 +563,7 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="351117501">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -589,6 +591,7 @@
</object>
</object>
<string key="NSFrameSize">{239, 54}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomObject" id="844257713">
@@ -597,27 +600,27 @@
<object class="NSUserDefaultsController" id="557723770">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>PBRefreshAutomatically</string>
<string>PBITerm2Available</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomView" id="263788152">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="237556568">
<object class="NSButton" id="944417844">
<reference key="NSNextResponder" ref="263788152"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 80}, {111, 18}}</string>
<string key="NSFrame">{{261, 53}, {121, 18}}</string>
<reference key="NSSuperview" ref="263788152"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="973971251">
<int key="NSCellFlags">-2080244224</int>
<object class="NSButtonCell" key="NSCell" id="544944090">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Enable 'Gist it'</string>
<string key="NSContents">Use iTerm2</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="237556568"/>
<reference key="NSControlView" ref="944417844"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
@@ -628,10 +631,111 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSBox" id="611988647">
<reference key="NSNextResponder" ref="263788152"/>
<int key="NSvFlags">36</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="983027044">
<reference key="NSNextResponder" ref="611988647"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="933582906">
<reference key="NSNextResponder" ref="983027044"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{36, 34}, {181, 18}}</string>
<reference key="NSSuperview" ref="983027044"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="601773126">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Confirm creation of Gists</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="933582906"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="237556568">
<reference key="NSNextResponder" ref="983027044"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{16, 54}, {111, 18}}</string>
<reference key="NSSuperview" ref="983027044"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="973971251">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Enable 'Gist it'</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="237556568"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="766070942">
<reference key="NSNextResponder" ref="983027044"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{36, 12}, {179, 18}}</string>
<reference key="NSSuperview" ref="983027044"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="817763751">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Make Gists public</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="766070942"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrame">{{1, 1}, {233, 80}}</string>
<reference key="NSSuperview" ref="611988647"/>
</object>
</object>
<string key="NSFrame">{{17, 20}, {235, 96}}</string>
<reference key="NSSuperview" ref="263788152"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Gits</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="521622403"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<reference key="NSContentView" ref="983027044"/>
<int key="NSBorderType">1</int>
<int key="NSBoxType">0</int>
<int key="NSTitlePosition">2</int>
<bool key="NSTransparent">NO</bool>
</object>
<object class="NSButton" id="485413225">
<reference key="NSNextResponder" ref="263788152"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 18}, {121, 18}}</string>
<string key="NSFrame">{{261, 80}, {121, 18}}</string>
<reference key="NSSuperview" ref="263788152"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="12685338">
@@ -650,52 +754,9 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="933582906">
<reference key="NSNextResponder" ref="263788152"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{38, 60}, {181, 18}}</string>
<reference key="NSSuperview" ref="263788152"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="601773126">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Confirm creation of Gists</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="933582906"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="766070942">
<reference key="NSNextResponder" ref="263788152"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{38, 38}, {179, 18}}</string>
<reference key="NSSuperview" ref="263788152"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="817763751">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Make Gists public</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="766070942"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="136676346"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{400, 116}</string>
<string key="NSFrameSize">{400, 136}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</object>
@@ -1121,6 +1182,38 @@
</object>
<int key="connectionID">144</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.PBUseITerm2</string>
<reference key="source" ref="944417844"/>
<reference key="destination" ref="557723770"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="944417844"/>
<reference key="NSDestination" ref="557723770"/>
<string key="NSLabel">value: values.PBUseITerm2</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.PBUseITerm2</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">149</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: values.PBITerm2Available</string>
<reference key="source" ref="944417844"/>
<reference key="destination" ref="557723770"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="944417844"/>
<reference key="NSDestination" ref="557723770"/>
<string key="NSLabel">enabled: values.PBITerm2Available</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">values.PBITerm2Available</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">154</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1410,10 +1503,9 @@
<reference key="object" ref="263788152"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="237556568"/>
<reference ref="933582906"/>
<reference ref="611988647"/>
<reference ref="485413225"/>
<reference ref="766070942"/>
<reference ref="944417844"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Integration</string>
@@ -1427,53 +1519,11 @@
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">89</int>
<reference key="object" ref="237556568"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="973971251"/>
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="973971251"/>
<reference key="parent" ref="237556568"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">91</int>
<reference key="object" ref="12685338"/>
<reference key="parent" ref="485413225"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">97</int>
<reference key="object" ref="933582906"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="601773126"/>
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">98</int>
<reference key="object" ref="601773126"/>
<reference key="parent" ref="933582906"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">108</int>
<reference key="object" ref="766070942"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="817763751"/>
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">109</int>
<reference key="object" ref="817763751"/>
<reference key="parent" ref="766070942"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">114</int>
<reference key="object" ref="910887184"/>
@@ -1600,6 +1650,73 @@
<reference key="object" ref="254305730"/>
<reference key="parent" ref="604563603"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">145</int>
<reference key="object" ref="611988647"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="933582906"/>
<reference ref="237556568"/>
<reference ref="766070942"/>
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">97</int>
<reference key="object" ref="933582906"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="601773126"/>
</object>
<reference key="parent" ref="611988647"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">98</int>
<reference key="object" ref="601773126"/>
<reference key="parent" ref="933582906"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">89</int>
<reference key="object" ref="237556568"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="973971251"/>
</object>
<reference key="parent" ref="611988647"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="973971251"/>
<reference key="parent" ref="237556568"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">108</int>
<reference key="object" ref="766070942"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="817763751"/>
</object>
<reference key="parent" ref="611988647"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">109</int>
<reference key="object" ref="817763751"/>
<reference key="parent" ref="766070942"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">146</int>
<reference key="object" ref="944417844"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="544944090"/>
</object>
<reference key="parent" ref="263788152"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">147</int>
<reference key="object" ref="544944090"/>
<reference key="parent" ref="944417844"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1641,6 +1758,9 @@
<string>141.IBPluginDependency</string>
<string>141.IBViewBoundsToFrameTransform</string>
<string>142.IBPluginDependency</string>
<string>145.IBViewBoundsToFrameTransform</string>
<string>146.IBPluginDependency</string>
<string>147.IBPluginDependency</string>
<string>15.IBEditorWindowLastContentRect</string>
<string>15.IBPluginDependency</string>
<string>16.IBPluginDependency</string>
@@ -1673,6 +1793,7 @@
<string>87.IBEditorWindowLastContentRect</string>
<string>87.IBPluginDependency</string>
<string>88.IBPluginDependency</string>
<string>88.IBViewBoundsToFrameTransform</string>
<string>89.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
<string>90.IBPluginDependency</string>
@@ -1683,7 +1804,7 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{511, 548}, {401, 279}}</string>
<string>{{511, 477}, {401, 279}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1737,6 +1858,11 @@
<bytes key="NSTransformStruct">P4AAAL+AAADBcAAAw3QAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUKaAABCvgAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{443, 712}, {103, 71}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1767,15 +1893,18 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{474, 394}, {239, 54}}</string>
<string>{{505, 405}, {239, 54}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{474, 352}, {400, 116}}</string>
<string>{{329, 400}, {400, 136}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCYAAAwoIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1800,7 +1929,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">144</int>
<int key="maxID">154</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1820,6 +1949,13 @@
<string key="minorKey">NSApplication+GitXScripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">View/CellTrackingRect.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PBPrefsWindowController</string>
<string key="superclassName">DBPrefsWindowController</string>
@@ -2032,6 +2168,14 @@
<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSBox</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButton</string>
<string key="superclassName">NSControl</string>
@@ -2385,6 +2529,13 @@
<string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">ScriptingBridge.framework/Headers/SBApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
GLFileView.m
+4 -2
View File
@@ -430,8 +430,10 @@
+(NSString *)getFileName:(NSString *)line
{
NSRange b = [line rangeOfString:@"b/"];
NSString *file=[line substringFromIndex:b.location+2];
NSRange b = [line rangeOfString:@" b/"];
NSString *file=[line substringFromIndex:b.location+3];
DLog(@"line=%@",line);
DLog(@"file=%@",file);
return file;
}
GitX.xcodeproj/project.pbxproj
+4
View File
@@ -232,6 +232,7 @@
F5FE6C030EB13BC900F30D12 /* PBServicesController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FE6C020EB13BC900F30D12 /* PBServicesController.m */; };
F5FF4E180E0829C20006317A /* PBGitRevList.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E170E0829C20006317A /* PBGitRevList.mm */; };
F5FF4E7A0E082E440006317A /* PBGitGrapher.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5FF4E790E082E440006317A /* PBGitGrapher.mm */; };
FA8DFF3E131AEE2700C0F289 /* Start_iTerm2.applescript in Resources */ = {isa = PBXBuildFile; fileRef = FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -575,6 +576,7 @@
F5FF4E170E0829C20006317A /* PBGitRevList.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitRevList.mm; sourceTree = "<group>"; };
F5FF4E780E082E440006317A /* PBGitGrapher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitGrapher.h; sourceTree = "<group>"; };
F5FF4E790E082E440006317A /* PBGitGrapher.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PBGitGrapher.mm; sourceTree = "<group>"; };
FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = Start_iTerm2.applescript; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -815,6 +817,7 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
FA8DFF37131AEDD400C0F289 /* Start_iTerm2.applescript */,
316E7200131EE9C600AFBB36 /* list_Template.png */,
316E7201131EE9C600AFBB36 /* sidebar_Template.png */,
21025C1012947AB200D87200 /* sourceListAction.png */,
@@ -1360,6 +1363,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
FA8DFF3E131AEE2700C0F289 /* Start_iTerm2.applescript in Resources */,
F5E92A1B0E88550E00056E75 /* empty_file.png in Resources */,
913D5E500E55645900CECEA2 /* gitx in Resources */,
551BF176112F3F4B00265053 /* gitx_askpasswd in Resources */,
PBGitDefaults.h
+3
View File
@@ -35,6 +35,9 @@
+ (void) setBranchFilter:(NSInteger)state;
+ (NSInteger)historySearchMode;
+ (void)setHistorySearchMode:(NSInteger)mode;
+ (BOOL) isUseITerm2;
+ (BOOL) isITerm2Available;
+ (void) setITerm2Available:(BOOL)iTerm2Available;
// Suppressed Dialog Warnings
PBGitDefaults.m
+28
View File
@@ -28,6 +28,8 @@
#define kBranchFilterState @"PBBranchFilter"
#define kHistorySearchMode @"PBHistorySearchMode"
#define kSuppressedDialogWarnings @"Suppressed Dialog Warnings"
#define kUseITerm2 @"PBUseITerm2"
#define kITerm2Available @"PBITerm2Available"
@implementation PBGitDefaults
@@ -61,6 +63,10 @@
forKey:kOpenPreviousDocumentsOnLaunch];
[defaultValues setObject:[NSNumber numberWithInteger:kGitXBasicSeachMode]
forKey:kHistorySearchMode];
[defaultValues setObject:[NSNumber numberWithBool:NO]
forKey:kUseITerm2];
[defaultValues setObject:[NSNumber numberWithBool:NO]
forKey:kITerm2Available];
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];
}
@@ -183,6 +189,28 @@
[[NSUserDefaults standardUserDefaults] setInteger:mode forKey:kHistorySearchMode];
}
+ (BOOL) isUseITerm2
{
[self isITerm2Available];
return [[NSUserDefaults standardUserDefaults] boolForKey:kUseITerm2];
}
+ (BOOL) isITerm2Available
{
NSString *iTermPath = [[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"com.googlecode.iterm2"];
[self setITerm2Available:[[NSFileManager defaultManager] fileExistsAtPath:iTermPath]];
return [[NSUserDefaults standardUserDefaults] boolForKey:kITerm2Available];
}
+ (void) setITerm2Available:(BOOL)iTerm2Available
{
if (!iTerm2Available)
[[NSUserDefaults standardUserDefaults] setBool:iTerm2Available forKey:kUseITerm2];
[[NSUserDefaults standardUserDefaults] setBool:iTerm2Available forKey:kITerm2Available];
[[NSUserDefaults standardUserDefaults] synchronize];
}
// Suppressed Dialog Warnings
PBGitWindowController.m
+27 -5
View File
@@ -140,6 +140,15 @@
if ([PBGitDefaults refreshAutomatically]) {
[contentController refresh:nil];
}
if ([PBGitDefaults isUseITerm2]) {
[terminalItem setImage:[[NSWorkspace sharedWorkspace] iconForFile:[[NSWorkspace sharedWorkspace] absolutePathForAppBundleWithIdentifier:@"com.googlecode.iterm2"]]];
[terminalItem setLabel:@"iTerm"];
}
else {
[terminalItem setImage:[[NSWorkspace sharedWorkspace] iconForFile:@"/Applications/Utilities/Terminal.app/"]];
[terminalItem setLabel:@"Terminal"];
}
}
- (void)showErrorSheetTitle:(NSString *)title message:(NSString *)message arguments:(NSArray *)arguments output:(NSString *)output
@@ -161,12 +170,25 @@
- (IBAction) openInTerminal:(id)sender
{
TerminalApplication *term = [SBApplication applicationWithBundleIdentifier: @"com.apple.Terminal"];
NSString *workingDirectory = [[repository workingDirectory] stringByAppendingString:@"/"];
NSString *cmd = [NSString stringWithFormat: @"cd \"%@\"; clear; echo '# Opened by GitX:'; git status", workingDirectory];
[term doScript: cmd in: nil];
[NSThread sleepForTimeInterval: 0.1];
[term activate];
if ([PBGitDefaults isUseITerm2]) {
NSStringEncoding encoding;
NSString *resourcePath = [[[NSBundle bundleForClass:[self class]] resourcePath] stringByAppendingPathComponent:@"Start_iTerm2.applescript"];
NSString *scriptSource = [NSString stringWithContentsOfFile:resourcePath usedEncoding:&encoding error:nil];
NSString *iTerm2StartScript = [scriptSource stringByReplacingOccurrencesOfString:@"%%workDir%%" withString:workingDirectory];
NSAppleScript *scriptObject = [[NSAppleScript alloc] initWithSource:iTerm2StartScript];
[scriptObject executeAndReturnError:nil];
}
else {
TerminalApplication *term = [SBApplication applicationWithBundleIdentifier:@"com.apple.Terminal"];
NSString *cmd = [NSString stringWithFormat: @"cd \"%@\"; clear; echo '# Opened by GitX:'; git status", workingDirectory];
[term doScript: cmd in: nil];
[NSThread sleepForTimeInterval: 0.1];
[term activate];
}
}
- (IBAction) cloneTo:(id)sender
Start_iTerm2.applescript
+16
View File
@@ -0,0 +1,16 @@
tell application "iTerm"
activate
try
set myterm to the first terminal
on error
set myterm to (make new terminal)
end try
tell myterm
launch session "gitx"
tell the last session
set name to "Opened by GitX"
exec command "/bin/bash"
write text "cd %%workDir%%; clear; echo '# Opened by GitX:'; git status"
end tell
end tell
end tell