Skip to content

GitLab

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

Add playlist view tabbar to iPad UI, so iPad users can open network streams, too (refs #8575)

parent f982baa4
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 6 deletions
AspenProject/VLCPlaylistViewController.m
View file @ 1d12d6d0
......@@ -43,10 +43,10 @@
_gridView.separatorStyle = AQGridViewCellSeparatorStyleEmptySpace;
_gridView.alwaysBounceVertical = YES;
_gridView.indicatorStyle = UIScrollViewIndicatorStyleWhite;
} else {
self.tabBar.selectedItem = self.localFilesBarItem;
self.networkStreamsBarItem.title = NSLocalizedString(@"Network",@"");
}
self.tabBar.selectedItem = self.localFilesBarItem;
self.networkStreamsBarItem.title = NSLocalizedString(@"Network",@"");
}
- (void)viewWillAppear:(BOOL)animated
......
Resources/VLCMovieViewController~ipad.xib
View file @ 1d12d6d0
......@@ -840,6 +840,14 @@
</object>
<int key="connectionID">161</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">resetVideoFilterButton</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="437839795"/>
</object>
<int key="connectionID">175</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">closePlayback:</string>
......@@ -1224,7 +1232,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">174</int>
<int key="maxID">175</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......
Resources/VLCPlaylistViewController~ipad.xib
View file @ 1d12d6d0
......@@ -12,6 +12,8 @@
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUITabBar</string>
<string>IBUITabBarItem</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
......@@ -37,9 +39,10 @@
<object class="IBUIView" id="344324954">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{768, 1004}</string>
<string key="NSFrameSize">{768, 955}</string>
<reference key="NSSuperview" ref="647120888"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="121273175"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
......@@ -47,10 +50,37 @@
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUITabBar" id="121273175">
<reference key="NSNextResponder" ref="647120888"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 955}, {768, 49}}</string>
<reference key="NSSuperview" ref="647120888"/>
<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>
<array class="NSMutableArray" key="IBUIItems">
<object class="IBUITabBarItem" id="484642032">
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUITabBar" ref="121273175"/>
<int key="IBUISystemItemIdentifier">1</int>
</object>
<object class="IBUITabBarItem" id="325406803">
<string key="IBUITitle">Network</string>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<reference key="IBUITabBar" ref="121273175"/>
</object>
</array>
</object>
</array>
<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="344324954"/>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
......@@ -80,6 +110,30 @@
</object>
<int key="connectionID">104</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">localFilesBarItem</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="484642032"/>
</object>
<int key="connectionID">108</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">networkStreamsBarItem</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="325406803"/>
</object>
<int key="connectionID">109</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">tabBar</string>
<reference key="source" ref="841351856"/>
<reference key="destination" ref="121273175"/>
</object>
<int key="connectionID">111</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">dataSource</string>
......@@ -96,6 +150,14 @@
</object>
<int key="connectionID">103</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="121273175"/>
<reference key="destination" ref="841351856"/>
</object>
<int key="connectionID">110</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
......@@ -121,6 +183,7 @@
<reference key="object" ref="647120888"/>
<array class="NSMutableArray" key="children">
<reference ref="344324954"/>
<reference ref="121273175"/>
</array>
<reference key="parent" ref="0"/>
</object>
......@@ -129,6 +192,25 @@
<reference key="object" ref="344324954"/>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">105</int>
<reference key="object" ref="121273175"/>
<array class="NSMutableArray" key="children">
<reference ref="484642032"/>
<reference ref="325406803"/>
</array>
<reference key="parent" ref="647120888"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">106</int>
<reference key="object" ref="484642032"/>
<reference key="parent" ref="121273175"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">107</int>
<reference key="object" ref="325406803"/>
<reference key="parent" ref="121273175"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -138,13 +220,16 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="101.CustomClassName">AQGridView</string>
<string key="101.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="106.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="107.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="8.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">104</int>
<int key="maxID">111</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -175,6 +260,9 @@
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="gridView">AQGridView</string>
<string key="localFilesBarItem">UITabBarItem</string>
<string key="networkStreamsBarItem">UITabBarItem</string>
<string key="tabBar">UITabBar</string>
<string key="tableView">UITableView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -182,6 +270,18 @@
<string key="name">gridView</string>
<string key="candidateClassName">AQGridView</string>
</object>
<object class="IBToOneOutletInfo" key="localFilesBarItem">
<string key="name">localFilesBarItem</string>
<string key="candidateClassName">UITabBarItem</string>
</object>
<object class="IBToOneOutletInfo" key="networkStreamsBarItem">
<string key="name">networkStreamsBarItem</string>
<string key="candidateClassName">UITabBarItem</string>
</object>
<object class="IBToOneOutletInfo" key="tabBar">
<string key="name">tabBar</string>
<string key="candidateClassName">UITabBar</string>
</object>
<object class="IBToOneOutletInfo" key="tableView">
<string key="name">tableView</string>
<string key="candidateClassName">UITableView</string>
......
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