Commit: 958cdfc5cabd185e5b462afac49255d0a92f7ea2 - BSIconSetComposer (git)

BathyScapheのアイコンセット生成＆適用ツール

Commit MetaInfo

• Revision: 958cdfc5cabd185e5b462afac49255d0a92f7ea2 (tree)
• Time: 2012-05-30 23:38:27
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

[New] デフォルト画像を持たないリソースの処理

Change Summary

• modified: BSIconSetComposer.xcodeproj/project.pbxproj
• modified: IconSetComposer.m
• add: NotHaveDefaultImageList.plist

Incremental Difference

--- a/BSIconSetComposer.xcodeproj/project.pbxproj
+++ b/BSIconSetComposer.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
 		8D15AC310486D014006FF6A4 /* IconSetDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A37F4ACFDCFA73011CA2CEA /* IconSetDocument.m */; settings = {ATTRIBUTES = (); }; };
 		8D15AC320486D014006FF6A4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
 		8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
+		F414890C157666FC0041118B /* NotHaveDefaultImageList.plist in Resources */ = {isa = PBXBuildFile; fileRef = F414890B157666FC0041118B /* NotHaveDefaultImageList.plist */; };
 		F41CD7AE090FDF3C00D66C88 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F4F4B5FC08818D4400E44313 /* Credits.rtf */; };
 		F42A855A0F8A580A0014157F /* DeprecatedImageList.plist in Resources */ = {isa = PBXBuildFile; fileRef = F42A85590F8A580A0014157F /* DeprecatedImageList.plist */; };
 		F42C27480987B78A0032C9F9 /* NSAppleEventDescriptor-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F42C27460987B78A0032C9F9 /* NSAppleEventDescriptor-Extensions.m */; };
@@ -90,6 +91,7 @@
 		32DBCF750370BD2300C91783 /* IconSetComposer_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconSetComposer_Prefix.pch; sourceTree = "<group>"; };
 		8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D15AC370486D014006FF6A4 /* BSIconSetComposer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BSIconSetComposer.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		F414890B157666FC0041118B /* NotHaveDefaultImageList.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = NotHaveDefaultImageList.plist; sourceTree = "<group>"; };
 		F42A85590F8A580A0014157F /* DeprecatedImageList.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = DeprecatedImageList.plist; sourceTree = "<group>"; };
 		F42C27450987B78A0032C9F9 /* NSAppleEventDescriptor-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSAppleEventDescriptor-Extensions.h"; sourceTree = "<group>"; };
 		F42C27460987B78A0032C9F9 /* NSAppleEventDescriptor-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSAppleEventDescriptor-Extensions.m"; sourceTree = "<group>"; };
@@ -240,6 +242,7 @@
 				F4F4B5FC08818D4400E44313 /* Credits.rtf */,
 				F4F4B2C508814EFF00E44313 /* ImageList.plist */,
 				F42A85590F8A580A0014157F /* DeprecatedImageList.plist */,
+				F414890B157666FC0041118B /* NotHaveDefaultImageList.plist */,
 				F461E46308ADCDB400384957 /* MainMenu.nib */,
 				F461E46608ADCDCA00384957 /* IconSetDocument.nib */,
 				8D15AC360486D014006FF6A4 /* Info.plist */,
@@ -375,6 +378,7 @@
 				F45B21840919919C0055CBC4 /* IconNames.strings in Resources */,
 				F42A855A0F8A580A0014157F /* DeprecatedImageList.plist in Resources */,
 				F4FDBDF81572231100036EBB /* DropToMe.png in Resources */,
+				F414890C157666FC0041118B /* NotHaveDefaultImageList.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

--- a/IconSetComposer.m
+++ b/IconSetComposer.m
@@ -72,7 +72,6 @@ static IconSetComposer *_instance = nil;
 	NSString *bsResourcesPath;
 	NSArray *bsResources;
 	NSArray *knownBSSystemImages;
-	NSArray *deprecatedImages;
 	NSArray *managedImages;
 	unsigned managedImageNum;
 	unsigned i, count;
@@ -97,8 +96,6 @@ static IconSetComposer *_instance = nil;
 	
 	knownBSSystemImages = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"BathyScapheSystemImages"
 																						   ofType:@"plist"]];
-	deprecatedImages = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DeprecatedImageList"
-																						ofType:@"plist"]];
 	
 	count = [bsResources count];
 	for( i = 0; i < count; i++ ) {
@@ -119,9 +116,15 @@ static IconSetComposer *_instance = nil;
 		}
 	}
 	if( managedImageNum > bsResourceImageNum ) {
+		NSArray *deprecatedImages = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DeprecatedImageList"
+																									 ofType:@"plist"]];
+		NSArray *notHaveDefault = [NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"NotHaveDefaultImageList"
+																									 ofType:@"plist"]];
+		
 		decrementalImages = [[managedImages mutableCopy] autorelease];
 		[decrementalImages removeObjectsInArray:containsImages];
 		[decrementalImages removeObjectsInArray:deprecatedImages];
+		[decrementalImages removeObjectsInArray:notHaveDefault];
 		if([decrementalImages count] > 0) {
 			status |= kIconsHaveIncreased;
 		}

--- /dev/null
+++ b/NotHaveDefaultImageList.plist
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>lastUpdatedHeaderLeft</string>
+	<string>lastUpdatedHeaderMiddle</string>
+	<string>lastUpdatedHeaderRight</string>
+</array>
+</plist>