Commits

Juri Pakaste committed 57983d3

Added a header to commit sheet to tell the user the type of commit (all or selected.) This helps when using the keyboard shortcuts.

Comments (0)

Files changed (5)

English.lproj/Repo.strings

 
 /* Class = "NSMenuItem"; title = "Compare With Base"; ObjectID = "300385"; */
 "300385.title" = "Compare With Base";
+
+/* Class = "NSTextFieldCell"; title = "Committing all changed files."; ObjectID = "300425"; */
+"300425.title" = "Committing all changed files.";

English.lproj/Repo.xib

 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="6"/>
+			<integer value="300061"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSWindowTemplate" id="519367524">
 				<int key="NSWindowStyleMask">9</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 302}, {408, 208}}</string>
+				<string key="NSWindowRect">{{196, 302}, {408, 236}}</string>
 				<int key="NSWTFlags">-1543503872</int>
 				<string key="NSWindowTitle">Commit Sheet</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{300, 124}</string>
 				<object class="NSView" key="NSWindowView" id="601455988">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSTextField" id="895980691">
 							<reference key="NSNextResponder" ref="601455988"/>
 							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{17, 171}, {374, 17}}</string>
+							<string key="NSFrame">{{17, 174}, {374, 17}}</string>
 							<reference key="NSSuperview" ref="601455988"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="213363148">
 													<string>public.url</string>
 												</object>
 											</object>
-											<string key="NSFrameSize">{366, 14}</string>
+											<string key="NSFrameSize">{366, 17}</string>
 											<reference key="NSSuperview" ref="592092130"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="945498614">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 											<nil key="NSDelegate"/>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 1}, {366, 101}}</string>
+									<string key="NSFrame">{{1, 1}, {366, 104}}</string>
 									<reference key="NSSuperview" ref="912248093"/>
 									<reference key="NSNextKeyView" ref="925909873"/>
 									<reference key="NSDocView" ref="925909873"/>
 									<double key="NSPercent">0.94565218687057495</double>
 								</object>
 							</object>
-							<string key="NSFrame">{{20, 60}, {368, 103}}</string>
+							<string key="NSFrame">{{20, 60}, {368, 106}}</string>
 							<reference key="NSSuperview" ref="601455988"/>
 							<reference key="NSNextKeyView" ref="592092130"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSHScroller" ref="104809913"/>
 							<reference key="NSContentView" ref="592092130"/>
 						</object>
-					</object>
-					<string key="NSFrameSize">{408, 208}</string>
+						<object class="NSTextField" id="759674735">
+							<reference key="NSNextResponder" ref="601455988"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 199}, {374, 17}}</string>
+							<reference key="NSSuperview" ref="601455988"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="484204465">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Committing all changed files.</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande-Bold</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="759674735"/>
+								<reference key="NSBackgroundColor" ref="265951760"/>
+								<reference key="NSTextColor" ref="306507377"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{408, 236}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{300, 146}</string>
 					</object>
 					<int key="connectionID">300423</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_commitTypeField</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="759674735"/>
+					</object>
+					<int key="connectionID">300426</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="495508749"/>
 							<reference ref="999697967"/>
+							<reference ref="912248093"/>
+							<reference ref="759674735"/>
 							<reference ref="895980691"/>
-							<reference ref="912248093"/>
 						</object>
 						<reference key="parent" ref="519367524"/>
 					</object>
 						<reference key="object" ref="457325178"/>
 						<reference key="parent" ref="722134955"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300424</int>
+						<reference key="object" ref="759674735"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="484204465"/>
+						</object>
+						<reference key="parent" ref="601455988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300425</int>
+						<reference key="object" ref="484204465"/>
+						<reference key="parent" ref="759674735"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>300417.IBPluginDependency</string>
 					<string>300421.IBPluginDependency</string>
 					<string>300422.IBPluginDependency</string>
+					<string>300424.IBPluginDependency</string>
+					<string>300425.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.ImportedFromIB2</string>
 					<string>8.IBPluginDependency</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{439, 595}, {408, 208}}</string>
+					<string>{{439, 567}, {408, 236}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{439, 595}, {408, 208}}</string>
+					<string>{{439, 567}, {408, 236}}</string>
 					<integer value="0"/>
 					<string>{{300, 252}, {408, 208}}</string>
 					<boolean value="YES"/>
 					<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>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">300423</int>
+			<int key="maxID">300426</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 							<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>
 {
     "French.lproj/Repo.strings": "1c882f55c1bc1e7629827090aae1f4ed", 
     "French.lproj/Projects.strings": "7f3632a7668f39432d8dbf4ffb770f55", 
-    "German.lproj/MainMenu.strings": "aa69dae50fd262857497ba56606ac537", 
+    "French.lproj/MainMenu.strings": "d54b312e76454c8742206c78acb4a7e8", 
+    "English.lproj/Projects.xib": "770fab372e314ce3a66f4c501d11d8ee", 
     "English.lproj/MainMenu.xib": "07985267460a39d475e4c96145dab97e", 
-    "French.lproj/MainMenu.strings": "d54b312e76454c8742206c78acb4a7e8", 
     "German.lproj/Projects.strings": "8554bdd35568c0d598d3f5b322836067", 
     "German.lproj/Repo.strings": "8bb4aeacd068f7b82e02806076095383", 
-    "English.lproj/Repo.xib": "7452550d8fee91e15f9b61ac56c32167", 
-    "English.lproj/Projects.xib": "770fab372e314ce3a66f4c501d11d8ee"
+    "English.lproj/Repo.xib": "d91e90e41a7bfa8953e9e70d0c35e530", 
+    "German.lproj/MainMenu.strings": "aa69dae50fd262857497ba56606ac537"
 }

Source/RepoController.h

     IBOutlet NSImageView *_infoImageView;
     
     IBOutlet NSPanel *_commitSheet;
+	IBOutlet NSTextField *_commitTypeField;
     IBOutlet NSTextView *_commitPanelMessageField;
     
     IBOutlet NSPanel *_pushSheet;

Source/RepoController_Actions.m

 
 - (IBAction) commitChanges: (id)sender
 {
+	_commitTypeField.stringValue = NSLocalizedString(@"Committing selected files.", @"Message to show when committing selected files");
     [self commitChangesToFiles: _tree.selectedObjects];
 }
 
 - (IBAction) commitAllChanges: (id)sender
 {
+	_commitTypeField.stringValue = NSLocalizedString(@"Committing all files.", @"Message to show when committing all files");
     [self commitChangesToFiles: nil];
 }