Commit 8df44fa4 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Add in-app help to http downloader and open network stream

parent 9b5e5b43
......@@ -14,6 +14,7 @@
@property (nonatomic, strong) IBOutlet UIButton *downloadButton;
@property (nonatomic, strong) IBOutlet UITextField *urlField;
@property (nonatomic, strong) IBOutlet UILabel *whatToDownloadHelpLabel;
@property (nonatomic, strong) IBOutlet UITableView *downloadsTable;
@property (nonatomic, strong) IBOutlet UIProgressView *progressView;
......
......@@ -28,6 +28,7 @@
_currentDownloads = [[NSMutableArray alloc] init];
self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
self.title = NSLocalizedString(@"DOWNLOAD_FROM_HTTP", @"");
self.whatToDownloadHelpLabel.text = [NSString stringWithFormat:NSLocalizedString(@"DOWNLOAD_FROM_HTTP_HELP", @""), [[UIDevice currentDevice] model]];
[super viewDidLoad];
}
......
......@@ -15,6 +15,7 @@
@property (strong, nonatomic) IBOutlet UISwitch *privateToggleSwitch;
@property (strong, nonatomic) IBOutlet UILabel *privateModeLabel;
@property (strong, nonatomic) IBOutlet UITableView *historyTableView;
@property (strong, nonatomic) IBOutlet UILabel *whatToOpenHelpLabel;
- (IBAction)openButtonAction:(id)sender;
......
......@@ -37,6 +37,7 @@
[self.privateModeLabel setText:NSLocalizedString(@"PRIVATE_PLAYBACK_TOGGLE", @"")];
self.title = NSLocalizedString(@"OPEN_NETWORK", @"");
self.navigationItem.leftBarButtonItem = [UIBarButtonItem themedRevealMenuButtonWithTarget:self andSelector:@selector(goBack:)];
[self.whatToOpenHelpLabel setText:NSLocalizedString(@"OPEN_NETWORK_HELP", @"")];
}
- (void)viewWillAppear:(BOOL)animated
......
......@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">12F17</string>
<string key="IBDocument.SystemVersion">12F33</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
......@@ -48,7 +48,7 @@
<object class="IBUIImageView" id="433654949">
<reference key="NSNextResponder" ref="234033301"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 60}</string>
<string key="NSFrameSize">{320, 101}</string>
<reference key="NSSuperview" ref="234033301"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="205664075"/>
......@@ -92,11 +92,11 @@
<string key="NSResourceName">input.png</string>
</object>
<int key="IBUIClearButtonMode">2</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<object class="IBUIFontDescription" key="IBUIFontDescription" id="328285726">
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont">
<object class="NSFont" key="IBUIFont" id="825639518">
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
......@@ -141,8 +141,34 @@
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="325478617">
<reference key="NSNextResponder" ref="234033301"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{10, 49}, {300, 50}}</string>
<reference key="NSSuperview" ref="234033301"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Enter any HTTP address to download the file to your $DEVICE.</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC43NDY1OTE5OTYyIDAuNzQ2NTkxOTk2MiAwLjc0NjU5MTk5NjIAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">9</float>
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="328285726"/>
<reference key="IBUIFont" ref="825639518"/>
<double key="preferredMaxLayoutWidth">300</double>
</object>
</array>
<string key="NSFrameSize">{320, 60}</string>
<string key="NSFrameSize">{320, 101}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="433654949"/>
......@@ -255,7 +281,7 @@
<int key="IBUIStyle">0</int>
</object>
</array>
<string key="NSFrame">{{0, 63}, {320, 60}}</string>
<string key="NSFrame">{{0, 122}, {320, 60}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1005679980"/>
......@@ -267,7 +293,7 @@
<object class="IBUITableView" id="831264216">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 127}, {320, 256}}</string>
<string key="NSFrame">{{0, 193}, {320, 190}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
......@@ -418,9 +444,9 @@
<int key="objectID">1</int>
<reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children">
<reference ref="234033301"/>
<reference ref="831264216"/>
<reference ref="1066205493"/>
<reference ref="234033301"/>
</array>
<reference key="parent" ref="0"/>
</object>
......@@ -442,6 +468,7 @@
<reference ref="205664075"/>
<reference ref="433654949"/>
<reference ref="209774297"/>
<reference ref="325478617"/>
</array>
<reference key="parent" ref="191373211"/>
</object>
......@@ -502,6 +529,11 @@
<reference key="object" ref="385572310"/>
<reference key="parent" ref="1066205493"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">95</int>
<reference key="object" ref="325478617"/>
<reference key="parent" ref="234033301"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -522,12 +554,13 @@
<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="91.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="95.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">94</int>
<int key="maxID">95</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -537,6 +570,7 @@
<dictionary class="NSMutableDictionary" key="actions">
<string key="cancelDownload:">id</string>
<string key="downloadAction:">id</string>
<string key="goBack:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="cancelDownload:">
......@@ -547,6 +581,10 @@
<string key="name">downloadAction:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="goBack:">
<string key="name">goBack:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="activityIndicator">UIActivityIndicatorView</string>
......@@ -556,6 +594,7 @@
<string key="downloadsTable">UITableView</string>
<string key="progressView">UIProgressView</string>
<string key="urlField">UITextField</string>
<string key="whatToDownloadHelpLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="activityIndicator">
......@@ -586,6 +625,10 @@
<string key="name">urlField</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo" key="whatToDownloadHelpLabel">
<string key="name">whatToDownloadHelpLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
......
......@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1296</int>
<string key="IBDocument.SystemVersion">12F17</string>
<string key="IBDocument.SystemVersion">12F33</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
......@@ -47,7 +47,7 @@
<object class="IBUIImageView" id="602492749">
<reference key="NSNextResponder" ref="975400831"/>
<int key="NSvFlags">290</int>
<string key="NSFrameSize">{320, 60}</string>
<string key="NSFrameSize">{320, 101}</string>
<reference key="NSSuperview" ref="975400831"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="554522247"/>
......@@ -90,11 +90,11 @@
<string key="NSResourceName">input.png</string>
</object>
<int key="IBUIClearButtonMode">2</int>
<object class="IBUIFontDescription" key="IBUIFontDescription">
<object class="IBUIFontDescription" key="IBUIFontDescription" id="629226946">
<int key="type">1</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont">
<object class="NSFont" key="IBUIFont" id="952859887">
<string key="NSName">Helvetica</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
......@@ -106,7 +106,7 @@
<string key="NSFrame">{{228, 11}, {82, 39}}</string>
<reference key="NSSuperview" ref="975400831"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="981202834"/>
<reference key="NSNextKeyView" ref="603723593"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
......@@ -139,8 +139,35 @@
<int key="NSfFlags">16</int>
</object>
</object>
<object class="IBUILabel" id="603723593">
<reference key="NSNextResponder" ref="975400831"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{10, 50}, {300, 50}}</string>
<reference key="NSSuperview" ref="975400831"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="981202834"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Enter any HTTP, RTSP, RTMP, MMS, FTP or UDP/RTP address to open the stream directly.</string>
<object class="NSColor" key="IBUITextColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC43NDY1OTE5OTYyIDAuNzQ2NTkxOTk2MiAwLjc0NjU5MTk5NjIAA</bytes>
</object>
<nil key="IBUIHighlightedColor"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">9</float>
<int key="IBUINumberOfLines">0</int>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="629226946"/>
<reference key="IBUIFont" ref="952859887"/>
<double key="preferredMaxLayoutWidth">300</double>
</object>
</array>
<string key="NSFrameSize">{320, 60}</string>
<string key="NSFrameSize">{320, 101}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="602492749"/>
......@@ -221,7 +248,7 @@
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
</array>
<string key="NSFrame">{{0, 63}, {320, 60}}</string>
<string key="NSFrame">{{0, 103}, {320, 60}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="989734413"/>
......@@ -233,7 +260,7 @@
<object class="IBUITableView" id="298922959">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 127}, {320, 256}}</string>
<string key="NSFrame">{{0, 167}, {320, 216}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
......@@ -321,6 +348,14 @@
</object>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">whatToOpenHelpLabel</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="603723593"/>
</object>
<int key="connectionID">29</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">openButtonAction:</string>
......@@ -383,6 +418,7 @@
<reference ref="602492749"/>
<reference ref="554522247"/>
<reference ref="504069026"/>
<reference ref="603723593"/>
</array>
<reference key="parent" ref="191373211"/>
</object>
......@@ -431,6 +467,11 @@
<reference key="object" ref="455902210"/>
<reference key="parent" ref="981202834"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">27</int>
<reference key="object" ref="603723593"/>
<reference key="parent" ref="975400831"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -442,6 +483,7 @@
<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -454,7 +496,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">25</int>
<int key="maxID">29</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -469,23 +511,27 @@
<object class="IBPartialClassDescription">
<string key="className">VLCOpenNetworkStreamViewController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">openButtonAction:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">openButtonAction:</string>
<object class="IBActionInfo" key="NS.object.0">
<dictionary class="NSMutableDictionary" key="actions">
<string key="goBack:">id</string>
<string key="openButtonAction:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="goBack:">
<string key="name">goBack:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="openButtonAction:">
<string key="name">openButtonAction:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="historyTableView">UITableView</string>
<string key="openButton">UIButton</string>
<string key="privateModeLabel">UILabel</string>
<string key="privateToggleSwitch">UISwitch</string>
<string key="urlField">UITextField</string>
<string key="whatToOpenHelpLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="historyTableView">
......@@ -508,6 +554,10 @@
<string key="name">urlField</string>
<string key="candidateClassName">UITextField</string>
</object>
<object class="IBToOneOutletInfo" key="whatToOpenHelpLabel">
<string key="name">whatToOpenHelpLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
......
B"CHOOSE_AUDIO_TRACK"="Odaberi Trag Zvuka";
......
B"CHOOSE_AUDIO_TRACK"="Trieu la pista d'àudio";
......
B"CHOOSE_AUDIO_TRACK"="Vælg lydspor";
......
B"CHOOSE_AUDIO_TRACK"="Audiospur wählen";
......
B"CHOOSE_AUDIO_TRACK"="Choose Audio Track";
......
B"CHOOSE_AUDIO_TRACK"="Elegir pista de audio";
......
B"CHOOSE_AUDIO_TRACK"="Valitse ääniraita";
......
B"CHOOSE_AUDIO_TRACK"="Choisir la piste audio";
......
B"CHOOSE_AUDIO_TRACK"="Seleccione a pista de audio";
......
B"CHOOSE_AUDIO_TRACK"="בחירת רצועת שמע";
......
B"CHOOSE_AUDIO_TRACK"="Pemilihan Track Audio";
......
B"CHOOSE_AUDIO_TRACK"="Scegli la traccia audio";
......
B"CHOOSE_AUDIO_TRACK"="オーディオトラックを選択してください";
......
B"CHOOSE_AUDIO_TRACK"="ध्वनी ट्रॅक निवडा";
......
B"CHOOSE_AUDIO_TRACK"="Audiospoor kiezen";
......
B"CHOOSE_AUDIO_TRACK"="Escolher Faixa de Áudio";
......
B"CHOOSE_AUDIO_TRACK"="Выберите аудио поток";
......
B"CHOOSE_AUDIO_TRACK"="Vybrať zvukovú stopu";
......
B"CHOOSE_AUDIO_TRACK"="Ses İzini Seçin";
......
B"CHOOSE_AUDIO_TRACK"="Вибрати звукову доріжку";
......
B"CHOOSE_AUDIO_TRACK"="Chọn track audio";
......
B"CHOOSE_AUDIO_TRACK"="选择音频轨道";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment