Commits

Juri Pakaste  committed 9a6456f Merge

merged

  • Participants
  • Parent commits 8c44264, 49f7421

Comments (0)

Files changed (5)

File English.lproj/MainMenu.xib

 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="29"/>
+			<integer value="81"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="125904431">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Commit Changes...</string>
-									<string key="NSKeyEquiv">S</string>
-									<int key="NSKeyEquivModMask">1572864</int>
+									<string type="base64-UTF8" key="NSKeyEquiv">DQ</string>
+									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="664567982"/>
 									<reference key="NSMixedImage" ref="578101116"/>
 								<object class="NSMenuItem" id="62861574">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Commit All Changes…</string>
-									<string key="NSKeyEquiv">s</string>
+									<string type="base64-UTF8" key="NSKeyEquiv">DQ</string>
 									<int key="NSKeyEquivModMask">1572864</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="664567982"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{365, 733}, {197, 103}}</string>
-					<string>{{250, 836}, {468, 20}}</string>
+					<string>{{50, 1109}, {468, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{74, 862}</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{326, 483}, {284, 353}}</string>
+					<string>{{126, 756}, {284, 353}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{147, 503}, {293, 333}}</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>_commitPanelMessageField</string>
 							<string>_commitSheet</string>
+							<string>_commitTypeField</string>
 							<string>_commitView</string>
 							<string>_hideShowUnmodifiedToolbarItem</string>
 							<string>_infoChooser</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSTextView</string>
 							<string>NSPanel</string>
+							<string>NSTextField</string>
 							<string>NSTextView</string>
 							<string>NSSegmentedControl</string>
 							<string>NSSegmentedControl</string>

File English.lproj/Repo.xib

 								<string key="NSToolbarItemPaletteLabel">Revision List</string>
 								<string key="NSToolbarItemToolTip">A list of all revisions in the repository.</string>
 								<object class="NSPopUpButton" key="NSToolbarItemView" id="296634478">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {100, 22}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSPopUpButtonCell" key="NSCell" id="973976143">
 										<int key="NSCellFlags">-2076049856</int>
 								<string key="NSToolbarItemPaletteLabel">View Mode</string>
 								<string key="NSToolbarItemToolTip">Switches between a tree view of all files, and a flat view of only the files modified in this revision.</string>
 								<object class="NSSegmentedControl" key="NSToolbarItemView" id="38463917">
-									<nil key="NSNextResponder"/>
+									<reference key="NSNextResponder"/>
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{0, 14}, {71, 25}}</string>
+									<reference key="NSSuperview"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSSegmentedCell" key="NSCell" id="498867354">
 										<int key="NSCellFlags">67239424</int>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{300, 124}</string>
 				<object class="NSView" key="NSWindowView" id="1008550395">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 							<int key="NSvFlags">266</int>
 							<string key="NSFrame">{{17, 173}, {444, 17}}</string>
 							<reference key="NSSuperview" ref="1008550395"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="42155647">
 								<int key="NSCellFlags">67239488</int>
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{368, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="1008550395"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="512836208">
 							<object class="NSPSMatrix" key="NSDrawMatrix"/>
 							<string key="NSFrame">{{18, 18}, {343, 20}}</string>
 							<reference key="NSSuperview" ref="1008550395"/>
+							<reference key="NSWindow"/>
 							<int key="NSpiFlags">16394</int>
 							<double key="NSMinValue">20</double>
 							<double key="NSMaxValue">100</double>
 							<int key="NSvFlags">274</int>
 							<string key="NSFrame">{{17, 48}, {444, 117}}</string>
 							<reference key="NSSuperview" ref="1008550395"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="220940688">
 								<int key="NSCellFlags">73530881</int>
 						</object>
 					</object>
 					<string key="NSFrameSize">{478, 210}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{300, 146}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>RSVerticallyCenteredTextFieldCell</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{420, 1025}, {616, 0}}</string>
+					<string>{{206, 1076}, {616, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{151, 623}, {616, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

File Localize.json

File contents unchanged.

File Source/HgRepository.m

         _changedPaths = [NSMutableSet set];
         _watcher = [[MYDirectoryWatcher alloc] initWithDirectory: _absolutePath
                                                         target: self action: @selector(_dirChanged:)];
-        _watcher.latency = 5;
+        _watcher.latency = 2;
         if( ! [_watcher start] )
             Warn(@"HgRepository: Couldn't start MYDirectoryWatcher on %@",_absolutePath);
         Log(@"Opened %@", self);

File Source/RepoController.m

 		[_commitView setString: @""];
 	
 	[_commitView setEditable: revision.isUncommitted];
+	[_commitView setRichText: !revision.isUncommitted];
     [_infoView setNeedsDisplay: YES];
 	[_commitView setNeedsDisplay: YES];
 }