This adds a "Development" tab to the preferences for debug-builds. The "Open current dir if it's a repo" pref has been moved there.
Also documents on the "Open dialog on GitX start if no repo" option in the preferences. Signed-off-by: Johannes Gilger <[email protected]> --- Since I didn't want to rebase my branches yet again and hand-repeat the changes to the XIBs I simply put this commit on top. It's about one of the prefs by Stonewall and probably not the worst thing to have in the future (it sure doesn't add any complexity for the user). Again, the "Development" tab is only added when building the DEBUG configuration (also a good indicator which one you're using). Screenshots of the preferences can be seen here: http://avalon.hoffentlich.net/~heipei/tmp/gitx-0.7-advanced-prefs-1.png http://avalon.hoffentlich.net/~heipei/tmp/gitx-0.7-advanced-prefs-2.png The branch this patch equals is at http://github.com/heipei/gitx/commits/dg/fsevents As you can see I also incorporated the changes Pieter proposed to AppController.m. ApplicationController.m | 33 +++--- English.lproj/Preferences.xib | 239 ++++++++++++++++++++++++++++------------- PBPrefsWindowController.h | 1 + PBPrefsWindowController.m | 5 + 4 files changed, 186 insertions(+), 92 deletions(-) diff --git a/ApplicationController.m b/ApplicationController.m index c6a37a3..a9d95f8 100644 --- a/ApplicationController.m +++ b/ApplicationController.m @@ -68,26 +68,27 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification // Only try to open a default document if there are no documents open already. // 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]) { + if ([[[PBRepositoryDocumentController sharedDocumentController] documents] count]) + return; - NSURL *url = nil; + if (![[NSApplication sharedApplication] isActive]) + return; - if ([PBGitDefaults openCurDirOnLaunch]) { + NSURL *url = nil; - // Try to open the current directory as a git repository - NSString* 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) { + if ([PBGitDefaults openCurDirOnLaunch]) { + // Try to open the current directory as a git repository + NSString* curPath = [[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"]; + if(curPath) + url = [NSURL fileURLWithPath:curPath]; + } - // 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]; - } + NSError *error = nil; + if (!url || [[PBRepositoryDocumentController sharedDocumentController] openDocumentWithContentsOfURL:url display:YES error:&error] == NO) { + // 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 0a25a76..50302bf 100644 --- a/English.lproj/Preferences.xib +++ b/English.lproj/Preferences.xib @@ -1,21 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <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> + <string key="IBDocument.SystemVersion">9L30</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> + <string key="IBDocument.AppKitVersion">949.54</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="4" id="12"/> + <integer value="132"/> <integer value="87"/> - <integer value="1"/> <integer value="62"/> + <integer value="4" id="12"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -49,7 +46,7 @@ <object class="NSButton" id="11946865"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{18, 146}, {308, 18}}</string> + <string key="NSFrame">{{18, 184}, {308, 18}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="249630167"> @@ -99,28 +96,6 @@ <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, 166}, {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> @@ -202,7 +177,7 @@ <object class="NSTextField" id="686422350"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{38, 84}, {272, 42}}</string> + <string key="NSFrame">{{38, 80}, {299, 42}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="560113160"> @@ -217,6 +192,23 @@ ZSByZXBvc2l0b3J5Lg</string> <reference key="NSTextColor" ref="716218002"/> </object> </object> + <object class="NSTextField" id="793842601"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{38, 150}, {299, 28}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="201553067"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272760832</int> + <string type="base64-UTF8" key="NSContents">RGV0ZXJtaW5lcyB3aGV0aGVyIEdpdFggc2hvdWxkIGRpc3BsYXkgYW4gIk9wZW4iIGRpYWxvZyBpZiBp +dCdzIHN0YXJ0ZWQgZGlyZWN0bHkgKHdpdGhvdXQgYSByZXBvc2l0b3J5KS4</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="793842601"/> + <reference key="NSBackgroundColor" ref="124675276"/> + <reference key="NSTextColor" ref="716218002"/> + </object> + </object> <object class="NSButton" id="1032928366"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">268</int> @@ -245,7 +237,7 @@ ZSByZXBvc2l0b3J5Lg</string> <object class="NSButton" id="910887184"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">12</int> - <string key="NSFrame">{{18, 186}, {203, 18}}</string> + <string key="NSFrame">{{18, 206}, {203, 18}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="709654045"> @@ -265,7 +257,7 @@ ZSByZXBvc2l0b3J5Lg</string> </object> </object> </object> - <string key="NSFrameSize">{378, 222}</string> + <string key="NSFrameSize">{354, 242}</string> <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> @@ -509,6 +501,56 @@ ZSByZXBvc2l0b3J5Lg</string> <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> </object> + <object class="NSCustomView" id="517188630"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="848359732"> + <reference key="NSNextResponder" ref="517188630"/> + <int key="NSvFlags">12</int> + <string key="NSFrame">{{18, 91}, {313, 18}}</string> + <reference key="NSSuperview" ref="517188630"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="200596726"> + <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="848359732"/> + <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="939273989"> + <reference key="NSNextResponder" ref="517188630"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 43}, {299, 42}}</string> + <reference key="NSSuperview" ref="517188630"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="359154551"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">272760832</int> + <string type="base64-UTF8" key="NSContents">V2hlbiBkZXZlbG9waW5nIG9uZSBvZnRlbiB1c2VzICJvcGVuIEdpdFguYXBwIiBpbiB0aGUgR2l0WC1y +ZXBvLCB3aGljaCBvcGVucyB0aGUgcmVwbyBpdHNlbGYgaW4gR2l0WC4gVGhpcyBkaXNhYmxlcyB0aGF0 +IGJlaGF2aW91ci4</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="939273989"/> + <reference key="NSBackgroundColor" ref="124675276"/> + <reference key="NSTextColor" ref="716218002"/> + </object> + </object> + </object> + <string key="NSFrameSize">{349, 127}</string> + <reference key="NSSuperview"/> + <string key="NSClassName">NSView</string> + </object> <object class="NSCustomObject" id="844257713"> <string key="NSClassName">SUUpdater</string> </object> @@ -950,22 +992,6 @@ ZSByZXBvc2l0b3J5Lg</string> </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"/> @@ -996,6 +1022,14 @@ ZSByZXBvc2l0b3J5Lg</string> </object> <int key="connectionID">129</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">developmentPrefsView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="517188630"/> + </object> + <int key="connectionID">137</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1031,14 +1065,14 @@ ZSByZXBvc2l0b3J5Lg</string> <reference key="object" ref="1005"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="961749906"/> - <reference ref="11946865"/> <reference ref="910887184"/> + <reference ref="11946865"/> + <reference ref="793842601"/> <reference ref="228125630"/> - <reference ref="686422350"/> <reference ref="441589300"/> <reference ref="525163949"/> <reference ref="617839596"/> + <reference ref="686422350"/> <reference ref="1032928366"/> </object> <reference key="parent" ref="1014414386"/> @@ -1362,20 +1396,6 @@ ZSByZXBvc2l0b3J5Lg</string> <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"> @@ -1417,6 +1437,59 @@ ZSByZXBvc2l0b3J5Lg</string> <reference key="object" ref="560113160"/> <reference key="parent" ref="686422350"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">132</int> + <reference key="object" ref="517188630"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="848359732"/> + <reference ref="939273989"/> + </object> + <reference key="parent" ref="1014414386"/> + <string key="objectName">Development</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">135</int> + <reference key="object" ref="848359732"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="200596726"/> + </object> + <reference key="parent" ref="517188630"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">136</int> + <reference key="object" ref="200596726"/> + <reference key="parent" ref="848359732"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">138</int> + <reference key="object" ref="793842601"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="201553067"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">139</int> + <reference key="object" ref="201553067"/> + <reference key="parent" ref="793842601"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">140</int> + <reference key="object" ref="939273989"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="359154551"/> + </object> + <reference key="parent" ref="517188630"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">141</int> + <reference key="object" ref="359154551"/> + <reference key="parent" ref="939273989"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1435,8 +1508,6 @@ ZSByZXBvc2l0b3J5Lg</string> <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> @@ -1445,7 +1516,15 @@ ZSByZXBvc2l0b3J5Lg</string> <string>13.IBPluginDependency</string> <string>130.IBPluginDependency</string> <string>131.IBPluginDependency</string> + <string>132.IBEditorWindowLastContentRect</string> + <string>132.IBPluginDependency</string> + <string>135.IBPluginDependency</string> + <string>136.IBPluginDependency</string> + <string>138.IBPluginDependency</string> + <string>139.IBPluginDependency</string> <string>14.IBPluginDependency</string> + <string>140.IBPluginDependency</string> + <string>141.IBPluginDependency</string> <string>15.IBEditorWindowLastContentRect</string> <string>15.IBPluginDependency</string> <string>16.IBPluginDependency</string> @@ -1488,7 +1567,7 @@ ZSByZXBvc2l0b3J5Lg</string> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{545, 534}, {378, 222}}</string> + <string>{{545, 514}, {354, 242}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1514,6 +1593,12 @@ ZSByZXBvc2l0b3J5Lg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{176, 215}, {349, 127}}</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>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1530,7 +1615,7 @@ ZSByZXBvc2l0b3J5Lg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{321, 441}, {400, 139}}</string> + <string>{{488, 445}, {400, 139}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1547,7 +1632,7 @@ ZSByZXBvc2l0b3J5Lg</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{187, 359}, {239, 54}}</string> + <string>{{186, 422}, {239, 54}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1584,7 +1669,7 @@ ZSByZXBvc2l0b3J5Lg</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">131</int> + <int key="maxID">141</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1620,6 +1705,7 @@ ZSByZXBvc2l0b3J5Lg</string> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>badGitPathIcon</string> + <string>developmentPrefsView</string> <string>generalPrefsView</string> <string>gitPathController</string> <string>gitPathOpenAccessory</string> @@ -1630,6 +1716,7 @@ ZSByZXBvc2l0b3J5Lg</string> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSImageView</string> <string>NSView</string> + <string>NSView</string> <string>NSPathControl</string> <string>NSView</string> <string>NSView</string> diff --git a/PBPrefsWindowController.h b/PBPrefsWindowController.h index ed65d38..ab7f90a 100644 --- a/PBPrefsWindowController.h +++ b/PBPrefsWindowController.h @@ -14,6 +14,7 @@ IBOutlet NSView *generalPrefsView; IBOutlet NSView *integrationPrefsView; IBOutlet NSView *updatesPrefsView; + IBOutlet NSView *developmentPrefsView; /* Variables for the Updates View */ IBOutlet NSPathControl *gitPathController; diff --git a/PBPrefsWindowController.m b/PBPrefsWindowController.m index 254adc4..1dfca4d 100644 --- a/PBPrefsWindowController.m +++ b/PBPrefsWindowController.m @@ -21,6 +21,11 @@ - (void)setupToolbar [self addView:integrationPrefsView label:@"Integration" image:[NSImage imageNamed:NSImageNameNetwork]]; // UPDATES [self addView:updatesPrefsView label:@"Updates"]; + +#ifdef DEBUG_BUILD + // DEVELOPMENT + [self addView:developmentPrefsView label:@"Development" image:[NSImage imageNamed:NSImageNameAdvanced]]; +#endif } #pragma mark - -- 1.6.4.2.236.gf324c
