Browse Source

Library: fix drawing issues from the future

Felix Paul Kühne 12 years ago
parent
commit
2bc98154d0

+ 2 - 1
AspenProject/VLCLinearProgressIndicator.h

@@ -10,6 +10,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface VLCLinearProgressIndicator : UIProgressView
+@interface VLCLinearProgressIndicator : UIView
+@property (nonatomic) CGFloat progress;
 
 @end

+ 1 - 1
AspenProject/VLCPlaylistTableViewCell.h

@@ -16,7 +16,7 @@
 @property (nonatomic, strong) IBOutlet UILabel *titleLabel;
 @property (nonatomic, strong) IBOutlet UILabel *subtitleLabel;
 @property (nonatomic, strong) IBOutlet UIImageView *thumbnailView;
-@property (nonatomic, strong) IBOutlet VLCLinearProgressIndicator*progressIndicator;
+@property (nonatomic, strong) IBOutlet VLCLinearProgressIndicator *progressIndicator;
 @property (nonatomic, strong) IBOutlet UIImageView *mediaIsUnreadView;
 
 @property (nonatomic, retain) MLFile *mediaObject;

+ 35 - 35
Resources/VLCPlaylistGridView.xib

@@ -54,7 +54,7 @@
 						<string key="NSFrame">{{16, 9}, {266, 154}}</string>
 						<reference key="NSSuperview" ref="93090196"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="978623485"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -106,6 +106,7 @@
 						<string key="NSFrame">{{20, 190}, {258, 28}}</string>
 						<reference key="NSSuperview" ref="93090196"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="593524440"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -138,7 +139,7 @@
 						<string key="NSFrame">{{260, 2}, {33, 29}}</string>
 						<reference key="NSSuperview" ref="93090196"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="863064291"/>
+						<reference key="NSNextKeyView" ref="276503826"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -167,20 +168,6 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUIView" id="863064291">
-						<reference key="NSNextResponder" ref="93090196"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 146}, {256, 12}}</string>
-						<reference key="NSSuperview" ref="93090196"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="276503826"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
-						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-					</object>
 					<object class="IBUIImageView" id="986363358">
 						<reference key="NSNextResponder" ref="93090196"/>
 						<int key="NSvFlags">297</int>
@@ -196,6 +183,20 @@
 							<string key="NSResourceName">badgeUnread~ipad.png</string>
 						</object>
 					</object>
+					<object class="IBUIView" id="593524440">
+						<reference key="NSNextResponder" ref="93090196"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{21, 146}, {256, 12}}</string>
+						<reference key="NSSuperview" ref="93090196"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
 				</array>
 				<string key="NSFrameSize">{298, 220}</string>
 				<reference key="NSSuperview"/>
@@ -241,14 +242,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">progressView</string>
-						<reference key="source" ref="93090196"/>
-						<reference key="destination" ref="863064291"/>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">removeMediaButton</string>
 						<reference key="source" ref="93090196"/>
 						<reference key="destination" ref="296556150"/>
@@ -264,6 +257,14 @@
 					<int key="connectionID">24</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">progressView</string>
+						<reference key="source" ref="93090196"/>
+						<reference key="destination" ref="593524440"/>
+					</object>
+					<int key="connectionID">27</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">removeMedia:</string>
 						<reference key="source" ref="296556150"/>
@@ -300,9 +301,9 @@
 							<reference ref="276503826"/>
 							<reference ref="610797449"/>
 							<reference ref="296556150"/>
-							<reference ref="863064291"/>
 							<reference ref="986363358"/>
 							<reference ref="528008643"/>
+							<reference ref="593524440"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -317,12 +318,6 @@
 						<reference key="parent" ref="93090196"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="863064291"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="93090196"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">20</int>
 						<reference key="object" ref="296556150"/>
 						<reference key="parent" ref="93090196"/>
@@ -343,6 +338,11 @@
 						<reference key="object" ref="528008643"/>
 						<reference key="parent" ref="93090196"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="593524440"/>
+						<reference key="parent" ref="93090196"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -351,11 +351,11 @@
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="17.CustomClassName">VLCLinearProgressIndicator</string>
-				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="26.CustomClassName">VLCLinearProgressIndicator</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="3.CustomClassName">VLCPlaylistGridView</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -364,7 +364,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">25</int>
+			<int key="maxID">27</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -378,7 +378,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">VLCLinearProgressIndicator</string>
-					<string key="superclassName">UIProgressView</string>
+					<string key="superclassName">UIView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/VLCLinearProgressIndicator.h</string>

+ 35 - 33
Resources/VLCPlaylistTableViewCell.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">12D78</string>
+		<string key="IBDocument.SystemVersion">12E55</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
+		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -73,7 +73,7 @@
 								<string key="NSFrame">{{137, 5}, {178, 42}}</string>
 								<reference key="NSSuperview" ref="162418872"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="442944742"/>
+								<reference key="NSNextKeyView" ref="625431089"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -106,6 +106,7 @@
 								<string key="NSFrame">{{137, 55}, {178, 15}}</string>
 								<reference key="NSSuperview" ref="162418872"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="636538169"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -131,20 +132,6 @@
 								</object>
 								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
 							</object>
-							<object class="IBUIView" id="442944742">
-								<reference key="NSNextResponder" ref="162418872"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrame">{{5, 65}, {124, 10}}</string>
-								<reference key="NSSuperview" ref="162418872"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="625431089"/>
-								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor" id="698237866">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwAA</bytes>
-								</object>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-							</object>
 							<object class="IBUIImageView" id="775158982">
 								<reference key="NSNextResponder" ref="162418872"/>
 								<int key="NSvFlags">300</int>
@@ -160,6 +147,21 @@
 									<string key="NSResourceName">badgeUnread~iphone.png</string>
 								</object>
 							</object>
+							<object class="IBUIView" id="636538169">
+								<reference key="NSNextResponder" ref="162418872"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{6, 64}, {122, 10}}</string>
+								<reference key="NSSuperview" ref="162418872"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<object class="NSColor" key="IBUIBackgroundColor" id="698237866">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
 						</array>
 						<string key="NSFrameSize">{320, 79}</string>
 						<reference key="NSSuperview" ref="962619467"/>
@@ -217,19 +219,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">progressIndicator</string>
+						<string key="label">mediaIsUnreadView</string>
 						<reference key="source" ref="962619467"/>
-						<reference key="destination" ref="442944742"/>
+						<reference key="destination" ref="775158982"/>
 					</object>
-					<int key="connectionID">19</int>
+					<int key="connectionID">21</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">mediaIsUnreadView</string>
+						<string key="label">progressIndicator</string>
 						<reference key="source" ref="962619467"/>
-						<reference key="destination" ref="775158982"/>
+						<reference key="destination" ref="636538169"/>
 					</object>
-					<int key="connectionID">21</int>
+					<int key="connectionID">28</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -258,9 +260,9 @@
 							<reference ref="784253519"/>
 							<reference ref="207506414"/>
 							<reference ref="625431089"/>
-							<reference ref="442944742"/>
 							<reference ref="775158982"/>
 							<reference ref="172563179"/>
+							<reference ref="636538169"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -280,11 +282,6 @@
 						<reference key="parent" ref="962619467"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">18</int>
-						<reference key="object" ref="442944742"/>
-						<reference key="parent" ref="962619467"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">20</int>
 						<reference key="object" ref="775158982"/>
 						<reference key="parent" ref="962619467"/>
@@ -294,16 +291,21 @@
 						<reference key="object" ref="172563179"/>
 						<reference key="parent" ref="962619467"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="636538169"/>
+						<reference key="parent" ref="962619467"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="18.CustomClassName">VLCLinearProgressIndicator</string>
-				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="27.CustomClassName">VLCLinearProgressIndicator</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="3.CustomClassName">VLCPlaylistTableViewCell</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -314,13 +316,13 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">24</int>
+			<int key="maxID">28</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">VLCLinearProgressIndicator</string>
-					<string key="superclassName">UIProgressView</string>
+					<string key="superclassName">UIView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/VLCLinearProgressIndicator.h</string>