Skip to content

V
vlc
Commit 5d83d1a2 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: CAS: added a label to sum up the current streaming settings in case... 

macosx: CAS: added a label to sum up the current streaming settings in case that the stream sheet is closed

Additionally, remove the Cancel button since it was against the HIGL
parent 7759c84b
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 117 deletions
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @ 5d83d1a2
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="309"/> <integer value="308"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
...@@ -489,28 +489,6 @@ ...@@ -489,28 +489,6 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSButton" id="477712445">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{433, 13}, {108, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<string key="NSReuseIdentifierKey">_NS:610</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="333855432">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
<reference key="NSSupport" ref="1024428774"/>
<string key="NSCellIdentifier">_NS:610</string>
<reference key="NSControlView" ref="477712445"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object> </object>
<string key="NSFrameSize">{663, 490}</string> <string key="NSFrameSize">{663, 490}</string>
</object> </object>
...@@ -2715,7 +2693,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -2715,7 +2693,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="277074074"> <object class="NSTextField" id="277074074">
<reference key="NSNextResponder" ref="501681605"/> <reference key="NSNextResponder" ref="501681605"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 30}, {345, 14}}</string> <string key="NSFrame">{{3, 30}, {419, 14}}</string>
<reference key="NSSuperview" ref="501681605"/> <reference key="NSSuperview" ref="501681605"/>
<string key="NSReuseIdentifierKey">_NS:4068</string> <string key="NSReuseIdentifierKey">_NS:4068</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -2736,7 +2714,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -2736,7 +2714,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="886208703"> <object class="NSButton" id="886208703">
<reference key="NSNextResponder" ref="501681605"/> <reference key="NSNextResponder" ref="501681605"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<string key="NSFrame">{{361, 19}, {156, 32}}</string> <string key="NSFrame">{{421, 19}, {156, 32}}</string>
<reference key="NSSuperview" ref="501681605"/> <reference key="NSSuperview" ref="501681605"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int> <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
...@@ -2758,7 +2736,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -2758,7 +2736,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
</object> </object>
<string key="NSFrameSize">{531, 72}</string> <string key="NSFrameSize">{571, 72}</string>
<string key="NSReuseIdentifierKey">_NS:1109</string> <string key="NSReuseIdentifierKey">_NS:1109</string>
<string key="NSClassName">NSView</string> <string key="NSClassName">NSView</string>
</object> </object>
...@@ -2782,22 +2760,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -2782,22 +2760,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="connectionID">99</int> <int key="connectionID">99</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performClose:</string>
<reference key="source" ref="1005"/>
<reference key="destination" ref="477712445"/>
</object>
<int key="connectionID">102</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_cancel_btn</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="477712445"/>
</object>
<int key="connectionID">104</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">_destination_filename_lbl</string> <string key="label">_destination_filename_lbl</string>
...@@ -3230,14 +3192,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3230,14 +3192,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="connectionID">297</int> <int key="connectionID">297</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">saveFile:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="210468830"/>
</object>
<int key="connectionID">298</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">_destination_stream_btn</string> <string key="label">_destination_stream_btn</string>
...@@ -3558,6 +3512,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3558,6 +3512,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<int key="connectionID">412</int> <int key="connectionID">412</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">finalizePanel:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="210468830"/>
</object>
<int key="connectionID">413</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_ttl_stepper</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="681462793"/>
</object>
<int key="connectionID">417</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
...@@ -3605,7 +3575,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3605,7 +3575,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="1053913655"/> <reference ref="1053913655"/>
<reference ref="960318313"/> <reference ref="960318313"/>
<reference ref="210468830"/> <reference ref="210468830"/>
<reference ref="477712445"/>
</object> </object>
<reference key="parent" ref="1005"/> <reference key="parent" ref="1005"/>
</object> </object>
...@@ -3759,20 +3728,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -3759,20 +3728,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="94756638"/> <reference key="object" ref="94756638"/>
<reference key="parent" ref="210468830"/> <reference key="parent" ref="210468830"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="477712445"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="333855432"/>
</object>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="333855432"/>
<reference key="parent" ref="477712445"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">25</int> <int key="objectID">25</int>
<reference key="object" ref="494472580"/> <reference key="object" ref="494472580"/>
...@@ -5219,20 +5174,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5219,20 +5174,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="994251054"/> <reference key="object" ref="994251054"/>
<reference key="parent" ref="886208703"/> <reference key="parent" ref="886208703"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">300</int>
<reference key="object" ref="277074074"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="301930122"/>
</object>
<reference key="parent" ref="501681605"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">301</int>
<reference key="object" ref="301930122"/>
<reference key="parent" ref="277074074"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">389</int> <int key="objectID">389</int>
<reference key="object" ref="501968637"/> <reference key="object" ref="501968637"/>
...@@ -5275,6 +5216,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5275,6 +5216,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="493857121"/> <reference key="object" ref="493857121"/>
<reference key="parent" ref="570131195"/> <reference key="parent" ref="570131195"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">300</int>
<reference key="object" ref="277074074"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="301930122"/>
</object>
<reference key="parent" ref="501681605"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">301</int>
<reference key="object" ref="301930122"/>
<reference key="parent" ref="277074074"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
...@@ -5421,8 +5376,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5421,8 +5376,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>227.IBPluginDependency</string> <string>227.IBPluginDependency</string>
<string>228.IBPluginDependency</string> <string>228.IBPluginDependency</string>
<string>229.IBPluginDependency</string> <string>229.IBPluginDependency</string>
<string>23.IBPluginDependency</string>
<string>23.IBViewBoundsToFrameTransform</string>
<string>230.IBPluginDependency</string> <string>230.IBPluginDependency</string>
<string>231.IBPluginDependency</string> <string>231.IBPluginDependency</string>
<string>231.IBViewBoundsToFrameTransform</string> <string>231.IBViewBoundsToFrameTransform</string>
...@@ -5436,7 +5389,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5436,7 +5389,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>238.IBPluginDependency</string> <string>238.IBPluginDependency</string>
<string>239.IBPluginDependency</string> <string>239.IBPluginDependency</string>
<string>239.IBViewBoundsToFrameTransform</string> <string>239.IBViewBoundsToFrameTransform</string>
<string>24.IBPluginDependency</string>
<string>240.IBPluginDependency</string> <string>240.IBPluginDependency</string>
<string>241.IBPluginDependency</string> <string>241.IBPluginDependency</string>
<string>241.IBViewBoundsToFrameTransform</string> <string>241.IBViewBoundsToFrameTransform</string>
...@@ -5603,9 +5555,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5603,9 +5555,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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>
<string>{{319, 207}, {663, 490}}</string> <string>{{329, 71}, {663, 490}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{319, 207}, {663, 490}}</string> <string>{{329, 71}, {663, 490}}</string>
<boolean value="NO"/> <boolean value="NO"/>
<string>{196, 240}</string> <string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string> <string>{{357, 418}, {480, 270}}</string>
...@@ -5813,10 +5765,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5813,10 +5765,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2IAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAww0AAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABBYAAAww0AAA</bytes>
...@@ -5837,7 +5785,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5837,7 +5785,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
<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="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCpgAAwz+MAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABCpgAAwz+MAA</bytes>
</object> </object>
...@@ -5890,7 +5837,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -5890,7 +5837,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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="NSAffineTransform"> <object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDvQAAwkQAAA</bytes> <bytes key="NSTransformStruct">P4AAAL+AAABDyIAAwkQAAA</bytes>
</object> </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{366, 101}, {532, 355}}</string> <string>{{366, 101}, {532, 355}}</string>
...@@ -6027,7 +5974,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6027,7 +5974,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{359, 563}, {531, 72}}</string> <string>{{359, 563}, {531, 72}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{372, 280}, {531, 72}}</string> <string>{{372, 280}, {571, 72}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>VLCDropEnabledButton</string> <string>VLCDropEnabledButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
...@@ -6102,7 +6049,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6102,7 +6049,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">412</int> <int key="maxID">417</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
...@@ -6134,10 +6081,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6134,10 +6081,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>closeCustomizationSheet:</string> <string>closeCustomizationSheet:</string>
<string>closeStreamPanel:</string> <string>closeStreamPanel:</string>
<string>customizeProfile:</string> <string>customizeProfile:</string>
<string>finalizePanel:</string>
<string>iWantAFile:</string> <string>iWantAFile:</string>
<string>iWantAStream:</string> <string>iWantAStream:</string>
<string>openMedia:</string> <string>openMedia:</string>
<string>saveFile:</string>
<string>showStreamPanel:</string> <string>showStreamPanel:</string>
<string>streamAnnouncementToggle:</string> <string>streamAnnouncementToggle:</string>
<string>streamTypeToggle:</string> <string>streamTypeToggle:</string>
...@@ -6169,10 +6116,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6169,10 +6116,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>closeCustomizationSheet:</string> <string>closeCustomizationSheet:</string>
<string>closeStreamPanel:</string> <string>closeStreamPanel:</string>
<string>customizeProfile:</string> <string>customizeProfile:</string>
<string>finalizePanel:</string>
<string>iWantAFile:</string> <string>iWantAFile:</string>
<string>iWantAStream:</string> <string>iWantAStream:</string>
<string>openMedia:</string> <string>openMedia:</string>
<string>saveFile:</string>
<string>showStreamPanel:</string> <string>showStreamPanel:</string>
<string>streamAnnouncementToggle:</string> <string>streamAnnouncementToggle:</string>
<string>streamTypeToggle:</string> <string>streamTypeToggle:</string>
...@@ -6201,19 +6148,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6201,19 +6148,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">iWantAFile:</string> <string key="name">finalizePanel:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">iWantAStream:</string> <string key="name">iWantAFile:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">openMedia:</string> <string key="name">iWantAStream:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">saveFile:</string> <string key="name">openMedia:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo"> <object class="IBActionInfo">
...@@ -6238,7 +6185,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6238,7 +6185,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>_cancel_btn</string>
<string>_customize_aud_bitrate_fld</string> <string>_customize_aud_bitrate_fld</string>
<string>_customize_aud_bitrate_lbl</string> <string>_customize_aud_bitrate_lbl</string>
<string>_customize_aud_channels_fld</string> <string>_customize_aud_channels_fld</string>
...@@ -6300,7 +6246,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6300,7 +6246,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_address_fld</string> <string>_stream_address_fld</string>
<string>_stream_address_lbl</string> <string>_stream_address_lbl</string>
<string>_stream_announcement_lbl</string> <string>_stream_announcement_lbl</string>
<string>_stream_cancel_btn</string>
<string>_stream_channel_fld</string> <string>_stream_channel_fld</string>
<string>_stream_destination_lbl</string> <string>_stream_destination_lbl</string>
<string>_stream_http_ckb</string> <string>_stream_http_ckb</string>
...@@ -6314,6 +6259,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6314,6 +6259,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_sdp_fld</string> <string>_stream_sdp_fld</string>
<string>_stream_ttl_fld</string> <string>_stream_ttl_fld</string>
<string>_stream_ttl_lbl</string> <string>_stream_ttl_lbl</string>
<string>_stream_ttl_stepper</string>
<string>_stream_type_lbl</string> <string>_stream_type_lbl</string>
<string>_stream_type_pop</string> <string>_stream_type_pop</string>
<string>_window</string> <string>_window</string>
...@@ -6398,14 +6344,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6398,14 +6344,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys"> <object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<string>_cancel_btn</string>
<string>_customize_aud_bitrate_fld</string> <string>_customize_aud_bitrate_fld</string>
<string>_customize_aud_bitrate_lbl</string> <string>_customize_aud_bitrate_lbl</string>
<string>_customize_aud_channels_fld</string> <string>_customize_aud_channels_fld</string>
...@@ -6467,7 +6411,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6467,7 +6411,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_address_fld</string> <string>_stream_address_fld</string>
<string>_stream_address_lbl</string> <string>_stream_address_lbl</string>
<string>_stream_announcement_lbl</string> <string>_stream_announcement_lbl</string>
<string>_stream_cancel_btn</string>
<string>_stream_channel_fld</string> <string>_stream_channel_fld</string>
<string>_stream_destination_lbl</string> <string>_stream_destination_lbl</string>
<string>_stream_http_ckb</string> <string>_stream_http_ckb</string>
...@@ -6481,16 +6424,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6481,16 +6424,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_sdp_fld</string> <string>_stream_sdp_fld</string>
<string>_stream_ttl_fld</string> <string>_stream_ttl_fld</string>
<string>_stream_ttl_lbl</string> <string>_stream_ttl_lbl</string>
<string>_stream_ttl_stepper</string>
<string>_stream_type_lbl</string> <string>_stream_type_lbl</string>
<string>_stream_type_pop</string> <string>_stream_type_pop</string>
<string>_window</string> <string>_window</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">_cancel_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">_customize_aud_bitrate_fld</string> <string key="name">_customize_aud_bitrate_fld</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
...@@ -6735,10 +6675,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6735,10 +6675,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">_stream_announcement_lbl</string> <string key="name">_stream_announcement_lbl</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_cancel_btn</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">_stream_channel_fld</string> <string key="name">_stream_channel_fld</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
...@@ -6791,6 +6727,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> ...@@ -6791,6 +6727,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">_stream_ttl_lbl</string> <string key="name">_stream_ttl_lbl</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_ttl_stepper</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo"> <object class="IBToOneOutletInfo">
<string key="name">_stream_type_lbl</string> <string key="name">_stream_type_lbl</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
......
modules/gui/macosx/ConvertAndSave.h
View file @ 5d83d1a2
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
@interface VLCConvertAndSave : NSObject @interface VLCConvertAndSave : NSObject
{ {
IBOutlet id _window; IBOutlet id _window;
IBOutlet id _cancel_btn;
IBOutlet id _ok_btn; IBOutlet id _ok_btn;
IBOutlet id _drop_lbl; IBOutlet id _drop_lbl;
...@@ -101,6 +100,7 @@ ...@@ -101,6 +100,7 @@
IBOutlet id _stream_address_fld; IBOutlet id _stream_address_fld;
IBOutlet id _stream_ttl_lbl; IBOutlet id _stream_ttl_lbl;
IBOutlet id _stream_ttl_fld; IBOutlet id _stream_ttl_fld;
IBOutlet id _stream_ttl_stepper;
IBOutlet id _stream_port_lbl; IBOutlet id _stream_port_lbl;
IBOutlet id _stream_port_fld; IBOutlet id _stream_port_fld;
IBOutlet id _stream_sap_ckb; IBOutlet id _stream_sap_ckb;
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
- (IBAction)toggleWindow; - (IBAction)toggleWindow;
- (IBAction)saveFile:(id)sender; - (IBAction)finalizePanel:(id)sender;
- (IBAction)openMedia:(id)sender; - (IBAction)openMedia:(id)sender;
- (IBAction)switchProfile:(id)sender; - (IBAction)switchProfile:(id)sender;
- (IBAction)customizeProfile:(id)sender; - (IBAction)customizeProfile:(id)sender;
......
modules/gui/macosx/ConvertAndSave.m
View file @ 5d83d1a2
...@@ -134,7 +134,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -134,7 +134,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
- (void)awakeFromNib - (void)awakeFromNib
{ {
[_window setTitle: _NS("Convert & Save")]; [_window setTitle: _NS("Convert & Save")];
[_cancel_btn setTitle: _NS("Cancel")];
[_ok_btn setTitle: _NS("Save")]; [_ok_btn setTitle: _NS("Save")];
[_drop_lbl setStringValue: _NS("Drop media here")]; [_drop_lbl setStringValue: _NS("Drop media here")];
[_drop_btn setTitle: _NS("Open media...")]; [_drop_btn setTitle: _NS("Open media...")];
...@@ -145,7 +144,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -145,7 +144,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_destination_filename_lbl setHidden: YES]; [_destination_filename_lbl setHidden: YES];
[_destination_browse_btn setTitle:_NS("Browse...")]; [_destination_browse_btn setTitle:_NS("Browse...")];
[_destination_stream_btn setTitle:_NS("Setup Streaming...")]; [_destination_stream_btn setTitle:_NS("Setup Streaming...")];
[_destination_stream_lbl setStringValue:@""]; [_destination_stream_lbl setStringValue:@"Select Streaming Method"];
[_destination_itwantafile_btn setTitle:_NS("Save as File")]; [_destination_itwantafile_btn setTitle:_NS("Save as File")];
[_destination_itwantastream_btn setTitle:_NS("Stream")]; [_destination_itwantastream_btn setTitle:_NS("Stream")];
[_destination_cancel_btn setHidden:YES]; [_destination_cancel_btn setHidden:YES];
...@@ -180,6 +179,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -180,6 +179,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_stream_type_lbl setStringValue:_NS("Type")]; [_stream_type_lbl setStringValue:_NS("Type")];
[_stream_address_lbl setStringValue:_NS("Address")]; [_stream_address_lbl setStringValue:_NS("Address")];
[_stream_ttl_lbl setStringValue:_NS("TTL")]; [_stream_ttl_lbl setStringValue:_NS("TTL")];
[_stream_ttl_fld setEnabled:NO];
[_stream_ttl_stepper setEnabled:NO];
[_stream_port_lbl setStringValue:_NS("Port")]; [_stream_port_lbl setStringValue:_NS("Port")];
[_stream_sap_ckb setStringValue:_NS("SAP Announcement")]; [_stream_sap_ckb setStringValue:_NS("SAP Announcement")];
[_stream_http_ckb setStringValue:_NS("HTTP Announcement")]; [_stream_http_ckb setStringValue:_NS("HTTP Announcement")];
...@@ -260,7 +261,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -260,7 +261,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
# pragma mark - # pragma mark -
# pragma mark User Interaction # pragma mark User Interaction
- (IBAction)saveFile:(id)sender - (IBAction)finalizePanel:(id)sender
{ {
playlist_t * p_playlist = pl_Get(VLCIntf); playlist_t * p_playlist = pl_Get(VLCIntf);
...@@ -379,6 +380,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -379,6 +380,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantafile_view afterDelay:0.2]; [_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantafile_view afterDelay:0.2];
[[_destination_cancel_btn animator] setHidden:NO]; [[_destination_cancel_btn animator] setHidden:NO];
b_streaming = NO; b_streaming = NO;
[_ok_btn setTitle:_NS("Save")];
} }
- (IBAction)iWantAStream:(id)sender - (IBAction)iWantAStream:(id)sender
...@@ -392,7 +394,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -392,7 +394,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[[_destination_itwantastream_btn animator] setHidden: YES]; [[_destination_itwantastream_btn animator] setHidden: YES];
[_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantastream_view afterDelay:0.2]; [_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantastream_view afterDelay:0.2];
[[_destination_cancel_btn animator] setHidden:NO]; [[_destination_cancel_btn animator] setHidden:NO];
b_streaming = NO; b_streaming = YES;
[_ok_btn setTitle:_NS("Stream")];
} }
- (IBAction)cancelDestination:(id)sender - (IBAction)cancelDestination:(id)sender
...@@ -440,6 +443,42 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -440,6 +443,42 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
- (IBAction)closeStreamPanel:(id)sender - (IBAction)closeStreamPanel:(id)sender
{ {
NSMutableString * labelContent = [[NSMutableString alloc] initWithFormat:@"%@ @ %@:%@", [_stream_type_pop titleOfSelectedItem], [_stream_address_fld stringValue], [_stream_port_fld stringValue]];
if ([_stream_type_pop indexOfSelectedItem] > 1) {
[labelContent appendFormat:@" TTL:%@", [_stream_ttl_fld stringValue]];
if ([_stream_sap_ckb state] || [_stream_rtsp_ckb state] || [_stream_http_ckb state] || [_stream_sdp_ckb state])
[labelContent appendFormat:@" — %@:\"%@\" (", _NS("Channel"), [_stream_channel_fld stringValue]];
BOOL b_gotSomething;
if (_stream_sap_ckb) {
[labelContent appendString:@"SAP"];
b_gotSomething = YES;
}
if (_stream_rtsp_ckb) {
if (b_gotSomething)
[labelContent appendString:@", "];
[labelContent appendString:@"RTSP"];
b_gotSomething = YES;
}
if (_stream_http_ckb) {
if (b_gotSomething)
[labelContent appendString:@", "];
[labelContent appendString:@"HTTP"];
b_gotSomething = YES;
}
if ([_stream_sdp_ckb state]) {
if (b_gotSomething)
[labelContent appendString:@", "];
[labelContent appendString:@"SDP"];
}
if ([_stream_sap_ckb state] || [_stream_rtsp_ckb state] || [_stream_http_ckb state] || [_stream_sdp_ckb state])
[labelContent appendString:@")"];
}
[_destination_stream_lbl setStringValue:labelContent];
[labelContent release];
[_stream_panel orderOut:sender]; [_stream_panel orderOut:sender];
[NSApp endSheet: _stream_panel]; [NSApp endSheet: _stream_panel];
} }
...@@ -449,12 +488,14 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -449,12 +488,14 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
NSUInteger index = [_stream_type_pop indexOfSelectedItem]; NSUInteger index = [_stream_type_pop indexOfSelectedItem];
if (index <= 1) { // HTTP, MMSH if (index <= 1) { // HTTP, MMSH
[_stream_ttl_fld setEnabled:NO]; [_stream_ttl_fld setEnabled:NO];
[_stream_ttl_stepper setEnabled:NO];
[_stream_sap_ckb setEnabled:NO]; [_stream_sap_ckb setEnabled:NO];
[_stream_rtsp_ckb setEnabled:NO]; [_stream_rtsp_ckb setEnabled:NO];
[_stream_http_ckb setEnabled:NO]; [_stream_http_ckb setEnabled:NO];
[_stream_sdp_ckb setEnabled:NO]; [_stream_sdp_ckb setEnabled:NO];
} else if (index == 2) { // RTP } else if (index == 2) { // RTP
[_stream_ttl_fld setEnabled:YES]; [_stream_ttl_fld setEnabled:YES];
[_stream_ttl_stepper setEnabled:YES];
[_stream_sap_ckb setEnabled:YES]; [_stream_sap_ckb setEnabled:YES];
[_stream_rtsp_ckb setEnabled:YES]; [_stream_rtsp_ckb setEnabled:YES];
[_stream_http_ckb setEnabled:YES]; [_stream_http_ckb setEnabled:YES];
...@@ -463,6 +504,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -463,6 +504,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]]; [_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
} else { // UDP } else { // UDP
[_stream_ttl_fld setEnabled:YES]; [_stream_ttl_fld setEnabled:YES];
[_stream_ttl_stepper setEnabled:YES];
[_stream_sap_ckb setEnabled:YES]; [_stream_sap_ckb setEnabled:YES];
[_stream_rtsp_ckb setEnabled:NO]; [_stream_rtsp_ckb setEnabled:NO];
[_stream_http_ckb setEnabled:NO]; [_stream_http_ckb setEnabled:NO];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment