Przeglądaj źródła

Fix timeDisplay layout issue in landscape orientation

Gleb Pinigin 12 lat temu
rodzic
commit
bfff14c5f1

+ 57 - 43
Resources/VLCMovieViewController~ipad.xib

@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12E52</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -163,32 +163,32 @@
 						<reference key="NSNextResponder" ref="647120888"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="25751072">
+							<object class="IBUISlider" id="887756615">
 								<reference key="NSNextResponder" ref="189908447"/>
 								<int key="NSvFlags">290</int>
+								<string key="NSFrame">{{67, 11}, {632, 23}}</string>
+								<reference key="NSSuperview" ref="189908447"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="25751072"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<string key="NSHuggingPriority">{250, 250}</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+									<integer value="512" key="IBUIAccessibilityTraits"/>
+								</object>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<float key="IBUIValue">0.5</float>
+							</object>
+							<object class="IBUIView" id="25751072">
+								<reference key="NSNextResponder" ref="189908447"/>
+								<int key="NSvFlags">292</int>
 								<array class="NSMutableArray" key="NSSubviews">
-									<object class="IBUISlider" id="887756615">
-										<reference key="NSNextResponder" ref="25751072"/>
-										<int key="NSvFlags">290</int>
-										<string key="NSFrame">{{0, 5}, {647, 23}}</string>
-										<reference key="NSSuperview" ref="25751072"/>
-										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="549307916"/>
-										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<string key="NSHuggingPriority">{250, 250}</string>
-										<bool key="IBUIOpaque">NO</bool>
-										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-											<integer value="512" key="IBUIAccessibilityTraits"/>
-										</object>
-										<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-										<int key="IBUIContentHorizontalAlignment">0</int>
-										<int key="IBUIContentVerticalAlignment">0</int>
-										<float key="IBUIValue">0.5</float>
-									</object>
 									<object class="IBUILabel" id="549307916">
 										<reference key="NSNextResponder" ref="25751072"/>
 										<int key="NSvFlags">289</int>
-										<string key="NSFrame">{{649, 5}, {46, 21}}</string>
+										<string key="NSFrame">{{-4, 5}, {46, 21}}</string>
 										<reference key="NSSuperview" ref="25751072"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="959094125"/>
@@ -218,10 +218,10 @@
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 								</array>
-								<string key="NSFrame">{{67, 6}, {720, 33}}</string>
+								<string key="NSFrame">{{709, 6}, {40, 33}}</string>
 								<reference key="NSSuperview" ref="189908447"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="887756615"/>
+								<reference key="NSNextKeyView" ref="549307916"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="8046438"/>
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -230,7 +230,7 @@
 						<string key="NSFrame">{{0, 20}, {768, 44}}</string>
 						<reference key="NSSuperview" ref="647120888"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="25751072"/>
+						<reference key="NSNextKeyView" ref="887756615"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -244,9 +244,13 @@
 								<reference key="IBUIToolbar" ref="189908447"/>
 								<int key="IBUISystemItemIdentifier">0</int>
 							</object>
+							<object class="IBUIBarButtonItem" id="133988511">
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<reference key="IBUICustomView" ref="887756615"/>
+								<reference key="IBUIToolbar" ref="189908447"/>
+							</object>
 							<object class="IBUIBarButtonItem" id="718052093">
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-								<float key="IBUIWidth">720</float>
 								<reference key="IBUICustomView" ref="25751072"/>
 								<reference key="IBUIToolbar" ref="189908447"/>
 							</object>
@@ -394,6 +398,7 @@
 								<string key="NSFrame">{{252, 20}, {44, 44}}</string>
 								<reference key="NSSuperview" ref="734589612"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="8046438"/>
 								<bool key="IBUIOpaque">NO</bool>
@@ -769,7 +774,7 @@
 								<string key="NSFrame">{{20, 5}, {280, 21}}</string>
 								<reference key="NSSuperview" ref="567155588"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSNextKeyView" ref="753155309"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -1105,14 +1110,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">positionSlider</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="887756615"/>
-					</object>
-					<int key="connectionID">222</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">timeDisplay</string>
 						<reference key="source" ref="841351856"/>
 						<reference key="destination" ref="549307916"/>
@@ -1128,6 +1125,14 @@
 					<int key="connectionID">229</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">positionSlider</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="887756615"/>
+					</object>
+					<int key="connectionID">222</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">closePlayback:</string>
 						<reference key="source" ref="270679370"/>
@@ -1322,6 +1327,7 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="270679370"/>
 							<reference ref="718052093"/>
+							<reference ref="133988511"/>
 						</array>
 						<reference key="parent" ref="647120888"/>
 					</object>
@@ -1496,7 +1502,6 @@
 						<reference key="object" ref="25751072"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="549307916"/>
-							<reference ref="887756615"/>
 						</array>
 						<reference key="parent" ref="718052093"/>
 					</object>
@@ -1507,12 +1512,6 @@
 						<string key="objectName">Time label</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">221</int>
-						<reference key="object" ref="887756615"/>
-						<reference key="parent" ref="25751072"/>
-						<string key="objectName">Position Slider</string>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">104</int>
 						<reference key="object" ref="734589612"/>
 						<array class="NSMutableArray" key="children">
@@ -1556,6 +1555,20 @@
 						<reference key="object" ref="968986218"/>
 						<reference key="parent" ref="734589612"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">230</int>
+						<reference key="object" ref="133988511"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="887756615"/>
+						</array>
+						<reference key="parent" ref="189908447"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="887756615"/>
+						<reference key="parent" ref="133988511"/>
+						<string key="objectName">Position Slider</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1603,6 +1616,7 @@
 				<string key="221.CustomClassName">OBSlider</string>
 				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="230.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="99.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
@@ -1610,7 +1624,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">229</int>
+			<int key="maxID">230</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">

+ 78 - 65
Resources/VLCMovieViewController~iphone.xib

@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12E52</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -331,33 +331,33 @@
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">290</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIView" id="685682846">
+							<object class="IBUISlider" id="402268973">
 								<reference key="NSNextResponder" ref="831191623"/>
 								<int key="NSvFlags">290</int>
+								<string key="NSFrame">{{66, 11}, {191, 23}}</string>
+								<reference key="NSSuperview" ref="831191623"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="449644467"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<string key="NSHuggingPriority">{250, 250}</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+									<integer value="512" key="IBUIAccessibilityTraits"/>
+								</object>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<float key="IBUIValue">0.5</float>
+							</object>
+							<object class="IBUIView" id="449644467">
+								<reference key="NSNextResponder" ref="831191623"/>
+								<int key="NSvFlags">292</int>
 								<array class="NSMutableArray" key="NSSubviews">
-									<object class="IBUISlider" id="402268973">
-										<reference key="NSNextResponder" ref="685682846"/>
-										<int key="NSvFlags">290</int>
-										<string key="NSFrame">{{0, 5}, {201, 23}}</string>
-										<reference key="NSSuperview" ref="685682846"/>
-										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="487467547"/>
-										<string key="NSReuseIdentifierKey">_NS:9</string>
-										<string key="NSHuggingPriority">{250, 250}</string>
-										<bool key="IBUIOpaque">NO</bool>
-										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
-											<integer value="512" key="IBUIAccessibilityTraits"/>
-										</object>
-										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<int key="IBUIContentHorizontalAlignment">0</int>
-										<int key="IBUIContentVerticalAlignment">0</int>
-										<float key="IBUIValue">0.5</float>
-									</object>
 									<object class="IBUILabel" id="487467547">
-										<reference key="NSNextResponder" ref="685682846"/>
-										<int key="NSvFlags">289</int>
-										<string key="NSFrame">{{203, 5}, {46, 21}}</string>
-										<reference key="NSSuperview" ref="685682846"/>
+										<reference key="NSNextResponder" ref="449644467"/>
+										<int key="NSvFlags">290</int>
+										<string key="NSFrame">{{-4, 5}, {46, 21}}</string>
+										<reference key="NSSuperview" ref="449644467"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="331977945"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -386,10 +386,10 @@
 										<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 									</object>
 								</array>
-								<string key="NSFrame">{{66, 6}, {260, 33}}</string>
+								<string key="NSFrame">{{267, 6}, {40, 33}}</string>
 								<reference key="NSSuperview" ref="831191623"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="402268973"/>
+								<reference key="NSNextKeyView" ref="487467547"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<reference key="IBUIBackgroundColor" ref="119528819"/>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -398,7 +398,7 @@
 						<string key="NSFrame">{{0, 20}, {320, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="685682846"/>
+						<reference key="NSNextKeyView" ref="402268973"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -412,10 +412,14 @@
 								<reference key="IBUIToolbar" ref="831191623"/>
 								<int key="IBUISystemItemIdentifier">0</int>
 							</object>
-							<object class="IBUIBarButtonItem" id="628244388">
+							<object class="IBUIBarButtonItem" id="1040356106">
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">260</float>
-								<reference key="IBUICustomView" ref="685682846"/>
+								<reference key="IBUICustomView" ref="402268973"/>
+								<reference key="IBUIToolbar" ref="831191623"/>
+							</object>
+							<object class="IBUIBarButtonItem" id="900256239">
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUICustomView" ref="449644467"/>
 								<reference key="IBUIToolbar" ref="831191623"/>
 							</object>
 						</array>
@@ -507,7 +511,7 @@
 						<string key="NSFrame">{{263, 135}, {44, 44}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="265611716"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -1122,6 +1126,14 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">aspectRatioButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="265611716"/>
+					</object>
+					<int key="connectionID">222</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">positionSlider</string>
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="402268973"/>
@@ -1137,14 +1149,6 @@
 					<int key="connectionID">219</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">aspectRatioButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="265611716"/>
-					</object>
-					<int key="connectionID">222</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">switchSubtitleTrack:</string>
 						<reference key="source" ref="649952457"/>
@@ -1530,48 +1534,56 @@
 						<reference key="object" ref="831191623"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="717140598"/>
-							<reference ref="628244388"/>
+							<reference ref="1040356106"/>
+							<reference ref="900256239"/>
 						</array>
 						<reference key="parent" ref="191373211"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">214</int>
-						<reference key="object" ref="628244388"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="685682846"/>
-						</array>
+						<int key="objectID">85</int>
+						<reference key="object" ref="717140598"/>
 						<reference key="parent" ref="831191623"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">213</int>
-						<reference key="object" ref="685682846"/>
+						<int key="objectID">220</int>
+						<reference key="object" ref="542483262"/>
+						<reference key="parent" ref="644225698"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="1040356106"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="402268973"/>
-							<reference ref="487467547"/>
 						</array>
-						<reference key="parent" ref="628244388"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">218</int>
-						<reference key="object" ref="487467547"/>
-						<reference key="parent" ref="685682846"/>
-						<string key="objectName">Time label</string>
+						<reference key="parent" ref="831191623"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">215</int>
 						<reference key="object" ref="402268973"/>
-						<reference key="parent" ref="685682846"/>
+						<reference key="parent" ref="1040356106"/>
 						<string key="objectName">Position Slider</string>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">85</int>
-						<reference key="object" ref="717140598"/>
+						<int key="objectID">229</int>
+						<reference key="object" ref="900256239"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="449644467"/>
+						</array>
 						<reference key="parent" ref="831191623"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">220</int>
-						<reference key="object" ref="542483262"/>
-						<reference key="parent" ref="644225698"/>
+						<int key="objectID">228</int>
+						<reference key="object" ref="449644467"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="487467547"/>
+						</array>
+						<reference key="parent" ref="900256239"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">218</int>
+						<reference key="object" ref="487467547"/>
+						<reference key="parent" ref="449644467"/>
+						<string key="objectName">Time label</string>
 					</object>
 				</array>
 			</object>
@@ -1606,12 +1618,13 @@
 				<string key="202.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="210.CustomClassName">VLCStatusLabel</string>
 				<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="215.CustomClassName">OBSlider</string>
 				<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="218.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="228.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="229.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1626,7 +1639,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">222</int>
+			<int key="maxID">229</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">