Browse Source

Implement ratio button icon

Felix Paul Kühne 12 years ago
parent
commit
56b98e0943

+ 3 - 2
AspenProject/VLCMovieViewController.m

@@ -133,8 +133,9 @@
 
     _aspectRatios = @[@"DEFAULT", @"4:3", @"16:9", @"16:10", @"2.21:1", @"FILL_TO_SCREEN"];
 
-    [self.aspectRatioButton setImage:[UIImage imageNamed:@"ratioButton"] forState:UIControlStateNormal];
-    [self.aspectRatioButton setImage:[UIImage imageNamed:@"ratioButtonHighlight"] forState:UIControlStateHighlighted];
+    [self.aspectRatioButton setBackgroundImage:[UIImage imageNamed:@"ratioButton"] forState:UIControlStateNormal];
+    [self.aspectRatioButton setBackgroundImage:[UIImage imageNamed:@"ratioButtonHighlight"] forState:UIControlStateHighlighted];
+    [self.aspectRatioButton setImage:[UIImage imageNamed:@"ratioIcon"] forState:UIControlStateNormal];
     [self.toolbar setBackgroundImage:[UIImage imageNamed:@"seekbarBg"] forBarMetrics:UIBarMetricsDefault];
     [self.backButton setBackgroundImage:[UIImage imageNamed:@"playbackDoneButton"] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
     [self.backButton setBackgroundImage:[UIImage imageNamed:@"playbackDoneButtonHighlight"] forState:UIControlStateHighlighted barMetrics:UIBarMetricsDefault];

+ 2 - 2
Resources/VLCMovieViewController~ipad.xib

@@ -122,7 +122,7 @@
 						</object>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">ratioButton.png</string>
+							<string key="NSResourceName">ratioIcon.png</string>
 						</object>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="581809469">
 							<int key="type">2</int>
@@ -2164,7 +2164,7 @@
 			<string key="forwardIcon.png">{32, 22}</string>
 			<string key="playIcon.png">{28, 27}</string>
 			<string key="playbackControllerBg.png">{352, 90}</string>
-			<string key="ratioButton.png">{50, 29}</string>
+			<string key="ratioIcon.png">{26, 19}</string>
 			<string key="resetIcon.png">{24, 30}</string>
 			<string key="speedIcon.png">{24, 25}</string>
 			<string key="subtitleIcon.png">{26, 27}</string>

+ 2 - 2
Resources/VLCMovieViewController~iphone.xib

@@ -117,7 +117,7 @@
 						</object>
 						<object class="NSCustomResource" key="IBUINormalImage">
 							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">ratioButton.png</string>
+							<string key="NSResourceName">ratioIcon.png</string>
 						</object>
 						<object class="IBUIFontDescription" key="IBUIFontDescription" id="838206983">
 							<int key="type">2</int>
@@ -2182,7 +2182,7 @@
 			<string key="forwardIcon.png">{32, 22}</string>
 			<string key="playIcon.png">{28, 27}</string>
 			<string key="playbackControllerBg.png">{352, 90}</string>
-			<string key="ratioButton.png">{50, 29}</string>
+			<string key="ratioIcon.png">{26, 19}</string>
 			<string key="resetIcon.png">{24, 30}</string>
 			<string key="speedIcon.png">{24, 25}</string>
 			<string key="subtitleIcon.png">{26, 27}</string>

+ 8 - 0
VLC for iOS.xcodeproj/project.pbxproj

@@ -63,6 +63,8 @@
 		7D07F731175691CC00CDE21C /* backButtonHighlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F72D175691CC00CDE21C /* backButtonHighlight@2x.png */; };
 		7D1AC3041762996100BD2EB5 /* resetIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC3021762996100BD2EB5 /* resetIcon.png */; };
 		7D1AC3051762996100BD2EB5 /* resetIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC3031762996100BD2EB5 /* resetIcon@2x.png */; };
+		7D1AC30817629AB600BD2EB5 /* ratioIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC30617629AB600BD2EB5 /* ratioIcon.png */; };
+		7D1AC30917629AB600BD2EB5 /* ratioIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D1AC30717629AB600BD2EB5 /* ratioIcon@2x.png */; };
 		7D2159E9174FD32F00EC00E8 /* page_white_text.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E5174FD32F00EC00E8 /* page_white_text.png */; };
 		7D2159EA174FD32F00EC00E8 /* folder.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E6174FD32F00EC00E8 /* folder.png */; };
 		7D2159EB174FD32F00EC00E8 /* page_white.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D2159E7174FD32F00EC00E8 /* page_white.png */; };
@@ -330,6 +332,8 @@
 		7D07F72D175691CC00CDE21C /* backButtonHighlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backButtonHighlight@2x.png"; sourceTree = "<group>"; };
 		7D1AC3021762996100BD2EB5 /* resetIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = resetIcon.png; sourceTree = "<group>"; };
 		7D1AC3031762996100BD2EB5 /* resetIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "resetIcon@2x.png"; sourceTree = "<group>"; };
+		7D1AC30617629AB600BD2EB5 /* ratioIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ratioIcon.png; sourceTree = "<group>"; };
+		7D1AC30717629AB600BD2EB5 /* ratioIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ratioIcon@2x.png"; sourceTree = "<group>"; };
 		7D2159E5174FD32F00EC00E8 /* page_white_text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white_text.png; sourceTree = "<group>"; };
 		7D2159E6174FD32F00EC00E8 /* folder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = folder.png; sourceTree = "<group>"; };
 		7D2159E7174FD32F00EC00E8 /* page_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = page_white.png; sourceTree = "<group>"; };
@@ -854,6 +858,8 @@
 		7D47D6C81760CD2700E86BAD /* Movie VIew */ = {
 			isa = PBXGroup;
 			children = (
+				7D1AC30617629AB600BD2EB5 /* ratioIcon.png */,
+				7D1AC30717629AB600BD2EB5 /* ratioIcon@2x.png */,
 				7D47D6CB1760CD8700E86BAD /* subtitleIcon.png */,
 				7D47D6CC1760CD8700E86BAD /* subtitleIcon@2x.png */,
 				7D47D6CD1760CD8700E86BAD /* videoEffectsIcon.png */,
@@ -1451,6 +1457,8 @@
 				7D6BD1871762026700AD311A /* thumbOverlay.png in Resources */,
 				7D1AC3041762996100BD2EB5 /* resetIcon.png in Resources */,
 				7D1AC3051762996100BD2EB5 /* resetIcon@2x.png in Resources */,
+				7D1AC30817629AB600BD2EB5 /* ratioIcon.png in Resources */,
+				7D1AC30917629AB600BD2EB5 /* ratioIcon@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};