Skip to content

VLC-iOS
VLC-iOS
Commit fb4bce8d authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

add preliminary icon set for AR, crop, speed and effects to achieve a cleaner appearance 

http://cl.ly/image/2j0e1k13203s
parent 848e7735
Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 523 deletions
AspenProject.xcodeproj/project.pbxproj
View file @ fb4bce8d
......@@ -19,8 +19,16 @@
7D10BC7F1743FA0F00DA7059 /* play@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC731743FA0F00DA7059 /* play@2x.png */; };
7D10BC801743FA0F00DA7059 /* subtitles.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC741743FA0F00DA7059 /* subtitles.png */; };
7D10BC811743FA0F00DA7059 /* subtitles@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC751743FA0F00DA7059 /* subtitles@2x.png */; };
7D10BC841743FB4A00DA7059 /* reset.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC821743FB4A00DA7059 /* reset.png */; };
7D10BC851743FB4A00DA7059 /* reset@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC831743FB4A00DA7059 /* reset@2x.png */; };
7D10BCA01743FE7B00DA7059 /* aspectratio.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC961743FE7B00DA7059 /* aspectratio.png */; };
7D10BCA11743FE7B00DA7059 /* aspectratio@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC971743FE7B00DA7059 /* aspectratio@2x.png */; };
7D10BCA21743FE7B00DA7059 /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC981743FE7B00DA7059 /* crop.png */; };
7D10BCA31743FE7B00DA7059 /* crop@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC991743FE7B00DA7059 /* crop@2x.png */; };
7D10BCA41743FE7B00DA7059 /* effects.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9A1743FE7B00DA7059 /* effects.png */; };
7D10BCA51743FE7B00DA7059 /* effects@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9B1743FE7B00DA7059 /* effects@2x.png */; };
7D10BCA61743FE7B00DA7059 /* reset.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9C1743FE7B00DA7059 /* reset.png */; };
7D10BCA71743FE7B00DA7059 /* reset@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9D1743FE7B00DA7059 /* reset@2x.png */; };
7D10BCA81743FE7B00DA7059 /* speed.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9E1743FE7B00DA7059 /* speed.png */; };
7D10BCA91743FE7B00DA7059 /* speed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC9F1743FE7B00DA7059 /* speed@2x.png */; };
7D33D41617182615008AF0E0 /* VLCMovieViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D33D41517182615008AF0E0 /* VLCMovieViewController~ipad.xib */; };
7D6B07BC1716C9B8003280C4 /* AQGridView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6B07A61716C9B8003280C4 /* AQGridView.m */; };
7D6B07BD1716C9B8003280C4 /* AQGridViewAnimatorItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6B07AA1716C9B8003280C4 /* AQGridViewAnimatorItem.m */; };
......@@ -99,8 +107,16 @@
7D10BC731743FA0F00DA7059 /* play@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "play@2x.png"; sourceTree = "<group>"; };
7D10BC741743FA0F00DA7059 /* subtitles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = subtitles.png; sourceTree = "<group>"; };
7D10BC751743FA0F00DA7059 /* subtitles@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "subtitles@2x.png"; sourceTree = "<group>"; };
7D10BC821743FB4A00DA7059 /* reset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = reset.png; sourceTree = "<group>"; };
7D10BC831743FB4A00DA7059 /* reset@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "reset@2x.png"; sourceTree = "<group>"; };
7D10BC961743FE7B00DA7059 /* aspectratio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = aspectratio.png; path = Resources/aspectratio.png; sourceTree = SOURCE_ROOT; };
7D10BC971743FE7B00DA7059 /* aspectratio@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "aspectratio@2x.png"; path = "Resources/aspectratio@2x.png"; sourceTree = SOURCE_ROOT; };
7D10BC981743FE7B00DA7059 /* crop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = crop.png; path = Resources/crop.png; sourceTree = SOURCE_ROOT; };
7D10BC991743FE7B00DA7059 /* crop@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "crop@2x.png"; path = "Resources/crop@2x.png"; sourceTree = SOURCE_ROOT; };
7D10BC9A1743FE7B00DA7059 /* effects.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = effects.png; path = Resources/effects.png; sourceTree = SOURCE_ROOT; };
7D10BC9B1743FE7B00DA7059 /* effects@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effects@2x.png"; path = "Resources/effects@2x.png"; sourceTree = SOURCE_ROOT; };
7D10BC9C1743FE7B00DA7059 /* reset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = reset.png; path = Resources/reset.png; sourceTree = SOURCE_ROOT; };
7D10BC9D1743FE7B00DA7059 /* reset@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "reset@2x.png"; path = "Resources/reset@2x.png"; sourceTree = SOURCE_ROOT; };
7D10BC9E1743FE7B00DA7059 /* speed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = speed.png; path = Resources/speed.png; sourceTree = SOURCE_ROOT; };
7D10BC9F1743FE7B00DA7059 /* speed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "speed@2x.png"; path = "Resources/speed@2x.png"; sourceTree = SOURCE_ROOT; };
7D33D41517182615008AF0E0 /* VLCMovieViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCMovieViewController~ipad.xib"; path = "Resources/VLCMovieViewController~ipad.xib"; sourceTree = SOURCE_ROOT; };
7D6B07A51716C9B8003280C4 /* AQGridView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AQGridView.h; path = ImportedSources/AQGridView/Classes/AQGridView.h; sourceTree = SOURCE_ROOT; };
7D6B07A61716C9B8003280C4 /* AQGridView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AQGridView.m; path = ImportedSources/AQGridView/Classes/AQGridView.m; sourceTree = SOURCE_ROOT; };
......@@ -274,8 +290,16 @@
7D10BC691743F9CB00DA7059 /* Filters and stuff */ = {
isa = PBXGroup;
children = (
7D10BC821743FB4A00DA7059 /* reset.png */,
7D10BC831743FB4A00DA7059 /* reset@2x.png */,
7D10BC961743FE7B00DA7059 /* aspectratio.png */,
7D10BC971743FE7B00DA7059 /* aspectratio@2x.png */,
7D10BC981743FE7B00DA7059 /* crop.png */,
7D10BC991743FE7B00DA7059 /* crop@2x.png */,
7D10BC9A1743FE7B00DA7059 /* effects.png */,
7D10BC9B1743FE7B00DA7059 /* effects@2x.png */,
7D10BC9C1743FE7B00DA7059 /* reset.png */,
7D10BC9D1743FE7B00DA7059 /* reset@2x.png */,
7D10BC9E1743FE7B00DA7059 /* speed.png */,
7D10BC9F1743FE7B00DA7059 /* speed@2x.png */,
);
name = "Filters and stuff";
path = ../AspenProject;
......@@ -555,8 +579,16 @@
7D10BC7F1743FA0F00DA7059 /* play@2x.png in Resources */,
7D10BC801743FA0F00DA7059 /* subtitles.png in Resources */,
7D10BC811743FA0F00DA7059 /* subtitles@2x.png in Resources */,
7D10BC841743FB4A00DA7059 /* reset.png in Resources */,
7D10BC851743FB4A00DA7059 /* reset@2x.png in Resources */,
7D10BCA01743FE7B00DA7059 /* aspectratio.png in Resources */,
7D10BCA11743FE7B00DA7059 /* aspectratio@2x.png in Resources */,
7D10BCA21743FE7B00DA7059 /* crop.png in Resources */,
7D10BCA31743FE7B00DA7059 /* crop@2x.png in Resources */,
7D10BCA41743FE7B00DA7059 /* effects.png in Resources */,
7D10BCA51743FE7B00DA7059 /* effects@2x.png in Resources */,
7D10BCA61743FE7B00DA7059 /* reset.png in Resources */,
7D10BCA71743FE7B00DA7059 /* reset@2x.png in Resources */,
7D10BCA81743FE7B00DA7059 /* speed.png in Resources */,
7D10BCA91743FE7B00DA7059 /* speed@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
AspenProject/VLCMovieViewController.h
View file @ fb4bce8d
......@@ -14,7 +14,7 @@
BOOL _controlsHidden;
BOOL _videoFiltersHidden;
BOOL _playbackViewHidden;
BOOL _playbackSpeedViewHidden;
UIActionSheet *_subtitleActionSheet;
UIActionSheet *_audiotrackActionSheet;
......@@ -56,8 +56,8 @@
@property (nonatomic, strong) IBOutlet UISlider *gammaSlider;
@property (nonatomic, strong) IBOutlet UIButton *resetVideoFilterButton;
@property (nonatomic, strong) IBOutlet UIView *playbackView;
@property (nonatomic, strong) IBOutlet UIButton *playbackButton;
@property (nonatomic, strong) IBOutlet UIView *playbackSpeedView;
@property (nonatomic, strong) IBOutlet UIButton *playbackSpeedButton;
@property (nonatomic, strong) IBOutlet UISlider *playbackSpeedSlider;
@property (nonatomic, strong) IBOutlet UILabel *playbackSpeedLabel;
@property (nonatomic, strong) IBOutlet UILabel *playbackSpeedIndicator;
......
AspenProject/VLCMovieViewController.m
View file @ fb4bce8d
......@@ -51,7 +51,8 @@
_saturationLabel.text = NSLocalizedString(@"VFILTER_SATURATION", @"");
_gammaLabel.text = NSLocalizedString(@"VFILTER_GAMMA", @"");
self.playbackView.hidden = YES;
self.playbackSpeedView.hidden = YES;
_playbackSpeedViewHidden = YES;
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
[center addObserver:self selector:@selector(handleExternalScreenDidConnect:)
......@@ -66,7 +67,7 @@
[self showOnExternalDisplay];
_movieView.userInteractionEnabled = NO;
UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(toogleControlsVisible)];
UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(toggleControlsVisible)];
recognizer.delegate = self;
[self.view addGestureRecognizer:recognizer];
......@@ -181,24 +182,28 @@
return YES;
}
- (void)toogleControlsVisible
- (void)toggleControlsVisible
{
_controlsHidden = !_controlsHidden;
CGFloat alpha = _controlsHidden? 0.0f: 1.0f;
if (!_controlsHidden) {
_controllerPanel.alpha = 0.0f;
_controllerPanel.hidden = !_videoFiltersHidden || !_playbackViewHidden;
_controllerPanel.hidden = !_videoFiltersHidden;
_toolbar.alpha = 0.0f;
_toolbar.hidden = NO;
_videoFilterView.alpha = 0.0f;
_videoFilterView.hidden = _videoFiltersHidden;
_playbackSpeedView.alpha = 0.0f;
_playbackSpeedView.hidden = _playbackSpeedViewHidden;
_playbackSpeedButton.alpha = 0.0f;
_playbackSpeedButton.hidden = NO;
_videoFilterButton.alpha = 0.0f;
_videoFilterButton.hidden = NO;
_playbackView.alpha = 0.0f;
_playbackView.hidden = _playbackViewHidden;
_playbackButton.alpha = 0.0f;
_playbackButton.hidden = NO;
_cropButton.alpha = 0.0f;
_cropButton.hidden = NO;
_aspectRatioButton.alpha = 0.0f;
_aspectRatioButton.hidden = NO;
}
void (^animationBlock)() = ^() {
......@@ -206,20 +211,33 @@
_toolbar.alpha = alpha;
_videoFilterView.alpha = alpha;
_videoFilterButton.alpha = alpha;
_playbackView.alpha = alpha;
_playbackButton.alpha = alpha;
_playbackSpeedView.alpha = alpha;
_playbackSpeedButton.alpha = alpha;
_videoFilterButton.alpha = alpha;
_cropButton.alpha = alpha;
_aspectRatioButton.alpha = alpha;
};
void (^completionBlock)(BOOL finished) = ^(BOOL finished) {
if (_videoFiltersHidden && _playbackViewHidden)
if (_videoFiltersHidden) {
_controllerPanel.hidden = _controlsHidden;
else
_controllerPanel.hidden = YES;
_playbackSpeedButton.hidden = _controlsHidden;
_videoFilterButton.hidden = _controlsHidden;
_cropButton.hidden = _controlsHidden;
_aspectRatioButton.hidden = _controlsHidden;
} else {
_controllerPanel.hidden = NO;
_playbackSpeedButton.hidden = NO;
_videoFilterButton.hidden = NO;
_cropButton.hidden = NO;
_aspectRatioButton.hidden = NO;
}
_toolbar.hidden = _controlsHidden;
_videoFilterView.hidden = _videoFiltersHidden;
_videoFilterButton.hidden = _controlsHidden;
_playbackView.hidden = _playbackViewHidden;
_playbackButton.hidden = _controlsHidden;
if (_controlsHidden)
_playbackSpeedView.hidden = YES;
else
_playbackSpeedView.hidden = _playbackSpeedViewHidden;
};
[UIView animateWithDuration:0.3f animations:animationBlock completion:completionBlock];
......@@ -244,7 +262,7 @@
{
_idleTimer = nil;
if (!_controlsHidden)
[self toogleControlsVisible];
[self toggleControlsVisible];
}
- (UIResponder *)nextResponder
......@@ -362,8 +380,8 @@
- (IBAction)videoFilterToggle:(id)sender
{
if (!_playbackViewHidden)
self.playbackView.hidden = _playbackViewHidden = YES;
if (!_playbackSpeedViewHidden)
self.playbackSpeedView.hidden = _playbackSpeedViewHidden = YES;
self.videoFilterView.hidden = !_videoFiltersHidden;
_videoFiltersHidden = self.videoFilterView.hidden;
......@@ -433,13 +451,12 @@
- (IBAction)videoDimensionAction:(id)sender
{
if (sender == self.playbackButton) {
if (sender == self.playbackSpeedButton) {
if (!_videoFiltersHidden)
self.videoFilterButton.hidden = _videoFiltersHidden = YES;
self.videoFilterView.hidden = _videoFiltersHidden = YES;
self.playbackView.hidden = !_playbackViewHidden;
_playbackViewHidden = self.playbackView.hidden;
self.controllerPanel.hidden = !_playbackViewHidden;
self.playbackSpeedView.hidden = !_playbackSpeedViewHidden;
_playbackSpeedViewHidden = self.playbackSpeedView.hidden;
} else if (sender == self.aspectRatioButton) {
NSArray *ratios = @[@"Default", @"1:1", @"4:3", @"16:9", @"16:10", @"2.21:1", @"2:35:1", @"2.39:1", @"5:4"];
NSUInteger count = [ratios count];
......@@ -447,17 +464,17 @@
_aspectRatioActionSheet = [[UIActionSheet alloc] initWithTitle:@"Choose Aspect Ratio" delegate:self cancelButtonTitle:nil destructiveButtonTitle:nil otherButtonTitles: nil];
for (NSUInteger i = 0; i < count; i++)
[_aspectRatioActionSheet addButtonWithTitle:ratios[i]];
[_aspectRatioActionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"subtitle track selector")];
[_aspectRatioActionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"")];
[_aspectRatioActionSheet setCancelButtonIndex:[_aspectRatioActionSheet numberOfButtons] - 1];
[_aspectRatioActionSheet showFromRect:[self.aspectRatioButton frame] inView:self.aspectRatioButton animated:YES];
} else if (sender == self.cropButton) {
NSArray *ratios = @[@"Default", @"16:10", @"16:9", @"1.85:1", @"2.21:1", @"2.35:1", @"2:39:1", @"5:3", @"4:3", @"5:4", @"1:1"];
NSUInteger count = [ratios count];
_cropActionSheet = [[UIActionSheet alloc] initWithTitle:@"Choose Aspect Ratio" delegate:self cancelButtonTitle:nil destructiveButtonTitle:nil otherButtonTitles: nil];
_cropActionSheet = [[UIActionSheet alloc] initWithTitle:@"Choose Crop Mask" delegate:self cancelButtonTitle:nil destructiveButtonTitle:nil otherButtonTitles: nil];
for (NSUInteger i = 0; i < count; i++)
[_cropActionSheet addButtonWithTitle:ratios[i]];
[_cropActionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"subtitle track selector")];
[_cropActionSheet addButtonWithTitle:NSLocalizedString(@"Cancel", @"")];
[_cropActionSheet setCancelButtonIndex:[_cropActionSheet numberOfButtons] - 1];
[_cropActionSheet showFromRect:[self.cropButton frame] inView:self.cropButton animated:YES];
}
......
Resources/VLCMovieViewController~ipad.xib
View file @ fb4bce8d
......@@ -376,20 +376,22 @@
<string key="NSFrame">{{704, 481}, {44, 44}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="734589612"/>
<reference key="NSNextKeyView" ref="458325731"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">VF</string>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">effects.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
......@@ -405,14 +407,66 @@
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">PB</string>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">speed.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
<object class="IBUIButton" id="458325731">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">297</int>
<string key="NSFrame">{{704, 533}, {44, 44}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="734589612"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">crop.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
<object class="IBUIButton" id="420106525">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">297</int>
<string key="NSFrame">{{20, 533}, {45, 44}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="753155309"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">aspectratio.png</string>
</object>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
......@@ -632,7 +686,7 @@
<reference key="IBUIFont" ref="560717679"/>
</object>
</array>
<string key="NSFrame">{{328, 406}, {298, 192}}</string>
<string key="NSFrame">{{386, 407}, {298, 192}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="24746056"/>
......@@ -689,7 +743,7 @@
<string key="NSFrame">{{20, 5}, {280, 21}}</string>
<reference key="NSSuperview" ref="567155588"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="86492204"/>
<reference key="NSNextKeyView" ref="420106525"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
......@@ -705,54 +759,8 @@
<reference key="IBUIFont" ref="96503569"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIButton" id="86492204">
<reference key="NSNextResponder" ref="567155588"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{103, 49}, {116, 44}}</string>
<reference key="NSSuperview" ref="567155588"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="306477855"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Aspect Ratio</string>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
<object class="IBUIButton" id="306477855">
<reference key="NSNextResponder" ref="567155588"/>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{131, 100}, {59, 44}}</string>
<reference key="NSSuperview" ref="567155588"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="753155309"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<int key="IBUIButtonType">1</int>
<string key="IBUINormalTitle">Crop</string>
<reference key="IBUIHighlightedTitleColor" ref="33107367"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="25335422"/>
<reference key="IBUIFontDescription" ref="581809469"/>
<reference key="IBUIFont" ref="560717679"/>
</object>
</array>
<string key="NSFrame">{{142, 426}, {320, 154}}</string>
<string key="NSFrame">{{73, 479}, {320, 46}}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="238880395"/>
......@@ -1004,59 +1012,59 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackView</string>
<string key="label">playbackSpeedSlider</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="567155588"/>
<reference key="destination" ref="238880395"/>
</object>
<int key="connectionID">184</int>
<int key="connectionID">191</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackButton</string>
<string key="label">playbackSpeedIndicator</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="959094125"/>
<reference key="destination" ref="1000595153"/>
</object>
<int key="connectionID">185</int>
<int key="connectionID">193</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">cropButton</string>
<string key="label">playbackSpeedLabel</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="306477855"/>
<reference key="destination" ref="86224047"/>
</object>
<int key="connectionID">189</int>
<int key="connectionID">194</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">aspectRatioButton</string>
<string key="label">playbackSpeedButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="86492204"/>
<reference key="destination" ref="959094125"/>
</object>
<int key="connectionID">190</int>
<int key="connectionID">196</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackSpeedSlider</string>
<string key="label">playbackSpeedView</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="238880395"/>
<reference key="destination" ref="567155588"/>
</object>
<int key="connectionID">191</int>
<int key="connectionID">197</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackSpeedIndicator</string>
<string key="label">aspectRatioButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="1000595153"/>
<reference key="destination" ref="420106525"/>
</object>
<int key="connectionID">193</int>
<int key="connectionID">202</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">playbackSpeedLabel</string>
<string key="label">cropButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="86224047"/>
<reference key="destination" ref="458325731"/>
</object>
<int key="connectionID">194</int>
<int key="connectionID">204</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
......@@ -1185,39 +1193,39 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="306477855"/>
<string key="label">playbackSpeedSliderAction:</string>
<reference key="source" ref="238880395"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
<int key="IBEventType">13</int>
</object>
<int key="connectionID">188</int>
<int key="connectionID">192</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="86492204"/>
<reference key="source" ref="959094125"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">187</int>
<int key="connectionID">186</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">playbackSpeedSliderAction:</string>
<reference key="source" ref="238880395"/>
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="458325731"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">13</int>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">192</int>
<int key="connectionID">203</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">videoDimensionAction:</string>
<reference key="source" ref="959094125"/>
<reference key="source" ref="420106525"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">186</int>
<int key="connectionID">201</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
......@@ -1251,6 +1259,8 @@
<reference ref="11334779"/>
<reference ref="567155588"/>
<reference ref="959094125"/>
<reference ref="458325731"/>
<reference ref="420106525"/>
</array>
<reference key="parent" ref="0"/>
</object>
......@@ -1441,8 +1451,6 @@
<int key="objectID">176</int>
<reference key="object" ref="567155588"/>
<array class="NSMutableArray" key="children">
<reference ref="306477855"/>
<reference ref="86492204"/>
<reference ref="1000595153"/>
<reference ref="238880395"/>
<reference ref="86224047"/>
......@@ -1450,16 +1458,6 @@
<reference key="parent" ref="647120888"/>
<string key="objectName">Controls panel</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">177</int>
<reference key="object" ref="306477855"/>
<reference key="parent" ref="567155588"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">178</int>
<reference key="object" ref="86492204"/>
<reference key="parent" ref="567155588"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">179</int>
<reference key="object" ref="1000595153"/>
......@@ -1480,6 +1478,16 @@
<reference key="object" ref="959094125"/>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">198</int>
<reference key="object" ref="458325731"/>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">199</int>
<reference key="object" ref="420106525"/>
<reference key="parent" ref="647120888"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -1517,12 +1525,12 @@
<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="176.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="177.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="180.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="181.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="182.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="198.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="199.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>
......@@ -1530,7 +1538,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">195</int>
<int key="maxID">204</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -1622,11 +1630,11 @@
<string key="hueSlider">UISlider</string>
<string key="movieView">UIView</string>
<string key="playPauseButton">UIButton</string>
<string key="playbackButton">UIButton</string>
<string key="playbackSpeedButton">UIButton</string>
<string key="playbackSpeedIndicator">UILabel</string>
<string key="playbackSpeedLabel">UILabel</string>
<string key="playbackSpeedSlider">UISlider</string>
<string key="playbackView">UIView</string>
<string key="playbackSpeedView">UIView</string>
<string key="playingExternallyDescription">UILabel</string>
<string key="playingExternallyTitle">UILabel</string>
<string key="playingExternallyView">UIView</string>
......@@ -1709,8 +1717,8 @@
<string key="name">playPauseButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="playbackButton">
<string key="name">playbackButton</string>
<object class="IBToOneOutletInfo" key="playbackSpeedButton">
<string key="name">playbackSpeedButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="playbackSpeedIndicator">
......@@ -1725,8 +1733,8 @@
<string key="name">playbackSpeedSlider</string>
<string key="candidateClassName">UISlider</string>
</object>
<object class="IBToOneOutletInfo" key="playbackView">
<string key="name">playbackView</string>
<object class="IBToOneOutletInfo" key="playbackSpeedView">
<string key="name">playbackSpeedView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="playingExternallyDescription">
......@@ -1795,11 +1803,15 @@
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="PlayingExternally~ipad.png">{261, 195}</string>
<string key="aspectratio.png">{40, 24}</string>
<string key="audio.png">{66, 66}</string>
<string key="backward.png">{100, 66}</string>
<string key="crop.png">{24, 24}</string>
<string key="effects.png">{33, 24}</string>
<string key="forward.png">{100, 66}</string>
<string key="play.png">{66, 66}</string>
<string key="reset.png">{19, 19}</string>
<string key="speed.png">{24, 24}</string>
<string key="subtitles.png">{66, 66}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">2083</string>
......
Resources/VLCMovieViewController~iphone.xib
View file @ fb4bce8d
......@@ -46,7 +46,6 @@
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{320, 568}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="831191623"/>