vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Mar 10 19:00:57 2019 +0100| [2d86e202c47af13cf1f77d485ef1c0b9885bfbab] | committer: Felix Paul Kühne
macosx/info panel: start modernization > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d86e202c47af13cf1f77d485ef1c0b9885bfbab --- .../package/macosx/VLC.xcodeproj/project.pbxproj | 12 +- modules/gui/macosx/Makefile.am | 4 +- modules/gui/macosx/UI/MediaInfo.xib | 218 ++++++++++----------- .../gui/macosx/coreinteraction/VLCInputManager.m | 2 +- modules/gui/macosx/main/VLCMain.h | 5 +- modules/gui/macosx/main/VLCMain.m | 8 +- modules/gui/macosx/menus/VLCMainMenu.m | 2 +- ...listInfo.h => VLCInformationWindowController.h} | 23 +-- ...listInfo.m => VLCInformationWindowController.m} | 31 +-- .../macosx/windows/video/VLCVideoOutputProvider.m | 2 +- 10 files changed, 149 insertions(+), 158 deletions(-) diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj index ef9ee2d129..86ea6d57f5 100644 --- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj +++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj @@ -45,7 +45,7 @@ 1C3113DD1E508C6900D4DD76 /* VLCTrackSynchronizationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC707EC4137464CD0003010A /* VLCTrackSynchronizationWindowController.m */; }; 1C3113DF1E508C6900D4DD76 /* VLCVideoEffectsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCE366E13817E4500694F2A /* VLCVideoEffectsWindowController.m */; }; 1C3113E11E508C6900D4DD76 /* VLCVoutView.m in Sources */ = {isa = PBXBuildFile; fileRef = CCCCDCA11413E1C000FE3DE1 /* VLCVoutView.m */; }; - 1C3113E51E508C6900D4DD76 /* VLCPlaylistInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */; }; + 1C3113E51E508C6900D4DD76 /* VLCInformationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E49720106417F6800370C9F /* VLCInformationWindowController.m */; }; 1C3113E91E508C6900D4DD76 /* VLCScrollingClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B13E2A71BC67678001AD24A /* VLCScrollingClipView.m */; }; 1C3113ED1E508C6900D4DD76 /* VLCTimeSelectionPanelController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD3667A1B7A242E0054E39F /* VLCTimeSelectionPanelController.m */; }; 1C3113EF1E508C7600D4DD76 /* VLCRendererDiscovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BBBB8B61D114628001BD9BA /* VLCRendererDiscovery.m */; }; @@ -519,8 +519,8 @@ 7DF812EE1B555A340052293C /* VLCInputManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCInputManager.m; sourceTree = "<group>"; }; 7DF812EF1B555C8E0052293C /* VLCKeyboardBacklightControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCKeyboardBacklightControl.h; sourceTree = "<group>"; }; 7DF812F01B555C8E0052293C /* VLCKeyboardBacklightControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCKeyboardBacklightControl.m; sourceTree = "<group>"; }; - 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPlaylistInfo.h; sourceTree = "<group>"; }; - 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPlaylistInfo.m; sourceTree = "<group>"; }; + 8E49720006417F6800370C9F /* VLCInformationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCInformationWindowController.h; sourceTree = "<group>"; }; + 8E49720106417F6800370C9F /* VLCInformationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCInformationWindowController.m; sourceTree = "<group>"; }; 8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCOutput.h; sourceTree = "<group>"; }; 8E55FB800459B0FD00FB3317 /* VLCOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCOutput.m; sourceTree = "<group>"; }; 8E6BC6F6041643860059A3A7 /* applescript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = applescript.h; sourceTree = "<group>"; }; @@ -713,8 +713,8 @@ CC5560241365CDC800D54038 /* VLCAudioEffectsWindowController.m */, DCE7BD0708A5724D007B10AE /* VLCBookmarksWindowController.h */, DCE7BD0608A5724D007B10AE /* VLCBookmarksWindowController.m */, - 8E49720006417F6800370C9F /* VLCPlaylistInfo.h */, - 8E49720106417F6800370C9F /* VLCPlaylistInfo.m */, + 8E49720006417F6800370C9F /* VLCInformationWindowController.h */, + 8E49720106417F6800370C9F /* VLCInformationWindowController.m */, 1CD366791B7A242E0054E39F /* VLCTimeSelectionPanelController.h */, 1CD3667A1B7A242E0054E39F /* VLCTimeSelectionPanelController.m */, CC707EC3137464CD0003010A /* VLCTrackSynchronizationWindowController.h */, @@ -1636,7 +1636,7 @@ 6B6FFF701EF9EC350001CEB1 /* CompatibilityFixes.m in Sources */, 1C3113DF1E508C6900D4DD76 /* VLCVideoEffectsWindowController.m in Sources */, 1C3113E11E508C6900D4DD76 /* VLCVoutView.m in Sources */, - 1C3113E51E508C6900D4DD76 /* VLCPlaylistInfo.m in Sources */, + 1C3113E51E508C6900D4DD76 /* VLCInformationWindowController.m in Sources */, 6B7F1FDF1F07DA920002BDD8 /* VLCHexNumberFormatter.m in Sources */, 7DB40D2A20CBCEB500F63173 /* VLCMainMenu.m in Sources */, 1C3113E91E508C6900D4DD76 /* VLCScrollingClipView.m in Sources */, diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 06eeac58fd..9a342bd748 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -103,8 +103,8 @@ libmacosx_plugin_la_SOURCES = \ gui/macosx/panels/VLCAudioEffectsWindowController.m \ gui/macosx/panels/VLCBookmarksWindowController.h \ gui/macosx/panels/VLCBookmarksWindowController.m \ - gui/macosx/panels/VLCPlaylistInfo.h \ - gui/macosx/panels/VLCPlaylistInfo.m \ + gui/macosx/panels/VLCInformationWindowController.h \ + gui/macosx/panels/VLCInformationWindowController.m \ gui/macosx/panels/VLCTimeSelectionPanelController.h \ gui/macosx/panels/VLCTimeSelectionPanelController.m \ gui/macosx/panels/VLCTrackSynchronizationWindowController.h \ diff --git a/modules/gui/macosx/UI/MediaInfo.xib b/modules/gui/macosx/UI/MediaInfo.xib index aa20fc45c8..a2e5c99fb7 100644 --- a/modules/gui/macosx/UI/MediaInfo.xib +++ b/modules/gui/macosx/UI/MediaInfo.xib @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17E199" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <dependencies> - <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> - <capability name="box content view" minToolsVersion="7.0"/> + <deployment identifier="macosx"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> - <customObject id="-2" userLabel="File's Owner" customClass="VLCInfo"> + <customObject id="-2" userLabel="File's Owner" customClass="VLCInformationWindowController"> <connections> <outlet property="audioDecodedLabel" destination="583" id="684"/> <outlet property="audioDecodedTextField" destination="582" id="685"/> @@ -70,22 +70,22 @@ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES" HUD="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/> <rect key="contentRect" x="196" y="34" width="506" height="476"/> - <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/> - <view key="contentView" id="3"> + <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/> + <view key="contentView" misplaced="YES" id="3"> <rect key="frame" x="0.0" y="0.0" width="506" height="476"/> <autoresizingMask key="autoresizingMask"/> <subviews> - <tabView drawsBackground="NO" type="noTabsNoBorder" initialItem="419" translatesAutoresizingMaskIntoConstraints="NO" id="418"> + <tabView misplaced="YES" drawsBackground="NO" type="noTabsNoBorder" initialItem="419" translatesAutoresizingMaskIntoConstraints="NO" id="418"> <rect key="frame" x="-21" y="-1" width="542" height="444"/> <font key="font" metaFont="system"/> <tabViewItems> <tabViewItem label="General" identifier="1" id="419"> <view key="view" id="422"> - <rect key="frame" x="0.0" y="0.0" width="542" height="432"/> + <rect key="frame" x="0.0" y="0.0" width="542" height="444"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="427"> - <rect key="frame" x="37" y="392" width="468" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="427"> + <rect key="frame" x="37" y="404" width="468" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="428"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -95,8 +95,8 @@ <action selector="metaFieldChanged:" target="-2" id="726"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="429"> - <rect key="frame" x="35" y="414" width="373" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="429"> + <rect key="frame" x="35" y="426" width="373" height="14"/> <constraints> <constraint firstAttribute="width" constant="369" id="QQR-jU-J5W"/> </constraints> @@ -106,8 +106,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="509"> - <rect key="frame" x="37" y="18" width="468" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="509"> + <rect key="frame" x="37" y="30" width="468" height="19"/> <constraints> <constraint firstAttribute="width" constant="468" id="CrL-XR-Ww4"/> <constraint firstAttribute="height" constant="19" id="POw-kc-CJg"/> @@ -118,16 +118,16 @@ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="510"> - <rect key="frame" x="35" y="40" width="475" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="510"> + <rect key="frame" x="35" y="52" width="475" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Location" id="511"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="431"> - <rect key="frame" x="37" y="349" width="368" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="431"> + <rect key="frame" x="37" y="361" width="368" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="434"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -137,16 +137,16 @@ <action selector="metaFieldChanged:" target="-2" id="724"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="432"> - <rect key="frame" x="35" y="371" width="330" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="432"> + <rect key="frame" x="35" y="383" width="330" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Artist" id="433"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="435"> - <rect key="frame" x="413" y="349" width="92" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="435"> + <rect key="frame" x="413" y="361" width="92" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="438"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -156,8 +156,8 @@ <action selector="metaFieldChanged:" target="-2" id="725"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="436"> - <rect key="frame" x="411" y="371" width="93" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="436"> + <rect key="frame" x="411" y="383" width="93" height="13"/> <constraints> <constraint firstAttribute="width" constant="89" id="R0Z-z4-bc9"/> </constraints> @@ -167,8 +167,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="439"> - <rect key="frame" x="37" y="306" width="368" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="439"> + <rect key="frame" x="37" y="318" width="368" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="446"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -178,16 +178,16 @@ <action selector="metaFieldChanged:" target="-2" id="722"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="440"> - <rect key="frame" x="35" y="328" width="330" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="440"> + <rect key="frame" x="35" y="340" width="330" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Album" id="445"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="441"> - <rect key="frame" x="413" y="306" width="92" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="441"> + <rect key="frame" x="413" y="318" width="92" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="444"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -197,16 +197,16 @@ <action selector="metaFieldChanged:" target="-2" id="723"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="442"> - <rect key="frame" x="411" y="328" width="93" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="442"> + <rect key="frame" x="411" y="340" width="93" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Track Number" id="443"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="461"> - <rect key="frame" x="37" y="263" width="300" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="461"> + <rect key="frame" x="37" y="275" width="300" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="468"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -216,16 +216,16 @@ <action selector="metaFieldChanged:" target="-2" id="720"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="462"> - <rect key="frame" x="35" y="285" width="307" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="462"> + <rect key="frame" x="35" y="297" width="307" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Genre" id="467"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="476"> - <rect key="frame" x="37" y="220" width="300" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="476"> + <rect key="frame" x="37" y="232" width="300" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="479"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -235,16 +235,16 @@ <action selector="metaFieldChanged:" target="-2" id="719"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="477"> - <rect key="frame" x="35" y="242" width="307" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="477"> + <rect key="frame" x="35" y="254" width="307" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Now Playing" id="478"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" horizontalHuggingPriority="200" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="481"> - <rect key="frame" x="37" y="91" width="228" height="19"/> + <textField focusRingType="none" horizontalHuggingPriority="200" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="481"> + <rect key="frame" x="37" y="103" width="228" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="484"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -254,16 +254,16 @@ <action selector="metaFieldChanged:" target="-2" id="715"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="482"> - <rect key="frame" x="35" y="113" width="232" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="482"> + <rect key="frame" x="35" y="125" width="232" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Publisher" id="483"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="504"> - <rect key="frame" x="273" y="86" width="232" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="504"> + <rect key="frame" x="273" y="98" width="232" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="507"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -273,16 +273,16 @@ <action selector="metaFieldChanged:" target="-2" id="716"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="505"> - <rect key="frame" x="273" y="108" width="232" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="505"> + <rect key="frame" x="273" y="120" width="232" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encoded by" id="506"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="486"> - <rect key="frame" x="37" y="134" width="300" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="486"> + <rect key="frame" x="37" y="146" width="300" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="489"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -292,16 +292,16 @@ <action selector="metaFieldChanged:" target="-2" id="717"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="487"> - <rect key="frame" x="35" y="156" width="307" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="487"> + <rect key="frame" x="35" y="168" width="307" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Copyright" id="488"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="497"> - <rect key="frame" x="37" y="177" width="300" height="19"/> + <textField focusRingType="none" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="497"> + <rect key="frame" x="37" y="189" width="300" height="19"/> <constraints> <constraint firstAttribute="width" constant="300" id="fNh-e9-7HF"/> </constraints> @@ -314,16 +314,16 @@ <action selector="metaFieldChanged:" target="-2" id="718"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="498"> - <rect key="frame" x="35" y="199" width="307" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="498"> + <rect key="frame" x="35" y="211" width="307" height="13"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Description" id="499"> <font key="font" metaFont="label"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="463"> - <rect key="frame" x="345" y="263" width="160" height="19"/> + <textField focusRingType="none" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="463"> + <rect key="frame" x="345" y="275" width="160" height="19"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" focusRingType="none" drawsBackground="YES" id="466"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -333,8 +333,8 @@ <action selector="metaFieldChanged:" target="-2" id="721"/> </connections> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="464"> - <rect key="frame" x="343" y="285" width="93" height="13"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="464"> + <rect key="frame" x="343" y="297" width="93" height="13"/> <constraints> <constraint firstAttribute="width" constant="89" id="qse-Y4-EaG"/> </constraints> @@ -344,16 +344,16 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <imageView translatesAutoresizingMaskIntoConstraints="NO" id="88"> - <rect key="frame" x="345" y="118" width="160" height="130"/> + <imageView misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="88"> + <rect key="frame" x="345" y="130" width="160" height="130"/> <constraints> <constraint firstAttribute="height" constant="130" id="f2E-e5-UdD"/> <constraint firstAttribute="width" constant="160" id="gEI-GS-p8S"/> </constraints> <imageCell key="cell" controlSize="small" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="noart" id="374"/> </imageView> - <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="412"> - <rect key="frame" x="345" y="60" width="160" height="19"/> + <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="412"> + <rect key="frame" x="345" y="72" width="160" height="19"/> <buttonCell key="cell" type="roundRect" title="Save Metadata" bezelStyle="roundedRect" alignment="center" enabled="NO" borderStyle="border" inset="2" id="413"> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <font key="font" metaFont="cellTitle"/> @@ -459,10 +459,10 @@ <rect key="frame" x="17" y="0.0" width="510" height="440"/> <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="jDW-Lc-WE4"> <rect key="frame" x="0.0" y="0.0" width="510" height="440"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> + <autoresizingMask key="autoresizingMask"/> <subviews> <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="521" id="519"> - <rect key="frame" x="0.0" y="0.0" width="510" height="19"/> + <rect key="frame" x="0.0" y="0.0" width="510" height="440"/> <autoresizingMask key="autoresizingMask"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -498,11 +498,11 @@ </outlineView> </subviews> </clipView> - <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="518"> + <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="518"> <rect key="frame" x="0.0" y="428" width="510" height="16"/> <autoresizingMask key="autoresizingMask"/> </scroller> - <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="517"> + <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="517"> <rect key="frame" x="-100" y="-100" width="15" height="458"/> <autoresizingMask key="autoresizingMask"/> </scroller> @@ -521,14 +521,14 @@ <rect key="frame" x="0.0" y="0.0" width="542" height="444"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="549" userLabel="Input Box"> + <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="549" userLabel="Input Box"> <rect key="frame" x="31" y="306" width="486" height="109"/> <view key="contentView" id="enP-o2-JOw"> - <rect key="frame" x="1" y="1" width="484" height="107"/> + <rect key="frame" x="3" y="3" width="480" height="103"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="531"> - <rect key="frame" x="12" y="78" width="370" height="14"/> + <rect key="frame" x="12" y="74" width="370" height="14"/> <constraints> <constraint firstAttribute="width" constant="366" id="Fe5-cw-cYX"/> </constraints> @@ -539,7 +539,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="535"> - <rect key="frame" x="384" y="78" width="89" height="14"/> + <rect key="frame" x="384" y="74" width="89" height="14"/> <constraints> <constraint firstAttribute="width" constant="85" id="jaJ-qV-SHG"/> </constraints> @@ -550,7 +550,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="537"> - <rect key="frame" x="12" y="59" width="370" height="14"/> + <rect key="frame" x="12" y="55" width="370" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Input bitrate" id="540"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -558,7 +558,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="538"> - <rect key="frame" x="384" y="59" width="89" height="14"/> + <rect key="frame" x="384" y="55" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000 kB/s" id="539"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -566,7 +566,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="541"> - <rect key="frame" x="12" y="40" width="370" height="14"/> + <rect key="frame" x="12" y="36" width="370" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Demuxed" id="544"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -574,7 +574,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="542"> - <rect key="frame" x="384" y="40" width="89" height="14"/> + <rect key="frame" x="384" y="36" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000 kB" id="543"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -582,7 +582,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="545"> - <rect key="frame" x="12" y="21" width="370" height="14"/> + <rect key="frame" x="12" y="17" width="370" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Stream bitrate" id="548"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -590,7 +590,7 @@ </textFieldCell> </textField> <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="546"> - <rect key="frame" x="384" y="21" width="89" height="14"/> + <rect key="frame" x="384" y="17" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000 kB/s" id="547"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -649,14 +649,14 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="573" userLabel="Audio Box"> + <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="573" userLabel="Audio Box"> <rect key="frame" x="275" y="182" width="242" height="109"/> <view key="contentView" id="7tR-kf-2ax"> - <rect key="frame" x="1" y="1" width="240" height="107"/> + <rect key="frame" x="3" y="3" width="236" height="103"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="583"> - <rect key="frame" x="12" y="66" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="583"> + <rect key="frame" x="12" y="62" width="121" height="14"/> <constraints> <constraint firstAttribute="width" constant="117" id="FaO-BP-Myr"/> </constraints> @@ -666,8 +666,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="582"> - <rect key="frame" x="135" y="66" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="582"> + <rect key="frame" x="135" y="62" width="89" height="14"/> <constraints> <constraint firstAttribute="width" constant="85" id="pgJ-Ad-US6"/> </constraints> @@ -677,32 +677,32 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="581"> - <rect key="frame" x="12" y="47" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="581"> + <rect key="frame" x="12" y="43" width="121" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Played buffer" id="586"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="580"> - <rect key="frame" x="135" y="47" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="580"> + <rect key="frame" x="135" y="43" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000" id="587"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="579"> - <rect key="frame" x="12" y="28" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="579"> + <rect key="frame" x="12" y="24" width="121" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Lost buffers" id="588"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="578"> - <rect key="frame" x="135" y="28" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="578"> + <rect key="frame" x="135" y="24" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000" id="589"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -738,14 +738,14 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <box autoresizesSubviews="NO" title="Box" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="552" userLabel="Video Box"> + <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="552" userLabel="Video Box"> <rect key="frame" x="31" y="182" width="243" height="109"/> <view key="contentView" id="QnG-Hd-ZtQ"> - <rect key="frame" x="1" y="1" width="241" height="107"/> + <rect key="frame" x="3" y="3" width="237" height="103"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="555"> - <rect key="frame" x="12" y="66" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="555"> + <rect key="frame" x="12" y="62" width="121" height="14"/> <constraints> <constraint firstAttribute="width" constant="117" id="Htg-L7-ZFh"/> </constraints> @@ -755,8 +755,8 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="556"> - <rect key="frame" x="135" y="66" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="556"> + <rect key="frame" x="135" y="62" width="89" height="14"/> <constraints> <constraint firstAttribute="width" constant="85" id="NGB-dc-ns6"/> </constraints> @@ -766,32 +766,32 @@ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="557"> - <rect key="frame" x="12" y="47" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="557"> + <rect key="frame" x="12" y="43" width="121" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Displayed frames" id="568"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="558"> - <rect key="frame" x="135" y="47" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="558"> + <rect key="frame" x="135" y="43" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000/s" id="567"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="559"> - <rect key="frame" x="12" y="28" width="121" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="559"> + <rect key="frame" x="12" y="24" width="121" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Lost frames" id="566"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> </textFieldCell> </textField> - <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="560"> - <rect key="frame" x="135" y="28" width="89" height="14"/> + <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="560"> + <rect key="frame" x="135" y="24" width="89" height="14"/> <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="1000" id="565"> <font key="font" metaFont="smallSystem"/> <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> @@ -843,7 +843,7 @@ </tabViewItem> </tabViewItems> </tabView> - <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GFW-aJ-Pub"> + <segmentedControl verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GFW-aJ-Pub"> <rect key="frame" x="118" y="448" width="270" height="24"/> <constraints> <constraint firstAttribute="height" constant="21" id="WVH-Tg-9g5"/> @@ -860,7 +860,7 @@ <action selector="takeSelectedTabViewItemFromSender:" target="418" id="Z4V-Lm-ikS"/> </connections> </segmentedControl> - <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-fJ-8UH"> + <box verticalHuggingPriority="750" misplaced="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-fJ-8UH"> <rect key="frame" x="0.0" y="440" width="506" height="5"/> <constraints> <constraint firstAttribute="height" constant="1" id="ivG-J4-70G"/> diff --git a/modules/gui/macosx/coreinteraction/VLCInputManager.m b/modules/gui/macosx/coreinteraction/VLCInputManager.m index e9bf60e97e..afb1a1bd70 100644 --- a/modules/gui/macosx/coreinteraction/VLCInputManager.m +++ b/modules/gui/macosx/coreinteraction/VLCInputManager.m @@ -31,7 +31,7 @@ #import "os-integration/VLCRemoteControlService.h" #import "os-integration/iTunes.h" #import "os-integration/Spotify.h" -#import "panels/VLCPlaylistInfo.h" +#import "panels/VLCInformationWindowController.h" #import "panels/VLCTrackSynchronizationWindowController.h" #import "panels/dialogs/VLCResumeDialogController.h" #import "windows/extensions/VLCExtensionsManager.h" diff --git a/modules/gui/macosx/main/VLCMain.h b/modules/gui/macosx/main/VLCMain.h index 75f0d90665..c705c4532a 100644 --- a/modules/gui/macosx/main/VLCMain.h +++ b/modules/gui/macosx/main/VLCMain.h @@ -62,7 +62,7 @@ static NSString * VLCAppleRemoteSettingChangedNotification = @"VLCAppleRemoteSet * VLCMain interface *****************************************************************************/ @class AppleRemote; -@class VLCInfo; +@class VLCInformationWindowController; @class VLCMainMenu; @class VLCInputManager; @class VLCResumeDialogController; @@ -78,7 +78,6 @@ static NSString * VLCAppleRemoteSettingChangedNotification = @"VLCAppleRemoteSet @class VLCVideoEffectsWindowController; @class VLCConvertAndSaveWindowController; @class VLCExtensionsManager; -@class VLCInfo; @class VLCStatusBarIcon; @class VLCPlaylistController; @@ -111,7 +110,7 @@ static NSString * VLCAppleRemoteSettingChangedNotification = @"VLCAppleRemoteSet - (VLCAudioEffectsWindowController *)audioEffectsPanel; - (VLCVideoEffectsWindowController *)videoEffectsPanel; -- (VLCInfo *)currentMediaInfoPanel; +- (VLCInformationWindowController *)currentMediaInfoPanel; - (VLCConvertAndSaveWindowController *)convertAndSaveWindow; diff --git a/modules/gui/macosx/main/VLCMain.m b/modules/gui/macosx/main/VLCMain.m index 93bf2c355a..161e7fa018 100644 --- a/modules/gui/macosx/main/VLCMain.m +++ b/modules/gui/macosx/main/VLCMain.m @@ -57,7 +57,7 @@ #import "panels/dialogs/VLCCoreDialogProvider.h" #import "panels/VLCAudioEffectsWindowController.h" #import "panels/VLCBookmarksWindowController.h" -#import "panels/VLCPlaylistInfo.h" +#import "panels/VLCInformationWindowController.h" #import "panels/VLCVideoEffectsWindowController.h" #import "panels/VLCTrackSynchronizationWindowController.h" @@ -186,7 +186,7 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable, VLCVideoEffectsWindowController *_videoEffectsPanel; VLCConvertAndSaveWindowController *_convertAndSaveWindow; VLCExtensionsManager *_extensionsManager; - VLCInfo *_currentMediaInfoPanel; + VLCInformationWindowController *_currentMediaInfoPanel; VLCLibraryWindowController *_libraryWindowController; bool b_intf_terminating; /* Makes sure applicationWillTerminate will be called only once */ @@ -518,10 +518,10 @@ static VLCMain *sharedInstance = nil; return _videoEffectsPanel; } -- (VLCInfo *)currentMediaInfoPanel; +- (VLCInformationWindowController *)currentMediaInfoPanel; { if (!_currentMediaInfoPanel) - _currentMediaInfoPanel = [[VLCInfo alloc] init]; + _currentMediaInfoPanel = [[VLCInformationWindowController alloc] init]; return _currentMediaInfoPanel; } diff --git a/modules/gui/macosx/menus/VLCMainMenu.m b/modules/gui/macosx/menus/VLCMainMenu.m index 0d71515044..9d2a1a613f 100644 --- a/modules/gui/macosx/menus/VLCMainMenu.m +++ b/modules/gui/macosx/menus/VLCMainMenu.m @@ -39,7 +39,7 @@ #import "panels/VLCVideoEffectsWindowController.h" #import "panels/VLCBookmarksWindowController.h" #import "panels/dialogs/VLCCoreDialogProvider.h" -#import "panels/VLCPlaylistInfo.h" +#import "panels/VLCInformationWindowController.h" #import "panels/VLCTimeSelectionPanelController.h" #import "playlist/VLCPlaylistController.h" diff --git a/modules/gui/macosx/panels/VLCPlaylistInfo.h b/modules/gui/macosx/panels/VLCInformationWindowController.h similarity index 89% rename from modules/gui/macosx/panels/VLCPlaylistInfo.h rename to modules/gui/macosx/panels/VLCInformationWindowController.h index 4a8a715fec..710003a586 100644 --- a/modules/gui/macosx/panels/VLCPlaylistInfo.h +++ b/modules/gui/macosx/panels/VLCInformationWindowController.h @@ -1,7 +1,7 @@ /***************************************************************************** - * VLCPlaylistInfo.h: Controller for the codec info panel + * VLCInformationWindowController.h: Controller for the codec info panel ***************************************************************************** - * Copyright (C) 2002-2015 VLC authors and VideoLAN + * Copyright (C) 2002-2019 VLC authors and VideoLAN * * Authors: Benjamin Pracht <bigben at videolan dot org> * Felix Paul Kühne <fkuehne at videolan dot org> @@ -21,15 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * VLCPlaylistInfo interface - *****************************************************************************/ - #import <Cocoa/Cocoa.h> - #import <vlc_common.h> -@interface VLCInfo : NSWindowController +@interface VLCInformationWindowController : NSWindowController @property (readonly) input_item_t *item; @@ -102,15 +97,3 @@ - (void)updateStatistics; @end - -/** - * Holds information for one element in the codec information panel - */ -@interface VLCInfoTreeItem : NSObject - -@property (readwrite) NSString *name; -@property (readwrite) NSString *value; - -@property (readwrite) NSArray *children; - -@end diff --git a/modules/gui/macosx/panels/VLCPlaylistInfo.m b/modules/gui/macosx/panels/VLCInformationWindowController.m similarity index 95% rename from modules/gui/macosx/panels/VLCPlaylistInfo.m rename to modules/gui/macosx/panels/VLCInformationWindowController.m index 4fa73f9df3..e45086dacb 100644 --- a/modules/gui/macosx/panels/VLCPlaylistInfo.m +++ b/modules/gui/macosx/panels/VLCInformationWindowController.m @@ -1,7 +1,7 @@ /***************************************************************************** - * VLCPlaylistInfo.m: Controller for the codec info panel + * VLCInformationWindowController.m: Controller for the codec info panel ***************************************************************************** - * Copyright (C) 2002-2015 VLC authors and VideoLAN + * Copyright (C) 2002-2019 VLC authors and VideoLAN * * Authors: Benjamin Pracht <bigben at videolan dot org> * Felix Paul Kühne <fkuehne at videolan dot org> @@ -21,14 +21,26 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. ******************************************************************************/ -#import "VLCPlaylistInfo.h" - -#import <vlc_url.h> +#import "VLCInformationWindowController.h" #import "main/CompatibilityFixes.h" #import "main/VLCMain.h" -@interface VLCInfo () <NSOutlineViewDataSource> +#import <vlc_url.h> + +/** + * Holds information for one element in the codec information panel + */ +@interface VLCInfoTreeItem : NSObject + +@property (readwrite) NSString *name; +@property (readwrite) NSString *value; + +@property (readwrite) NSArray *children; + +@end + +@interface VLCInformationWindowController () <NSOutlineViewDataSource> { VLCInfoTreeItem *rootItem; @@ -38,14 +50,11 @@ } @end -@implementation VLCInfo +@implementation VLCInformationWindowController - (id)init { self = [super initWithWindowNibName:@"MediaInfo"]; - if (self) { - - } return self; } @@ -374,7 +383,7 @@ FREENULL( psz_##foo ); @end -@implementation VLCInfo (NSTableDataSource) +@implementation VLCInformationWindowController (NSTableDataSource) - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { diff --git a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m index 111ee6ab1c..3339229933 100644 --- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m +++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m @@ -36,7 +36,7 @@ #import "panels/dialogs/VLCResumeDialogController.h" #import "panels/VLCVideoEffectsWindowController.h" #import "panels/VLCAudioEffectsWindowController.h" -#import "panels/VLCPlaylistInfo.h" +#import "panels/VLCInformationWindowController.h" #import "panels/VLCBookmarksWindowController.h" #import "panels/VLCTrackSynchronizationWindowController.h" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
