moved some files around, fixed an annoying shell script with Sparkle …

…that kept failing unless you cleaned first, fixed alignment of 'enable' checkbox in new prefs panel, activated static analyzer on ClickToFlash project
rentzsch · Sep 17, 2009 · ce18695 · ce18695
1 parent 8d01590
commit ce18695
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 138 deletions.
diff --git a/ClickToFlash.xcodeproj/project.pbxproj b/ClickToFlash.xcodeproj/project.pbxproj
diff --git a/CTFAboutBoxWindowController.h → Plugin/CTFAboutBoxWindowController.h b/CTFAboutBoxWindowController.h → Plugin/CTFAboutBoxWindowController.h
diff --git a/CTFAboutBoxWindowController.m → Plugin/CTFAboutBoxWindowController.m b/CTFAboutBoxWindowController.m → Plugin/CTFAboutBoxWindowController.m
diff --git a/Credits.css → Plugin/English.lproj/Credits.css b/Credits.css → Plugin/English.lproj/Credits.css
diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1040</int>
-		<string key="IBDocument.SystemVersion">10B503</string>
+		<string key="IBDocument.SystemVersion">10A432</string>
 		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
+		<string key="IBDocument.AppKitVersion">1038</string>
 		<string key="IBDocument.HIToolboxVersion">437.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -250,7 +250,7 @@
 						<object class="NSButton" id="596693856">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{18, 444}, {148, 18}}</string>
+							<string key="NSFrame">{{150, 444}, {148, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="410759951">
@@ -1515,7 +1515,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="1006"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="596693856"/>
 							<reference ref="43744226"/>
 							<reference ref="241393621"/>
 							<reference ref="510641939"/>
@@ -1532,6 +1531,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="48241452"/>
 							<reference ref="1009121487"/>
 							<reference ref="282228737"/>
+							<reference ref="596693856"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>

diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
@@ -120,10 +120,7 @@ - (id) initWithArguments:(NSDictionary *)arguments
 		_hasHDH264Version = NO;
 		_contextMenuIsVisible = NO;
 		_embeddedYouTubeView = NO;
-<<<<<<< HEAD
-=======
 		_isSIFR = NO;
->>>>>>> 86ed051e012659506321be24751897ffaa229799
 		_youTubeAutoPlay = NO;
 		_delayingTimer = nil;
 		defaultWhitelist = [NSArray arrayWithObjects:	@"com.apple.frontrow",

diff --git a/Plugin/Sparkle/Sparkle.xcodeproj/project.pbxproj b/Plugin/Sparkle/Sparkle.xcodeproj/project.pbxproj
@@ -802,7 +802,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env ruby";
-			shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`ln -s \"#{resources}/fr.lproj\" \"#{resources}/fr_CA.lproj\"`";
+			shellScript = "resources = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"WRAPPER_NAME\"]}/Resources\"\n`rm \"#{resources}/fr_CA.lproj\"`\n`ln -s \"#{resources}/fr.lproj\" \"#{resources}/fr_CA.lproj\"`";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/Plugin/de.lproj/Credits.css b/Plugin/de.lproj/Credits.css
@@ -0,0 +1,17 @@
+* {
+	margin: 0px;
+	padding: 0px;
+}
+
+body { 
+	font-family: Lucida Grande; 
+	font-size: 10px; 
+	line-height: 20px; 
+	text-align: center; 
+}
+
+a[hreflang]:after {
+	content:"[" attr(hreflang) "]"; 
+	font-size:71%; 
+	margin-left:0.2em;
+}
diff --git a/Plugin/de.lproj/WhitelistPanel.xib b/Plugin/de.lproj/WhitelistPanel.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1040</int>
-		<string key="IBDocument.SystemVersion">10B503</string>
+		<string key="IBDocument.SystemVersion">10A432</string>
 		<string key="IBDocument.InterfaceBuilderVersion">732</string>
-		<string key="IBDocument.AppKitVersion">1038.2</string>
+		<string key="IBDocument.AppKitVersion">1038</string>
 		<string key="IBDocument.HIToolboxVersion">437.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -250,7 +250,7 @@
 						<object class="NSButton" id="596693856">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">264</int>
-							<string key="NSFrame">{{18, 427}, {150, 18}}</string>
+							<string key="NSFrame">{{155, 427}, {150, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="410759951">
@@ -1547,7 +1547,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="1006"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="596693856"/>
 							<reference ref="168229436"/>
 							<reference ref="211748724"/>
 							<reference ref="90714319"/>
@@ -1564,6 +1563,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="264763803"/>
 							<reference ref="43744226"/>
 							<reference ref="457146514"/>
+							<reference ref="596693856"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -2179,8 +2179,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>17.IBPluginDependency</string>
 					<string>170.CustomClassName</string>
 					<string>170.IBPluginDependency</string>
+					<string>187.IBPluginDependency</string>
 					<string>190.IBPluginDependency</string>
-					<string>191.IBPluginDependency</string>
 					<string>194.IBEditorWindowLastContentRect</string>
 					<string>194.IBPluginDependency</string>
 					<string>194.IBWindowTemplateEditedContentRect</string>
@@ -2257,11 +2257,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>263.IBPluginDependency</string>
 					<string>264.IBPluginDependency</string>
 					<string>265.IBPluginDependency</string>
+					<string>270.IBPluginDependency</string>
 					<string>271.IBPluginDependency</string>
 					<string>271.ImportedFromIB2</string>
-					<string>272.IBPluginDependency</string>
+					<string>273.IBPluginDependency</string>
 					<string>282.IBPluginDependency</string>
-					<string>283.IBPluginDependency</string>
 					<string>36.IBAttributePlaceholdersKey</string>
 					<string>36.IBPluginDependency</string>
 					<string>38.IBPluginDependency</string>
@@ -2456,8 +2456,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">

diff --git a/Plugin/fr.lproj/Credits.css b/Plugin/fr.lproj/Credits.css
@@ -0,0 +1,17 @@
+* {
+	margin: 0px;
+	padding: 0px;
+}
+
+body { 
+	font-family: Lucida Grande; 
+	font-size: 10px; 
+	line-height: 20px; 
+	text-align: center; 
+}
+
+a[hreflang]:after {
+	content:"[" attr(hreflang) "]"; 
+	font-size:71%; 
+	margin-left:0.2em;
+}
diff --git a/Plugin/fr.lproj/InfoPlist.strings b/Plugin/fr.lproj/InfoPlist.strings
@@ -6,4 +6,5 @@
    Copyright 2009 earthlingsoft. All rights reserved.
 */
 
+
 NSHumanReadableCopyright = "© 2008-2009 Concepteurs ClickToFlash";
diff --git a/Plugin/fr.lproj/Localizable.strings b/Plugin/fr.lproj/Localizable.strings
@@ -1,6 +1,11 @@
-
+/* 
+	PLUGIN
+*/
 
 
+/*
+	CtF Plug-In Badges
+*/
 
 /* Flash badge text */
 "Flash" = "Flash";