Skip to content

Commit

Permalink
Merge branch 'release/1.0a10'
Browse files Browse the repository at this point in the history
  • Loading branch information
@griff
griff committed Nov 1, 2012
2 parents 3d42de9 + 9bddcbc commit 6455766
Show file tree
Hide file tree
Showing 47 changed files with 2,792 additions and 218 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
View file

This file was deleted.

69 changes: 50 additions & 19 deletions App/English.lproj/MainMenu.xib
View file
Expand Up @@ -12,9 +12,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1798"/>
<integer value="1723"/>
<integer value="1833"/>
<integer value="1798"/>
<integer value="106"/>
<integer value="475"/>
</object>
Expand All @@ -29,7 +29,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1021">
<string key="NSClassName">NSApplication</string>
<string key="NSClassName">MetaZApplication</string>
</object>
<object class="NSCustomObject" id="1014">
<string key="NSClassName">FirstResponder</string>
Expand Down Expand Up @@ -8981,22 +8981,6 @@
</object>
<int key="connectionID">1846</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">data: data</string>
<reference key="source" ref="83431714"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="83431714"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">data: data</string>
<string key="NSBinding">data</string>
<string key="NSKeyPath">data</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1848</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">picturesController</string>
Expand Down Expand Up @@ -9221,6 +9205,34 @@
</object>
<int key="connectionID">1906</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">data: data</string>
<reference key="source" ref="83431714"/>
<reference key="destination" ref="569338711"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="83431714"/>
<reference key="NSDestination" ref="569338711"/>
<string key="NSLabel">data: data</string>
<string key="NSBinding">data</string>
<string key="NSKeyPath">data</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSConditionallySetsEnabled</string>
<boolean value="NO" key="NS.object.0"/>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1913</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">filesController</string>
<reference key="source" ref="1021"/>
<reference key="destination" ref="35104934"/>
</object>
<int key="connectionID">1914</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -14108,7 +14120,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1906</int>
<int key="maxID">1914</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down Expand Up @@ -14822,6 +14834,25 @@
<string key="minorKey">App/src/MetaEditPanel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MetaZApplication</string>
<string key="superclassName">NSApplication</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">filesController</string>
<string key="NS.object.0">NSArrayController</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">filesController</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">filesController</string>
<string key="candidateClassName">NSArrayController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">App/src/MetaZApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down
48 changes: 13 additions & 35 deletions App/Info.plist
View file
Expand Up @@ -34,16 +34,17 @@
<string>video/x-m4v</string>
</array>
<key>CFBundleTypeName</key>
<string>The Other MPEG-4 Video</string>
<string>Apple MPEG-4 movie</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>M4V</string>
<string>M4V </string>
</array>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSItemContentTypes</key>
<array>
<string>org.maven-group.mpeg4-video</string>
<string>com.apple.m4v-video</string>
<string>com.apple.protected-mpeg-4-video</string>
</array>
<key>LSTypeIsPackage</key>
<false/>
Expand Down Expand Up @@ -142,17 +143,23 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>BUILDDATE</string>
<string>BUILDVERSION</string>
<key>BuildId</key>
<string>BUILDID</string>
<key>BuildDate</key>
<string>BUILDDATE</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2009, Brian Olsen &amp; Nigel Graham</string>
<string>Copyright © 2012, Brian Olsen &amp; Nigel Graham</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSAppleScriptEnabled</key>
<true/>
<key>OSAScriptingDefinition</key>
<string>MetaZ.sdef</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<string>MetaZApplication</string>
<key>SUEnableAutomaticChecks</key>
<string>YES</string>
<key>SUFeedURL</key>
Expand All @@ -161,41 +168,12 @@
<string>YES</string>
<key>SUPublicDSAKeyFile</key>
<string>sparkle_public.pem</string>
<key>SmartCrashReports_CompanyName</key>
<string>Maven-Group</string>
<key>SmartCrashReports_EmailTicket</key>
<string>SCR-6246806ACD</string>
<key>com.apple.PreferenceSync.ExcludeSyncKeys</key>
<array>
<string>SULastCheckTime</string>
</array>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.movie</string>
</array>
<key>UTTypeIdentifier</key>
<string>org.maven-group.mpeg4-video</string>
<key>UTTypeDescription</key>
<string>The Other MPEG-4 Video</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.mime-type</key>
<array>
<string>video/x-m4v</string>
</array>
<key>com.apple.ostype</key>
<array>
<string>M4V</string>
</array>
<key>public.filename-extension</key>
<array>
<string>m4v</string>
</array>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
Expand Down

0 comments on commit 6455766

Please sign in to comment.