Skip to content

Commit

Permalink
Merge branch 'release/1.0a13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@griff
griff committed Dec 4, 2012
2 parents 3d15eff + 20c53b9 commit 09a1c10
Show file tree
Hide file tree
Showing 109 changed files with 6,299 additions and 3,963 deletions.
1,780 changes: 624 additions & 1,156 deletions App/English.lproj/MainMenu.xib
View file

Large diffs are not rendered by default.

172 changes: 65 additions & 107 deletions App/English.lproj/PreferencesWindow.xib
View file
Expand Up @@ -12,10 +12,10 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
<integer value="246"/>
<integer value="119"/>
<integer value="265"/>
<integer value="119"/>
<integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -880,33 +880,6 @@
<reference key="NSTextColor" ref="500584907"/>
</object>
</object>
<object class="NSBox" id="137078893">
<reference key="NSNextResponder" ref="863573265"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 171}, {358, 5}}</string>
<reference key="NSSuperview" ref="863573265"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="908428889"/>
<object class="NSColor" key="NSBackgroundColor" id="576578931">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<reference key="NSColor" ref="666775887"/>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
</object>
<object class="NSButton" id="134739344">
<reference key="NSNextResponder" ref="863573265"/>
<int key="NSvFlags">268</int>
Expand All @@ -929,33 +902,6 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTokenField" id="209069157">
<reference key="NSNextResponder" ref="863573265"/>
<int key="NSvFlags">268</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSStringPboardType</string>
</object>
</object>
<string key="NSFrame">{{20, 70}, {358, 22}}</string>
<reference key="NSSuperview" ref="863573265"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="523164299">
<int key="NSCellFlags">341966336</int>
<int key="NSCellFlags2">0</int>
<reference key="NSSupport" ref="908428889"/>
<reference key="NSControlView" ref="209069157"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="576578931"/>
<reference key="NSTextColor" ref="500584907"/>
<reference key="NSDelegate" ref="209069157"/>
<double key="NSCompletionDelay">0.0</double>
<int key="NSTokenStyle">0</int>
</object>
<int key="NSTokenFieldVersion">2</int>
</object>
<object class="NSPopUpButton" id="584295991">
<reference key="NSNextResponder" ref="863573265"/>
<int key="NSvFlags">265</int>
Expand Down Expand Up @@ -1012,7 +958,7 @@
</object>
<object class="NSMenuItem" id="133247725">
<reference key="NSMenu" ref="221772976"/>
<string key="NSTitle">Movie</string>
<string key="NSTitle">Home Movie</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="242764706"/>
Expand Down Expand Up @@ -1066,7 +1012,7 @@
</object>
<object class="NSMenuItem" id="519605188">
<reference key="NSMenu" ref="221772976"/>
<string key="NSTitle">Short Film</string>
<string key="NSTitle">Movie</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="242764706"/>
Expand Down Expand Up @@ -1097,6 +1043,39 @@
<int key="NSTag">11</int>
<reference key="NSTarget" ref="85628273"/>
</object>
<object class="NSMenuItem" id="13116352">
<reference key="NSMenu" ref="221772976"/>
<string key="NSTitle">Ringtone</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="242764706"/>
<reference key="NSMixedImage" ref="799998079"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">14</int>
<reference key="NSTarget" ref="85628273"/>
</object>
<object class="NSMenuItem" id="880904910">
<reference key="NSMenu" ref="221772976"/>
<string key="NSTitle">Podcast</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="242764706"/>
<reference key="NSMixedImage" ref="799998079"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">21</int>
<reference key="NSTarget" ref="85628273"/>
</object>
<object class="NSMenuItem" id="299012597">
<reference key="NSMenu" ref="221772976"/>
<string key="NSTitle">iTunes U</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="242764706"/>
<reference key="NSMixedImage" ref="799998079"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">23</int>
<reference key="NSTarget" ref="85628273"/>
</object>
</object>
</object>
<int key="NSPreferredEdge">1</int>
Expand Down Expand Up @@ -1978,9 +1957,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="574682135"/>
<reference ref="137078893"/>
<reference ref="134739344"/>
<reference ref="209069157"/>
<reference ref="584295991"/>
<reference ref="741519697"/>
<reference ref="1018770212"/>
Expand All @@ -2002,11 +1979,6 @@
<reference key="object" ref="973407974"/>
<reference key="parent" ref="574682135"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">153</int>
<reference key="object" ref="137078893"/>
<reference key="parent" ref="863573265"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">154</int>
<reference key="object" ref="134739344"/>
Expand All @@ -2021,20 +1993,6 @@
<reference key="object" ref="105429189"/>
<reference key="parent" ref="134739344"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">156</int>
<reference key="object" ref="209069157"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="523164299"/>
</object>
<reference key="parent" ref="863573265"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">157</int>
<reference key="object" ref="523164299"/>
<reference key="parent" ref="209069157"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">159</int>
<reference key="object" ref="1040842103"/>
Expand Down Expand Up @@ -2073,6 +2031,9 @@
<reference ref="789328217"/>
<reference ref="395950030"/>
<reference ref="224971716"/>
<reference ref="13116352"/>
<reference ref="880904910"/>
<reference ref="299012597"/>
</object>
<reference key="parent" ref="85628273"/>
</object>
Expand Down Expand Up @@ -2333,6 +2294,21 @@
<reference key="parent" ref="0"/>
<string key="objectName">Actions Controller</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">284</int>
<reference key="object" ref="13116352"/>
<reference key="parent" ref="221772976"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">285</int>
<reference key="object" ref="880904910"/>
<reference key="parent" ref="221772976"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">286</int>
<reference key="object" ref="299012597"/>
<reference key="parent" ref="221772976"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand Down Expand Up @@ -2380,11 +2356,8 @@
<string>12.IBPluginDependency</string>
<string>141.IBPluginDependency</string>
<string>142.IBPluginDependency</string>
<string>153.IBPluginDependency</string>
<string>154.IBPluginDependency</string>
<string>155.IBPluginDependency</string>
<string>156.IBPluginDependency</string>
<string>157.IBPluginDependency</string>
<string>175.IBAttributePlaceholdersKey</string>
<string>175.IBPluginDependency</string>
<string>176.IBPluginDependency</string>
Expand Down Expand Up @@ -2439,6 +2412,9 @@
<string>274.IBPluginDependency</string>
<string>275.IBPluginDependency</string>
<string>28.IBPluginDependency</string>
<string>284.IBPluginDependency</string>
<string>285.IBPluginDependency</string>
<string>286.IBPluginDependency</string>
<string>57.IBPluginDependency</string>
<string>68.IBPluginDependency</string>
<string>75.IBAttributePlaceholdersKey</string>
Expand Down Expand Up @@ -2520,9 +2496,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">ToolTip</string>
<object class="IBToolTipAttribute" key="NS.object.0">
Expand All @@ -2533,7 +2506,7 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{336, 279}, {185, 193}}</string>
<string>{{844, 490}, {154, 217}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -2599,6 +2572,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
Expand Down Expand Up @@ -2642,7 +2618,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">283</int>
<int key="maxID">286</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down Expand Up @@ -2897,14 +2873,6 @@
<string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSBox</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButton</string>
<string key="superclassName">NSControl</string>
Expand Down Expand Up @@ -3203,14 +3171,14 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="627382822">
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1046458555">
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string>
</object>
Expand Down Expand Up @@ -3596,16 +3564,6 @@
<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTokenField</string>
<string key="superclassName">NSTextField</string>
<reference key="sourceIdentifier" ref="627382822"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTokenFieldCell</string>
<string key="superclassName">NSTextFieldCell</string>
<reference key="sourceIdentifier" ref="1046458555"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSToolbar</string>
<string key="superclassName">NSObject</string>
Expand Down

0 comments on commit 09a1c10

Please sign in to comment.