Skip to content

Commit 546ed7d

Browse files
Simone Manganellirentzsch
Simone Manganelli
authored and
rentzsch
committed
CtF version now included in the 'Installed Plug-ins' page; added version number to settings window
Signed-off-by: Jonathan 'Wolf' Rentzsch <[email protected]>
1 parent 8a0a2bd commit 546ed7d

File tree

3 files changed

+73
-12
lines changed

3 files changed

+73
-12
lines changed

‎Plugin/CTFWhitelistWindowController.m

+6
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,10 @@ - (IBAction)checkForUpdates:(id)sender;
2929
[[SparkleManager sharedManager] checkForUpdates];
3030
}
3131

32+
- (NSString *)versionString
33+
{
34+
NSBundle *CTFBundle = [NSBundle bundleWithIdentifier:@"com.github.rentzsch.clicktoflash"];
35+
return [CTFBundle objectForInfoDictionaryKey: @"CFBundleShortVersionString"];
36+
}
37+
3238
@end

‎Plugin/English.lproj/WhitelistPanel.xib

+65-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<object class="NSWindowTemplate" id="1005">
3939
<int key="NSWindowStyleMask">15</int>
4040
<int key="NSWindowBacking">2</int>
41-
<string key="NSWindowRect">{{80, 276}, {527, 427}}</string>
41+
<string key="NSWindowRect">{{80, 265}, {527, 438}}</string>
4242
<int key="NSWTFlags">-534248448</int>
4343
<string type="base64-UTF8" key="NSWindowTitle">Q2xpY2sgdG8gRmxhc2gg4oCUIFNldHRpbmdzA</string>
4444
<string key="NSWindowClass">NSPanel</string>
@@ -204,7 +204,7 @@
204204
</object>
205205
<reference ref="929019191"/>
206206
</object>
207-
<string key="NSFrame">{{20, 47}, {487, 169}}</string>
207+
<string key="NSFrame">{{20, 58}, {487, 169}}</string>
208208
<reference key="NSSuperview" ref="1006"/>
209209
<reference key="NSNextKeyView" ref="769633510"/>
210210
<int key="NSsFlags">530</int>
@@ -218,7 +218,7 @@
218218
<object class="NSButton" id="43744226">
219219
<reference key="NSNextResponder" ref="1006"/>
220220
<int key="NSvFlags">292</int>
221-
<string key="NSFrame">{{48, 19}, {29, 26}}</string>
221+
<string key="NSFrame">{{48, 30}, {29, 26}}</string>
222222
<reference key="NSSuperview" ref="1006"/>
223223
<bool key="NSEnabled">YES</bool>
224224
<object class="NSButtonCell" key="NSCell" id="13544439">
@@ -242,7 +242,7 @@
242242
<object class="NSButton" id="241393621">
243243
<reference key="NSNextResponder" ref="1006"/>
244244
<int key="NSvFlags">292</int>
245-
<string key="NSFrame">{{20, 19}, {29, 26}}</string>
245+
<string key="NSFrame">{{20, 30}, {29, 26}}</string>
246246
<reference key="NSSuperview" ref="1006"/>
247247
<bool key="NSEnabled">YES</bool>
248248
<object class="NSButtonCell" key="NSCell" id="811527510">
@@ -262,7 +262,7 @@
262262
<object class="NSTextField" id="513114676">
263263
<reference key="NSNextResponder" ref="1006"/>
264264
<int key="NSvFlags">289</int>
265-
<string key="NSFrame">{{227, 20}, {283, 17}}</string>
265+
<string key="NSFrame">{{227, 31}, {283, 17}}</string>
266266
<reference key="NSSuperview" ref="1006"/>
267267
<bool key="NSEnabled">YES</bool>
268268
<object class="NSTextFieldCell" key="NSCell" id="363160467">
@@ -722,12 +722,28 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
722722
</object>
723723
</object>
724724
</object>
725-
<string key="NSFrame">{{65, 224}, {397, 207}}</string>
725+
<string key="NSFrame">{{65, 235}, {397, 207}}</string>
726726
<reference key="NSSuperview" ref="1006"/>
727727
<string key="NSClassName">NSView</string>
728728
</object>
729+
<object class="NSTextField" id="710573940">
730+
<reference key="NSNextResponder" ref="1006"/>
731+
<int key="NSvFlags">289</int>
732+
<string key="NSFrame">{{471, 9}, {39, 14}}</string>
733+
<reference key="NSSuperview" ref="1006"/>
734+
<bool key="NSEnabled">YES</bool>
735+
<object class="NSTextFieldCell" key="NSCell" id="358695226">
736+
<int key="NSCellFlags">68288064</int>
737+
<int key="NSCellFlags2">71435264</int>
738+
<string key="NSContents">1.4fc6</string>
739+
<reference key="NSSupport" ref="26"/>
740+
<reference key="NSControlView" ref="710573940"/>
741+
<reference key="NSBackgroundColor" ref="416396323"/>
742+
<reference key="NSTextColor" ref="205706440"/>
743+
</object>
744+
</object>
729745
</object>
730-
<string key="NSFrameSize">{527, 427}</string>
746+
<string key="NSFrameSize">{527, 438}</string>
731747
<reference key="NSSuperview"/>
732748
</object>
733749
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
@@ -942,6 +958,26 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
942958
</object>
943959
<int key="connectionID">155</int>
944960
</object>
961+
<object class="IBConnectionRecord">
962+
<object class="IBBindingConnection" key="connection">
963+
<string key="label">value: versionString</string>
964+
<reference key="source" ref="710573940"/>
965+
<reference key="destination" ref="1001"/>
966+
<object class="NSNibBindingConnector" key="connector">
967+
<reference key="NSSource" ref="710573940"/>
968+
<reference key="NSDestination" ref="1001"/>
969+
<string key="NSLabel">value: versionString</string>
970+
<string key="NSBinding">value</string>
971+
<string key="NSKeyPath">versionString</string>
972+
<object class="NSDictionary" key="NSOptions">
973+
<string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string>
974+
<boolean value="NO" key="NS.object.0"/>
975+
</object>
976+
<int key="NSNibBindingConnectorVersion">2</int>
977+
</object>
978+
</object>
979+
<int key="connectionID">165</int>
980+
</object>
945981
</object>
946982
<object class="IBMutableOrderedSet" key="objectRecords">
947983
<object class="NSArray" key="orderedObjects">
@@ -991,6 +1027,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
9911027
<reference ref="241393621"/>
9921028
<reference ref="513114676"/>
9931029
<reference ref="510641939"/>
1030+
<reference ref="710573940"/>
9941031
</object>
9951032
<reference key="parent" ref="1005"/>
9961033
</object>
@@ -1258,6 +1295,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
12581295
<reference key="object" ref="410759951"/>
12591296
<reference key="parent" ref="596693856"/>
12601297
</object>
1298+
<object class="IBObjectRecord">
1299+
<int key="objectID">156</int>
1300+
<reference key="object" ref="710573940"/>
1301+
<object class="NSMutableArray" key="children">
1302+
<bool key="EncodedWithXMLCoder">YES</bool>
1303+
<reference ref="358695226"/>
1304+
</object>
1305+
<reference key="parent" ref="1006"/>
1306+
</object>
1307+
<object class="IBObjectRecord">
1308+
<int key="objectID">157</int>
1309+
<reference key="object" ref="358695226"/>
1310+
<reference key="parent" ref="710573940"/>
1311+
</object>
12611312
</object>
12621313
</object>
12631314
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1305,6 +1356,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
13051356
<string>149.IBAttributePlaceholdersKey</string>
13061357
<string>149.IBPluginDependency</string>
13071358
<string>150.IBPluginDependency</string>
1359+
<string>156.IBPluginDependency</string>
1360+
<string>157.IBPluginDependency</string>
13081361
<string>17.IBPluginDependency</string>
13091362
<string>2.IBPluginDependency</string>
13101363
<string>20.IBPluginDependency</string>
@@ -1324,10 +1377,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
13241377
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
13251378
<string>com.apple.InterfaceBuilderKit</string>
13261379
<string>com.apple.InterfaceBuilderKit</string>
1327-
<string>{{65, 235}, {527, 427}}</string>
1380+
<string>{{40, 279}, {527, 438}}</string>
13281381
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
13291382
<reference ref="8"/>
1330-
<string>{{65, 235}, {527, 427}}</string>
1383+
<string>{{40, 279}, {527, 438}}</string>
13311384
<reference ref="5"/>
13321385
<string>{196, 240}</string>
13331386
<string>{{202, 428}, {480, 270}}</string>
@@ -1410,6 +1463,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
14101463
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
14111464
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
14121465
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1466+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1467+
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
14131468
<object class="NSMutableDictionary">
14141469
<string key="NS.key.0">ToolTip</string>
14151470
<object class="IBToolTipAttribute" key="NS.object.0">
@@ -1446,7 +1501,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
14461501
</object>
14471502
</object>
14481503
<nil key="sourceID"/>
1449-
<int key="maxID">155</int>
1504+
<int key="maxID">165</int>
14501505
</object>
14511506
<object class="IBClassDescriber" key="IBDocument.Classes">
14521507
<object class="NSMutableArray" key="referencedPartialClassDescriptions">

‎Plugin/Info-Plugin.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<key>SUFeedURL</key>
2828
<string>https://s3.amazonaws.com/clicktoflash/appcast.xml</string>
2929
<key>WebPluginDescription</key>
30-
<string>Shockwave Flash 9.0 r151 (ClickToFlash)</string>
30+
<string>Shockwave Flash 9.0 r151 (ClickToFlash ${PRODUCT_VERSION})</string>
3131
<key>WebPluginMIMETypes</key>
3232
<dict>
3333
<key>application/x-shockwave-flash</key>
@@ -37,7 +37,7 @@
3737
<string>swf</string>
3838
</array>
3939
<key>WebPluginTypeDescription</key>
40-
<string>Shockwave Flash 9.0 r151 (ClickToFlash)</string>
40+
<string>Shockwave Flash 9.0 r151 (ClickToFlash ${PRODUCT_VERSION})</string>
4141
</dict>
4242
</dict>
4343
<key>WebPluginName</key>

0 commit comments

Comments
 (0)