vlc | branch: master | Marvin Scholz <epira...@gmail.com> | Fri Nov 25 09:20:36 2016 +0100| [e54c9bed8790580101135f8684fc95b6eabaff0c] | committer: Marvin Scholz
macosx: Disallow Window tabbing VLC does not use Window tabbing as it does not allow multiple windows in the sense of multiple tabs or documents at the moment, so we disable tabbing explicitly, to not have a slightly confusing menu item to enable tabs without having support for it. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e54c9bed8790580101135f8684fc95b6eabaff0c --- .../macosx/Resources/English.lproj/MainWindow.xib | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/MainWindow.xib b/extras/package/macosx/Resources/English.lproj/MainWindow.xib index 8f4d9c6..2f415b5 100644 --- a/extras/package/macosx/Resources/English.lproj/MainWindow.xib +++ b/extras/package/macosx/Resources/English.lproj/MainWindow.xib @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2657" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> - <deployment version="1070" identifier="macosx"/> + <deployment identifier="macosx"/> <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/> <capability name="box content view" minToolsVersion="7.0"/> </dependencies> <objects> @@ -14,7 +14,7 @@ </customObject> <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/> <customObject id="-3" userLabel="Application" customClass="NSObject"/> - <window title="VLC media player" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="21" userLabel="Main Window" customClass="VLCMainWindow"> + <window title="VLC media player" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" tabbingMode="disallowed" id="21" userLabel="Main Window" customClass="VLCMainWindow"> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/> <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/> <rect key="contentRect" x="53" y="419" width="604" height="310"/> @@ -39,7 +39,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <outlineView focusRingType="none" appearanceType="vibrantLight" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="20" indentationPerLevel="14" autoresizesOutlineColumn="YES" outlineTableColumn="4717" id="4714" customClass="PXSourceList"> - <rect key="frame" x="0.0" y="0.0" width="199" height="20"/> + <rect key="frame" x="0.0" y="0.0" width="199" height="272"/> <autoresizingMask key="autoresizingMask" widthSizable="YES"/> <size key="intercellSpacing" width="3" height="0.0"/> <color key="backgroundColor" name="_sourceListBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -82,11 +82,11 @@ <rect key="frame" x="0.0" y="0.0" width="403" height="254"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <clipView key="contentView" id="wTX-wO-asx"> - <rect key="frame" x="1" y="17" width="401" height="236"/> + <rect key="frame" x="1" y="0.0" width="401" height="253"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="reverseSequential" alternatingRowBackgroundColors="YES" autosaveColumns="NO" rowHeight="15" headerView="4373" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="4380" id="4376" customClass="VLCPlaylistView"> - <rect key="frame" x="0.0" y="0.0" width="21" height="17"/> + <rect key="frame" x="0.0" y="0.0" width="401" height="236"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <size key="intercellSpacing" width="3" height="2"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> @@ -105,7 +105,6 @@ </tableColumns> </outlineView> </subviews> - <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> </clipView> <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="4374"> <rect key="frame" x="1" y="238" width="402" height="15"/> @@ -511,7 +510,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="250"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <box autoresizesSubviews="NO" transparent="YES" title="Box" borderType="none" titlePosition="noTitle" id="4739"> + <box autoresizesSubviews="NO" borderType="none" title="Box" titlePosition="noTitle" transparent="YES" id="4739"> <rect key="frame" x="10" y="10" width="300" height="230"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <view key="contentView" id="pxq-Tn-LtA"> @@ -545,8 +544,6 @@ </button> </subviews> </view> - <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/> - <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/> </box> </subviews> </customView> @@ -765,7 +762,7 @@ Gw <image name="stop-pressed" width="29" height="23"/> <image name="topbar_background" width="1" height="27"/> <image name="volume-high" width="13" height="11"/> - <image name="volume-low" width="5" height="11"/> + <image name="volume-low" width="5" height="10"/> <image name="volume-slider-track" width="48" height="5"/> <image name="window-resize" width="12" height="12"/> </resources> _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
