Commits

Jens Alfke  committed a286d49

Added toolbar icons to Xcode project. Moved all icon files to new Resources/Icons dir.

  • Participants
  • Parent commits a572bf2

Comments (0)

Files changed (27)

File Murky.xcodeproj/project.pbxproj

 		27D918810C890F5500D53A8D /* xmlminimal.style in Resources */ = {isa = PBXBuildFile; fileRef = 27D918800C890F5500D53A8D /* xmlminimal.style */; };
 		27E771CC0FB01124006504EF /* BitbucketFavIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 27E771CB0FB01124006504EF /* BitbucketFavIcon.png */; };
 		27E772930FB09EA7006504EF /* MYWindowUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 27E772920FB09EA7006504EF /* MYWindowUtils.m */; };
-		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		27FEB46D0FBB200600290049 /* toolbar_add.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4640FBB200600290049 /* toolbar_add.png */; };
+		27FEB46E0FBB200600290049 /* toolbar_commit.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4650FBB200600290049 /* toolbar_commit.png */; };
+		27FEB46F0FBB200600290049 /* toolbar_commitall.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4660FBB200600290049 /* toolbar_commitall.png */; };
+		27FEB4700FBB200600290049 /* toolbar_compare.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4670FBB200600290049 /* toolbar_compare.png */; };
+		27FEB4710FBB200600290049 /* toolbar_diff.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4680FBB200600290049 /* toolbar_diff.png */; };
+		27FEB4720FBB200600290049 /* toolbar_pull.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4690FBB200600290049 /* toolbar_pull.png */; };
+		27FEB4730FBB200600290049 /* toolbar_push.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46A0FBB200600290049 /* toolbar_push.png */; };
+		27FEB4740FBB200600290049 /* toolbar_remove.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46B0FBB200600290049 /* toolbar_remove.png */; };
+		27FEB4750FBB200600290049 /* toolbar_update.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB46C0FBB200600290049 /* toolbar_update.png */; };
+		27FEB4860FBB209D00290049 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 27FEB4840FBB209D00290049 /* InfoPlist.strings */; };
 		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		27075E690D66B9A900A8F759 /* mercurial-logo-official.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = "mercurial-logo-official.icns"; path = "Resources/mercurial-logo-official.icns"; sourceTree = "<group>"; };
+		27075E690D66B9A900A8F759 /* mercurial-logo-official.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "mercurial-logo-official.icns"; sourceTree = "<group>"; };
 		270E509B0C56A5400069C9C6 /* HgDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HgDir.h; sourceTree = "<group>"; };
 		270E509C0C56A5400069C9C6 /* HgDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HgDir.m; sourceTree = "<group>"; };
 		270E51270C56AD520069C9C6 /* HgLogOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HgLogOperation.h; sourceTree = "<group>"; };
 		27C656870FAE01A200CFB909 /* MYTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYTask.m; sourceTree = "<group>"; };
 		27C656B70FAE046B00CFB909 /* MYDirectoryWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYDirectoryWatcher.m; sourceTree = "<group>"; };
 		27C656B80FAE046B00CFB909 /* MYDirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYDirectoryWatcher.h; sourceTree = "<group>"; };
-		27C656FC0FAE0DC100CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
-		27C6572C0FAE743800CFB909 /* TextEditors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = TextEditors.plist; path = Resources/TextEditors.plist; sourceTree = "<group>"; };
+		27C656FC0FAE0DC100CFB909 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = ../English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		27C6572C0FAE743800CFB909 /* TextEditors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = TextEditors.plist; sourceTree = "<group>"; };
 		27C657A00FAEA7E800CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Projects.xib; sourceTree = SOURCE_ROOT; };
 		27C657A20FAEA7F900CFB909 /* German */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = German; path = German.lproj/Projects.xib; sourceTree = SOURCE_ROOT; };
 		27C657A40FAEA80D00CFB909 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Repo.xib; sourceTree = SOURCE_ROOT; };
 		27D124F40C8F501B0075446A /* URLFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URLFormatter.h; sourceTree = "<group>"; };
 		27D124F50C8F501B0075446A /* URLFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = URLFormatter.m; sourceTree = "<group>"; };
 		27D918800C890F5500D53A8D /* xmlminimal.style */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xmlminimal.style; sourceTree = "<group>"; };
-		27E771CB0FB01124006504EF /* BitbucketFavIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BitbucketFavIcon.png; path = Resources/BitbucketFavIcon.png; sourceTree = "<group>"; };
+		27E771CB0FB01124006504EF /* BitbucketFavIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BitbucketFavIcon.png; sourceTree = "<group>"; };
 		27E772910FB09EA7006504EF /* MYWindowUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYWindowUtils.h; sourceTree = "<group>"; };
 		27E772920FB09EA7006504EF /* MYWindowUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYWindowUtils.m; sourceTree = "<group>"; };
+		27FEB4640FBB200600290049 /* toolbar_add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_add.png; sourceTree = "<group>"; };
+		27FEB4650FBB200600290049 /* toolbar_commit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_commit.png; sourceTree = "<group>"; };
+		27FEB4660FBB200600290049 /* toolbar_commitall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_commitall.png; sourceTree = "<group>"; };
+		27FEB4670FBB200600290049 /* toolbar_compare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_compare.png; sourceTree = "<group>"; };
+		27FEB4680FBB200600290049 /* toolbar_diff.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_diff.png; sourceTree = "<group>"; };
+		27FEB4690FBB200600290049 /* toolbar_pull.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_pull.png; sourceTree = "<group>"; };
+		27FEB46A0FBB200600290049 /* toolbar_push.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_push.png; sourceTree = "<group>"; };
+		27FEB46B0FBB200600290049 /* toolbar_remove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_remove.png; sourceTree = "<group>"; };
+		27FEB46C0FBB200600290049 /* toolbar_update.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar_update.png; sourceTree = "<group>"; };
+		27FEB4850FBB209D00290049 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		32CA4F630368D1EE00C91783 /* Murky_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Murky_Prefix.pch; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Resources/Info.plist; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* Murky.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Murky.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 				270E512C0C56AED10069C9C6 /* xml.style */,
 				27D918800C890F5500D53A8D /* xmlminimal.style */,
 			);
-			name = xmlstyle;
-			path = Resources/xmlstyle;
+			path = xmlstyle;
 			sourceTree = "<group>";
 		};
 		2712F05C0C5823BF00E36E41 /* Support */ = {
 			name = MYUtilities;
 			sourceTree = MYUtilities;
 		};
+		27FEB4630FBB200600290049 /* Icons */ = {
+			isa = PBXGroup;
+			children = (
+				27075E690D66B9A900A8F759 /* mercurial-logo-official.icns */,
+				27E771CB0FB01124006504EF /* BitbucketFavIcon.png */,
+				27FEB4640FBB200600290049 /* toolbar_add.png */,
+				27FEB4650FBB200600290049 /* toolbar_commit.png */,
+				27FEB4660FBB200600290049 /* toolbar_commitall.png */,
+				27FEB4670FBB200600290049 /* toolbar_compare.png */,
+				27FEB4680FBB200600290049 /* toolbar_diff.png */,
+				27FEB4690FBB200600290049 /* toolbar_pull.png */,
+				27FEB46A0FBB200600290049 /* toolbar_push.png */,
+				27FEB46B0FBB200600290049 /* toolbar_remove.png */,
+				27FEB46C0FBB200600290049 /* toolbar_update.png */,
+			);
+			path = Icons;
+			sourceTree = "<group>";
+		};
 		29B97314FDCFA39411CA2CEA /* MercurialViewer */ = {
 			isa = PBXGroup;
 			children = (
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				27075E690D66B9A900A8F759 /* mercurial-logo-official.icns */,
+				8D1107310486CEB800E47090 /* Info.plist */,
+				27FEB4840FBB209D00290049 /* InfoPlist.strings */,
+				27FEB4630FBB200600290049 /* Icons */,
 				270E512A0C56AED10069C9C6 /* xmlstyle */,
-				8D1107310486CEB800E47090 /* Info.plist */,
-				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				27C656FB0FAE0DC100CFB909 /* Credits.rtf */,
 				27C6572C0FAE743800CFB909 /* TextEditors.plist */,
-				27E771CB0FB01124006504EF /* BitbucketFavIcon.png */,
 			);
-			name = Resources;
+			path = Resources;
 			sourceTree = "<group>";
 		};
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				270E512D0C56AED10069C9C6 /* changeset.tmpl in Resources */,
 				270E512E0C56AED10069C9C6 /* xml.style in Resources */,
 				27D918810C890F5500D53A8D /* xmlminimal.style in Resources */,
 				27C657A60FAEA80D00CFB909 /* Repo.xib in Resources */,
 				27C657AA0FAEA82300CFB909 /* MainMenu.xib in Resources */,
 				27E771CC0FB01124006504EF /* BitbucketFavIcon.png in Resources */,
+				27FEB46D0FBB200600290049 /* toolbar_add.png in Resources */,
+				27FEB46E0FBB200600290049 /* toolbar_commit.png in Resources */,
+				27FEB46F0FBB200600290049 /* toolbar_commitall.png in Resources */,
+				27FEB4700FBB200600290049 /* toolbar_compare.png in Resources */,
+				27FEB4710FBB200600290049 /* toolbar_diff.png in Resources */,
+				27FEB4720FBB200600290049 /* toolbar_pull.png in Resources */,
+				27FEB4730FBB200600290049 /* toolbar_push.png in Resources */,
+				27FEB4740FBB200600290049 /* toolbar_remove.png in Resources */,
+				27FEB4750FBB200600290049 /* toolbar_update.png in Resources */,
+				27FEB4860FBB209D00290049 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C165DFE840E0CC02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
 		27C656FB0FAE0DC100CFB909 /* Credits.rtf */ = {
 			isa = PBXVariantGroup;
 			children = (
-				27C656FC0FAE0DC100CFB909 /* English */,
+				27C656FC0FAE0DC100CFB909 /* Credits.rtf */,
 			);
 			name = Credits.rtf;
 			sourceTree = "<group>";
 			name = MainMenu.xib;
 			sourceTree = "<group>";
 		};
+		27FEB4840FBB209D00290049 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				27FEB4850FBB209D00290049 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

File Resources/BitbucketFavIcon.png

Removed
Old image

File Resources/BitbucketLogo.png

Removed
Old image

File Resources/Icons/BitbucketFavIcon.png

Added
New image

File Resources/Icons/BitbucketLogo.png

Added
New image

File Resources/Icons/mercurial-logo-official-128.png

Added
New image

File Resources/Icons/mercurial-logo-official.icns

Binary file added.

File Resources/Icons/toolbar_add.png

Added
New image

File Resources/Icons/toolbar_commit.png

Added
New image

File Resources/Icons/toolbar_commitall.png

Added
New image

File Resources/Icons/toolbar_compare.png

Added
New image

File Resources/Icons/toolbar_diff.png

Added
New image

File Resources/Icons/toolbar_pull.png

Added
New image

File Resources/Icons/toolbar_push.png

Added
New image

File Resources/Icons/toolbar_remove.png

Added
New image

File Resources/Icons/toolbar_update.png

Added
New image

File Resources/mercurial-logo-official-128.png

Removed
Old image

File Resources/mercurial-logo-official.icns

Binary file removed.

File toolbar_add.png

Removed
Old image

File toolbar_commit.png

Removed
Old image

File toolbar_commitall.png

Removed
Old image

File toolbar_compare.png

Removed
Old image

File toolbar_diff.png

Removed
Old image

File toolbar_pull.png

Removed
Old image

File toolbar_push.png

Removed
Old image

File toolbar_remove.png

Removed
Old image

File toolbar_update.png

Removed
Old image