Skip to content

Commit

Permalink
- Finished implementing presets
Browse files Browse the repository at this point in the history 
- Made relase compile with fewer warnings
- Moved localized strings for video type to its own file
- Removed pause button from main window and queue window
- Made extension to NSXMLNode that makes getting a string from an XPath easier
  • Loading branch information
@griff
griff committed Nov 15, 2009
1 parent d56b8af commit 5e45de0
Show file tree
Hide file tree
Showing 28 changed files with 2,678 additions and 422 deletions.
Binary file modified App/English.lproj/Localizable.strings
View file
Binary file not shown.
126 changes: 26 additions & 100 deletions App/English.lproj/MainMenu.xib
View file
Expand Up @@ -2,18 +2,18 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10B504</string>
<string key="IBDocument.SystemVersion">10C540</string>
<string key="IBDocument.InterfaceBuilderVersion">732</string>
<string key="IBDocument.AppKitVersion">1038.2</string>
<string key="IBDocument.HIToolboxVersion">437.00</string>
<string key="IBDocument.AppKitVersion">1038.25</string>
<string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">732</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="475"/>
<integer value="1723"/>
<integer value="371"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
Expand Down Expand Up @@ -798,7 +798,6 @@
<string>52DC7AAF-0F1F-43FD-AC51-0E2213DDEE30</string>
<string>6E446216-6FCF-46AD-8DEA-F8112ED75427</string>
<string>858F849C-EE95-45C7-990F-6A44F26F96F9</string>
<string>C6892E37-C894-464E-B7F8-7A4A4FF6A8DC</string>
<string>EF60F3A4-7601-417E-B211-1878771A915A</string>
<string>NSToolbarCustomizeToolbarItem</string>
<string>NSToolbarFlexibleSpaceItem</string>
Expand All @@ -815,7 +814,10 @@
<string key="NSToolbarItemPaletteLabel">Presets</string>
<string key="NSToolbarItemToolTip">Presets</string>
<nil key="NSToolbarItemView"/>
<nil key="NSToolbarItemImage"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">presets</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
Expand Down Expand Up @@ -892,28 +894,6 @@
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="362149766">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">C6892E37-C894-464E-B7F8-7A4A4FF6A8DC</characters>
</object>
<string key="NSToolbarItemLabel">Pause</string>
<string key="NSToolbarItemPaletteLabel">Pause/Resume</string>
<string key="NSToolbarItemToolTip"/>
<nil key="NSToolbarItemView"/>
<object class="NSCustomResource" key="NSToolbarItemImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Pause</string>
</object>
<nil key="NSToolbarItemTarget"/>
<nil key="NSToolbarItemAction"/>
<string key="NSToolbarItemMinSize">{0, 0}</string>
<string key="NSToolbarItemMaxSize">{0, 0}</string>
<bool key="NSToolbarItemEnabled">YES</bool>
<bool key="NSToolbarItemAutovalidates">YES</bool>
<int key="NSToolbarItemTag">-1</int>
<bool key="NSToolbarIsUserRemovable">YES</bool>
<int key="NSToolbarItemVisibilityPriority">0</int>
</object>
<object class="NSToolbarItem" id="718045454">
<object class="NSMutableString" key="NSToolbarItemIdentifier">
<characters key="NS.bytes">EF60F3A4-7601-417E-B211-1878771A915A</characters>
Expand Down Expand Up @@ -1044,18 +1024,16 @@
<reference ref="42398147"/>
<reference ref="780099782"/>
<reference ref="601558638"/>
<reference ref="814997065"/>
<reference ref="711632079"/>
<reference ref="814997065"/>
<reference ref="718045454"/>
<reference ref="143563378"/>
<reference ref="362149766"/>
<reference ref="499462233"/>
<reference ref="328011138"/>
</object>
<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="143563378"/>
<reference ref="362149766"/>
<reference ref="328011138"/>
<reference ref="499462233"/>
<reference ref="42398147"/>
Expand Down Expand Up @@ -4460,7 +4438,10 @@
</object>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="600445500"/>
<object class="NSColor" key="NSBackgroundColor" id="1030">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<reference key="NSGridColor" ref="999592587"/>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">-876609536</int>
Expand All @@ -4478,10 +4459,7 @@
<reference key="NSSuperview" ref="443955039"/>
<reference key="NSNextKeyView" ref="488786011"/>
<reference key="NSDocView" ref="488786011"/>
<object class="NSColor" key="NSBGColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<reference key="NSBGColor" ref="1030"/>
<int key="NScvFlags">4</int>
</object>
<object class="NSScroller" id="548141389">
Expand Down Expand Up @@ -5370,14 +5348,6 @@
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="608064723">
<reference key="NSMenu" ref="1020961090"/>
<string key="NSTitle">Reload</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
</object>
</object>
<object class="NSCustomObject" id="265254279">
Expand Down Expand Up @@ -7520,22 +7490,6 @@
</object>
<int key="connectionID">1325</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: started</string>
<reference key="source" ref="362149766"/>
<reference key="destination" ref="107141262"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="362149766"/>
<reference key="NSDestination" ref="107141262"/>
<string key="NSLabel">enabled: started</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">started</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">1339</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">startStopEncoding:</string>
Expand All @@ -7544,14 +7498,6 @@
</object>
<int key="connectionID">1341</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">pauseResumeEncoding:</string>
<reference key="source" ref="1003405073"/>
<reference key="destination" ref="362149766"/>
</object>
<int key="connectionID">1342</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showQueue:</string>
Expand Down Expand Up @@ -7608,14 +7554,6 @@
</object>
<int key="connectionID">1354</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">pauseBtn</string>
<reference key="source" ref="1003405073"/>
<reference key="destination" ref="362149766"/>
</object>
<int key="connectionID">1355</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">playBtn</string>
Expand Down Expand Up @@ -8453,6 +8391,14 @@
</object>
<int key="connectionID">1752</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">showPresets:</string>
<reference key="source" ref="1053022543"/>
<reference key="destination" ref="711632079"/>
</object>
<int key="connectionID">1754</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -8979,7 +8925,6 @@
<reference ref="711632079"/>
<reference ref="718045454"/>
<reference ref="143563378"/>
<reference ref="362149766"/>
<reference ref="499462233"/>
<reference ref="328011138"/>
</object>
Expand Down Expand Up @@ -11112,11 +11057,6 @@
<reference key="object" ref="143563378"/>
<reference key="parent" ref="814868855"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1335</int>
<reference key="object" ref="362149766"/>
<reference key="parent" ref="814868855"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1336</int>
<reference key="object" ref="499462233"/>
Expand Down Expand Up @@ -11813,7 +11753,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="635211437"/>
<reference ref="452066177"/>
<reference ref="608064723"/>
</object>
<reference key="parent" ref="0"/>
</object>
Expand All @@ -11827,11 +11766,6 @@
<reference key="object" ref="452066177"/>
<reference key="parent" ref="1020961090"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1731</int>
<reference key="object" ref="608064723"/>
<reference key="parent" ref="1020961090"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1734</int>
<reference key="object" ref="498844968"/>
Expand Down Expand Up @@ -11888,7 +11822,6 @@
<string>1326.IBPluginDependency</string>
<string>1327.IBPluginDependency</string>
<string>1334.IBPluginDependency</string>
<string>1335.IBPluginDependency</string>
<string>1336.IBPluginDependency</string>
<string>1337.IBPluginDependency</string>
<string>134.IBPluginDependency</string>
Expand Down Expand Up @@ -12026,11 +11959,9 @@
<string>1723.IBPluginDependency</string>
<string>1724.IBPluginDependency</string>
<string>1725.IBPluginDependency</string>
<string>1731.IBPluginDependency</string>
<string>1734.IBPluginDependency</string>
<string>1735.IBPluginDependency</string>
<string>1736.IBPluginDependency</string>
<string>1753.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
<string>19.ImportedFromIB2</string>
<string>195.IBPluginDependency</string>
Expand Down Expand Up @@ -12463,7 +12394,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>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -12594,9 +12524,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{83, 759}, {149, 63}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{83, 779}, {149, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -13039,7 +12967,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">1753</int>
<int key="maxID">1754</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand All @@ -13062,6 +12990,7 @@
<string>showImageEditor:</string>
<string>showInfoTab:</string>
<string>showPreferences:</string>
<string>showPresets:</string>
<string>showSortTab:</string>
<string>showVideoTab:</string>
<string>startSearch:</string>
Expand All @@ -13082,6 +13011,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
Expand Down Expand Up @@ -13352,7 +13282,6 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addToQueue:</string>
<string>pauseResumeEncoding:</string>
<string>showQueue:</string>
<string>startStopEncoding:</string>
</object>
Expand All @@ -13361,7 +13290,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
Expand All @@ -13370,15 +13298,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>filesController</string>
<string>mainWindow</string>
<string>pauseBtn</string>
<string>playBtn</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSArrayController</string>
<string>NSWindow</string>
<string>NSToolbarItem</string>
<string>NSToolbarItem</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
Expand Down

0 comments on commit 5e45de0

Please sign in to comment.