Switch settings implementation to a saner approach, so the user can set most options both in System Settings and in-app (using InAppSettingsKit)

TODO: re-add l10n support, fix in-app setting of subtitles text encoding (only supported in System Settings right now)

AspenProject/VLCAppDelegate.m

@@ -24,7 +24,7 @@
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
-    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : kVLCSettingStretchAudioDefaultValue, kVLCSettingVerboseOutput : kVLCSettingVerboseOutputDefaultValue, kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue};
+    NSDictionary *appDefaults = @{kVLCSettingPasscodeKey : @"", kVLCSettingPasscodeOnKey : @(NO), kVLCSettingContinueAudioInBackgroundKey : @(YES), kVLCSettingStretchAudio : @(NO), kVLCSettingVerboseOutput : @(NO), kVLCSettingTextEncoding : kVLCSettingTextEncodingDefaultValue};
 
     [defaults registerDefaults:appDefaults];
 }

AspenProject/VLCConstants.h

@@ -12,8 +12,10 @@
 #define kVLCSettingPasscodeOnKey @"PasscodeProtection"
 #define kVLCSettingContinueAudioInBackgroundKey @"BackgroundAudioPlayback"
 #define kVLCSettingStretchAudio @"StretchAudio"
-#define kVLCSettingStretchAudioDefaultValue @"--no-audio-time-stretch"
+#define kVLCSettingStretchAudioOnValue @"--audio-time-stretch"
+#define kVLCSettingStretchAudioOffValue @"--no-audio-time-stretch"
 #define kVLCSettingVerboseOutput @"VerboseLogs"
-#define kVLCSettingVerboseOutputDefaultValue @"--verbose=3"
+#define kVLCSettingVerboseOutputOnValue @"--verbose=3"
+#define kVLCSettingVerboseOutputOffValue @"--verbose=0"
 #define kVLCSettingTextEncoding @"subsdec-encoding"
-#define kVLCSettingTextEncodingDefaultValue @""
+#define kVLCSettingTextEncodingDefaultValue @"Windows-1252"

AspenProject/VLCMovieViewController.m

@@ -83,9 +83,9 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSArray *options = @[[defaults objectForKey:kVLCSettingVerboseOutput],
-                         [defaults objectForKey:kVLCSettingStretchAudio],
-                         [defaults objectForKey:kVLCSettingTextEncoding]];
+    NSArray *options = @[[[defaults objectForKey:kVLCSettingVerboseOutput] intValue] ? kVLCSettingVerboseOutputOnValue : kVLCSettingVerboseOutputOffValue,
+                         [[defaults objectForKey:kVLCSettingStretchAudio] intValue] ? kVLCSettingStretchAudioOnValue : kVLCSettingStretchAudioOffValue,
+                         [NSString stringWithFormat:@"--subsdec-encoding=%@",[defaults objectForKey:kVLCSettingTextEncoding]]];
 
     _mediaPlayer = [[VLCMediaPlayer alloc] initWithOptions:options];
     [_mediaPlayer setDelegate:self];

AspenProject/VLCSettingsViewController.h

@@ -6,27 +6,15 @@
 //  Copyright (c) 2013 VideoLAN. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import "IASKAppSettingsViewController.h"
+#import "PAPasscodeViewController.h"
 
-@interface VLCSettingsViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate>
+@interface VLCSettingsViewController : UIViewController <IASKSettingsDelegate, PAPasscodeViewControllerDelegate>
 
+@property (nonatomic, strong) IBOutlet UIToolbar *topToolbar;
 @property (nonatomic, strong) IBOutlet UIBarButtonItem *dismissButton;
-@property (nonatomic, strong) IBOutlet UISwitch *passcodeLockSwitch;
-@property (nonatomic, strong) IBOutlet UILabel *passcodeLockLabel;
 
-@property (nonatomic, strong) IBOutlet UISwitch *audioPlaybackInBackgroundSwitch;
-@property (nonatomic, strong) IBOutlet UILabel *audioPlaybackInBackgroundLabel;
-
-@property (nonatomic, strong) IBOutlet UISwitch *audioStretchingSwitch;
-@property (nonatomic, strong) IBOutlet UILabel *audioStretchingLabel;
-
-@property (nonatomic, strong) IBOutlet UISwitch *debugOutputSwitch;
-@property (nonatomic, strong) IBOutlet UILabel *debugOutputLabel;
-
-@property (nonatomic, strong) IBOutlet UIPickerView *textEncodingPicker;
-@property (nonatomic, strong) IBOutlet UILabel *textEncodingLabel;
-
-- (IBAction)toggleSetting:(id)sender;
+@property (nonatomic, retain) IBOutlet IASKAppSettingsViewController *appSettingsViewController;
 
 - (IBAction)dismiss:(id)sender;
 

Resources/Settings.bundle/Root.inApp.plist

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Generic</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>NO</string>
+			<key>Key</key>
+			<string>PasscodeProtection</string>
+			<key>Title</key>
+			<string>Passcode Lock</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Video</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Titles</key>
+			<array>
+				<string>Universal (UTF-8)</string>
+				<string>Universal (UTF-16)</string>
+				<string>Universal (big endian UTF-16)</string>
+				<string>Universal (little endian UTF-16)</string>
+				<string>Universal Chinese (GB18030)</string>
+				<string>Western European (Latin-9)</string>
+				<string>Western European (Windows-1252)</string>
+				<string>Western European (IBM 00850)</string>
+				<string>Eastern European (Latin-2)</string>
+				<string>Eastern European (Windows-1250)</string>
+				<string>Esperanto (Latin-3)</string>
+				<string>Nordic (Latin-6)</string>
+				<string>Cyrillic (Windows-1251)</string>
+				<string>Russian (KOI8-R)</string>
+				<string>Ukrainian (KOI8-U)</string>
+				<string>Arabic (ISO 8859-6)</string>
+				<string>Arabic (Windows-1256)</string>
+				<string>Greek (ISO 8859-7)</string>
+				<string>Greek (Windows-1253)</string>
+				<string>Hebrew (ISO 8859-8)</string>
+				<string>Hebrew (Windows-1255)</string>
+				<string>Turkish (ISO 8859-9)</string>
+				<string>Turkish (Windows-1254)</string>
+				<string>Thai (TIS 620-2533/ISO 8859-11)</string>
+				<string>Thai (Windows-874)</string>
+				<string>Baltic (Latin-7)</string>
+				<string>Baltic (Windows-1257)</string>
+				<string>Celtic (Latin-8)</string>
+				<string>South-Eastern European (Latin-10)</string>
+				<string>Simplified Chinese (ISO-2022-CN-EXT)</string>
+				<string>Simplified Chinese Unix (EUC-CN)</string>
+				<string>Japanese (7-bits JIS/ISO-2022-JP-2)</string>
+				<string>Japanese Unix (EUC-JP)</string>
+				<string>Japanese (Shift JIS)</string>
+				<string>Korean (EUC-KR/CP949)</string>
+				<string>Korean (ISO-2022-KR)</string>
+				<string>Traditional Chinese (Big5)</string>
+				<string>Traditional Chinese Unix (EUC-TW)</string>
+				<string>Hong-Kong Supplementary (HKSCS)</string>
+				<string>Vietnamese (VISCII)</string>
+				<string>Vietnamese (Windows-1258)</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<string>UTF-8</string>
+				<string>UTF-16</string>
+				<string>UTF-16BE</string>
+				<string>UTF-16LE</string>
+				<string>GB18030</string>
+				<string>ISO-8859-15</string>
+				<string>Windows-1252</string>
+				<string>IBM850</string>
+				<string>ISO-8859-2</string>
+				<string>Windows-1250</string>
+				<string>ISO-8859-3</string>
+				<string>ISO-8859-10</string>
+				<string>Windows-1251</string>
+				<string>KOI8-R</string>
+				<string>KOI8-U</string>
+				<string>ISO-8859-6</string>
+				<string>Windows-1256</string>
+				<string>ISO-8859-7</string>
+				<string>Windows-1253</string>
+				<string>ISO-8859-8</string>
+				<string>Windows-1255</string>
+				<string>ISO-8859-9</string>
+				<string>Windows-1254</string>
+				<string>ISO-8859-11</string>
+				<string>Windows-874</string>
+				<string>ISO-8859-13</string>
+				<string>Windows-1257</string>
+				<string>ISO-8859-14</string>
+				<string>ISO-8859-16</string>
+				<string>ISO-2022-CN-EXT</string>
+				<string>EUC-CN</string>
+				<string>ISO-2022-JP-2</string>
+				<string>EUC-JP</string>
+				<string>Shift_JIS</string>
+				<string>CP949</string>
+				<string>ISO-2022-KR</string>
+				<string>Big5</string>
+				<string>ISO-2022-TW</string>
+				<string>Big5-HKSCS</string>
+				<string>VISCII</string>
+				<string>Windows-1258</string>
+			</array>
+			<key>Title</key>
+			<string>Subtitles Text Encoding</string>
+			<key>Key</key>
+			<string>subsdec-encoding</string>
+			<key>DefaultValue</key>
+			<string>Windows-1252</string>
+		</dict>
+        <dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Audio</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Time-stretching audio</string>
+			<key>Key</key>
+			<string>StretchAudio</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>BackgroundAudioPlayback</string>
+			<key>Title</key>
+			<string>Audio playback in background</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Advanced</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Verbose debug logs</string>
+			<key>Key</key>
+			<string>VerboseLogs</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Root</string>
+</dict>
+</plist>

Resources/Settings.bundle/Root.plist

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Video</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Titles</key>
+			<array>
+				<string>Universal (UTF-8)</string>
+				<string>Universal (UTF-16)</string>
+				<string>Universal (big endian UTF-16)</string>
+				<string>Universal (little endian UTF-16)</string>
+				<string>Universal Chinese (GB18030)</string>
+				<string>Western European (Latin-9)</string>
+				<string>Western European (Windows-1252)</string>
+				<string>Western European (IBM 00850)</string>
+				<string>Eastern European (Latin-2)</string>
+				<string>Eastern European (Windows-1250)</string>
+				<string>Esperanto (Latin-3)</string>
+				<string>Nordic (Latin-6)</string>
+				<string>Cyrillic (Windows-1251)</string>
+				<string>Russian (KOI8-R)</string>
+				<string>Ukrainian (KOI8-U)</string>
+				<string>Arabic (ISO 8859-6)</string>
+				<string>Arabic (Windows-1256)</string>
+				<string>Greek (ISO 8859-7)</string>
+				<string>Greek (Windows-1253)</string>
+				<string>Hebrew (ISO 8859-8)</string>
+				<string>Hebrew (Windows-1255)</string>
+				<string>Turkish (ISO 8859-9)</string>
+				<string>Turkish (Windows-1254)</string>
+				<string>Thai (TIS 620-2533/ISO 8859-11)</string>
+				<string>Thai (Windows-874)</string>
+				<string>Baltic (Latin-7)</string>
+				<string>Baltic (Windows-1257)</string>
+				<string>Celtic (Latin-8)</string>
+				<string>South-Eastern European (Latin-10)</string>
+				<string>Simplified Chinese (ISO-2022-CN-EXT)</string>
+				<string>Simplified Chinese Unix (EUC-CN)</string>
+				<string>Japanese (7-bits JIS/ISO-2022-JP-2)</string>
+				<string>Japanese Unix (EUC-JP)</string>
+				<string>Japanese (Shift JIS)</string>
+				<string>Korean (EUC-KR/CP949)</string>
+				<string>Korean (ISO-2022-KR)</string>
+				<string>Traditional Chinese (Big5)</string>
+				<string>Traditional Chinese Unix (EUC-TW)</string>
+				<string>Hong-Kong Supplementary (HKSCS)</string>
+				<string>Vietnamese (VISCII)</string>
+				<string>Vietnamese (Windows-1258)</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<string>UTF-8</string>
+				<string>UTF-16</string>
+				<string>UTF-16BE</string>
+				<string>UTF-16LE</string>
+				<string>GB18030</string>
+				<string>ISO-8859-15</string>
+				<string>Windows-1252</string>
+				<string>IBM850</string>
+				<string>ISO-8859-2</string>
+				<string>Windows-1250</string>
+				<string>ISO-8859-3</string>
+				<string>ISO-8859-10</string>
+				<string>Windows-1251</string>
+				<string>KOI8-R</string>
+				<string>KOI8-U</string>
+				<string>ISO-8859-6</string>
+				<string>Windows-1256</string>
+				<string>ISO-8859-7</string>
+				<string>Windows-1253</string>
+				<string>ISO-8859-8</string>
+				<string>Windows-1255</string>
+				<string>ISO-8859-9</string>
+				<string>Windows-1254</string>
+				<string>ISO-8859-11</string>
+				<string>Windows-874</string>
+				<string>ISO-8859-13</string>
+				<string>Windows-1257</string>
+				<string>ISO-8859-14</string>
+				<string>ISO-8859-16</string>
+				<string>ISO-2022-CN-EXT</string>
+				<string>EUC-CN</string>
+				<string>ISO-2022-JP-2</string>
+				<string>EUC-JP</string>
+				<string>Shift_JIS</string>
+				<string>CP949</string>
+				<string>ISO-2022-KR</string>
+				<string>Big5</string>
+				<string>ISO-2022-TW</string>
+				<string>Big5-HKSCS</string>
+				<string>VISCII</string>
+				<string>Windows-1258</string>
+			</array>
+			<key>Title</key>
+			<string>Subtitles Text Encoding</string>
+			<key>Key</key>
+			<string>subsdec-encoding</string>
+			<key>DefaultValue</key>
+			<string>Windows-1252</string>
+		</dict>
+        <dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Audio</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Time-stretching audio</string>
+			<key>Key</key>
+			<string>StretchAudio</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>BackgroundAudioPlayback</string>
+			<key>Title</key>
+			<string>Audio playback in background</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Advanced</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Verbose debug logs</string>
+			<key>Key</key>
+			<string>VerboseLogs</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+	</array>
+	<key>StringsTable</key>
+	<string>Root</string>
+</dict>
+</plist>

Resources/VLCSettingsViewController.xib

@@ -13,9 +13,8 @@
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
 			<string>IBUIBarButtonItem</string>
-			<string>IBUILabel</string>
-			<string>IBUIPickerView</string>
-			<string>IBUISwitch</string>
+			<string>IBUITableView</string>
+			<string>IBUITableViewController</string>
 			<string>IBUIToolbar</string>
 			<string>IBUIView</string>
 		</array>
@@ -35,6 +34,57 @@
 				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
+			<object class="IBUITableViewController" id="321639310">
+				<object class="IBUITableView" key="IBUIView" id="796830225">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">274</int>
+					<array class="NSMutableArray" key="NSSubviews"/>
+					<string key="NSFrame">{{0, 20}, {320, 548}}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<string key="NSReuseIdentifierKey">_NS:10</string>
+					<object class="NSColor" key="IBUIBackgroundColor">
+						<int key="NSColorSpace">1</int>
+						<bytes key="NSRGB">MCAwIDAgMAA</bytes>
+						<string key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
+					</object>
+					<bool key="IBUIOpaque">NO</bool>
+					<bool key="IBUIClipsSubviews">YES</bool>
+					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					<bool key="IBUIAlwaysBounceVertical">YES</bool>
+					<int key="IBUIStyle">1</int>
+					<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
+					<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
+					<float key="IBUIRowHeight">44</float>
+					<float key="IBUISectionHeaderHeight">10</float>
+					<float key="IBUISectionFooterHeight">10</float>
+				</object>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
+					<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
+					<object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<array key="dict.sortedKeys">
+							<integer value="1"/>
+							<integer value="3"/>
+						</array>
+						<array key="dict.values">
+							<string>{320, 568}</string>
+							<string>{568, 320}</string>
+						</array>
+					</object>
+					<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
+					<string key="IBUIDisplayName">Retina 4 Full Screen</string>
+					<int key="IBUIType">2</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
 			<object class="IBUIView" id="1058981638">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">301</int>
@@ -45,7 +95,7 @@
 						<string key="NSFrameSize">{540, 44}</string>
 						<reference key="NSSuperview" ref="1058981638"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="890162779"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -69,182 +119,6 @@
 							<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
 						</object>
 					</object>
-					<object class="IBUILabel" id="890162779">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 69}, {415, 21}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="268284080"/>
-						<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">Passcode Lock</string>
-						<object class="NSColor" key="IBUITextColor" id="143882257">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-						</object>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">0</int>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="732816504">
-							<int key="type">1</int>
-							<double key="pointSize">17</double>
-						</object>
-						<object class="NSFont" key="IBUIFont" id="15938098">
-							<string key="NSName">Helvetica</string>
-							<double key="NSSize">17</double>
-							<int key="NSfFlags">16</int>
-						</object>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-					</object>
-					<object class="IBUISwitch" id="268284080">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{428, 66}, {94, 27}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="232517451"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-					</object>
-					<object class="IBUILabel" id="796381961">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 154}, {415, 21}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="115169191"/>
-						<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">Time-stretching audio</string>
-						<reference key="IBUITextColor" ref="143882257"/>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">0</int>
-						<reference key="IBUIFontDescription" ref="732816504"/>
-						<reference key="IBUIFont" ref="15938098"/>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-					</object>
-					<object class="IBUISwitch" id="115169191">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{428, 151}, {94, 27}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-					</object>
-					<object class="IBUILabel" id="232517451">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{20, 101}, {415, 42}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="670606907"/>
-						<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">Continue audio playback in background</string>
-						<reference key="IBUITextColor" ref="143882257"/>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">0</int>
-						<int key="IBUINumberOfLines">2</int>
-						<int key="IBUILineBreakMode">0</int>
-						<reference key="IBUIFontDescription" ref="732816504"/>
-						<reference key="IBUIFont" ref="15938098"/>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-						<double key="preferredMaxLayoutWidth">415</double>
-					</object>
-					<object class="IBUISwitch" id="670606907">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{428, 108}, {94, 27}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-					</object>
-					<object class="IBUILabel" id="604519838">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 196}, {415, 21}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="723892894"/>
-						<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">Verbose debug logs</string>
-						<reference key="IBUITextColor" ref="143882257"/>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">0</int>
-						<reference key="IBUIFontDescription" ref="732816504"/>
-						<reference key="IBUIFont" ref="15938098"/>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-					</object>
-					<object class="IBUILabel" id="645076836">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 236}, {415, 21}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<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">Subtitle Text Encoding</string>
-						<reference key="IBUITextColor" ref="143882257"/>
-						<nil key="IBUIHighlightedColor"/>
-						<int key="IBUIBaselineAdjustment">0</int>
-						<reference key="IBUIFontDescription" ref="732816504"/>
-						<reference key="IBUIFont" ref="15938098"/>
-						<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
-					</object>
-					<object class="IBUISwitch" id="723892894">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{428, 193}, {94, 27}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-					</object>
-					<object class="IBUIPickerView" id="1021216954">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrame">{{20, 271}, {500, 216}}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<bool key="IBUIShowsSelectionIndicator">YES</bool>
-					</object>
 				</array>
 				<string key="NSFrameSize">{540, 568}</string>
 				<reference key="NSSuperview"/>
@@ -275,22 +149,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">passcodeLockLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="890162779"/>
-					</object>
-					<int key="connectionID">34</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">passcodeLockSwitch</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="268284080"/>
-					</object>
-					<int key="connectionID">35</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dismissButton</string>
 						<reference key="source" ref="372490531"/>
 						<reference key="destination" ref="320254837"/>
@@ -299,51 +157,19 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">audioPlaybackInBackgroundLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="232517451"/>
-					</object>
-					<int key="connectionID">42</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">audioPlaybackInBackgroundSwitch</string>
+						<string key="label">appSettingsViewController</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="670606907"/>
+						<reference key="destination" ref="321639310"/>
 					</object>
-					<int key="connectionID">43</int>
+					<int key="connectionID">71</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">audioStretchingSwitch</string>
+						<string key="label">topToolbar</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="115169191"/>
+						<reference key="destination" ref="222768752"/>
 					</object>
-					<int key="connectionID">53</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">debugOutputSwitch</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="723892894"/>
-					</object>
-					<int key="connectionID">54</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">textEncodingPicker</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1021216954"/>
-					</object>
-					<int key="connectionID">57</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">textEncodingLabel</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="645076836"/>
-					</object>
-					<int key="connectionID">60</int>
+					<int key="connectionID">72</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
@@ -354,56 +180,28 @@
 					<int key="connectionID">37</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">toggleSetting:</string>
-						<reference key="source" ref="268284080"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">13</int>
-					</object>
-					<int key="connectionID">46</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">toggleSetting:</string>
-						<reference key="source" ref="670606907"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">13</int>
-					</object>
-					<int key="connectionID">45</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">toggleSetting:</string>
-						<reference key="source" ref="115169191"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">13</int>
-					</object>
-					<int key="connectionID">49</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">toggleSetting:</string>
-						<reference key="source" ref="723892894"/>
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="321639310"/>
 						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">13</int>
 					</object>
-					<int key="connectionID">52</int>
+					<int key="connectionID">70</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="1021216954"/>
-						<reference key="destination" ref="372490531"/>
+						<reference key="source" ref="796830225"/>
+						<reference key="destination" ref="321639310"/>
 					</object>
-					<int key="connectionID">58</int>
+					<int key="connectionID">68</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
-						<reference key="source" ref="1021216954"/>
-						<reference key="destination" ref="372490531"/>
+						<reference key="source" ref="796830225"/>
+						<reference key="destination" ref="321639310"/>
 					</object>
-					<int key="connectionID">59</int>
+					<int key="connectionID">69</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -426,20 +224,24 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">66</int>
+						<reference key="object" ref="321639310"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="796830225"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">67</int>
+						<reference key="object" ref="796830225"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="321639310"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">4</int>
 						<reference key="object" ref="1058981638"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="222768752"/>
-							<reference ref="890162779"/>
-							<reference ref="268284080"/>
-							<reference ref="232517451"/>
-							<reference ref="670606907"/>
-							<reference ref="796381961"/>
-							<reference ref="115169191"/>
-							<reference ref="604519838"/>
-							<reference ref="723892894"/>
-							<reference ref="645076836"/>
-							<reference ref="1021216954"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -453,66 +255,14 @@
 						<reference key="parent" ref="1058981638"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="320254837"/>
-						<reference key="parent" ref="222768752"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
 						<reference key="object" ref="883438531"/>
 						<reference key="parent" ref="222768752"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="890162779"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">26</int>
-						<reference key="object" ref="268284080"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="232517451"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="670606907"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="796381961"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="115169191"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">50</int>
-						<reference key="object" ref="604519838"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">51</int>
-						<reference key="object" ref="723892894"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="645076836"/>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">55</int>
-						<reference key="object" ref="1021216954"/>
-						<reference key="parent" ref="1058981638"/>
+						<int key="objectID">12</int>
+						<reference key="object" ref="320254837"/>
+						<reference key="parent" ref="222768752"/>
 					</object>
 				</array>
 			</object>
@@ -524,27 +274,39 @@
 				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="47.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="48.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="66.CustomClassName">IASKAppSettingsViewController</string>
+				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="67.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">60</int>
+			<int key="maxID">72</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
+					<string key="className">IASKAppSettingsViewController</string>
+					<string key="superclassName">UITableViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">delegate</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IASKAppSettingsViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">VLCSettingsViewController</string>
 					<string key="superclassName">UIViewController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
@@ -562,62 +324,22 @@
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="audioPlaybackInBackgroundLabel">UILabel</string>
-						<string key="audioPlaybackInBackgroundSwitch">UISwitch</string>
-						<string key="audioStretchingLabel">UILabel</string>
-						<string key="audioStretchingSwitch">UISwitch</string>
-						<string key="debugOutputLabel">UILabel</string>
-						<string key="debugOutputSwitch">UISwitch</string>
+						<string key="appSettingsViewController">IASKAppSettingsViewController</string>
 						<string key="dismissButton">UIBarButtonItem</string>
-						<string key="passcodeLockLabel">UILabel</string>
-						<string key="passcodeLockSwitch">UISwitch</string>
-						<string key="textEncodingLabel">UILabel</string>
-						<string key="textEncodingPicker">UIPickerView</string>
+						<string key="topToolbar">UIToolbar</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="audioPlaybackInBackgroundLabel">
-							<string key="name">audioPlaybackInBackgroundLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="audioPlaybackInBackgroundSwitch">
-							<string key="name">audioPlaybackInBackgroundSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="audioStretchingLabel">
-							<string key="name">audioStretchingLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="audioStretchingSwitch">
-							<string key="name">audioStretchingSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="debugOutputLabel">
-							<string key="name">debugOutputLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="debugOutputSwitch">
-							<string key="name">debugOutputSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
+						<object class="IBToOneOutletInfo" key="appSettingsViewController">
+							<string key="name">appSettingsViewController</string>
+							<string key="candidateClassName">IASKAppSettingsViewController</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="dismissButton">
 							<string key="name">dismissButton</string>
 							<string key="candidateClassName">UIBarButtonItem</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="passcodeLockLabel">
-							<string key="name">passcodeLockLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="passcodeLockSwitch">
-							<string key="name">passcodeLockSwitch</string>
-							<string key="candidateClassName">UISwitch</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textEncodingLabel">
-							<string key="name">textEncodingLabel</string>
-							<string key="candidateClassName">UILabel</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="textEncodingPicker">
-							<string key="name">textEncodingPicker</string>
-							<string key="candidateClassName">UIPickerView</string>
+						<object class="IBToOneOutletInfo" key="topToolbar">
+							<string key="name">topToolbar</string>
+							<string key="candidateClassName">UIToolbar</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">

VLC for iOS.xcodeproj/project.pbxproj

@@ -103,6 +103,7 @@
 		7D6B08F7174D65B500A05173 /* IASKSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6B08E8174D65B500A05173 /* IASKSwitch.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		7D6B08F8174D65B500A05173 /* IASKTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6B08EA174D65B500A05173 /* IASKTextField.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		7D6B08FA174D716200A05173 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D6B08F9174D716200A05173 /* MessageUI.framework */; };
+		7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08FB174D773C00A05173 /* Settings.bundle */; };
 		7D6BA1121748EA8300C0E203 /* playback_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1101748EA8300C0E203 /* playback_background.png */; };
 		7D6BA1131748EA8300C0E203 /* playback_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1111748EA8300C0E203 /* playback_background@2x.png */; };
 		7D6BA1171748EFE100C0E203 /* VLCAddMediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */; };
@@ -330,6 +331,7 @@
 		7D6B08E9174D65B500A05173 /* IASKTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IASKTextField.h; sourceTree = "<group>"; };
 		7D6B08EA174D65B500A05173 /* IASKTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IASKTextField.m; sourceTree = "<group>"; };
 		7D6B08F9174D716200A05173 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
+		7D6B08FB174D773C00A05173 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = Settings.bundle; path = Resources/Settings.bundle; sourceTree = SOURCE_ROOT; };
 		7D6BA1101748EA8300C0E203 /* playback_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = playback_background.png; sourceTree = "<group>"; };
 		7D6BA1111748EA8300C0E203 /* playback_background@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "playback_background@2x.png"; sourceTree = "<group>"; };
 		7D6BA1141748EFE100C0E203 /* VLCAddMediaViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCAddMediaViewController.h; sourceTree = "<group>"; };
@@ -899,6 +901,7 @@
 		A7924697170F0ED20036AAF2 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				7D6B08FB174D773C00A05173 /* Settings.bundle */,
 				29125E5317492219003F03E5 /* web */,
 				A7035BBD174519600057DFA7 /* iTunesArtwork */,
 				7D10BC691743F9CB00DA7059 /* Filters and stuff */,
@@ -1080,6 +1083,7 @@
 				A7A0E9F8174BA66000162F25 /* papasscode_failed_bg@2x.png in Resources */,
 				A7A0E9F9174BA66000162F25 /* papasscode_marker.png in Resources */,
 				A7A0E9FA174BA66000162F25 /* papasscode_marker@2x.png in Resources */,
+				7D6B08FC174D773C00A05173 /* Settings.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};