In order to work around the Default Folder problem and the irritation
with a debug build opening its own repository, I've added two
preferences to select (1) whether GitX should open the current
directory at launch as a repository and (2) whether GitX should
present an Open pane on launch. They default to YES, but I keep mine
at NO.
This also makes it simple to choose the repository I want from the
recent files menu, as the one selected by the launch-time Open panel
is always wrong. I no longer have to close that.
As a special bonus, I fixed the warnings that "The image scaling
property should not be used with checkboxes". This patch contains only
the fixes for the preferences xib. I'll contribute a patch for the
others separately.
---
ApplicationController.m | 22 ++-
English.lproj/Preferences.xib | 317 +++++++++++++++++++++++++++++
+-----------
PBGitDefaults.h | 2 +
PBGitDefaults.m | 18 +++-
4 files changed, 269 insertions(+), 90 deletions(-)
diff --git a/ApplicationController.m b/ApplicationController.m
index 48f3964..21117a4 100644
--- a/ApplicationController.m
+++ b/ApplicationController.m
@@ -69,15 +69,25 @@ - (void)applicationDidFinishLaunching:
(NSNotification*)notification
// For example, the application might have been launched by double-
clicking a .git repository,
// or by dragging a folder to the app icon
if ([[[PBRepositoryDocumentController sharedDocumentController]
documents] count] == 0 && [[NSApplication sharedApplication]
isActive]) {
- // Try to open the current directory as a git repository
+
NSURL *url = nil;
- if([[[NSProcessInfo processInfo] environment]
objectForKey:@"PWD"])
- url = [NSURL fileURLWithPath:[[[NSProcessInfo
processInfo]
environment] objectForKey:@"PWD"]];
+
+ if ([PBGitDefaults openCurDirOnLaunch]) {
+
+ // Try to open the current directory as a git repository
+ id curPath = [[[NSProcessInfo processInfo] environment]
objectForKey:@"PWD"];
+ if(curPath)
+ url = [NSURL fileURLWithPath:curPath];
+ }
NSError *error = nil;
+
if (!url || [[PBRepositoryDocumentController
sharedDocumentController] openDocumentWithContentsOfURL:url
display:YES error:&error] == NO) {
- // The current directory could not be opened (most
likely it’s not
a git repository)
- // so show an open panel for the user to select a
repository to
view
- [[PBRepositoryDocumentController
sharedDocumentController]
openDocument:self];
+
+ // The current directory was not enabled or could not
be opened
(most likely it’s not a git repository)
+ if ([PBGitDefaults showOpenPanelOnLaunch]) {
+ // show an open panel for the user to select a
repository to view
+ [[PBRepositoryDocumentController
sharedDocumentController]
openDocument:self];
+ }
}
}
}
diff --git a/English.lproj/Preferences.xib b/English.lproj/
Preferences.xib
index 5058653..a547632 100644
--- a/English.lproj/Preferences.xib
+++ b/English.lproj/Preferences.xib
@@ -1,26 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9J61</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.46</string>
- <string key="IBDocument.HIToolboxVersion">353.00</string>
+ <string key="IBDocument.SystemVersion">10A432</string>
+ <string key="IBDocument.InterfaceBuilderVersion">732</string>
+ <string key="IBDocument.AppKitVersion">1038</string>
+ <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
+ <string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</
string>
+ <string key="NS.object.0">732</string>
+ </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="4" id="12"/>
- <integer value="87"/>
+ <integer value="4"/>
<integer value="62"/>
+ <integer value="87"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilderKit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -43,6 +46,59 @@
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButton" id="11946865">
+ <reference
key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">12</int>
+ <string key="NSFrame">{{18,
97}, {297, 18}}</string>
+ <reference key="NSSuperview"
ref="1005"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell"
key="NSCell" id="249630167">
+ <int
key="NSCellFlags">-2080244224</int>
+ <int
key="NSCellFlags2">0</int>
+ <string
key="NSContents">Show open panel on launch if no
repository</string>
+ <object class="NSFont"
key="NSSupport" id="734450335">
+ <string
key="NSName">LucidaGrande</string>
+ <double
key="NSSize">13</double>
+ <int
key="NSfFlags">1044</int>
+ </object>
+ <reference
key="NSControlView" ref="11946865"/>
+ <int
key="NSButtonFlags">1211912703</int>
+ <int
key="NSButtonFlags2">2</int>
+ <object
class="NSCustomResource" key="NSNormalImage"
id="696935153">
+ <string
key="NSClassName">NSImage</string>
+ <string
key="NSResourceName">NSSwitch</string>
+ </object>
+ <object
class="NSButtonImageSource" key="NSAlternateImage"
id="690089052">
+ <string
key="NSImageName">NSSwitch</string>
+ </object>
+ <string
key="NSAlternateContents"/>
+ <string
key="NSKeyEquivalent"/>
+ <int
key="NSPeriodicDelay">200</int>
+ <int
key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="961749906">
+ <reference
key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">12</int>
+ <string key="NSFrame">{{18,
117}, {313, 18}}</string>
+ <reference key="NSSuperview"
ref="1005"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell"
key="NSCell" id="809919488">
+ <int
key="NSCellFlags">-2080244224</int>
+ <int
key="NSCellFlags2">0</int>
+ <string
key="NSContents">Open current directory on launch if
repository</string>
+ <reference
key="NSSupport" ref="734450335"/>
+ <reference
key="NSControlView" ref="961749906"/>
+ <int
key="NSButtonFlags">1211912703</int>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
+ <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="NSTextField"
id="441589300">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
@@ -53,11 +109,7 @@
<int
key="NSCellFlags">68288064</int>
<int
key="NSCellFlags2">272630784</int>
<string
key="NSContents">Git Executable:</string>
- <object class="NSFont"
key="NSSupport" id="734450335">
- <string
key="NSName">LucidaGrande</string>
- <double
key="NSSize">1.300000e+01</double>
- <int
key="NSfFlags">1044</int>
- </object>
+ <reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="441589300"/>
<object class="NSColor"
key="NSBackgroundColor"
id="124675276">
<int
key="NSColorSpace">6</int>
@@ -65,7 +117,7 @@
<string
key="NSColorName">controlColor</string>
<object
class="NSColor" key="NSColor">
<int
key="NSColorSpace">3</int>
- <bytes
key="NSWhite">MC42NjY2NjY2OQA</bytes>
+ <bytes
key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor"
key="NSTextColor" id="716218002">
@@ -84,7 +136,7 @@
<int key="NSvFlags">268</int>
<object class="NSMutableSet"
key="NSDragTypes">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSMutableArray" key="set.sortedObjects">
+ <object class="NSArray"
key="set.sortedObjects">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>Apple
URL pasteboard type</string>
<string>NSFilenamesPboardType</string>
@@ -98,7 +150,7 @@
<int
key="NSCellFlags2">163840</int>
<object class="NSFont"
key="NSSupport" id="26">
<string
key="NSName">LucidaGrande</string>
- <double
key="NSSize">1.100000e+01</double>
+ <double
key="NSSize">11</double>
<int
key="NSfFlags">3100</int>
</object>
<reference
key="NSControlView" ref="525163949"/>
@@ -132,7 +184,7 @@
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="806993456">
- <int
key="NSCellFlags">-2080244224</int>
+ <int
key="NSCellFlags">67239424</int>
<int
key="NSCellFlags2">0</int>
<string
key="NSContents"/>
<reference
key="NSSupport" ref="734450335"/>
@@ -152,8 +204,8 @@
</object>
<object class="NSButton" id="910887184">
<reference
key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{18,
103}, {203, 18}}</string>
+ <int key="NSvFlags">12</int>
+ <string key="NSFrame">{{18,
137}, {203, 18}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="709654045">
@@ -163,14 +215,9 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="910887184"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <object
class="NSCustomResource" key="NSNormalImage"
id="495198475">
- <string
key="NSClassName">NSImage</string>
- <string
key="NSResourceName">NSSwitch</string>
- </object>
- <object
class="NSButtonImageSource" key="NSAlternateImage"
id="690089052">
- <string
key="NSImageName">NSSwitch</string>
- </object>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
+ <reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
<int
key="NSPeriodicDelay">200</int>
@@ -178,7 +225,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{400, 139}</string>
+ <string key="NSFrameSize">{402, 173}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -216,8 +263,8 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="250497668"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -342,7 +389,7 @@
<object
class="NSDateFormatter" key="NSFormatter"
id="787712114">
<object
class="NSMutableDictionary" key="NS.attributes">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSMutableArray" key="dict.sortedKeys">
+ <object
class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>dateFormat_10_0</string>
<string>dateStyle</string>
@@ -352,7 +399,7 @@
<object
class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>%m/%d/%y</string>
-
<reference ref="12"/>
+
<integer value="4"/>
<integer value="1040"/>
<integer value="2"/>
</object>
@@ -408,8 +455,8 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="890810109"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -428,7 +475,8 @@
<object class="NSUserDefaultsController" id="557723770">
<object class="NSMutableArray"
key="NSDeclaredKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>PBShowWhitespaceDifferences</string>
+ <string>PBOpenCurDirOnLaunch</string>
+ <string>PBShowOpenPanelOnLaunch</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
@@ -446,12 +494,12 @@
<object class="NSButtonCell"
key="NSCell" id="973971251">
<int
key="NSCellFlags">-2080244224</int>
<int
key="NSCellFlags2">0</int>
- <string
type="base64-UTF8"
key="NSContents">RW5hYmxlICdHaXN0IGl0Jw</string>
+ <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">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -472,8 +520,8 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="485413225"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -494,8 +542,8 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="933582906"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -516,8 +564,8 @@
<reference
key="NSSupport" ref="734450335"/>
<reference
key="NSControlView" ref="766070942"/>
<int
key="NSButtonFlags">1211912703</int>
- <int
key="NSButtonFlags2">130</int>
- <reference
key="NSNormalImage" ref="495198475"/>
+ <int
key="NSButtonFlags2">2</int>
+ <reference
key="NSNormalImage" ref="696935153"/>
<reference
key="NSAlternateImage" ref="690089052"/>
<string
key="NSAlternateContents"/>
<string
key="NSKeyEquivalent"/>
@@ -727,7 +775,7 @@
<string
key="NSKeyPath">values.gitExecutable</string>
<object
class="NSDictionary" key="NSOptions">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object
class="NSMutableArray" key="dict.sortedKeys">
+ <object
class="NSArray" key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>NSAllowsEditingMultipleValuesSelection</string>
<string>NSNullPlaceholder</string>
@@ -865,34 +913,64 @@
</object>
<int key="connectionID">117</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection"
key="connection">
+ <string key="label">value:
values.PBOpenCurDirOnLaunch</string>
+ <reference key="source"
ref="961749906"/>
+ <reference key="destination"
ref="557723770"/>
+ <object
class="NSNibBindingConnector" key="connector">
+ <reference
key="NSSource" ref="961749906"/>
+ <reference
key="NSDestination" ref="557723770"/>
+ <string
key="NSLabel">value: values.PBOpenCurDirOnLaunch</
string>
+ <string
key="NSBinding">value</string>
+ <string
key="NSKeyPath">values.PBOpenCurDirOnLaunch</string>
+ <int
key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">123</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection"
key="connection">
+ <string key="label">value:
values.PBShowOpenPanelOnLaunch</
string>
+ <reference key="source"
ref="11946865"/>
+ <reference key="destination"
ref="557723770"/>
+ <object
class="NSNibBindingConnector" key="connector">
+ <reference
key="NSSource" ref="11946865"/>
+ <reference
key="NSDestination" ref="557723770"/>
+ <string
key="NSLabel">value: values.PBShowOpenPanelOnLaunch</
string>
+ <string
key="NSBinding">value</string>
+ <string
key="NSKeyPath">values.PBShowOpenPanelOnLaunch</
string>
+ <int
key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">125</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <object class="NSArray"
key="object" id="1002">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="object"
ref="0"/>
<reference key="children"
ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object"
ref="1001"/>
- <reference key="parent"
ref="1002"/>
- <string type="base64-UTF8"
key="objectName">RmlsZSdzIE93bmVyA</
string>
+ <reference key="parent"
ref="0"/>
+ <string key="objectName">File's
Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object"
ref="1003"/>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string key="objectName">First
Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object"
ref="1004"/>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string
key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@@ -900,13 +978,15 @@
<reference key="object"
ref="1005"/>
<object class="NSMutableArray"
key="children">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <reference
ref="441589300"/>
- <reference
ref="525163949"/>
- <reference
ref="617839596"/>
+ <reference
ref="961749906"/>
+ <reference
ref="11946865"/>
<reference
ref="1032928366"/>
+ <reference
ref="617839596"/>
+ <reference
ref="525163949"/>
+ <reference
ref="441589300"/>
<reference
ref="910887184"/>
</object>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string
key="objectName">General</string>
</object>
<object class="IBObjectRecord">
@@ -921,7 +1001,7 @@
<reference
ref="819946684"/>
<reference
ref="1045127964"/>
</object>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string
key="objectName">Updates</string>
</object>
<object class="IBObjectRecord">
@@ -1051,12 +1131,12 @@
<object class="IBObjectRecord">
<int key="objectID">26</int>
<reference key="object"
ref="844257713"/>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object"
ref="557723770"/>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">42</int>
@@ -1112,7 +1192,7 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<reference
ref="890810109"/>
</object>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string key="objectName">Open
Panel Accessory</string>
</object>
<object class="IBObjectRecord">
@@ -1153,7 +1233,7 @@
<reference
ref="485413225"/>
<reference
ref="766070942"/>
</object>
- <reference key="parent"
ref="1002"/>
+ <reference key="parent"
ref="0"/>
<string
key="objectName">Integration</string>
</object>
<object class="IBObjectRecord">
@@ -1226,14 +1306,40 @@
<reference key="object"
ref="709654045"/>
<reference key="parent"
ref="910887184"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">118</int>
+ <reference key="object"
ref="961749906"/>
+ <object class="NSMutableArray"
key="children">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <reference
ref="809919488"/>
+ </object>
+ <reference key="parent"
ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">119</int>
+ <reference key="object"
ref="809919488"/>
+ <reference key="parent"
ref="961749906"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">120</int>
+ <reference key="object"
ref="11946865"/>
+ <object class="NSMutableArray"
key="children">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <reference
ref="249630167"/>
+ </object>
+ <reference key="parent"
ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">121</int>
+ <reference key="object"
ref="249630167"/>
+ <reference key="parent"
ref="11946865"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary"
key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray"
key="dict.sortedKeys">
+ <object class="NSArray" key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <string>-1.IBPluginDependency</string>
- <string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
@@ -1246,7 +1352,11 @@
<string>11.IBPluginDependency</string>
<string>114.IBPluginDependency</string>
<string>115.IBPluginDependency</string>
+ <string>118.IBPluginDependency</string>
+ <string>119.IBPluginDependency</string>
<string>12.IBPluginDependency</string>
+ <string>120.IBPluginDependency</string>
+ <string>121.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>14.IBPluginDependency</string>
<string>15.IBEditorWindowLastContentRect</string>
@@ -1261,7 +1371,7 @@
<string>23.IBPluginDependency</string>
<string>24.IBPluginDependency</string>
<string>25.IBPluginDependency</string>
- <string>26.IBPluginDependency</string>
+ <string>28.IBPluginDependency</string>
<string>4.IBEditorWindowLastContentRect</string>
<string>4.IBPluginDependency</string>
<string>4.IBUserGuides</string>
@@ -1291,15 +1401,13 @@
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilderKit</string>
-
<string>com.apple.InterfaceBuilderKit</string>
- <string>{{477, 551}, {400,
139}}</string>
+ <string>{{428, 636}, {402,
173}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view"
ref="1005"/>
- <float
key="location">1.210000e+02</float>
+ <double
key="location">121</double>
<int
key="affinity">0</int>
</object>
</object>
@@ -1314,6 +1422,10 @@
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{514, 459}, {106, 71}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1327,13 +1439,13 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{297, 436}, {400,
139}}</string>
+ <string>{{321, 441}, {400,
139}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableArray">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBUserGuide">
<reference key="view"
ref="970459672"/>
- <float
key="location">4.200000e+01</float>
+ <double
key="location">42</double>
<int
key="affinity">0</int>
</object>
</object>
@@ -1344,13 +1456,13 @@
<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>{{187, 359}, {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>{{461, 244}, {400,
116}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1363,9 +1475,7 @@
</object>
<object class="NSMutableDictionary"
key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
</object>
@@ -1373,15 +1483,13 @@
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool
key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">117</int>
+ <int key="maxID">125</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray"
key="referencedPartialClassDescriptions">
@@ -1399,7 +1507,7 @@
<string
key="superclassName">DBPrefsWindowController</string>
<object class="NSMutableDictionary"
key="actions">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray"
key="dict.sortedKeys">
+ <object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>checkGitValidity:</string>
<string>resetGitPath:</string>
@@ -1414,7 +1522,7 @@
</object>
<object class="NSMutableDictionary"
key="outlets">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray"
key="dict.sortedKeys">
+ <object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>badGitPathIcon</string>
<string>generalPrefsView</string>
@@ -1469,8 +1577,51 @@
<reference key="sourceIdentifier"
ref="657347130"/>
</object>
</object>
+ <object class="NSMutableArray"
key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSObject</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBFrameworkSource</string>
+ <string
key="minorKey">Sparkle.framework/Headers/SUAppcast.h</
string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSObject</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier"
id="614042494">
+ <string
key="majorKey">IBFrameworkSource</string>
+ <string
key="minorKey">Sparkle.framework/Headers/SUUpdater.h</
string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">SUUpdater</string>
+ <string
key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary"
key="actions">
+ <string
key="NS.key.0">checkForUpdates:</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary"
key="outlets">
+ <string
key="NS.key.0">delegate</string>
+ <string
key="NS.object.0">id</string>
+ </object>
+ <reference key="sourceIdentifier"
ref="614042494"/>
+ </object>
+ </object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencies">
+ <string key="NS.key.
0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <integer value="1050" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.
0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <integer value="1050" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.
0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</
bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../
GitX.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
diff --git a/PBGitDefaults.h b/PBGitDefaults.h
index 6610681..fec2430 100644
--- a/PBGitDefaults.h
+++ b/PBGitDefaults.h
@@ -17,5 +17,7 @@
+ (BOOL) confirmPublicGists;
+ (BOOL) isGistPublic;
+ (BOOL)showWhitespaceDifferences;
++ (BOOL)openCurDirOnLaunch;
++ (BOOL)showOpenPanelOnLaunch;
@end
diff --git a/PBGitDefaults.m b/PBGitDefaults.m
index c605617..dc9cfd1 100644
--- a/PBGitDefaults.m
+++ b/PBGitDefaults.m
@@ -15,6 +15,8 @@
#define kConfirmPublicGists @"PBConfirmPublicGists"
#define kPublicGist @"PBGistPublic"
#define kShowWhitespaceDifferences @"PBShowWhitespaceDifferences"
+#define kOpenCurDirOnLaunch @"PBOpenCurDirOnLaunch"
+#define kShowOpenPanelOnLaunch @"PBShowOpenPanelOnLaunch"
@implementation PBGitDefaults
@@ -33,6 +35,10 @@ + (void)initialize
forKey:kPublicGist];
[defaultValues setObject:[NSNumber numberWithBool:YES]
forKey:kShowWhitespaceDifferences];
+ [defaultValues setObject:[NSNumber numberWithBool:YES]
+ forKey:kOpenCurDirOnLaunch];
+ [defaultValues setObject:[NSNumber numberWithBool:YES]
+ forKey:kShowOpenPanelOnLaunch];
[[NSUserDefaults standardUserDefaults]
registerDefaults:defaultValues];
}
@@ -61,9 +67,19 @@ + (BOOL) isGistPublic
return [[NSUserDefaults standardUserDefaults]
boolForKey:kPublicGist];
}
-
+ (BOOL)showWhitespaceDifferences
{
return [[NSUserDefaults standardUserDefaults]
boolForKey:kShowWhitespaceDifferences];
}
+
++ (BOOL)openCurDirOnLaunch
+{
+ return [[NSUserDefaults standardUserDefaults]
boolForKey:kOpenCurDirOnLaunch];
+}
+
++ (BOOL)showOpenPanelOnLaunch
+{
+ return [[NSUserDefaults standardUserDefaults]
boolForKey:kShowOpenPanelOnLaunch];
+}
+
@end
--
1.6.0.4.781.gf2070
