Commits

Juri Pakaste committed a996e21

Changed the commit sheet's Committing all files message to Committing all changed files and added an image view displaying the appropriate toolbar icon in the sheet.

Comments (0)

Files changed (4)

English.lproj/Repo.xib

 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="6"/>
+			<integer value="300421"/>
 			<integer value="300061"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 								<string key="NSToolbarItemPaletteLabel">Commit All</string>
 								<string key="NSToolbarItemToolTip">Commits changes to all files.</string>
 								<nil key="NSToolbarItemView"/>
-								<object class="NSCustomResource" key="NSToolbarItemImage">
+								<object class="NSCustomResource" key="NSToolbarItemImage" id="230019408">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">toolbar_commitall</string>
 								</object>
 						<object class="NSTextField" id="895980691">
 							<reference key="NSNextResponder" ref="601455988"/>
 							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{17, 174}, {374, 17}}</string>
+							<string key="NSFrame">{{69, 174}, {322, 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, 17}</string>
+											<string key="NSFrameSize">{314, 14}</string>
 											<reference key="NSSuperview" ref="592092130"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="945498614">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<nil key="NSDelegate"/>
 												</object>
 												<reference key="NSTextView" ref="925909873"/>
-												<double key="NSWidth">366</double>
+												<double key="NSWidth">314</double>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
 											<nil key="NSDelegate"/>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 1}, {366, 104}}</string>
+									<string key="NSFrame">{{1, 1}, {314, 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, 106}}</string>
+							<string key="NSFrame">{{72, 60}, {316, 106}}</string>
 							<reference key="NSSuperview" ref="601455988"/>
 							<reference key="NSNextKeyView" ref="592092130"/>
 							<int key="NSsFlags">530</int>
 						<object class="NSTextField" id="759674735">
 							<reference key="NSNextResponder" ref="601455988"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{17, 199}, {374, 17}}</string>
+							<string key="NSFrame">{{69, 199}, {322, 17}}</string>
 							<reference key="NSSuperview" ref="601455988"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="484204465">
 								<reference key="NSTextColor" ref="306507377"/>
 							</object>
 						</object>
+						<object class="NSImageView" id="1027594338">
+							<reference key="NSNextResponder" ref="601455988"/>
+							<int key="NSvFlags">268</int>
+							<object class="NSMutableSet" key="NSDragTypes">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="set.sortedObjects">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>Apple PDF pasteboard type</string>
+									<string>Apple PICT pasteboard type</string>
+									<string>Apple PNG pasteboard type</string>
+									<string>NSFilenamesPboardType</string>
+									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+									<string>NeXT TIFF v4.0 pasteboard type</string>
+								</object>
+							</object>
+							<string key="NSFrame">{{20, 184}, {32, 32}}</string>
+							<reference key="NSSuperview" ref="601455988"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSImageCell" key="NSCell" id="860831933">
+								<int key="NSCellFlags">130560</int>
+								<int key="NSCellFlags2">33554432</int>
+								<reference key="NSContents" ref="230019408"/>
+								<int key="NSAlign">0</int>
+								<int key="NSScale">0</int>
+								<int key="NSStyle">0</int>
+								<bool key="NSAnimates">NO</bool>
+							</object>
+							<bool key="NSEditable">YES</bool>
+						</object>
 					</object>
 					<string key="NSFrameSize">{408, 236}</string>
 					<reference key="NSSuperview"/>
 					</object>
 					<int key="connectionID">300426</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">_commitIconView</string>
+						<reference key="source" ref="798535885"/>
+						<reference key="destination" ref="1027594338"/>
+					</object>
+					<int key="connectionID">300429</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 							<reference ref="495508749"/>
 							<reference ref="999697967"/>
 							<reference ref="912248093"/>
+							<reference ref="895980691"/>
+							<reference ref="1027594338"/>
 							<reference ref="759674735"/>
-							<reference ref="895980691"/>
 						</object>
 						<reference key="parent" ref="519367524"/>
 					</object>
 						<reference key="object" ref="484204465"/>
 						<reference key="parent" ref="759674735"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300427</int>
+						<reference key="object" ref="1027594338"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="860831933"/>
+						</object>
+						<reference key="parent" ref="601455988"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300428</int>
+						<reference key="object" ref="860831933"/>
+						<reference key="parent" ref="1027594338"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
 					<string>300422.IBPluginDependency</string>
 					<string>300424.IBPluginDependency</string>
 					<string>300425.IBPluginDependency</string>
+					<string>300427.IBPluginDependency</string>
+					<string>300428.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>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">300426</int>
+			<int key="maxID">300429</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>_commitIconView</string>
 							<string>_commitPanelMessageField</string>
 							<string>_commitSheet</string>
 							<string>_commitTypeField</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSImageView</string>
 							<string>NSTextView</string>
 							<string>NSPanel</string>
 							<string>NSTextField</string>
     "English.lproj/MainMenu.xib": "07985267460a39d475e4c96145dab97e", 
     "German.lproj/Projects.strings": "8554bdd35568c0d598d3f5b322836067", 
     "German.lproj/Repo.strings": "8bb4aeacd068f7b82e02806076095383", 
-    "English.lproj/Repo.xib": "d91e90e41a7bfa8953e9e70d0c35e530", 
+    "English.lproj/Repo.xib": "b14353add4b6a70cfdb736af5e06ef4d", 
     "German.lproj/MainMenu.strings": "aa69dae50fd262857497ba56606ac537"
 }

Source/RepoController.h

     
     IBOutlet NSPanel *_commitSheet;
 	IBOutlet NSTextField *_commitTypeField;
+	IBOutlet NSImageView *_commitIconView;
     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");
+	_commitIconView.image = [NSImage imageNamed:@"toolbar_commit.png"];
     [self commitChangesToFiles: _tree.selectedObjects];
 }
 
 - (IBAction) commitAllChanges: (id)sender
 {
-	_commitTypeField.stringValue = NSLocalizedString(@"Committing all files.", @"Message to show when committing all files");
+	_commitTypeField.stringValue = NSLocalizedString(@"Committing all changed files.", @"Message to show when committing all files");
+	_commitIconView.image = [NSImage imageNamed:@"toolbar_commitall.png"];
     [self commitChangesToFiles: nil];
 }