Permalink
Browse files

ObjectiveC updates (mainly the app menus for the new licence files)

  • Loading branch information...
1 parent 1073065 commit 809cdaac6eac608ec9c4314c961ca29c45229fcb @Philbywhizz Philbywhizz committed Sep 25, 2012
Showing with 49 additions and 95 deletions.
  1. +6 −10 osx/SDLMain.m
  2. +43 −85 osx/pioneerApp.xib
View
@@ -80,21 +80,17 @@ - (IBAction)openFile:(id)sender
{
[[NSWorkspace sharedWorkspace] openFile:@"Quickstart.txt"];
}
- else if ([[sender title] isEqualToString:@"COPYING"])
+ else if ([[sender title] isEqualToString:@"CC-BY-SA-3.0"])
{
- [[NSWorkspace sharedWorkspace] openFile:@"COPYING.txt"];
+ [[NSWorkspace sharedWorkspace] openFile:@"CC-BY-SA-3.0.txt"];
}
- else if ([[sender title] isEqualToString:@"fonts COPYING"])
+ else if ([[sender title] isEqualToString:@"GPL-3"])
{
- [[NSWorkspace sharedWorkspace] openFile:@"fonts.COPYING.txt"];
+ [[NSWorkspace sharedWorkspace] openFile:@"GPL-3.txt"];
}
- else if ([[sender title] isEqualToString:@"lua COPYING"])
+ else if ([[sender title] isEqualToString:@"SIL-1.1"])
{
- [[NSWorkspace sharedWorkspace] openFile:@"lua.COPYING.txt"];
- }
- else if ([[sender title] isEqualToString:@"music COPYING"])
- {
- [[NSWorkspace sharedWorkspace] openFile:@"music.COPYING.txt"];
+ [[NSWorkspace sharedWorkspace] openFile:@"../Resources/SIL-1.1.txt"];
}
}
View
@@ -2,18 +2,18 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">11E53</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.47</string>
+ <string key="IBDocument.SystemVersion">11G56</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2840</string>
+ <string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2840</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSCustomObject</string>
<string>NSMenu</string>
<string>NSMenuItem</string>
- <string>NSCustomObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -261,33 +261,25 @@
<object class="NSMenu" key="NSSubmenu" id="252624639">
<string key="NSTitle">Licenses</string>
<array class="NSMutableArray" key="NSMenuItems">
- <object class="NSMenuItem" id="248366196">
+ <object class="NSMenuItem" id="992617826">
<reference key="NSMenu" ref="252624639"/>
- <string key="NSTitle">COPYING</string>
+ <string key="NSTitle">CC-By-SA-3.0</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="575155727"/>
<reference key="NSMixedImage" ref="299182213"/>
</object>
- <object class="NSMenuItem" id="1001393508">
+ <object class="NSMenuItem" id="167005050">
<reference key="NSMenu" ref="252624639"/>
- <string key="NSTitle">fonts COPYING</string>
+ <string key="NSTitle">GPL-3</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="575155727"/>
<reference key="NSMixedImage" ref="299182213"/>
</object>
- <object class="NSMenuItem" id="534079004">
+ <object class="NSMenuItem" id="980011492">
<reference key="NSMenu" ref="252624639"/>
- <string key="NSTitle">lua COPYING</string>
- <string key="NSKeyEquiv"/>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="575155727"/>
- <reference key="NSMixedImage" ref="299182213"/>
- </object>
- <object class="NSMenuItem" id="438413845">
- <reference key="NSMenu" ref="252624639"/>
- <string key="NSTitle">music COPYING</string>
+ <string key="NSTitle">SIL-1.1</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="575155727"/>
@@ -425,43 +417,35 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">openFile:</string>
+ <string key="label">openAboutPanel:</string>
<reference key="source" ref="448461463"/>
- <reference key="destination" ref="248366196"/>
+ <reference key="destination" ref="137732289"/>
</object>
- <int key="connectionID">375</int>
+ <int key="connectionID">380</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">openFile:</string>
<reference key="source" ref="448461463"/>
- <reference key="destination" ref="1001393508"/>
+ <reference key="destination" ref="992617826"/>
</object>
- <int key="connectionID">376</int>
+ <int key="connectionID">384</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">openFile:</string>
<reference key="source" ref="448461463"/>
- <reference key="destination" ref="534079004"/>
+ <reference key="destination" ref="167005050"/>
</object>
- <int key="connectionID">377</int>
+ <int key="connectionID">385</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">openFile:</string>
<reference key="source" ref="448461463"/>
- <reference key="destination" ref="438413845"/>
+ <reference key="destination" ref="980011492"/>
</object>
- <int key="connectionID">378</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">openAboutPanel:</string>
- <reference key="source" ref="448461463"/>
- <reference key="destination" ref="137732289"/>
- </object>
- <int key="connectionID">380</int>
+ <int key="connectionID">386</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -649,39 +633,18 @@
<int key="objectID">346</int>
<reference key="object" ref="252624639"/>
<array class="NSMutableArray" key="children">
- <reference ref="248366196"/>
- <reference ref="1001393508"/>
- <reference ref="534079004"/>
- <reference ref="438413845"/>
+ <reference ref="992617826"/>
+ <reference ref="167005050"/>
+ <reference ref="980011492"/>
</array>
<reference key="parent" ref="460214064"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">342</int>
- <reference key="object" ref="248366196"/>
- <reference key="parent" ref="252624639"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">348</int>
<reference key="object" ref="405237757"/>
<reference key="parent" ref="837849758"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">349</int>
- <reference key="object" ref="1001393508"/>
- <reference key="parent" ref="252624639"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">350</int>
- <reference key="object" ref="534079004"/>
- <reference key="parent" ref="252624639"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">351</int>
- <reference key="object" ref="438413845"/>
- <reference key="parent" ref="252624639"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">357</int>
<reference key="object" ref="215651114"/>
<reference key="parent" ref="837849758"/>
@@ -706,6 +669,21 @@
<reference key="object" ref="686928768"/>
<reference key="parent" ref="837849758"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">381</int>
+ <reference key="object" ref="992617826"/>
+ <reference key="parent" ref="252624639"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">382</int>
+ <reference key="object" ref="167005050"/>
+ <reference key="parent" ref="252624639"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">383</int>
+ <reference key="object" ref="980011492"/>
+ <reference key="parent" ref="252624639"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -730,18 +708,17 @@
<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="341.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="342.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="345.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="357.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="358.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="359.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -750,30 +727,11 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">380</int>
+ <int key="maxID">386</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
- <string key="className">SDLApplication</string>
- <string key="superclassName">NSApplication</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">terminate:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">terminate:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">terminate:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/SDLApplication.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">SDLMain</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
@@ -810,7 +768,7 @@
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
+ <real value="1070" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>

0 comments on commit 809cdaa

Please sign in to comment.