macosx: overhaul simple preferences interface
authorDavid Fuhrmann <dfuhrmann@videolan.org>
Sat, 5 Dec 2015 14:12:44 +0000 (15:12 +0100)
committerDavid Fuhrmann <dfuhrmann@videolan.org>
Sat, 5 Dec 2015 14:18:55 +0000 (15:18 +0100)
- cleanup interfaces section
- Regroup settings, move some to video section
- remove rarely used settings from the simple settings page
- reorder outlets and setup code

close #14504

extras/package/macosx/Resources/English.lproj/SimplePreferences.xib
modules/gui/macosx/simple_prefs.h
modules/gui/macosx/simple_prefs.m

index 9ae4239..f746da5 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
         <development version="5100" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="VLCSimplePrefs">
@@ -52,7 +52,6 @@
                 <outlet property="input_cachelevelPopup" destination="2580" id="lts-mx-3Kh"/>
                 <outlet property="input_cachelevel_customLabel" destination="3162" id="fbZ-oF-HKW"/>
                 <outlet property="input_cachingBox" destination="2572" id="EC7-3Y-jc1"/>
-                <outlet property="input_mkv_preload_dirCheckbox" destination="3647" id="Ki6-iB-FlQ"/>
                 <outlet property="input_muxBox" destination="2585" id="Yng-39-8zd"/>
                 <outlet property="input_netBox" destination="2563" id="xSD-ks-oYK"/>
                 <outlet property="input_postprocLabel" destination="2592" id="Qs8-Ac-u30"/>
@@ -60,7 +59,7 @@
                 <outlet property="input_recordBox" destination="3623" id="eSr-8K-LtQ"/>
                 <outlet property="input_recordButton" destination="3616" id="Saw-OZ-ydg"/>
                 <outlet property="input_recordTextField" destination="3614" id="Ecp-9y-KOl"/>
-                <outlet property="input_rtspCheckbox" destination="2599" id="9QY-Az-Dxq"/>
+                <outlet property="input_skipFramesCheckbox" destination="lem-yf-jZB" id="r05-tX-CCa"/>
                 <outlet property="input_skipLoopLabel" destination="3434" id="N1W-pG-ln6"/>
                 <outlet property="input_skipLoopPopup" destination="3435" id="ia2-kQ-VwV"/>
                 <outlet property="input_urlhandlerButton" destination="3742" id="1GV-O9-8SF"/>
                 <outlet property="intf_appleremoteCheckbox" destination="3542" id="Oxt-Lr-ogk"/>
                 <outlet property="intf_appleremote_sysvolCheckbox" destination="3738" id="uwy-oj-7yn"/>
                 <outlet property="intf_artCheckbox" destination="3928" id="HND-nW-BHK"/>
-                <outlet property="intf_autoresizeCheckbox" destination="3674" id="Qag-ij-O0k"/>
                 <outlet property="intf_continueplaybackLabel" destination="3919" id="ZJO-qY-UCq"/>
                 <outlet property="intf_continueplaybackPopup" destination="3920" id="dZ3-SI-SCp"/>
-                <outlet property="intf_embeddedCheckbox" destination="2445" id="eGx-n3-YeT"/>
                 <outlet property="intf_enableNotificationsCheckbox" destination="3564" id="IIA-ce-g61"/>
-                <outlet property="intf_fspanelCheckbox" destination="2327" id="cnD-cL-uNI"/>
+                <outlet property="intf_generalSettingsBox" destination="3TH-Bv-gjk" id="eaN-aQ-k4d"/>
                 <outlet property="intf_languageLabel" destination="3892" id="klM-r2-XKf"/>
                 <outlet property="intf_languagePopup" destination="3900" id="USp-A1-Aut"/>
                 <outlet property="intf_last_updateLabel" destination="3560" id="9TG-0W-rqH"/>
                 <outlet property="intf_luahttppwdLabel" destination="3875" id="zl0-da-lHe"/>
                 <outlet property="intf_luahttppwdTextField" destination="3884" id="dxk-zl-ZLZ"/>
                 <outlet property="intf_mediakeysCheckbox" destination="3543" id="qh4-7b-Dff"/>
-                <outlet property="intf_nativefullscreenCheckbox" destination="3631" id="XPQ-Ln-5TD"/>
                 <outlet property="intf_networkBox" destination="2318" id="wm1-kM-rZB"/>
                 <outlet property="intf_pauseitunesLabel" destination="3910" id="miA-VW-WB3"/>
                 <outlet property="intf_pauseitunesPopup" destination="3911" id="UZN-lH-STQ"/>
-                <outlet property="intf_pauseminimizedCheckbox" destination="3677" id="rFZ-il-OTV"/>
+                <outlet property="intf_playbackBehaviourBox" destination="EKZ-iB-CMo" id="mbV-7q-aS2"/>
+                <outlet property="intf_playbackControlBox" destination="CZP-ZN-k6p" id="voN-Ji-9aw"/>
                 <outlet property="intf_styleLabel" destination="3605" id="aqL-QJ-qWd"/>
                 <outlet property="intf_style_brightButtonCell" destination="3604" id="PBI-Ye-5op"/>
                 <outlet property="intf_style_darkButtonCell" destination="3601" id="6op-ar-6O9"/>
                 <outlet property="urlhandler_udpPopup" destination="3845" id="xJU-C6-6Cc"/>
                 <outlet property="urlhandler_win" destination="3745" id="5qQ-aU-KO7"/>
                 <outlet property="videoView" destination="2440" id="BYi-3T-vUQ"/>
-                <outlet property="video_blackCheckbox" destination="2453" id="9w6-IX-yRX"/>
+                <outlet property="video_blackScreenCheckbox" destination="i5X-iK-Hbj" id="b3s-kQ-Myp"/>
                 <outlet property="video_deinterlaceLabel" destination="3705" id="6TA-6G-k4c"/>
                 <outlet property="video_deinterlacePopup" destination="3704" id="Dml-Eu-lQ0"/>
                 <outlet property="video_deinterlace_modeLabel" destination="3707" id="wpM-z5-0zJ"/>
                 <outlet property="video_deinterlace_modePopup" destination="3706" id="Aa2-X9-mpw"/>
-                <outlet property="video_deviceLabel" destination="2488" id="s5e-k7-1Mb"/>
-                <outlet property="video_devicePopup" destination="2483" id="vKY-8u-67V"/>
+                <outlet property="video_deviceLabel" destination="pch-Ac-iPY" id="BMX-TB-PWw"/>
+                <outlet property="video_devicePopup" destination="74n-z2-A2G" id="xc9-xO-bZb"/>
                 <outlet property="video_displayBox" destination="2449" id="i0p-HK-1F5"/>
+                <outlet property="video_embeddedCheckbox" destination="2452" id="1k0-sj-mAd"/>
                 <outlet property="video_enableCheckbox" destination="2448" id="EfL-Vf-auC"/>
-                <outlet property="video_fullscreenCheckbox" destination="2452" id="UIh-tx-LLZ"/>
+                <outlet property="video_fullscreenBox" destination="9CN-jv-NQ1" id="xXs-Bs-yCM"/>
+                <outlet property="video_nativeFullscreenCheckbox" destination="6mo-Qc-MZV" id="4Qq-ci-Gbl"/>
                 <outlet property="video_onTopCheckbox" destination="2451" id="64h-nw-rQ0"/>
-                <outlet property="video_skipFramesCheckbox" destination="2454" id="vmb-WS-UEt"/>
+                <outlet property="video_pauseWhenMinimizedCheckbox" destination="rpy-5O-tek" id="jBe-GO-Iiw"/>
                 <outlet property="video_snapBox" destination="2466" id="bQQ-pv-z09"/>
                 <outlet property="video_snap_folderButton" destination="2473" id="c2H-eo-wvH"/>
                 <outlet property="video_snap_folderLabel" destination="2470" id="oBs-TH-xvl"/>
                 <outlet property="video_snap_prefixLabel" destination="2475" id="oaH-HK-RPD"/>
                 <outlet property="video_snap_prefixTextField" destination="2474" id="O5Q-MK-Cz3"/>
                 <outlet property="video_snap_seqnumCheckbox" destination="2476" id="Fa0-ZE-QW9"/>
+                <outlet property="video_startInFullscreenCheckbox" destination="5Db-fa-Ffw" id="eK9-Wr-Nym"/>
                 <outlet property="video_videoBox" destination="3722" id="bRq-1u-kBT"/>
                 <outlet property="video_videodecoCheckbox" destination="3728" id="yE0-ry-RZA"/>
                 <outlet property="window" destination="2265" id="mGG-NZ-eoi"/>
@@ -243,119 +243,11 @@ Gw
         </window>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="2311" userLabel="Interface">
-            <rect key="frame" x="0.0" y="0.0" width="570" height="568"/>
+            <rect key="frame" x="0.0" y="0.0" width="570" height="535"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <button id="3543">
-                    <rect key="frame" x="18" y="308" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Control playback with media keys" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3546">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="Svx-Jd-ghP"/>
-                    </connections>
-                </button>
-                <button id="3564">
-                    <rect key="frame" x="18" y="281" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Enable notifications on playlist item change" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3565">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="ZE0-IR-FYq"/>
-                    </connections>
-                </button>
-                <button id="3677">
-                    <rect key="frame" x="18" y="253" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Pause the video playback when minimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3678">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="MrF-Ct-EyC"/>
-                    </connections>
-                </button>
-                <button id="3542">
-                    <rect key="frame" x="18" y="362" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Control playback with the Apple Remote" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3547">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="3Jy-4t-gHQ"/>
-                    </connections>
-                </button>
-                <button id="3738">
-                    <rect key="frame" x="18" y="336" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Control system volume with the Apple Remote" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3739">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="a0a-gR-teU"/>
-                    </connections>
-                </button>
-                <button id="2445">
-                    <rect key="frame" x="18" y="389" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Add controls to the video window" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3456">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="cDE-N4-Ijz"/>
-                    </connections>
-                </button>
-                <button id="3674">
-                    <rect key="frame" x="18" y="416" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Resize interface to the native video size" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3675">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="Cl4-Rl-5xg"/>
-                    </connections>
-                </button>
-                <button id="2327">
-                    <rect key="frame" x="18" y="471" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Show Fullscreen Controller" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3455">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="Zll-Av-4d4"/>
-                    </connections>
-                </button>
-                <button id="3631">
-                    <rect key="frame" x="18" y="443" width="534" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <buttonCell key="cell" type="check" title="Use the native fullscreen mode on OS X Lion" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3632">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="Xxp-h6-FOe"/>
-                    </connections>
-                </button>
                 <box title="Privacy / Network Interaction" id="2318">
-                    <rect key="frame" x="17" y="79" width="536" height="107"/>
+                    <rect key="frame" x="17" y="80" width="536" height="107"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
                         <rect key="frame" x="2" y="2" width="532" height="90"/>
@@ -402,63 +294,212 @@ Gw
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
-                <textField verticalHuggingPriority="750" id="3605">
-                    <rect key="frame" x="17" y="501" width="114" height="17"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Interface style" id="3606">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <textField verticalHuggingPriority="750" id="3892">
-                    <rect key="frame" x="17" y="530" width="241" height="17"/>
+                <box title="Playback control" id="CZP-ZN-k6p">
+                    <rect key="frame" x="17" y="281" width="536" height="142"/>
                     <autoresizingMask key="autoresizingMask"/>
+                    <view key="contentView">
+                        <rect key="frame" x="2" y="2" width="532" height="125"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button id="3542">
+                                <rect key="frame" x="15" y="66" width="534" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Control playback with the Apple Remote" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3547">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="3Jy-4t-gHQ"/>
+                                </connections>
+                            </button>
+                            <button id="3543">
+                                <rect key="frame" x="15" y="39" width="534" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Control playback with media keys" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3546">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="Svx-Jd-ghP"/>
+                                </connections>
+                            </button>
+                            <textField verticalHuggingPriority="750" id="3919">
+                                <rect key="frame" x="15" y="96" width="206" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Continue playback" id="3923">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <popUpButton verticalHuggingPriority="750" id="3920">
+                                <rect key="frame" x="225" y="91" width="293" height="26"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3921">
+                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="menu"/>
+                                    <menu key="menu" title="OtherViews" id="3922"/>
+                                </popUpButtonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="SxN-sI-55J"/>
+                                </connections>
+                            </popUpButton>
+                            <button id="3738">
+                                <rect key="frame" x="15" y="11" width="534" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Control system volume with the Apple Remote" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3739">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="a0a-gR-teU"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <animations/>
+                    </view>
                     <animations/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Language" id="3893">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" id="3600">
-                    <rect key="frame" x="262" y="500" width="288" height="18"/>
+                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </box>
+                <box title="Playback behaviour" borderType="line" id="EKZ-iB-CMo">
+                    <rect key="frame" x="17" y="191" width="536" height="86"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <view key="contentView">
+                        <rect key="frame" x="1" y="1" width="534" height="70"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button id="3564">
+                                <rect key="frame" x="16" y="44" width="534" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Enable notifications on playlist item change" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3565">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="ZE0-IR-FYq"/>
+                                </connections>
+                            </button>
+                            <textField verticalHuggingPriority="750" id="3910">
+                                <rect key="frame" x="16" y="16" width="205" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Pause iTunes" id="3914">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <popUpButton verticalHuggingPriority="750" id="3911">
+                                <rect key="frame" x="225" y="11" width="293" height="26"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3912">
+                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="menu"/>
+                                    <menu key="menu" title="OtherViews" id="3913"/>
+                                </popUpButtonCell>
+                                <connections>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="qeG-Iu-Gee"/>
+                                </connections>
+                            </popUpButton>
+                        </subviews>
+                        <animations/>
+                    </view>
                     <animations/>
-                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    <size key="cellSize" width="142" height="18"/>
-                    <size key="intercellSpacing" width="4" height="2"/>
-                    <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="3603">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <cells>
-                        <column>
-                            <buttonCell type="radio" title="Dark" imagePosition="left" alignment="left" tag="1" inset="2" id="3601">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
+                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </box>
+                <box title="General Settings" borderType="line" id="3TH-Bv-gjk">
+                    <rect key="frame" x="17" y="427" width="536" height="88"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <view key="contentView">
+                        <rect key="frame" x="1" y="1" width="534" height="72"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField verticalHuggingPriority="750" id="3605">
+                                <rect key="frame" x="16" y="15" width="114" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Interface style" id="3606">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <textField verticalHuggingPriority="750" id="3892">
+                                <rect key="frame" x="16" y="44" width="204" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Language" id="3893">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <popUpButton verticalHuggingPriority="750" id="3900">
+                                <rect key="frame" x="224" y="38" width="293" height="26"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3901">
+                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="menu"/>
+                                    <menu key="menu" title="OtherViews" id="3902"/>
+                                </popUpButtonCell>
                                 <connections>
-                                    <action selector="interfaceSettingChanged:" target="-2" id="LMY-zG-H9C"/>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="iZ8-Hl-fvA"/>
                                 </connections>
-                            </buttonCell>
-                        </column>
-                        <column>
-                            <buttonCell type="radio" title="Bright" imagePosition="left" alignment="left" state="on" inset="2" id="3604">
-                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                <font key="font" metaFont="system"/>
+                            </popUpButton>
+                            <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" id="3600">
+                                <rect key="frame" x="226" y="14" width="288" height="18"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <animations/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                <size key="cellSize" width="142" height="18"/>
+                                <size key="intercellSpacing" width="4" height="2"/>
+                                <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="3603">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <cells>
+                                    <column>
+                                        <buttonCell type="radio" title="Dark" imagePosition="left" alignment="left" tag="1" inset="2" id="3601">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                            <connections>
+                                                <action selector="interfaceSettingChanged:" target="-2" id="LMY-zG-H9C"/>
+                                            </connections>
+                                        </buttonCell>
+                                    </column>
+                                    <column>
+                                        <buttonCell type="radio" title="Bright" imagePosition="left" alignment="left" state="on" inset="2" id="3604">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                            <connections>
+                                                <action selector="interfaceSettingChanged:" target="-2" id="hh8-IG-hHT"/>
+                                            </connections>
+                                        </buttonCell>
+                                    </column>
+                                </cells>
                                 <connections>
-                                    <action selector="interfaceSettingChanged:" target="-2" id="hh8-IG-hHT"/>
+                                    <action selector="interfaceSettingChanged:" target="-2" id="05Z-q1-rGx"/>
                                 </connections>
-                            </buttonCell>
-                        </column>
-                    </cells>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="05Z-q1-rGx"/>
-                    </connections>
-                </matrix>
+                            </matrix>
+                        </subviews>
+                        <animations/>
+                    </view>
+                    <animations/>
+                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </box>
                 <box autoresizesSubviews="NO" title="Lua HTTP" borderType="line" id="3883">
-                    <rect key="frame" x="17" y="15" width="536" height="60"/>
+                    <rect key="frame" x="17" y="16" width="536" height="60"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <view key="contentView">
                         <rect key="frame" x="1" y="1" width="534" height="44"/>
@@ -494,67 +535,9 @@ Gw
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
-                <popUpButton verticalHuggingPriority="750" id="3900">
-                    <rect key="frame" x="260" y="524" width="293" height="26"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3901">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="3902"/>
-                    </popUpButtonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="iZ8-Hl-fvA"/>
-                    </connections>
-                </popUpButton>
-                <textField verticalHuggingPriority="750" id="3910">
-                    <rect key="frame" x="17" y="229" width="241" height="17"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Pause iTunes" id="3914">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" id="3911">
-                    <rect key="frame" x="260" y="223" width="293" height="26"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3912">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="3913"/>
-                    </popUpButtonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="qeG-Iu-Gee"/>
-                    </connections>
-                </popUpButton>
-                <textField verticalHuggingPriority="750" id="3919">
-                    <rect key="frame" x="17" y="201" width="241" height="17"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Continue playback" id="3923">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <popUpButton verticalHuggingPriority="750" id="3920">
-                    <rect key="frame" x="260" y="195" width="293" height="26"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <animations/>
-                    <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="3921">
-                        <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="menu"/>
-                        <menu key="menu" title="OtherViews" id="3922"/>
-                    </popUpButtonCell>
-                    <connections>
-                        <action selector="interfaceSettingChanged:" target="-2" id="SxN-sI-55J"/>
-                    </connections>
-                </popUpButton>
             </subviews>
             <animations/>
+            <point key="canvasLocation" x="245" y="234.5"/>
         </customView>
         <customView id="2330" userLabel="Audio">
             <rect key="frame" x="0.0" y="0.0" width="569" height="448"/>
@@ -843,116 +826,64 @@ Gw
             <animations/>
         </customView>
         <customView id="2440" userLabel="Video">
-            <rect key="frame" x="0.0" y="0.0" width="570" height="409"/>
+            <rect key="frame" x="0.0" y="0.0" width="570" height="497"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <box title="Video snapshots" id="2466">
-                    <rect key="frame" x="17" y="16" width="536" height="116"/>
+                <box title="Display" id="2449">
+                    <rect key="frame" x="17" y="351" width="536" height="104"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
-                        <rect key="frame" x="2" y="2" width="532" height="99"/>
+                        <rect key="frame" x="2" y="2" width="532" height="87"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField verticalHuggingPriority="750" id="2468">
-                                <rect key="frame" x="80" y="67" width="305" height="22"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3486">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                                <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="4cS-5o-8CH"/>
-                                    <outlet property="nextKeyView" destination="2474" id="3429"/>
-                                </connections>
-                            </textField>
-                            <textField verticalHuggingPriority="750" id="2470">
-                                <rect key="frame" x="13" y="70" width="62" height="17"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Folder" id="3487">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <button verticalHuggingPriority="750" id="2473">
-                                <rect key="frame" x="387" y="61" width="135" height="32"/>
+                            <button id="2452">
+                                <rect key="frame" x="15" y="61" width="502" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3488">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <buttonCell key="cell" type="check" title="Show video within main window" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3479">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="OpE-LJ-bwy"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="jdL-pA-9Ed"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" id="2474">
-                                <rect key="frame" x="80" y="40" width="209" height="22"/>
+                            <button id="2451">
+                                <rect key="frame" x="15" y="10" width="248" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="vlcsnap-" drawsBackground="YES" id="3489">
+                                <buttonCell key="cell" type="check" title="Always on top" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3478">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
+                                </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="l7G-BO-EWd"/>
-                                    <outlet property="nextKeyView" destination="2468" id="3430"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="m6x-T2-Ao2"/>
                                 </connections>
-                            </textField>
-                            <textField verticalHuggingPriority="750" id="2475">
-                                <rect key="frame" x="13" y="43" width="62" height="17"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Prefix" id="3490">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <button id="2476">
-                                <rect key="frame" x="295" y="43" width="223" height="18"/>
+                            </button>
+                            <button id="rpy-5O-tek">
+                                <rect key="frame" x="15" y="36" width="502" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <buttonCell key="cell" type="check" title="Sequential numbering" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3491">
+                                <buttonCell key="cell" type="check" title="Pause the video playback when minimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="v2U-aI-gRI">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="qnw-Lv-7dq"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="sk0-pw-9AE"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" id="2477">
-                                <rect key="frame" x="13" y="14" width="62" height="17"/>
+                            <button id="3728">
+                                <rect key="frame" x="270" y="11" width="221" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Format" id="3492">
+                                <buttonCell key="cell" type="check" title="Window decorations" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3729">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
-                            <popUpButton verticalHuggingPriority="750" id="2478">
-                                <rect key="frame" x="77" y="8" width="215" height="26"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <popUpButtonCell key="cell" type="push" title="PNG" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2481" id="3493">
-                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
-                                    <menu key="menu" title="OtherViews" id="2479">
-                                        <items>
-                                            <menuItem title="PNG" state="on" id="2481"/>
-                                            <menuItem title="JPEG" id="2482"/>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
+                                </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="buC-OF-Rew"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="EQc-X2-ZSV"/>
                                 </connections>
-                            </popUpButton>
+                            </button>
                         </subviews>
                         <animations/>
                     </view>
@@ -960,97 +891,73 @@ Gw
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
-                <box title="Display" id="2449">
-                    <rect key="frame" x="17" y="234" width="536" height="133"/>
+                <box title="Fullscreen" id="9CN-jv-NQ1">
+                    <rect key="frame" x="17" y="229" width="536" height="118"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
-                        <rect key="frame" x="2" y="2" width="532" height="116"/>
+                        <rect key="frame" x="2" y="2" width="532" height="101"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button id="2451">
-                                <rect key="frame" x="14" y="64" width="248" height="18"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <buttonCell key="cell" type="check" title="Always on top" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3478">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="m6x-T2-Ao2"/>
-                                </connections>
-                            </button>
-                            <button id="2452">
-                                <rect key="frame" x="14" y="89" width="248" height="18"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <buttonCell key="cell" type="check" title="Fullscreen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3479">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="jdL-pA-9Ed"/>
-                                </connections>
-                            </button>
-                            <button id="2453">
-                                <rect key="frame" x="270" y="89" width="248" height="18"/>
+                            <button id="5Db-fa-Ffw">
+                                <rect key="frame" x="14" y="74" width="248" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <buttonCell key="cell" type="check" title="Black screens in Fullscreen mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3480">
+                                <buttonCell key="cell" type="check" title="Start in fullscreen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="dib-dQ-tMp">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="To6-hm-fKb"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="9Dw-qx-0Eo"/>
                                 </connections>
                             </button>
-                            <button id="2454">
-                                <rect key="frame" x="270" y="64" width="248" height="18"/>
+                            <button id="i5X-iK-Hbj">
+                                <rect key="frame" x="270" y="74" width="248" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <buttonCell key="cell" type="check" title="Skip frames" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3481">
+                                <buttonCell key="cell" type="check" title="Black screens in Fullscreen mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="mR8-Zk-i3R">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="SaZ-r7-aea"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="cL2-0Y-iKD"/>
                                 </connections>
                             </button>
-                            <button id="3728">
-                                <rect key="frame" x="14" y="39" width="248" height="18"/>
+                            <button id="6mo-Qc-MZV">
+                                <rect key="frame" x="15" y="45" width="248" height="18"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <buttonCell key="cell" type="check" title="Window decorations" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3729">
+                                <buttonCell key="cell" type="check" title="Use native fullscreen mode" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="8UZ-lD-mnI">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="EQc-X2-ZSV"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="dyL-vV-01T"/>
                                 </connections>
                             </button>
-                            <popUpButton verticalHuggingPriority="750" id="2483">
-                                <rect key="frame" x="182" y="9" width="258" height="26"/>
+                            <popUpButton verticalHuggingPriority="750" id="74n-z2-A2G">
+                                <rect key="frame" x="184" y="10" width="258" height="26"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <popUpButtonCell key="cell" type="push" title="Screen 1 (1280 * 800)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2486" id="3484">
+                                <popUpButtonCell key="cell" type="push" title="Screen 1 (1280 * 800)" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2ni-Sy-Xtp" id="HOa-K5-WKi">
                                     <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="menu"/>
-                                    <menu key="menu" title="OtherViews" id="2484">
+                                    <menu key="menu" title="OtherViews" id="Q7U-7F-NwP">
                                         <items>
-                                            <menuItem title="Screen 1 (1280 * 800)" state="on" id="2486"/>
-                                            <menuItem title="Item2" id="2487"/>
-                                            <menuItem title="Item3" id="2485"/>
+                                            <menuItem title="Screen 1 (1280 * 800)" state="on" id="2ni-Sy-Xtp"/>
+                                            <menuItem title="Item2" id="RRu-9L-ZAD"/>
+                                            <menuItem title="Item3" id="5QQ-MZ-ktd"/>
                                         </items>
                                     </menu>
                                 </popUpButtonCell>
                                 <connections>
-                                    <action selector="videoSettingChanged:" target="-2" id="4sd-h0-L7x"/>
+                                    <action selector="videoSettingChanged:" target="-2" id="43z-cH-dlV"/>
                                 </connections>
                             </popUpButton>
-                            <textField verticalHuggingPriority="750" id="2488">
-                                <rect key="frame" x="13" y="16" width="167" height="17"/>
+                            <textField verticalHuggingPriority="750" id="pch-Ac-iPY">
+                                <rect key="frame" x="15" y="17" width="167" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
-                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Videogerät für Vollbild" id="3485">
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Fullscreen video device" id="Ft8-Q4-fXE">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -1064,7 +971,7 @@ Gw
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
                 <button id="2448">
-                    <rect key="frame" x="18" y="373" width="352" height="18"/>
+                    <rect key="frame" x="18" y="461" width="352" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Enable Video" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3477">
@@ -1076,14 +983,14 @@ Gw
                     </connections>
                 </button>
                 <box autoresizesSubviews="NO" title="Video" borderType="line" id="3722">
-                    <rect key="frame" x="17" y="140" width="536" height="88"/>
+                    <rect key="frame" x="17" y="136" width="536" height="89"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <view key="contentView">
-                        <rect key="frame" x="1" y="1" width="534" height="72"/>
+                        <rect key="frame" x="1" y="1" width="534" height="73"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField verticalHuggingPriority="750" id="3707">
-                                <rect key="frame" x="13" y="17" width="167" height="17"/>
+                                <rect key="frame" x="13" y="18" width="167" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Deinterlace mode" id="3708">
@@ -1093,7 +1000,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" id="3705">
-                                <rect key="frame" x="13" y="45" width="167" height="17"/>
+                                <rect key="frame" x="13" y="46" width="167" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Deinterlace" id="3714">
@@ -1103,7 +1010,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" id="3704">
-                                <rect key="frame" x="182" y="38" width="258" height="26"/>
+                                <rect key="frame" x="182" y="39" width="258" height="26"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3718" id="3715">
@@ -1122,7 +1029,7 @@ Gw
                                 </connections>
                             </popUpButton>
                             <popUpButton verticalHuggingPriority="750" id="3706">
-                                <rect key="frame" x="182" y="10" width="258" height="26"/>
+                                <rect key="frame" x="182" y="11" width="258" height="26"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3712" id="3709">
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
+                <box title="Video snapshots" id="2466">
+                    <rect key="frame" x="17" y="16" width="536" height="116"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <view key="contentView">
+                        <rect key="frame" x="2" y="2" width="532" height="99"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField verticalHuggingPriority="750" id="2468">
+                                <rect key="frame" x="80" y="67" width="305" height="22"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="3486">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <connections>
+                                    <action selector="videoSettingChanged:" target="-2" id="4cS-5o-8CH"/>
+                                    <outlet property="nextKeyView" destination="2474" id="3429"/>
+                                </connections>
+                            </textField>
+                            <textField verticalHuggingPriority="750" id="2470">
+                                <rect key="frame" x="13" y="70" width="62" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Folder" id="3487">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button verticalHuggingPriority="750" id="2473">
+                                <rect key="frame" x="387" y="61" width="135" height="32"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="3488">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="videoSettingChanged:" target="-2" id="OpE-LJ-bwy"/>
+                                </connections>
+                            </button>
+                            <textField verticalHuggingPriority="750" id="2474">
+                                <rect key="frame" x="80" y="40" width="209" height="22"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="vlcsnap-" drawsBackground="YES" id="3489">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <connections>
+                                    <action selector="videoSettingChanged:" target="-2" id="l7G-BO-EWd"/>
+                                    <outlet property="nextKeyView" destination="2468" id="3430"/>
+                                </connections>
+                            </textField>
+                            <textField verticalHuggingPriority="750" id="2475">
+                                <rect key="frame" x="13" y="43" width="62" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Prefix" id="3490">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button id="2476">
+                                <rect key="frame" x="295" y="43" width="223" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Sequential numbering" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3491">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="videoSettingChanged:" target="-2" id="qnw-Lv-7dq"/>
+                                </connections>
+                            </button>
+                            <textField verticalHuggingPriority="750" id="2477">
+                                <rect key="frame" x="13" y="14" width="62" height="17"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Format" id="3492">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <popUpButton verticalHuggingPriority="750" id="2478">
+                                <rect key="frame" x="77" y="8" width="215" height="26"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <popUpButtonCell key="cell" type="push" title="PNG" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2481" id="3493">
+                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="menu"/>
+                                    <menu key="menu" title="OtherViews" id="2479">
+                                        <items>
+                                            <menuItem title="PNG" state="on" id="2481"/>
+                                            <menuItem title="JPEG" id="2482"/>
+                                        </items>
+                                    </menu>
+                                </popUpButtonCell>
+                                <connections>
+                                    <action selector="videoSettingChanged:" target="-2" id="buC-OF-Rew"/>
+                                </connections>
+                            </popUpButton>
+                        </subviews>
+                        <animations/>
+                    </view>
+                    <animations/>
+                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
+                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </box>
             </subviews>
             <animations/>
+            <point key="canvasLocation" x="-392" y="89.5"/>
         </customView>
         <customView id="2562" userLabel="Input &amp; Codecs">
-            <rect key="frame" x="0.0" y="0.0" width="572" height="473"/>
+            <rect key="frame" x="0.0" y="0.0" width="572" height="446"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <box title="Caching" id="2572">
-                    <rect key="frame" x="17" y="234" width="537" height="88"/>
+                    <rect key="frame" x="17" y="207" width="537" height="88"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
                         <rect key="frame" x="2" y="2" width="533" height="71"/>
@@ -1208,14 +1230,14 @@ Gw
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
                 <box title="Codecs / Muxers" id="2585">
-                    <rect key="frame" x="17" y="16" width="536" height="211"/>
+                    <rect key="frame" x="17" y="16" width="536" height="184"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
-                        <rect key="frame" x="2" y="2" width="532" height="194"/>
+                        <rect key="frame" x="2" y="2" width="532" height="167"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField verticalHuggingPriority="750" id="2587">
-                                <rect key="frame" x="320" y="130" width="58" height="22"/>
+                                <rect key="frame" x="320" y="103" width="58" height="22"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1234" drawsBackground="YES" id="3516">
@@ -1236,7 +1258,7 @@ Gw
                                 </connections>
                             </textField>
                             <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="2589">
-                                <rect key="frame" x="383" y="127" width="19" height="27"/>
+                                <rect key="frame" x="383" y="100" width="19" height="27"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <stepperCell key="cell" continuous="YES" alignment="left" maxValue="8" valueWraps="YES" id="3517"/>
@@ -1245,7 +1267,7 @@ Gw
                                 </connections>
                             </stepper>
                             <textField verticalHuggingPriority="750" id="2592">
-                                <rect key="frame" x="13" y="133" width="246" height="17"/>
+                                <rect key="frame" x="15" y="106" width="246" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Post-Processing Quality" id="3518">
@@ -1255,7 +1277,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" id="2593">
-                                <rect key="frame" x="13" y="101" width="246" height="17"/>
+                                <rect key="frame" x="15" y="73" width="246" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Repair AVI Files" id="3519">
@@ -1265,7 +1287,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" id="2594">
-                                <rect key="frame" x="317" y="95" width="202" height="26"/>
+                                <rect key="frame" x="317" y="68" width="202" height="26"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="2598" id="3520">
@@ -1283,32 +1305,8 @@ Gw
                                     <action selector="inputSettingChanged:" target="-2" id="AYa-x1-EVT"/>
                                 </connections>
                             </popUpButton>
-                            <button id="2599">
-                                <rect key="frame" x="14" y="69" width="503" height="18"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <buttonCell key="cell" type="check" title="Use RTP over RTSP (TCP)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3521">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="inputSettingChanged:" target="-2" id="9jL-u8-t4O"/>
-                                </connections>
-                            </button>
-                            <button id="3647">
-                                <rect key="frame" x="14" y="16" width="503" height="18"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <buttonCell key="cell" type="check" title="Preload MKV files in the same directory" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3648">
-                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="inputSettingChanged:" target="-2" id="jnW-h4-mip"/>
-                                </connections>
-                            </button>
                             <textField verticalHuggingPriority="750" id="3434">
-                                <rect key="frame" x="13" y="45" width="302" height="17"/>
+                                <rect key="frame" x="15" y="42" width="302" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Skip the Loop filter for H.264 decoding" id="3522">
@@ -1317,27 +1315,8 @@ Gw
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <popUpButton verticalHuggingPriority="750" id="3435">
-                                <rect key="frame" x="317" y="39" width="202" height="26"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
-                                <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3439" id="3523">
-                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="menu"/>
-                                    <menu key="menu" title="OtherViews" id="3436">
-                                        <items>
-                                            <menuItem title="Item1" state="on" id="3439"/>
-                                            <menuItem title="Item2" id="3437"/>
-                                            <menuItem title="Item3" id="3438"/>
-                                        </items>
-                                    </menu>
-                                </popUpButtonCell>
-                                <connections>
-                                    <action selector="inputSettingChanged:" target="-2" id="I6O-un-hHx"/>
-                                </connections>
-                            </popUpButton>
                             <textField verticalHuggingPriority="750" id="3861">
-                                <rect key="frame" x="12" y="166" width="246" height="17"/>
+                                <rect key="frame" x="15" y="139" width="246" height="17"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Hardware Acceleration" id="3868">
@@ -1347,7 +1326,7 @@ Gw
                                 </textFieldCell>
                             </textField>
                             <popUpButton verticalHuggingPriority="750" id="3862">
-                                <rect key="frame" x="316" y="160" width="202" height="26"/>
+                                <rect key="frame" x="316" y="133" width="202" height="26"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <animations/>
                                 <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3865" id="3863">
@@ -1365,6 +1344,37 @@ Gw
                                     <action selector="inputSettingChanged:" target="-2" id="NbU-v1-MAD"/>
                                 </connections>
                             </popUpButton>
+                            <button id="lem-yf-jZB">
+                                <rect key="frame" x="15" y="11" width="248" height="18"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <buttonCell key="cell" type="check" title="Skip frames" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="lfl-mG-es8">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="inputSettingChanged:" target="-2" id="tI4-5J-NJ2"/>
+                                </connections>
+                            </button>
+                            <popUpButton verticalHuggingPriority="750" id="3435">
+                                <rect key="frame" x="316" y="36" width="202" height="26"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <animations/>
+                                <popUpButtonCell key="cell" type="push" title="Item1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="3439" id="3523">
+                                    <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="menu"/>
+                                    <menu key="menu" title="OtherViews" id="3436">
+                                        <items>
+                                            <menuItem title="Item1" state="on" id="3439"/>
+                                            <menuItem title="Item2" id="3437"/>
+                                            <menuItem title="Item3" id="3438"/>
+                                        </items>
+                                    </menu>
+                                </popUpButtonCell>
+                                <connections>
+                                    <action selector="inputSettingChanged:" target="-2" id="I6O-un-hHx"/>
+                                </connections>
+                            </popUpButton>
                         </subviews>
                         <animations/>
                     </view>
@@ -1373,7 +1383,7 @@ Gw
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
                 <box title="Network" id="2563">
-                    <rect key="frame" x="17" y="327" width="538" height="60"/>
+                    <rect key="frame" x="17" y="300" width="538" height="60"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <view key="contentView">
                         <rect key="frame" x="2" y="2" width="534" height="43"/>
@@ -1399,7 +1409,7 @@ Gw
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
                 <box autoresizesSubviews="NO" title="Record directory or filename" borderType="line" id="3623">
-                    <rect key="frame" x="17" y="391" width="538" height="62"/>
+                    <rect key="frame" x="17" y="364" width="538" height="62"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <view key="contentView">
                         <rect key="frame" x="1" y="1" width="536" height="46"/>
@@ -1439,6 +1449,7 @@ Gw
                 </box>
             </subviews>
             <animations/>
+            <point key="canvasLocation" x="883" y="170"/>
         </customView>
         <customView id="2523" userLabel="Subtitles &amp; OSD Settings">
             <rect key="frame" x="0.0" y="0.0" width="570" height="396"/>
@@ -1818,12 +1829,12 @@ Gw
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
                     <animations/>
-                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="3540">
+                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="3540">
                         <rect key="frame" x="1" y="294" width="528" height="15"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <animations/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="3539">
+                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="3539">
                         <rect key="frame" x="514" y="17" width="15" height="277"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <animations/>
index 5db8d26..0ab2423 100644 (file)
@@ -27,6 +27,7 @@
 
 @interface VLCSimplePrefs : NSWindowController
 
+// Audio pane
 @property (readwrite, weak) IBOutlet NSPopUpButton *audio_dolbyPopup;
 @property (readwrite, weak) IBOutlet NSTextField *audio_dolbyLabel;
 @property (readwrite, weak) IBOutlet NSBox *audio_effectsBox;
@@ -50,6 +51,7 @@
 @property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_yesButtonCell;
 @property (readwrite, weak) IBOutlet NSButtonCell *audio_autosavevol_noButtonCell;
 
+// hotkeys pane
 @property (readwrite, weak) IBOutlet NSButton *hotkeys_changeButton;
 @property (readwrite, weak) IBOutlet NSTextField *hotkeys_changeLabel;
 @property (readwrite, weak) IBOutlet NSTextField *hotkeys_change_keysLabel;
@@ -62,6 +64,7 @@
 @property (readwrite, weak) IBOutlet NSTableView *hotkeys_listbox;
 @property (readwrite, weak) IBOutlet NSView *hotkeysView;
 
+// input pane
 @property (readwrite, weak) IBOutlet NSBox *input_recordBox;
 @property (readwrite, weak) IBOutlet NSTextField *input_recordTextField;
 @property (readwrite, weak) IBOutlet NSButton *input_recordButton;
 @property (readwrite, weak) IBOutlet NSPopUpButton *input_avcodec_hwPopup;
 @property (readwrite, weak) IBOutlet NSTextField *input_postprocTextField;
 @property (readwrite, weak) IBOutlet NSTextField *input_postprocLabel;
-@property (readwrite, weak) IBOutlet NSButton *input_rtspCheckbox;
 @property (readwrite, weak) IBOutlet NSTextField *input_skipLoopLabel;
 @property (readwrite, weak) IBOutlet NSPopUpButton *input_skipLoopPopup;
-@property (readwrite, weak) IBOutlet NSButton *input_mkv_preload_dirCheckbox;
 @property (readwrite, weak) IBOutlet NSButton *input_urlhandlerButton;
+@property (readwrite, weak) IBOutlet NSButton *input_skipFramesCheckbox;
 @property (readwrite, weak) IBOutlet NSView *inputView;
 
+// intf pane - general box
+@property (readwrite, weak) IBOutlet NSBox *intf_generalSettingsBox;
 @property (readwrite, weak) IBOutlet NSPopUpButton *intf_languagePopup;
 @property (readwrite, weak) IBOutlet NSTextField *intf_languageLabel;
 @property (readwrite, weak) IBOutlet NSTextField *intf_styleLabel;
 @property (readwrite, weak) IBOutlet NSButtonCell *intf_style_darkButtonCell;
 @property (readwrite, weak) IBOutlet NSButtonCell *intf_style_brightButtonCell;
-@property (readwrite, weak) IBOutlet NSButton *intf_artCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_embeddedCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_fspanelCheckbox;
+
+// intf pane - control box
+@property (readwrite, weak) IBOutlet NSBox *intf_playbackControlBox;
+@property (readwrite, weak) IBOutlet NSTextField *intf_continueplaybackLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *intf_continueplaybackPopup;
 @property (readwrite, weak) IBOutlet NSButton *intf_appleremoteCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_appleremote_sysvolCheckbox;
 @property (readwrite, weak) IBOutlet NSButton *intf_mediakeysCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *intf_appleremote_sysvolCheckbox;
+
+// intf pane - behaviour box
+@property (readwrite, weak) IBOutlet NSBox *intf_playbackBehaviourBox;
+@property (readwrite, weak) IBOutlet NSButton *intf_enableNotificationsCheckbox;
+@property (readwrite, weak) IBOutlet NSTextField *intf_pauseitunesLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *intf_pauseitunesPopup;
+
+// intf pane - network box
 @property (readwrite, weak) IBOutlet NSBox *intf_networkBox;
-@property (readwrite, weak) IBOutlet NSView *intfView;
+@property (readwrite, weak) IBOutlet NSButton *intf_artCheckbox;
 @property (readwrite, weak) IBOutlet NSButton *intf_updateCheckbox;
 @property (readwrite, weak) IBOutlet NSTextField *intf_last_updateLabel;
-@property (readwrite, weak) IBOutlet NSButton *intf_enableNotificationsCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_nativefullscreenCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_autoresizeCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *intf_pauseminimizedCheckbox;
+
+// intf pane - http interface box
 @property (readwrite, weak) IBOutlet NSBox *intf_luahttpBox;
 @property (readwrite, weak) IBOutlet NSTextField *intf_luahttppwdLabel;
 @property (readwrite, weak) IBOutlet NSTextField *intf_luahttppwdTextField;
-@property (readwrite, weak) IBOutlet NSTextField *intf_pauseitunesLabel;
-@property (readwrite, weak) IBOutlet NSPopUpButton *intf_pauseitunesPopup;
-@property (readwrite, weak) IBOutlet NSTextField *intf_continueplaybackLabel;
-@property (readwrite, weak) IBOutlet NSPopUpButton *intf_continueplaybackPopup;
+@property (readwrite, weak) IBOutlet NSView *intfView;
 
+// osd pane
 @property (readwrite, weak) IBOutlet NSPopUpButton *osd_encodingPopup;
 @property (readwrite, weak) IBOutlet NSTextField *osd_encodingLabel;
 @property (readwrite, weak) IBOutlet NSBox *osd_fontBox;
 @property (readwrite, weak) IBOutlet NSButton *resetButton;
 @property (readwrite, weak) IBOutlet NSButton *saveButton;
 
-@property (readwrite, weak) IBOutlet NSButton *video_blackCheckbox;
-@property (readwrite, weak) IBOutlet NSPopUpButton *video_devicePopup;
-@property (readwrite, weak) IBOutlet NSTextField *video_deviceLabel;
-@property (readwrite, weak) IBOutlet NSBox *video_displayBox;
+// video pane
 @property (readwrite, weak) IBOutlet NSButton *video_enableCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *video_fullscreenCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *video_videodecoCheckbox;
+// video pane - display box
+@property (readwrite, weak) IBOutlet NSBox *video_displayBox;
+@property (readwrite, weak) IBOutlet NSButton *video_embeddedCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *video_pauseWhenMinimizedCheckbox;
 @property (readwrite, weak) IBOutlet NSButton *video_onTopCheckbox;
-@property (readwrite, weak) IBOutlet NSButton *video_skipFramesCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *video_videodecoCheckbox;
+
+// video pane - fullscreen box
+@property (readwrite, weak) IBOutlet NSBox *video_fullscreenBox;
+@property (readwrite, weak) IBOutlet NSButton *video_startInFullscreenCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *video_blackScreenCheckbox;
+@property (readwrite, weak) IBOutlet NSButton *video_nativeFullscreenCheckbox;
+@property (readwrite, weak) IBOutlet NSTextField *video_deviceLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *video_devicePopup;
+
+// video pane - video box
+@property (readwrite, weak) IBOutlet NSBox *video_videoBox;
+@property (readwrite, weak) IBOutlet NSTextField *video_deinterlaceLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlacePopup;
+@property (readwrite, weak) IBOutlet NSTextField *video_deinterlace_modeLabel;
+@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlace_modePopup;
+
+// video pane - snapshot box
 @property (readwrite, weak) IBOutlet NSBox *video_snapBox;
 @property (readwrite, weak) IBOutlet NSButton *video_snap_folderButton;
 @property (readwrite, weak) IBOutlet NSTextField *video_snap_folderTextField;
 @property (readwrite, weak) IBOutlet NSTextField *video_snap_prefixTextField;
 @property (readwrite, weak) IBOutlet NSTextField *video_snap_prefixLabel;
 @property (readwrite, weak) IBOutlet NSButton *video_snap_seqnumCheckbox;
-@property (readwrite, weak) IBOutlet NSTextField *video_deinterlaceLabel;
-@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlacePopup;
-@property (readwrite, weak) IBOutlet NSTextField *video_deinterlace_modeLabel;
-@property (readwrite, weak) IBOutlet NSPopUpButton *video_deinterlace_modePopup;
-@property (readwrite, weak) IBOutlet NSBox *video_videoBox;
+
 @property (readwrite, weak) IBOutlet NSView *videoView;
 
 @property (readwrite, weak) IBOutlet NSTextField *urlhandler_titleLabel;
index af0a982..4781347 100644 (file)
@@ -351,10 +351,9 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
     [_input_netBox setTitle: _NS("Network")];
     [_input_avcodec_hwLabel setStringValue: _NS("Hardware Acceleration")];
     [_input_postprocLabel setStringValue: _NS("Post-Processing Quality")];
-    [_input_rtspCheckbox setTitle: _NS("Use RTP over RTSP (TCP)")];
     [_input_skipLoopLabel setStringValue: _NS("Skip the loop filter for H.264 decoding")];
-    [_input_mkv_preload_dirCheckbox setTitle: _NS("Preload MKV files in the same directory")];
     [_input_urlhandlerButton setTitle: _NS("Edit default application settings for network protocols")];
+    [_input_skipFramesCheckbox setTitle: _NS("Skip frames")];
 
     /* url handler */
     [_urlhandler_titleLabel setStringValue: _NS("Open network streams using the following protocols")];
@@ -363,27 +362,29 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
     [_urlhandler_cancelButton setTitle: _NS("Cancel")];
 
     /* interface */
+    [_intf_generalSettingsBox setTitle:_NS("General settings")];
     [_intf_languageLabel setStringValue: _NS("Language")];
     [_intf_styleLabel setStringValue: _NS("Interface style")];
     [_intf_style_darkButtonCell setTitle: _NS("Dark")];
     [_intf_style_brightButtonCell setTitle: _NS("Bright")];
-    [_intf_embeddedCheckbox setTitle: _NS("Show video within the main window")];
-    [_intf_nativefullscreenCheckbox setTitle: _NS("Use the native fullscreen mode")];
-    [_intf_fspanelCheckbox setTitle: _NS("Show Fullscreen Controller")];
-    [_intf_networkBox setTitle: _NS("Privacy / Network Interaction")];
+
+    [_intf_playbackControlBox setTitle:_NS("Playback control")];
+    [_intf_continueplaybackLabel setStringValue:_NS("Continue playback")];
     [_intf_appleremoteCheckbox setTitle: _NS("Control playback with the Apple Remote")];
-    [_intf_appleremote_sysvolCheckbox setTitle: _NS("Control system volume with the Apple Remote")];
     [_intf_mediakeysCheckbox setTitle: _NS("Control playback with media keys")];
+    [_intf_appleremote_sysvolCheckbox setTitle: _NS("Control system volume with the Apple Remote")];
+
+    [_intf_playbackBehaviourBox setTitle:_NS("Playback behaviour")];
+    [_intf_enableNotificationsCheckbox setTitle: _NS("Enable notifications on playlist item change")];
+    [_intf_pauseitunesLabel setStringValue:_NS("Control external music players")];
+
+    [_intf_networkBox setTitle: _NS("Privacy / Network Interaction")];
     [_intf_artCheckbox setTitle: _NS("Allow metadata network access")];
     [_intf_updateCheckbox setTitle: _NS("Automatically check for updates")];
     [_intf_last_updateLabel setStringValue: @""];
-    [_intf_enableNotificationsCheckbox setTitle: _NS("Enable notifications on playlist item change")];
-    [_intf_autoresizeCheckbox setTitle: _NS("Resize interface to the native video size")];
-    [_intf_pauseminimizedCheckbox setTitle: _NS("Pause the video playback when minimized")];
-    [_intf_luahttpBox setTitle:_NS("Lua HTTP")];
+
+    [_intf_luahttpBox setTitle:_NS("HTTP web interface")];
     [_intf_luahttppwdLabel setStringValue:_NS("Password")];
-    [_intf_pauseitunesLabel setStringValue:_NS("Control external music players")];
-    [_intf_continueplaybackLabel setStringValue:_NS("Continue playback")];
 
     /* Subtitles and OSD */
     [_osd_encodingLabel setStringValue: _NS("Default Encoding")];
@@ -402,14 +403,19 @@ create_toolbar_item(NSString *itemIdent, NSString *name, NSString *desc, NSStrin
     [_osd_outline_thicknessLabel setStringValue: _NS("Outline thickness")];
 
     /* video */
-    [_video_blackCheckbox setTitle: _NS("Black screens in Fullscreen mode")];
-    [_video_deviceLabel setStringValue: _NS("Fullscreen Video Device")];
-    [_video_displayBox setTitle: _NS("Display")];
     [_video_enableCheckbox setTitle: _NS("Enable video")];
-    [_video_fullscreenCheckbox setTitle: _NS("Fullscreen")];
-    [_video_videodecoCheckbox setTitle: _NS("Window decorations")];
+    [_video_displayBox setTitle: _NS("Display")];
+    [_video_embeddedCheckbox setTitle: _NS("Show video within the main window")];
+    [_video_pauseWhenMinimizedCheckbox setTitle:_NS("Pause the video playback when minimized")];
     [_video_onTopCheckbox setTitle: _NS("Float on Top")];
-    [_video_skipFramesCheckbox setTitle: _NS("Skip frames")];
+    [_video_videodecoCheckbox setTitle: _NS("Window decorations")];
+
+    [_video_fullscreenBox setTitle:_NS("Fullscreen settings")];
+    [_video_startInFullscreenCheckbox setTitle:_NS("Start in fullscreen")];
+    [_video_blackScreenCheckbox setTitle: _NS("Black screens in Fullscreen mode")];
+    [_video_nativeFullscreenCheckbox setTitle: _NS("Use the native fullscreen mode")];
+    [_video_deviceLabel setStringValue: _NS("Fullscreen Video Device")];
+
     [_video_snapBox setTitle: _NS("Video snapshots")];
     [_video_snap_folderButton setTitle: _NS("Browse...")];
     [_video_snap_folderLabel setStringValue: _NS("Folder")];
@@ -568,18 +574,18 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
     }
     [_intf_languagePopup selectItemAtIndex:sel];
 
-    [self setupButton:_intf_artCheckbox forBoolValue: "metadata-network-access"];
-
-    [self setupButton:_intf_fspanelCheckbox forBoolValue: "macosx-fspanel"];
+    [self setupButton:_intf_continueplaybackPopup forIntList: "macosx-continue-playback"];
+    [self setupButton:_intf_appleremoteCheckbox forBoolValue: "macosx-appleremote"];
+    [self setupButton:_intf_appleremote_sysvolCheckbox forBoolValue: "macosx-appleremote-sysvol"];
+    [self setupButton:_intf_mediakeysCheckbox forBoolValue: "macosx-mediakeys"];
 
-    [self setupButton:_intf_nativefullscreenCheckbox forBoolValue: "macosx-nativefullscreenmode"];
+    [self setupButton:_video_nativeFullscreenCheckbox forBoolValue: "macosx-nativefullscreenmode"];
+    [self setupButton:_video_embeddedCheckbox forBoolValue: "embedded-video"];
 
-    [self setupButton:_intf_embeddedCheckbox forBoolValue: "embedded-video"];
+    [self setupButton:_intf_pauseitunesPopup forIntList: "macosx-control-itunes"];
 
-    [self setupButton:_intf_appleremoteCheckbox forBoolValue: "macosx-appleremote"];
-    [self setupButton:_intf_appleremote_sysvolCheckbox forBoolValue: "macosx-appleremote-sysvol"];
+    [self setupButton:_intf_artCheckbox forBoolValue: "metadata-network-access"];
 
-    [self setupButton:_intf_mediakeysCheckbox forBoolValue: "macosx-mediakeys"];
 
 #ifdef HAVE_SPARKLE
     if ([[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL)
@@ -601,11 +607,8 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
         [_intf_style_darkButtonCell setState: NO];
         [_intf_style_brightButtonCell setState: YES];
     }
-    [self setupButton:_intf_autoresizeCheckbox forBoolValue: "macosx-video-autoresize"];
-    [self setupButton:_intf_pauseminimizedCheckbox forBoolValue: "macosx-pause-minimized"];
+
     [self setupField:_intf_luahttppwdTextField forOption: "http-password"];
-    [self setupButton:_intf_pauseitunesPopup forIntList: "macosx-control-itunes"];
-    [self setupButton:_intf_continueplaybackPopup forIntList: "macosx-continue-playback"];
 
     /******************
      * audio settings *
@@ -660,11 +663,11 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
      * video settings *
      ******************/
     [self setupButton:_video_enableCheckbox forBoolValue: "video"];
-    [self setupButton:_video_fullscreenCheckbox forBoolValue: "fullscreen"];
+    [self setupButton:_video_startInFullscreenCheckbox forBoolValue: "fullscreen"];
     [self setupButton:_video_onTopCheckbox forBoolValue: "video-on-top"];
-    [self setupButton:_video_skipFramesCheckbox forBoolValue: "skip-frames"];
-    [self setupButton:_video_blackCheckbox forBoolValue: "macosx-black"];
+    [self setupButton:_video_blackScreenCheckbox forBoolValue: "macosx-black"];
     [self setupButton:_video_videodecoCheckbox forBoolValue: "video-deco"];
+    [self setupButton:_video_pauseWhenMinimizedCheckbox forBoolValue: "macosx-pause-minimized"];
 
     [_video_devicePopup removeAllItems];
     i = 0;
@@ -690,7 +693,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
     [self setupButton:_video_deinterlace_modePopup forStringList: "deinterlace-mode"];
 
     // set lion fullscreen mode restrictions
-    [self enableLionFullscreenMode: [_intf_nativefullscreenCheckbox state]];
+    [self enableLionFullscreenMode: [_video_nativeFullscreenCheckbox state]];
 
     /***************************
      * input & codecs settings *
@@ -699,14 +702,10 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
     [_input_postprocTextField setIntValue: config_GetInt(p_intf, "postproc-q")];
     [_input_postprocTextField setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))];
     [self setupButton:_input_avcodec_hwPopup forModuleList: "avcodec-hw"];
-
+    [self setupButton:_input_skipFramesCheckbox forBoolValue: "skip-frames"];
     [self setupButton:_input_aviPopup forIntList: "avi-index"];
-
-    [self setupButton:_input_rtspCheckbox forBoolValue: "rtsp-tcp"];
     [self setupButton:_input_skipLoopPopup forIntList: "avcodec-skiploopfilter"];
 
-    [self setupButton:_input_mkv_preload_dirCheckbox forBoolValue: "mkv-preload-local-dir"];
-
     [_input_cachelevelPopup removeAllItems];
     NSMenuItem *item = [[_input_cachelevelPopup menu] addItemWithTitle:_NS("Custom") action:nil keyEquivalent:@""];
     [item setTag: 0];
@@ -919,16 +918,14 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
 
         config_PutInt(p_intf, "metadata-network-access", [_intf_artCheckbox state]);
 
-        config_PutInt(p_intf, "macosx-fspanel", [_intf_fspanelCheckbox state]);
-        config_PutInt(p_intf, "embedded-video", [_intf_embeddedCheckbox state]);
+        config_PutInt(p_intf, "embedded-video", [_video_embeddedCheckbox state]);
 
         config_PutInt(p_intf, "macosx-appleremote", [_intf_appleremoteCheckbox state]);
         config_PutInt(p_intf, "macosx-appleremote-sysvol", [_intf_appleremote_sysvolCheckbox state]);
         config_PutInt(p_intf, "macosx-mediakeys", [_intf_mediakeysCheckbox state]);
         config_PutInt(p_intf, "macosx-interfacestyle", [_intf_style_darkButtonCell state]);
-        config_PutInt(p_intf, "macosx-nativefullscreenmode", [_intf_nativefullscreenCheckbox state]);
-        config_PutInt(p_intf, "macosx-pause-minimized", [_intf_pauseminimizedCheckbox state]);
-        config_PutInt(p_intf, "macosx-video-autoresize", [_intf_autoresizeCheckbox state]);
+        config_PutInt(p_intf, "macosx-nativefullscreenmode", [_video_nativeFullscreenCheckbox state]);
+
         if ([_intf_enableNotificationsCheckbox state] == NSOnState) {
             tmpString = getString("control");
             tmpRange = [tmpString rangeOfString:@"growl"];
@@ -1000,11 +997,12 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
      ******************/
     if (_videoSettingChanged) {
         config_PutInt(p_intf, "video", [_video_enableCheckbox state]);
-        config_PutInt(p_intf, "fullscreen", [_video_fullscreenCheckbox state]);
+        config_PutInt(p_intf, "fullscreen", [_video_startInFullscreenCheckbox state]);
         config_PutInt(p_intf, "video-deco", [_video_videodecoCheckbox state]);
         config_PutInt(p_intf, "video-on-top", [_video_onTopCheckbox state]);
-        config_PutInt(p_intf, "skip-frames", [_video_skipFramesCheckbox state]);
-        config_PutInt(p_intf, "macosx-black", [_video_blackCheckbox state]);
+        config_PutInt(p_intf, "macosx-black", [_video_blackScreenCheckbox state]);
+
+        config_PutInt(p_intf, "macosx-pause-minimized", [_video_pauseWhenMinimizedCheckbox state]);
 
         config_PutInt(p_intf, "macosx-vdev", [[_video_devicePopup selectedItem] tag]);
 
@@ -1023,15 +1021,13 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
     if (_inputSettingChanged) {
         config_PutPsz(p_intf, "input-record-path", [[_input_recordTextField stringValue] UTF8String]);
         config_PutInt(p_intf, "postproc-q", [_input_postprocTextField intValue]);
+        config_PutInt(p_intf, "skip-frames", [_input_skipFramesCheckbox state]);
 
         SaveIntList(_input_aviPopup, "avi-index");
 
-        config_PutInt(p_intf, "rtsp-tcp", [_input_rtspCheckbox state]);
         SaveModuleList(_input_avcodec_hwPopup, "avcodec-hw");
         SaveIntList(_input_skipLoopPopup, "avcodec-skiploopfilter");
 
-        config_PutInt(p_intf, "mkv-preload-local-dir", [_input_mkv_preload_dirCheckbox state]);
-
         #define CaC(name, factor) config_PutInt(p_intf, name, [[_input_cachelevelPopup selectedItem] tag] * factor)
         if ([[_input_cachelevelPopup selectedItem] tag] == 0) {
             msg_Dbg(p_intf, "Custom chosen, not adjusting cache values");
@@ -1131,26 +1127,23 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
 - (void)enableLionFullscreenMode: (BOOL)_value
 {
     [_video_videodecoCheckbox setEnabled: !_value];
-    [_video_blackCheckbox setEnabled: !_value];
+    [_video_blackScreenCheckbox setEnabled: !_value];
 
     if (_value) {
         [_video_videodecoCheckbox setState: NSOnState];
-        [_video_blackCheckbox setState: NSOffState];
+        [_video_blackScreenCheckbox setState: NSOffState];
 
         NSString *tooltipText = _NS("This setting cannot be changed because the native fullscreen mode is enabled.");
         [_video_videodecoCheckbox setToolTip:tooltipText];
-        [_video_blackCheckbox setToolTip:tooltipText];
+        [_video_blackScreenCheckbox setToolTip:tooltipText];
     } else {
         [self setupButton:_video_videodecoCheckbox forBoolValue: "video-deco"];
-        [self setupButton:_video_blackCheckbox forBoolValue: "macosx-black"];
+        [self setupButton:_video_blackScreenCheckbox forBoolValue: "macosx-black"];
     }
 }
 
 - (IBAction)interfaceSettingChanged:(id)sender
 {
-    if (sender == _intf_nativefullscreenCheckbox)
-        [self enableLionFullscreenMode:[sender state]];
-
     _intfSettingChanged = YES;
 }
 
@@ -1193,7 +1186,9 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
 
 - (IBAction)videoSettingChanged:(id)sender
 {
-    if (sender == _video_snap_folderButton) {
+    if (sender == _video_nativeFullscreenCheckbox)
+        [self enableLionFullscreenMode:[sender state]];
+    else if (sender == _video_snap_folderButton) {
         _selectFolderPanel = [[NSOpenPanel alloc] init];
         [_selectFolderPanel setCanChooseDirectories: YES];
         [_selectFolderPanel setCanChooseFiles: NO];