[Unison-hackers] [unison-svn] r477 - in trunk/src: . uimacnew09 uimacnew09/English.lproj
schmitta at seas.upenn.edu
schmitta at seas.upenn.edu
Tue Jul 19 10:40:37 EDT 2011
Author: schmitta
Date: 2011-07-19 10:40:36 -0400 (Tue, 19 Jul 2011)
New Revision: 477
Modified:
trunk/src/RECENTNEWS
trunk/src/mkProjectInfo.ml
trunk/src/uimacnew09/English.lproj/MainMenu.xib
trunk/src/uimacnew09/MyController.h
trunk/src/uimacnew09/MyController.m
Log:
- uimacnew09: file details panel selectable
- uimacnew09: automatically quit when done synchronizing if called from the command line with "-batch"
Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS 2011-07-18 08:15:01 UTC (rev 476)
+++ trunk/src/RECENTNEWS 2011-07-19 14:40:36 UTC (rev 477)
@@ -1,3 +1,9 @@
+CHANGES FROM VERSION 2.44.5
+
+- uimacnew09: file details panel selectable
+- uimacnew09: automatically quit when done synchronizing if called from the command line with "-batch"
+
+-------------------------------
CHANGES FROM VERSION 2.44.4
- fixed a bug when calling the Unison macnew09 GUI from the command line with a profile specified
Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml 2011-07-18 08:15:01 UTC (rev 476)
+++ trunk/src/mkProjectInfo.ml 2011-07-19 14:40:36 UTC (rev 477)
@@ -58,3 +58,4 @@
+
Modified: trunk/src/uimacnew09/English.lproj/MainMenu.xib
===================================================================
--- trunk/src/uimacnew09/English.lproj/MainMenu.xib 2011-07-18 08:15:01 UTC (rev 476)
+++ trunk/src/uimacnew09/English.lproj/MainMenu.xib 2011-07-19 14:40:36 UTC (rev 477)
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -15,14 +15,14 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>740</string>
- <string>1.2.2</string>
+ <string>823</string>
+ <string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="590"/>
<integer value="29"/>
+ <integer value="589"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -30,13 +30,8 @@
<string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="892182555">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -720,7 +715,6 @@
<reference key="NSHScroller" ref="370050818"/>
<reference key="NSContentView" ref="629016622"/>
<reference key="NSHeaderClipView" ref="214885356"/>
- <reference key="NSCornerView" ref="626227720"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
</object>
@@ -751,7 +745,7 @@
<object class="NSTableView" id="809169243">
<reference key="NSNextResponder" ref="674056095"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{730, 410}</string>
+ <string key="NSFrameSize">{730, 411}</string>
<reference key="NSSuperview" ref="674056095"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="285438200">
@@ -941,7 +935,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
- <string key="NSFrame">{{0, 17}, {730, 410}}</string>
+ <string key="NSFrame">{{0, 17}, {730, 411}}</string>
<reference key="NSSuperview" ref="319719388"/>
<reference key="NSNextKeyView" ref="809169243"/>
<reference key="NSDocView" ref="809169243"/>
@@ -983,7 +977,7 @@
</object>
<reference ref="971941000"/>
</object>
- <string key="NSFrameSize">{730, 427}</string>
+ <string key="NSFrameSize">{730, 428}</string>
<reference key="NSSuperview" ref="398078791"/>
<reference key="NSNextKeyView" ref="674056095"/>
<int key="NSsFlags">528</int>
@@ -1006,7 +1000,7 @@
<reference key="NSSuperview" ref="700068909"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="900780132">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">69336577</int>
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">Label</string>
<reference key="NSSupport" ref="26"/>
@@ -1041,6 +1035,7 @@
<bool key="BWGBHasTopBorder">NO</bool>
<bool key="BWGBHasBottomBorder">YES</bool>
<bool key="BWGBHasGradient">YES</bool>
+ <bool key="BWGBHasFillColor">NO</bool>
<float key="BWGBTopInsetAlpha">0.30000001192092896</float>
<float key="BWGBBottomInsetAlpha">0.0</float>
</object>
@@ -1051,7 +1046,9 @@
<bool key="BWSVColorIsEnabled">NO</bool>
<object class="NSMutableDictionary" key="BWSVMinValues">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@@ -1522,6 +1519,7 @@
<bool key="BWGBHasTopBorder">NO</bool>
<bool key="BWGBHasBottomBorder">NO</bool>
<bool key="BWGBHasGradient">YES</bool>
+ <bool key="BWGBHasFillColor">NO</bool>
<float key="BWGBTopInsetAlpha">0.30000001192092896</float>
<float key="BWGBBottomInsetAlpha">0.0</float>
</object>
@@ -5144,7 +5142,7 @@
<string>{{345, 795}, {363, 281}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{357, 361}, {730, 546}}</string>
+ <string>{{203, 460}, {730, 546}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5501,6 +5499,75 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>copyLR:</string>
+ <string>copyRL:</string>
+ <string>forceNewer:</string>
+ <string>forceOlder:</string>
+ <string>ignoreExt:</string>
+ <string>ignoreName:</string>
+ <string>ignorePath:</string>
+ <string>leaveAlone:</string>
+ <string>merge:</string>
+ <string>revert:</string>
+ <string>selectConflicts:</string>
+ <string>showDiff:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">copyLR:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">copyRL:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">forceNewer:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">forceOlder:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignoreExt:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignoreName:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignorePath:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">leaveAlone:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">merge:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">revert:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">selectConflicts:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">showDiff:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -5556,6 +5623,110 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancelProfileButton:</string>
+ <string>checkOpenProfileChanged:</string>
+ <string>chooseFont:</string>
+ <string>cltoolNoButton:</string>
+ <string>cltoolYesButton:</string>
+ <string>createButton:</string>
+ <string>endPasswordWindow:</string>
+ <string>installCommandLineTool:</string>
+ <string>onlineHelp:</string>
+ <string>openButton:</string>
+ <string>raiseAboutWindow:</string>
+ <string>raiseCltoolWindow:</string>
+ <string>raiseWindow:</string>
+ <string>rescan:</string>
+ <string>restartButton:</string>
+ <string>saveProfileButton:</string>
+ <string>showPreferences:</string>
+ <string>syncButton:</string>
+ <string>tableModeChanged:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">cancelProfileButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">checkOpenProfileChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">chooseFont:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">cltoolNoButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">cltoolYesButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">createButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">endPasswordWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">installCommandLineTool:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">onlineHelp:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">openButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">raiseAboutWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">raiseCltoolWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">raiseWindow:</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">rescan:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">restartButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">saveProfileButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">showPreferences:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">syncButton:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">tableModeChanged:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -5633,6 +5804,185 @@
<string>NSTextField</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>ConnectingView</string>
+ <string>aboutWindow</string>
+ <string>checkOpenProfile</string>
+ <string>chooseDetailsFont</string>
+ <string>chooseDiffFont</string>
+ <string>chooseProfileView</string>
+ <string>cltoolPref</string>
+ <string>cltoolWindow</string>
+ <string>connectingAnimation</string>
+ <string>detailsFontLabel</string>
+ <string>detailsTextView</string>
+ <string>diffFontLabel</string>
+ <string>diffView</string>
+ <string>diffWindow</string>
+ <string>fontChangeTarget</string>
+ <string>mainWindow</string>
+ <string>notificationController</string>
+ <string>passwordCancelButton</string>
+ <string>passwordPrompt</string>
+ <string>passwordText</string>
+ <string>passwordWindow</string>
+ <string>preferencesController</string>
+ <string>preferencesView</string>
+ <string>preferencesWindow</string>
+ <string>profileBox</string>
+ <string>profileController</string>
+ <string>progressBar</string>
+ <string>splitView</string>
+ <string>statusText</string>
+ <string>tableModeSelector</string>
+ <string>tableView</string>
+ <string>updatesText</string>
+ <string>updatesView</string>
+ <string>versionText</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">ConnectingView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">aboutWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">checkOpenProfile</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">chooseDetailsFont</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">chooseDiffFont</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">chooseProfileView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cltoolPref</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cltoolWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">connectingAnimation</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">detailsFontLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">detailsTextView</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">diffFontLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">diffView</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">diffWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">fontChangeTarget</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">mainWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">notificationController</string>
+ <string key="candidateClassName">NotificationController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">passwordCancelButton</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">passwordPrompt</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">passwordText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">passwordWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">preferencesController</string>
+ <string key="candidateClassName">PreferencesController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">preferencesView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">preferencesWindow</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">profileBox</string>
+ <string key="candidateClassName">NSComboBox</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">profileController</string>
+ <string key="candidateClassName">ProfileController</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">progressBar</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">splitView</string>
+ <string key="candidateClassName">NSSplitView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">statusText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableModeSelector</string>
+ <string key="candidateClassName">NSSegmentedControl</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">ReconTableView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">updatesText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">updatesView</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">versionText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">MyController.h</string>
@@ -5703,6 +6053,30 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>anyEnter:</string>
+ <string>localClick:</string>
+ <string>remoteClick:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">anyEnter:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">localClick:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">remoteClick:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -5726,6 +6100,50 @@
<string>NSTextField</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>firstRootText</string>
+ <string>localButtonCell</string>
+ <string>profileNameText</string>
+ <string>remoteButtonCell</string>
+ <string>secondRootHost</string>
+ <string>secondRootText</string>
+ <string>secondRootUser</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">firstRootText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">localButtonCell</string>
+ <string key="candidateClassName">NSButtonCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">profileNameText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">remoteButtonCell</string>
+ <string key="candidateClassName">NSButtonCell</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">secondRootHost</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">secondRootText</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">secondRootUser</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">PreferencesController.h</string>
@@ -5746,6 +6164,13 @@
<string key="NS.key.0">tableView</string>
<string key="NS.object.0">NSTableView</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">tableView</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">tableView</string>
+ <string key="candidateClassName">NSTableView</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">ProfileController.h</string>
@@ -5766,6 +6191,13 @@
<string key="NS.key.0">myController</string>
<string key="NS.object.0">MyController</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">myController</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">myController</string>
+ <string key="candidateClassName">MyController</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">ProfileTableView.h</string>
@@ -5815,6 +6247,75 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>copyLR:</string>
+ <string>copyRL:</string>
+ <string>forceNewer:</string>
+ <string>forceOlder:</string>
+ <string>ignoreExt:</string>
+ <string>ignoreName:</string>
+ <string>ignorePath:</string>
+ <string>leaveAlone:</string>
+ <string>merge:</string>
+ <string>revert:</string>
+ <string>selectConflicts:</string>
+ <string>showDiff:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">copyLR:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">copyRL:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">forceNewer:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">forceOlder:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignoreExt:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignoreName:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">ignorePath:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">leaveAlone:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">merge:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">revert:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">selectConflicts:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">showDiff:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<reference key="sourceIdentifier" ref="716125380"/>
</object>
<object class="IBPartialClassDescription">
@@ -5859,6 +6360,13 @@
<string key="NS.key.0">toggleCollapse:</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">toggleCollapse:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">toggleCollapse:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">BWToolkitFramework.framework/Headers/BWSplitView.h</string>
@@ -5910,6 +6418,7 @@
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -5925,5 +6434,30 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../uimacnew.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSMenuCheckmark</string>
+ <string>NSMenuMixedState</string>
+ <string>NSPreferencesGeneral</string>
+ <string>NSSwitch</string>
+ <string>Outline-Deep</string>
+ <string>Outline-Flat</string>
+ <string>Outline-Flattened</string>
+ <string>Unison</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{9, 8}</string>
+ <string>{7, 2}</string>
+ <string>{32, 32}</string>
+ <string>{15, 15}</string>
+ <string>{24, 16}</string>
+ <string>{24, 16}</string>
+ <string>{24, 16}</string>
+ <string>{128, 128}</string>
+ </object>
+ </object>
</data>
</archive>
Modified: trunk/src/uimacnew09/MyController.h
===================================================================
--- trunk/src/uimacnew09/MyController.h 2011-07-18 08:15:01 UTC (rev 476)
+++ trunk/src/uimacnew09/MyController.h 2011-07-19 14:40:36 UTC (rev 477)
@@ -76,6 +76,8 @@
IBOutlet NSSplitView *splitView;
id fontChangeTarget;
+
+ BOOL isBatchSet;
}
- (id)init;
Modified: trunk/src/uimacnew09/MyController.m
===================================================================
--- trunk/src/uimacnew09/MyController.m 2011-07-18 08:15:01 UTC (rev 476)
+++ trunk/src/uimacnew09/MyController.m 2011-07-19 14:40:36 UTC (rev 477)
@@ -584,7 +584,7 @@
[self updateTableViewWithReset:([reconItems count] > 0)];
[self updateToolbar];
- BOOL isBatchSet = (long)ocamlCall("i", "isBatchSet") ? YES : NO;
+ isBatchSet = (long)ocamlCall("i", "isBatchSet") ? YES : NO;
if (isBatchSet) {
NSLog(@"batch set on the command line");
}
@@ -622,6 +622,15 @@
[self updateTableViewWithReset:FALSE];
}
+- (void)quitIfBatch:(id)ignore
+{
+ if (isBatchSet) {
+ NSLog(@"Automatically quitting because of -batch");
+ [NSApp performSelector:@selector(terminate:) withObject:nil afterDelay:0.0];
+ return Val_unit;
+ }
+}
+
CAMLprim value syncComplete()
{
id pool = [[NSAutoreleasePool alloc] init];
@@ -629,6 +638,9 @@
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"deleteLogOnExit"])
[[NSFileManager defaultManager] removeItemAtPath:[@"~/unison.log" stringByExpandingTildeInPath] error:nil];
[pool release];
+
+ [me performSelectorOnMainThread:@selector(quitIfBatch:) withObject:nil waitUntilDone:FALSE];
+
return Val_unit;
}
More information about the Unison-hackers
mailing list