diff --git a/ClickToFlash.xcodeproj/project.pbxproj b/ClickToFlash.xcodeproj/project.pbxproj index b1699c11..ba6597f3 100755 --- a/ClickToFlash.xcodeproj/project.pbxproj +++ b/ClickToFlash.xcodeproj/project.pbxproj @@ -309,7 +309,14 @@ isa = PBXProject; buildConfigurationList = 55EB70350E04A8410016593D /* Build configuration list for PBXProject "ClickToFlash" */; compatibilityVersion = "Xcode 3.0"; + developmentRegion = English; hasScannedForEncodings = 0; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 55EB70300E04A8410016593D; productRefGroup = 55EB70430E04A8640016593D /* Products */; projectDirPath = ""; diff --git a/Plugin/English.lproj/ContextualMenu.xib b/Plugin/English.lproj/ContextualMenu.xib index 7225fb2e..b7a665d5 100755 --- a/Plugin/English.lproj/ContextualMenu.xib +++ b/Plugin/English.lproj/ContextualMenu.xib @@ -1,28 +1,26 @@ - + 1050 - 9J61 - 677 - 949.46 - 353.00 + 10H574 + 804 + 1038.35 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 804 + YES - + YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -53,6 +51,84 @@ NSMenuMixedState + + + Load Flash With Quality + + 2147483647 + + + submenuAction: + + Menu + + YES + + + Low + + 2147483647 + + + + + + Medium + + 2147483647 + + + 1 + + + + High + + 2147483647 + + + 2 + + + + Best + + 2147483647 + + + 3 + + + + YES + YES + + + 2147483647 + + + + + + Auto Low + + 2147483647 + + + 4 + + + + Auto High + + 2147483647 + + + 5 + + + + Load All on This Page @@ -143,6 +219,54 @@ 22 + + + loadFlashWithQuality: + + + + 33 + + + + loadFlashWithQuality: + + + + 34 + + + + loadFlashWithQuality: + + + + 35 + + + + loadFlashWithQuality: + + + + 36 + + + + loadFlashWithQuality: + + + + 37 + + + + loadFlashWithQuality: + + + + 38 + @@ -159,7 +283,7 @@ -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -184,6 +308,7 @@ + @@ -217,14 +342,71 @@ + + 24 + + + YES + + + + + + 25 + + + YES + + + + + + + + + + + + 26 + + + + + 27 + + + + + 28 + + + + + 29 + + + + + 30 + + + + + 31 + + + + + 32 + + + YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency @@ -233,14 +415,32 @@ 16.IBPluginDependency 19.IBPluginDependency 21.IBPluginDependency + 24.IBPluginDependency + 25.IBEditorWindowLastContentRect + 25.IBPluginDependency + 26.IBPluginDependency + 27.IBPluginDependency + 28.IBPluginDependency + 29.IBPluginDependency 3.IBPluginDependency + 30.IBPluginDependency + 31.IBPluginDependency + 32.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - {{371, 335}, {213, 103}} + {{371, 315}, {211, 123}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{582, 285}, {121, 133}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -252,9 +452,7 @@ YES - - YES - + YES @@ -262,15 +460,13 @@ YES - - YES - + YES - 23 + 38 @@ -279,17 +475,34 @@ CTFClickToFlashPlugin YES - + YES addToWhitelist: editWhitelist: - removeFromWhitelist: YES id id - id + + + + YES + + YES + addToWhitelist: + editWhitelist: + + + YES + + addToWhitelist: + id + + + editWhitelist: + id + @@ -309,11 +522,12 @@ NSView YES - + YES downloadH264: loadAllOnPage: loadFlash: + loadFlashWithQuality: loadH264: @@ -322,21 +536,163 @@ id id id + id + + + + YES + + YES + downloadH264: + loadAllOnPage: + loadFlash: + loadFlashWithQuality: + loadH264: + + + YES + + downloadH264: + id + + + loadAllOnPage: + id + + + loadFlash: + id + + + loadFlashWithQuality: + id + + + loadH264: + id + trackingArea id + + trackingArea + + trackingArea + id + + IBProjectSource Plugin/Plugin.h + + YES + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebDownload.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebEditingDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebFrameLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebJavaPlugIn.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPlugin.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPluginContainer.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPolicyDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebResourceLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebScriptObject.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebUIDelegate.h + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../../ClickToFlash.xcodeproj 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + + diff --git a/Plugin/English.lproj/WhitelistPanel.xib b/Plugin/English.lproj/WhitelistPanel.xib index 7fd83732..549b3634 100755 --- a/Plugin/English.lproj/WhitelistPanel.xib +++ b/Plugin/English.lproj/WhitelistPanel.xib @@ -1,27 +1,26 @@ - + 1040 - 9L30 - 677 - 949.54 - 353.00 + 10H574 + 804 + 1038.35 + 461.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 804 + YES - + YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -37,12 +36,12 @@ 15 2 - {{80, 187}, {527, 516}} + {{80, 187}, {527, 716}} -534248448 - Q2xpY2tUb0ZsYXNoIOKAlCBTZXR0aW5ncw + ClickToFlash — Settings NSPanel - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {420, 400} @@ -62,7 +61,7 @@ 4352 - {485, 151} + {485, 247} YES @@ -75,22 +74,22 @@ -2147483392 - {{-26, 0}, {16, 17}} + {{471, 0}, {16, 0}} YES - 4.820000e+02 - 4.000000e+01 - 2.000000e+03 + 482 + 40 + 2000 75628096 134219776 Whitelisted Sites LucidaGrande - 1.100000e+01 + 11 3100 @@ -113,7 +112,7 @@ Text Cell LucidaGrande - 1.100000e+01 + 11 16 @@ -123,7 +122,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -139,8 +138,8 @@ - 3.000000e+00 - 2.000000e+00 + 3 + 2 6 @@ -151,16 +150,19 @@ MC41AA - 1.700000e+01 + 17 1119879168 + + 2 4 15 0 YES + 0 - {{1, 17}, {485, 151}} + {{1, 17}, {485, 247}} @@ -170,12 +172,11 @@ -2147483392 - {{471, 17}, {15, 152}} + {{471, 0}, {15, 0}} _doScroller: - 3.700000e+01 - 1.947368e-01 + 1 @@ -185,7 +186,7 @@ 1 _doScroller: - 9.976415e-01 + 0.99764149999999996 @@ -203,7 +204,7 @@ - {{20, 69}, {487, 169}} + {{20, 69}, {487, 265}} 530 @@ -223,10 +224,10 @@ 67239424 134348800 - 4oiSA + Courier - 1.400000e+01 + 14 16 @@ -287,7 +288,7 @@ 268 - {{93, 216}, {286, 18}} + {{93, 307}, {286, 18}} YES @@ -296,7 +297,7 @@ Load H.264 videos from YouTube LucidaGrande - 1.300000e+01 + 13 1044 @@ -318,7 +319,7 @@ 268 - {{120, 196}, {259, 18}} + {{120, 287}, {259, 18}} YES @@ -340,7 +341,7 @@ 268 - {{93, 174}, {286, 18}} + {{93, 265}, {286, 18}} YES @@ -362,7 +363,7 @@ 268 - {{17, 237}, {67, 17}} + {{17, 328}, {67, 17}} YES @@ -375,10 +376,252 @@ + + + 268 + {{93, 101}, {284, 78}} + + YES + 4 + 2 + + YES + + -2080244224 + 0 + Don't Change + + + 1211912703 + 0 + + NSRadioButton + + + + 200 + 25 + + + 67239424 + 0 + Low + + + 1 + 1211912703 + 0 + + 400 + 75 + + + 67239424 + 0 + Auto Low + + + 2 + 1211912703 + 0 + + 400 + 75 + + + 67239424 + 0 + Medium + + + 3 + 1211912703 + 0 + + 400 + 75 + + + 67239424 + 0 + Auto High + + + 4 + 1211912703 + 0 + + 549453824 + {18, 18} + + YES + + YES + + + + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw +IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ +29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 +dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA +AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG +AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ +0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ +7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ +5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ +3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD +AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns +AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ +6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ +/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ +///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl +YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA +AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD +AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu +AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAPcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAD3GFw +cGwCAAAAbW50clJHQiBYWVogB9kAAQAHAAIADAAeYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsCh6zG+heDkCDNUtZfpGylwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA +AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAAwbmRpbgAA +AggAAAA4ZGVzYwAAAkAAAABfZHNjbQAAAqAAAADwbW1vZAAAA5AAAAAoY3BydAAAA7gAAAAkWFlaIAAA +AAAAAHkhAAA/ywAAApxYWVogAAAAAAAAVx0AAKwHAAAU+FhZWiAAAAAAAAAmlwAAFD0AALuUWFlaIAAA +AAAAAPSSAAEAAAABF55zZjMyAAAAAAABC18AAAVd///zOAAABs8AAP40///7sv///ZgAAAP2AAC/0WN1 +cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAQAA +0XQAAAAAAAEAAAAA0XQAAAAAAAEAAAAA0XQAAAAAAAEAAG5kaW4AAAAAAAAAMAAAo8AAAFcAAABKwAAA +ncAAACZ3AAASuwAAUEAAAFQAAAIzMwACMzMAAjMzZGVzYwAAAAAAAAAFaU1hYwAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAbWx1YwAAAAAAAAASAAAADG5iTk8AAAAIAAAA6HB0UFQAAAAIAAAA6HN2U0UAAAAIAAAA6GZp +RkkAAAAIAAAA6GRhREsAAAAIAAAA6HpoQ04AAAAIAAAA6GZyRlIAAAAIAAAA6GphSlAAAAAIAAAA6GVu +VVMAAAAIAAAA6HBsUEwAAAAIAAAA6HB0QlIAAAAIAAAA6GVzRVMAAAAIAAAA6HpoVFcAAAAIAAAA6HJ1 +UlUAAAAIAAAA6GtvS1IAAAAIAAAA6GRlREUAAAAIAAAA6G5sTkwAAAAIAAAA6Gl0SVQAAAAIAAAA6ABp +AE0AYQBjbW1vZAAAAAAAAAYQAACcWQAAAAC98l4AAAAAAAAAAAAAAAAAAAAAAHRleHQAAAAAQ29weXJp +Z2h0IEFwcGxlLCBJbmMuLCAyMDA5AA + + + + + + 3 + MCAwAA + + + + 400 + 75 + + + 67239424 + 0 + High + + + 5 + 1211912703 + 0 + + 400 + 75 + + + 67239424 + 0 + Best + + + 1211945471 + 0 + + 400 + 75 + + + 67239424 + 0 + Best + + + 7 + 1211912703 + 0 + + 400 + 75 + + + {140, 18} + {4, 2} + 1151868928 + NSActionCell + + 67239424 + 0 + Radio + + 1211912703 + 0 + + 549453824 + {18, 18} + + YES + + YES + + + + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw +IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ +29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 +dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA +AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG +AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ +0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ +7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ +5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ +3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD +AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns +AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ +6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ +/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ +///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl +YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA +AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD +AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu +AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB +AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + + + + + + 400 + 75 + + + + + 3 + MQA + + + 268 - {{93, 103}, {285, 58}} + {{93, 194}, {285, 58}} YES 3 @@ -393,9 +636,7 @@ 1211912703 0 - - NSRadioButton - + 200 @@ -406,8 +647,8 @@ 0 Always load (provides better typography) - 1 + 1 1211912703 0 @@ -417,7 +658,7 @@ YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -443,7 +684,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -501,10 +742,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA - - 3 - MCAwAA - + 400 @@ -515,8 +753,8 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA 0 Suppress replacement (uses HTML text) - 2 + 2 1211912703 0 @@ -526,7 +764,7 @@ QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -552,7 +790,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAPcAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAD3GFw cGwCAAAAbW50clJHQiBYWVogB9kAAQAHAAIADAAeYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAPbWAAEAAAAA0y1hcHBsCh6zG+heDkCDNUtZfpGylwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -600,7 +838,7 @@ Z2h0IEFwcGxlLCBJbmMuLCAyMDA5AA YES YES - + TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA @@ -626,7 +864,7 @@ AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS +AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA @@ -640,16 +878,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 3 - MQA - + + + + 268 + {{17, 162}, {67, 17}} + + YES + + 68288064 + 71304192 + Quality: + + + + + + 268 - {{17, 144}, {67, 17}} + {{17, 235}, {67, 17}} YES @@ -739,7 +990,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 268 - {{93, 236}, {286, 18}} + {{93, 327}, {286, 18}} YES @@ -779,7 +1030,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {{65, 246}, {397, 274}} + {{65, 355}, {397, 365}} NSView @@ -800,12 +1051,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {527, 516} + {527, 716} {{0, 0}, {1280, 778}} {420, 422} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} ClickToFlash_settingsWindow @@ -833,6 +1084,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA checkForUpdatesOnFirstLoad siteInfo useYouTubeHDH264 + qualityLevel YES @@ -846,7 +1098,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -869,7 +1121,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 Helvetica - 1.300000e+01 + 13 16 @@ -908,7 +1160,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -947,7 +1199,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA Are you sure you want to uninstall ClickToFlash? LucidaGrande-Bold - 1.300000e+01 + 13 2072 @@ -976,7 +1228,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -988,7 +1240,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -1025,7 +1277,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -1074,9 +1326,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 67239424 4194304 - Q2xpY2tUb0ZsYXNoIG1heSBiZSBpbnN0YWxsZWQgZm9yIGFsbCB1c2Vycy4gIE1hbnVhbGx5IGRlbGV0 -ZSAiQ2xpY2tUb0ZsYXNoLndlYnBsdWdpbiIgZnJvbSAvTGlicmFyeS9JbnRlcm5ldCBQbHVnLWlucy8g -dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 + ClickToFlash may be installed for all users. Manually delete "ClickToFlash.webplugin" from /Library/Internet Plug-ins/ to uninstall ClickToFlash. @@ -1088,7 +1338,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} 1 @@ -1100,7 +1350,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 View - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {213, 107} @@ -1137,7 +1387,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 256 YES - + YES Apple PDF pasteboard type Apple PICT pasteboard type @@ -1198,7 +1448,10 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 {{0, 0}, {1280, 778}} {213, 129} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} + + + YES @@ -1273,7 +1526,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 versionString NSAllowsEditingMultipleValuesSelection - + 2 @@ -1357,7 +1610,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 values.siteInfo NSHandlesContentAsCompoundValue - + 2 @@ -1473,14 +1726,14 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 arrangedObjects.site YES - + YES NSAllowsEditingMultipleValuesSelection NSNullPlaceholder YES - + double-click to set @@ -1513,6 +1766,22 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 259 + + + selectedTag: values.qualityLevel + + + + + + selectedTag: values.qualityLevel + selectedTag + values.qualityLevel + 2 + + + 274 + @@ -1529,7 +1798,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -1681,6 +1950,8 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 + + @@ -2139,16 +2410,96 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 + + 260 + + + YES + + + + + + 261 + + + + + 262 + + + YES + + + + + + + + + + + + + + 265 + + + + + 266 + + + + + 268 + + + + + 270 + + + + + 275 + + + + + 276 + + + + + 277 + + + + + 278 + + + + + 279 + + + + + 263 + + + YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect + 1.IBPluginDependency 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch @@ -2159,12 +2510,14 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 10.IBPluginDependency 101.IBAttributePlaceholdersKey 101.IBPluginDependency + 101.IBViewBoundsToFrameTransform 102.IBPluginDependency 103.IBPluginDependency 104.IBPluginDependency 105.IBPluginDependency 106.IBAttributePlaceholdersKey 106.IBPluginDependency + 106.IBViewBoundsToFrameTransform 107.IBPluginDependency 11.IBPluginDependency 113.IBPluginDependency @@ -2196,6 +2549,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 190.IBPluginDependency 191.IBPluginDependency 194.IBEditorWindowLastContentRect + 194.IBPluginDependency 194.IBViewEditorWindowController.showingLayoutRectangles 194.IBWindowTemplateEditedContentRect 194.ImportedFromIB2 @@ -2222,6 +2576,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 207.IBPluginDependency 21.IBPluginDependency 213.IBEditorWindowLastContentRect + 213.IBPluginDependency 213.IBViewEditorWindowController.showingLayoutRectangles 213.IBWindowTemplateEditedContentRect 213.ImportedFromIB2 @@ -2242,6 +2597,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 222.IBPluginDependency 223.IBPluginDependency 225.IBEditorWindowLastContentRect + 225.IBPluginDependency 225.IBViewEditorWindowController.showingLayoutRectangles 225.IBWindowTemplateEditedContentRect 225.ImportedFromIB2 @@ -2264,6 +2620,15 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 240.IBAttributePlaceholdersKey 240.IBPluginDependency 241.IBPluginDependency + 260.IBAttributePlaceholdersKey + 260.IBPluginDependency + 261.IBPluginDependency + 262.IBAttributePlaceholdersKey + 262.IBPluginDependency + 262.IBViewBoundsToFrameTransform + 263.IBPluginDependency + 265.IBPluginDependency + 266.IBPluginDependency 31.IBPluginDependency 32.IBPluginDependency 36.IBAttributePlaceholdersKey @@ -2278,15 +2643,14 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 YES com.apple.InterfaceBuilder.CocoaPlugin + {{376, 89}, {527, 716}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{369, 140}, {527, 516}} - - {{369, 140}, {527, 516}} - + + {{376, 89}, {527, 716}} + {196, 240} {{202, 428}, {480, 270}} - + {420, 400} com.apple.InterfaceBuilder.CocoaPlugin @@ -2298,6 +2662,9 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCugAAw3oAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2311,6 +2678,9 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw3oAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2370,25 +2740,26 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{97, 461}, {461, 124}} - + com.apple.InterfaceBuilder.CocoaPlugin + {{97, 461}, {461, 124}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2396,41 +2767,43 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{105, 287}, {461, 150}} - + com.apple.InterfaceBuilder.CocoaPlugin + {{105, 287}, {461, 150}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin {{132, 289}, {461, 124}} - + com.apple.InterfaceBuilder.CocoaPlugin + {{132, 289}, {461, 124}} - - + + {213, 107} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2445,6 +2818,31 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + sIFR (Scalable Inman Flash Replacement) replaces text on HTML pages with Flash equivalents to provide better typography. + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + sIFR (Scalable Inman Flash Replacement) replaces text on HTML pages with Flash equivalents to provide better typography. + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCugAAwzEAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2466,9 +2864,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 YES - - YES - + YES @@ -2476,15 +2872,13 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 YES - - YES - + YES - 259 + 280 @@ -2502,7 +2896,7 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 NSWindowController YES - + YES approveUninstall: automaticallyCheckForUpdatesDidChange: @@ -2523,9 +2917,53 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 id + + YES + + YES + approveUninstall: + automaticallyCheckForUpdatesDidChange: + cancelUninstall: + checkForUpdates: + dismissFailureSheet: + dismissSuccessSheet: + uninstallClickToFlash: + + + YES + + approveUninstall: + id + + + automaticallyCheckForUpdatesDidChange: + id + + + cancelUninstall: + id + + + checkForUpdates: + id + + + dismissFailureSheet: + id + + + dismissSuccessSheet: + id + + + uninstallClickToFlash: + id + + + YES - + YES _checkNowButton _controller @@ -2542,15 +2980,149 @@ dG8gdW5pbnN0YWxsIENsaWNrVG9GbGFzaC4 NSPanel + + YES + + YES + _checkNowButton + _controller + confirmUninstallSheet + failedUninstallationSheet + successfulUninstallationSheet + + + YES + + _checkNowButton + NSButton + + + _controller + NSArrayController + + + confirmUninstallSheet + NSPanel + + + failedUninstallationSheet + NSPanel + + + successfulUninstallationSheet + NSPanel + + + IBProjectSource Plugin/CTFWhitelistWindowController.h + + YES + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebDownload.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebEditingDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebFrameLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebJavaPlugIn.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPlugin.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPluginContainer.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPolicyDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebResourceLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebScriptObject.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebUIDelegate.h + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../../ClickToFlash.xcodeproj 3 + + YES + + YES + NSSwitch + ctf + + + YES + {15, 15} + {256, 256} + + diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h index 6b12e329..8e3bb24a 100755 --- a/Plugin/Plugin.h +++ b/Plugin/Plugin.h @@ -61,6 +61,9 @@ THE SOFTWARE. unsigned expectedResponses; NSTimer *_delayingTimer; NSRect _drawnRect; + + BOOL _loadFlashWithQuality; + NSString *_qualityLevelString; } + (NSView *)plugInViewWithArguments:(NSDictionary *)arguments; @@ -96,6 +99,7 @@ THE SOFTWARE. - (void)setLaunchedAppBundleIdentifier:(NSString *)newValue; - (IBAction)loadFlash:(id)sender; +- (IBAction)loadFlashWithQuality:(id)sender; - (IBAction)loadH264:(id)sender; - (IBAction)loadAllOnPage:(id)sender; diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m index 73eaf5e3..06b15971 100755 --- a/Plugin/Plugin.m +++ b/Plugin/Plugin.m @@ -443,6 +443,9 @@ - (id) initWithArguments:(NSDictionary *)arguments [self _checkMouseLocation]; [self _addTrackingAreaForCTF]; + + _loadFlashWithQuality = NO; + _qualityLevelString = nil; } return self; @@ -787,9 +790,41 @@ - (BOOL) validateMenuItem: (NSMenuItem *)menuItem - (IBAction)loadFlash:(id)sender; { + _loadFlashWithQuality = NO; + [_qualityLevelString release]; + _qualityLevelString = nil; + [self _convertTypesForFlashContainer]; } +- (IBAction)loadFlashWithQuality:(id)sender { + [_qualityLevelString release]; + + switch ([sender tag]) { + case 0: + _qualityLevelString = [[NSString alloc] initWithString:@"low"]; + break; + case 1: + _qualityLevelString = [[NSString alloc] initWithString:@"medium"]; + break; + case 2: + _qualityLevelString = [[NSString alloc] initWithString:@"high"]; + break; + case 3: + _qualityLevelString = [[NSString alloc] initWithString:@"best"]; + break; + case 4: + _qualityLevelString = [[NSString alloc] initWithString:@"autolow"]; + break; + case 5: + _qualityLevelString = [[NSString alloc] initWithString:@"autohigh"]; + break; + } + + _loadFlashWithQuality = YES; + [self _convertTypesForFlashContainer]; +} + - (IBAction)loadH264:(id)sender; { [self _convertToMP4Container]; @@ -797,7 +832,11 @@ - (IBAction)loadH264:(id)sender; - (IBAction)loadAllOnPage:(id)sender { - [[CTFMenubarMenuController sharedController] loadFlashForWindow: [self window]]; + _loadFlashWithQuality = NO; + [_qualityLevelString release]; + _qualityLevelString = nil; + + [[CTFMenubarMenuController sharedController] loadFlashForWindow: [self window]]; } - (void) _loadContent: (NSNotification*) notification @@ -1665,9 +1704,34 @@ - (void)_getEmbeddedPlayerFlashVarsAndCheckForVariantsWithVideoId:(NSString *)vi - (void) _convertTypesForElement:(DOMElement *)element { NSString *type = [element getAttribute:@"type"]; - + if ([type isEqualToString:sFlashOldMIMEType] || [type length] == 0) { [element setAttribute:@"type" value:sFlashNewMIMEType]; + + if (_loadFlashWithQuality) { + [element setAttribute:@"quality" value:_qualityLevelString]; + } else { + switch ([[CTFUserDefaultsController standardUserDefaults] integerForKey:@"qualityLevel"]) { + case 1: + [element setAttribute:@"quality" value:@"low"]; + break; + case 2: + [element setAttribute:@"quality" value:@"autolow"]; + break; + case 3: + [element setAttribute:@"quality" value:@"medium"]; + break; + case 4: + [element setAttribute:@"quality" value:@"autohigh"]; + break; + case 5: + [element setAttribute:@"quality" value:@"high"]; + break; + case 6: + [element setAttribute:@"quality" value:@"best"]; + break; + } + } } }