Skip to content

Commit 001f49b

Browse files
author
Roustem Karimov
committed
Disabling "Open Current Directory on Launch" by default. Adding a checkbox in Preferences window to control this setting.
This fixed a problem happening on Mac OS X Lion where more than one GitX window is shown when using gitx CLI.
1 parent 467f7ee commit 001f49b

File tree

2 files changed

+84
-25
lines changed

2 files changed

+84
-25
lines changed

‎English.lproj/Preferences.xib

Lines changed: 83 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
33
<data>
44
<int key="IBDocument.SystemTarget">1050</int>
5-
<string key="IBDocument.SystemVersion">10J869</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">1305</string>
7-
<string key="IBDocument.AppKitVersion">1038.35</string>
8-
<string key="IBDocument.HIToolboxVersion">461.00</string>
5+
<string key="IBDocument.SystemVersion">11A459e</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">1565</string>
7+
<string key="IBDocument.AppKitVersion">1121.2</string>
8+
<string key="IBDocument.HIToolboxVersion">557.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
11-
<string key="NS.object.0">1305</string>
11+
<string key="NS.object.0">1565</string>
1212
</object>
1313
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
1414
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -58,7 +58,7 @@
5858
<object class="NSButton" id="604563603">
5959
<reference key="NSNextResponder" ref="1005"/>
6060
<int key="NSvFlags">268</int>
61-
<string key="NSFrame">{{18, 185}, {158, 18}}</string>
61+
<string key="NSFrame">{{18, 197}, {158, 18}}</string>
6262
<reference key="NSSuperview" ref="1005"/>
6363
<reference key="NSWindow"/>
6464
<reference key="NSNextKeyView" ref="910887184"/>
@@ -91,7 +91,7 @@
9191
<object class="NSTextField" id="63761450">
9292
<reference key="NSNextResponder" ref="1005"/>
9393
<int key="NSvFlags">268</int>
94-
<string key="NSFrame">{{17, 22}, {166, 17}}</string>
94+
<string key="NSFrame">{{17, 34}, {166, 17}}</string>
9595
<reference key="NSSuperview" ref="1005"/>
9696
<reference key="NSWindow"/>
9797
<reference key="NSNextKeyView" ref="83909567"/>
@@ -125,7 +125,7 @@
125125
<object class="NSButton" id="83909567">
126126
<reference key="NSNextResponder" ref="1005"/>
127127
<int key="NSvFlags">268</int>
128-
<string key="NSFrame">{{182, 12}, {137, 32}}</string>
128+
<string key="NSFrame">{{182, 24}, {137, 32}}</string>
129129
<reference key="NSSuperview" ref="1005"/>
130130
<reference key="NSWindow"/>
131131
<reference key="NSNextKeyView"/>
@@ -148,7 +148,7 @@
148148
<object class="NSTextField" id="25030403">
149149
<reference key="NSNextResponder" ref="1005"/>
150150
<int key="NSvFlags">268</int>
151-
<string key="NSFrame">{{248, 117}, {41, 22}}</string>
151+
<string key="NSFrame">{{248, 129}, {41, 22}}</string>
152152
<reference key="NSSuperview" ref="1005"/>
153153
<reference key="NSWindow"/>
154154
<reference key="NSNextKeyView" ref="441589300"/>
@@ -180,7 +180,7 @@
180180
<object class="NSTextField" id="258144035">
181181
<reference key="NSNextResponder" ref="1005"/>
182182
<int key="NSvFlags">268</int>
183-
<string key="NSFrame">{{121, 119}, {122, 17}}</string>
183+
<string key="NSFrame">{{121, 131}, {122, 17}}</string>
184184
<reference key="NSSuperview" ref="1005"/>
185185
<reference key="NSWindow"/>
186186
<reference key="NSNextKeyView" ref="25030403"/>
@@ -198,7 +198,7 @@
198198
<object class="NSButton" id="968361983">
199199
<reference key="NSNextResponder" ref="1005"/>
200200
<int key="NSvFlags">268</int>
201-
<string key="NSFrame">{{18, 145}, {273, 18}}</string>
201+
<string key="NSFrame">{{18, 157}, {273, 18}}</string>
202202
<reference key="NSSuperview" ref="1005"/>
203203
<reference key="NSWindow"/>
204204
<reference key="NSNextKeyView" ref="258144035"/>
@@ -222,7 +222,7 @@
222222
<object class="NSTextField" id="441589300">
223223
<reference key="NSNextResponder" ref="1005"/>
224224
<int key="NSvFlags">268</int>
225-
<string key="NSFrame">{{17, 92}, {99, 17}}</string>
225+
<string key="NSFrame">{{17, 104}, {99, 17}}</string>
226226
<reference key="NSSuperview" ref="1005"/>
227227
<reference key="NSWindow"/>
228228
<reference key="NSNextKeyView" ref="525163949"/>
@@ -248,7 +248,7 @@
248248
<string>NSFilenamesPboardType</string>
249249
</object>
250250
</object>
251-
<string key="NSFrame">{{121, 88}, {179, 22}}</string>
251+
<string key="NSFrame">{{121, 100}, {179, 22}}</string>
252252
<reference key="NSSuperview" ref="1005"/>
253253
<reference key="NSWindow"/>
254254
<reference key="NSNextKeyView" ref="1032928366"/>
@@ -272,7 +272,7 @@
272272
<object class="NSTextField" id="617839596">
273273
<reference key="NSNextResponder" ref="1005"/>
274274
<int key="NSvFlags">268</int>
275-
<string key="NSFrame">{{118, 52}, {192, 28}}</string>
275+
<string key="NSFrame">{{118, 64}, {192, 28}}</string>
276276
<reference key="NSSuperview" ref="1005"/>
277277
<reference key="NSWindow"/>
278278
<reference key="NSNextKeyView" ref="63761450"/>
@@ -290,7 +290,7 @@
290290
<object class="NSButton" id="1032928366">
291291
<reference key="NSNextResponder" ref="1005"/>
292292
<int key="NSvFlags">268</int>
293-
<string key="NSFrame">{{306, 92}, {54, 14}}</string>
293+
<string key="NSFrame">{{306, 104}, {54, 14}}</string>
294294
<reference key="NSSuperview" ref="1005"/>
295295
<reference key="NSWindow"/>
296296
<reference key="NSNextKeyView" ref="617839596"/>
@@ -317,7 +317,7 @@
317317
<object class="NSButton" id="910887184">
318318
<reference key="NSNextResponder" ref="1005"/>
319319
<int key="NSvFlags">268</int>
320-
<string key="NSFrame">{{18, 165}, {203, 18}}</string>
320+
<string key="NSFrame">{{18, 177}, {203, 18}}</string>
321321
<reference key="NSSuperview" ref="1005"/>
322322
<reference key="NSWindow"/>
323323
<reference key="NSNextKeyView" ref="968361983"/>
@@ -338,14 +338,38 @@
338338
<int key="NSPeriodicInterval">25</int>
339339
</object>
340340
</object>
341-
<object class="NSButton" id="160081910">
341+
<object class="NSButton" id="669441257">
342342
<reference key="NSNextResponder" ref="1005"/>
343343
<int key="NSvFlags">268</int>
344-
<string key="NSFrame">{{18, 205}, {279, 18}}</string>
344+
<string key="NSFrame">{{18, 217}, {279, 18}}</string>
345345
<reference key="NSSuperview" ref="1005"/>
346346
<reference key="NSWindow"/>
347347
<reference key="NSNextKeyView" ref="604563603"/>
348348
<bool key="NSEnabled">YES</bool>
349+
<object class="NSButtonCell" key="NSCell" id="856716276">
350+
<int key="NSCellFlags">-2080244224</int>
351+
<int key="NSCellFlags2">0</int>
352+
<string key="NSContents">Try to open current directory on launch</string>
353+
<reference key="NSSupport" ref="734450335"/>
354+
<reference key="NSControlView" ref="669441257"/>
355+
<int key="NSButtonFlags">1211912703</int>
356+
<int key="NSButtonFlags2">2</int>
357+
<reference key="NSNormalImage" ref="136676346"/>
358+
<reference key="NSAlternateImage" ref="690089052"/>
359+
<string key="NSAlternateContents"/>
360+
<string key="NSKeyEquivalent"/>
361+
<int key="NSPeriodicDelay">200</int>
362+
<int key="NSPeriodicInterval">25</int>
363+
</object>
364+
</object>
365+
<object class="NSButton" id="160081910">
366+
<reference key="NSNextResponder" ref="1005"/>
367+
<int key="NSvFlags">268</int>
368+
<string key="NSFrame">{{18, 237}, {279, 18}}</string>
369+
<reference key="NSSuperview" ref="1005"/>
370+
<reference key="NSWindow"/>
371+
<reference key="NSNextKeyView" ref="669441257"/>
372+
<bool key="NSEnabled">YES</bool>
349373
<object class="NSButtonCell" key="NSCell" id="876763316">
350374
<int key="NSCellFlags">-2080244224</int>
351375
<int key="NSCellFlags2">0</int>
@@ -365,7 +389,7 @@
365389
<object class="NSButton" id="516324081">
366390
<reference key="NSNextResponder" ref="1005"/>
367391
<int key="NSvFlags">268</int>
368-
<string key="NSFrame">{{18, 225}, {207, 18}}</string>
392+
<string key="NSFrame">{{18, 257}, {207, 18}}</string>
369393
<reference key="NSSuperview" ref="1005"/>
370394
<reference key="NSWindow"/>
371395
<reference key="NSNextKeyView" ref="160081910"/>
@@ -389,7 +413,7 @@
389413
<object class="NSButton" id="68472633">
390414
<reference key="NSNextResponder" ref="1005"/>
391415
<int key="NSvFlags">268</int>
392-
<string key="NSFrame">{{18, 245}, {207, 18}}</string>
416+
<string key="NSFrame">{{18, 277}, {207, 18}}</string>
393417
<reference key="NSSuperview" ref="1005"/>
394418
<reference key="NSWindow"/>
395419
<reference key="NSNextKeyView" ref="516324081"/>
@@ -411,7 +435,7 @@
411435
</object>
412436
</object>
413437
</object>
414-
<string key="NSFrameSize">{401, 281}</string>
438+
<string key="NSFrameSize">{401, 313}</string>
415439
<reference key="NSSuperview"/>
416440
<reference key="NSWindow"/>
417441
<reference key="NSNextKeyView" ref="68472633"/>
@@ -592,7 +616,7 @@
592616
<integer value="2"/>
593617
</object>
594618
</object>
595-
<string key="NS.format">EEEE, MMMM d, yyyy h:mm:ss a</string>
619+
<string key="NS.format">EEEE, d MMMM, y h:mm:ss a</string>
596620
<bool key="NS.natural">NO</bool>
597621
</object>
598622
<reference key="NSControlView" ref="1045127964"/>
@@ -695,7 +719,7 @@
695719
<bool key="EncodedWithXMLCoder">YES</bool>
696720
<object class="NSView" id="983027044">
697721
<reference key="NSNextResponder" ref="611988647"/>
698-
<int key="NSvFlags">256</int>
722+
<int key="NSvFlags">274</int>
699723
<object class="NSMutableArray" key="NSSubviews">
700724
<bool key="EncodedWithXMLCoder">YES</bool>
701725
<object class="NSButton" id="933582906">
@@ -1286,6 +1310,22 @@
12861310
</object>
12871311
<int key="connectionID">161</int>
12881312
</object>
1313+
<object class="IBConnectionRecord">
1314+
<object class="IBBindingConnection" key="connection">
1315+
<string key="label">value: values.PBOpenCurDirOnLaunch</string>
1316+
<reference key="source" ref="669441257"/>
1317+
<reference key="destination" ref="557723770"/>
1318+
<object class="NSNibBindingConnector" key="connector">
1319+
<reference key="NSSource" ref="669441257"/>
1320+
<reference key="NSDestination" ref="557723770"/>
1321+
<string key="NSLabel">value: values.PBOpenCurDirOnLaunch</string>
1322+
<string key="NSBinding">value</string>
1323+
<string key="NSKeyPath">values.PBOpenCurDirOnLaunch</string>
1324+
<int key="NSNibBindingConnectorVersion">2</int>
1325+
</object>
1326+
</object>
1327+
<int key="connectionID">165</int>
1328+
</object>
12891329
</object>
12901330
<object class="IBMutableOrderedSet" key="objectRecords">
12911331
<object class="NSArray" key="orderedObjects">
@@ -1333,6 +1373,7 @@
13331373
<reference ref="441589300"/>
13341374
<reference ref="83909567"/>
13351375
<reference ref="63761450"/>
1376+
<reference ref="669441257"/>
13361377
</object>
13371378
<reference key="parent" ref="0"/>
13381379
<string key="objectName">General</string>
@@ -1805,6 +1846,20 @@
18051846
<reference key="object" ref="498406892"/>
18061847
<reference key="parent" ref="516324081"/>
18071848
</object>
1849+
<object class="IBObjectRecord">
1850+
<int key="objectID">162</int>
1851+
<reference key="object" ref="669441257"/>
1852+
<object class="NSMutableArray" key="children">
1853+
<bool key="EncodedWithXMLCoder">YES</bool>
1854+
<reference ref="856716276"/>
1855+
</object>
1856+
<reference key="parent" ref="1005"/>
1857+
</object>
1858+
<object class="IBObjectRecord">
1859+
<int key="objectID">163</int>
1860+
<reference key="object" ref="856716276"/>
1861+
<reference key="parent" ref="669441257"/>
1862+
</object>
18081863
</object>
18091864
</object>
18101865
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1854,6 +1909,8 @@
18541909
<string>155.IBPluginDependency</string>
18551910
<string>156.IBPluginDependency</string>
18561911
<string>16.IBPluginDependency</string>
1912+
<string>162.IBPluginDependency</string>
1913+
<string>163.IBPluginDependency</string>
18571914
<string>17.IBPluginDependency</string>
18581915
<string>18.IBPluginDependency</string>
18591916
<string>19.IBPluginDependency</string>
@@ -1968,6 +2025,8 @@
19682025
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
19692026
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
19702027
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2028+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
2029+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
19712030
<string>{{324, 683}, {400, 139}}</string>
19722031
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
19732032
<object class="NSMutableArray">
@@ -2017,7 +2076,7 @@
20172076
<reference key="dict.values" ref="0"/>
20182077
</object>
20192078
<nil key="sourceID"/>
2020-
<int key="maxID">161</int>
2079+
<int key="maxID">165</int>
20212080
</object>
20222081
<object class="IBClassDescriber" key="IBDocument.Classes">
20232082
<object class="NSMutableArray" key="referencedPartialClassDescriptions">

‎PBGitDefaults.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ + (void)initialize
5656
forKey:kRefreshAutomatically];
5757
[defaultValues setObject:[NSNumber numberWithBool:YES]
5858
forKey:kUseAskPasswd];
59-
[defaultValues setObject:[NSNumber numberWithBool:YES]
59+
[defaultValues setObject:[NSNumber numberWithBool:NO]
6060
forKey:kOpenCurDirOnLaunch];
6161
[defaultValues setObject:[NSNumber numberWithBool:YES]
6262
forKey:kShowOpenPanelOnLaunch];

0 commit comments

Comments
 (0)