macosx: remove http proxy settings from simplified preferences since the networking...

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.xib b/extras/package/macosx/Resources/English.lproj/Preferences.xib
index a932b0ecf95c8afb1f3199cea6c8ee7004a210d6..6e067504dda71a30e97f7e2ccb44dc1304ef1151 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.xib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">12C60</string>
+    <string key="IBDocument.SystemVersion">12D78</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
-    <string key="IBDocument.AppKitVersion">1187.34</string>
-    <string key="IBDocument.HIToolboxVersion">625.00</string>
+    <string key="IBDocument.AppKitVersion">1187.37</string>
+    <string key="IBDocument.HIToolboxVersion">626.00</string>
     <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
       <string key="NS.object.0">851</string>
@@ -13,7 +13,7 @@
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
       <integer value="2311"/>
-      <integer value="2585"/>
+      <integer value="2562"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -3551,7 +3551,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <reference key="NSSuperview" ref="886591955"/>
               </object>
             </object>
-            <string key="NSFrame">{{17, 451}, {538, 62}}</string>
+            <string key="NSFrame">{{17, 391}, {538, 62}}</string>
             <reference key="NSSuperview" ref="127370005"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -3581,80 +3581,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <int key="NSvFlags">274</int>
                 <object class="NSMutableArray" key="NSSubviews">
                   <bool key="EncodedWithXMLCoder">YES</bool>
-                  <object class="NSTextField" id="652321588">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{13, 74}, {204, 17}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="17261147">
-                      <int key="NSCellFlags">67108864</int>
-                      <int key="NSCellFlags2">272629760</int>
-                      <string key="NSContents">HTTP Proxy</string>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <reference key="NSControlView" ref="652321588"/>
-                      <reference key="NSBackgroundColor" ref="535468639"/>
-                      <reference key="NSTextColor" ref="499525791"/>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                  </object>
-                  <object class="NSTextField" id="1031566139">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{222, 72}, {290, 22}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="541454770">
-                      <int key="NSCellFlags">-1804074943</int>
-                      <int key="NSCellFlags2">272630784</int>
-                      <string key="NSContents"/>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <reference key="NSControlView" ref="1031566139"/>
-                      <bool key="NSDrawsBackground">YES</bool>
-                      <reference key="NSBackgroundColor" ref="122952243"/>
-                      <reference key="NSTextColor" ref="292380699"/>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                  </object>
-                  <object class="NSTextField" id="506517403">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{14, 46}, {204, 17}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="368625871">
-                      <int key="NSCellFlags">67108864</int>
-                      <int key="NSCellFlags2">272629760</int>
-                      <string key="NSContents">Password for HTTP Proxy</string>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <reference key="NSControlView" ref="506517403"/>
-                      <reference key="NSBackgroundColor" ref="535468639"/>
-                      <reference key="NSTextColor" ref="499525791"/>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                  </object>
-                  <object class="NSTextField" id="823832045">
-                    <reference key="NSNextResponder" ref="71852276"/>
-                    <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{222, 44}, {290, 22}}</string>
-                    <reference key="NSSuperview" ref="71852276"/>
-                    <bool key="NSEnabled">YES</bool>
-                    <object class="NSTextFieldCell" key="NSCell" id="716901297">
-                      <int key="NSCellFlags">-1804074943</int>
-                      <int key="NSCellFlags2">272630784</int>
-                      <string key="NSContents"/>
-                      <reference key="NSSupport" ref="96267115"/>
-                      <reference key="NSControlView" ref="823832045"/>
-                      <bool key="NSDrawsBackground">YES</bool>
-                      <reference key="NSBackgroundColor" ref="122952243"/>
-                      <reference key="NSTextColor" ref="292380699"/>
-                    </object>
-                    <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-                  </object>
                   <object class="NSButton" id="270198341">
                     <reference key="NSNextResponder" ref="71852276"/>
                     <int key="NSvFlags">256</int>
-                    <string key="NSFrame">{{72, 5}, {387, 32}}</string>
+                    <string key="NSFrame">{{73, 5}, {387, 32}}</string>
                     <reference key="NSSuperview" ref="71852276"/>
                     <bool key="NSEnabled">YES</bool>
                     <object class="NSButtonCell" key="NSCell" id="123259817">
@@ -3676,11 +3606,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                     <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                   </object>
                 </object>
-                <string key="NSFrame">{{2, 2}, {532, 104}}</string>
+                <string key="NSFrame">{{2, 2}, {534, 43}}</string>
                 <reference key="NSSuperview" ref="247116589"/>
               </object>
             </object>
-            <string key="NSFrame">{{18, 326}, {536, 121}}</string>
+            <string key="NSFrame">{{17, 327}, {538, 60}}</string>
             <reference key="NSSuperview" ref="127370005"/>
             <string key="NSOffsets">{0, 0}</string>
             <object class="NSTextFieldCell" key="NSTitleCell">
@@ -4312,7 +4242,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bool key="NSTransparent">NO</bool>
           </object>
         </object>
-        <string key="NSFrameSize">{572, 533}</string>
+        <string key="NSFrameSize">{572, 473}</string>
         <reference key="NSSuperview"/>
         <string key="NSClassName">NSView</string>
         <string key="NSExtension">NSResponder</string>
@@ -6208,14 +6138,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">2522</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">inputSettingChanged:</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="1031566139"/>
-          </object>
-          <int key="connectionID">2609</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">inputSettingChanged:</string>
@@ -6288,22 +6210,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">2624</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_httpproxy_txt</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="652321588"/>
-          </object>
-          <int key="connectionID">2626</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_httpproxy_fld</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="1031566139"/>
-          </object>
-          <int key="connectionID">2627</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_input_mux_box</string>
@@ -6672,22 +6578,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3164</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_httpproxypwd_sfld</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="823832045"/>
-          </object>
-          <int key="connectionID">3288</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">o_input_httpproxypwd_txt</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="506517403"/>
-          </object>
-          <int key="connectionID">3289</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">o_audio_lastpwd_sfld</string>
@@ -6696,14 +6586,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3291</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBActionConnection" key="connection">
-            <string key="label">inputSettingChanged:</string>
-            <reference key="source" ref="150917409"/>
-            <reference key="destination" ref="823832045"/>
-          </object>
-          <int key="connectionID">3308</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBActionConnection" key="connection">
             <string key="label">showFontPicker:</string>
@@ -6712,22 +6594,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3418</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">nextKeyView</string>
-            <reference key="source" ref="1031566139"/>
-            <reference key="destination" ref="823832045"/>
-          </object>
-          <int key="connectionID">3421</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">nextKeyView</string>
-            <reference key="source" ref="823832045"/>
-            <reference key="destination" ref="962653572"/>
-          </object>
-          <int key="connectionID">3422</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">nextKeyView</string>
@@ -7016,14 +6882,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3626</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">nextKeyView</string>
-            <reference key="source" ref="1007508864"/>
-            <reference key="destination" ref="1031566139"/>
-          </object>
-          <int key="connectionID">3627</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">nextKeyView</string>
@@ -7176,22 +7034,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <int key="connectionID">3659</int>
         </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">delegate</string>
-            <reference key="source" ref="1031566139"/>
-            <reference key="destination" ref="150917409"/>
-          </object>
-          <int key="connectionID">3660</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
-            <string key="label">delegate</string>
-            <reference key="source" ref="823832045"/>
-            <reference key="destination" ref="150917409"/>
-          </object>
-          <int key="connectionID">3661</int>
-        </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
             <string key="label">delegate</string>
@@ -7978,10 +7820,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="247116589"/>
             <object class="NSMutableArray" key="children">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="652321588"/>
-              <reference ref="1031566139"/>
-              <reference ref="506517403"/>
-              <reference ref="823832045"/>
               <reference ref="270198341"/>
             </object>
             <reference key="parent" ref="127370005"/>
@@ -9222,62 +9060,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <reference key="object" ref="12940531"/>
             <reference key="parent" ref="599295502"/>
           </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2570</int>
-            <reference key="object" ref="652321588"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="17261147"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3509</int>
-            <reference key="object" ref="17261147"/>
-            <reference key="parent" ref="652321588"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">2571</int>
-            <reference key="object" ref="1031566139"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="541454770"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3510</int>
-            <reference key="object" ref="541454770"/>
-            <reference key="parent" ref="1031566139"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3284</int>
-            <reference key="object" ref="506517403"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="368625871"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3511</int>
-            <reference key="object" ref="368625871"/>
-            <reference key="parent" ref="506517403"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3285</int>
-            <reference key="object" ref="823832045"/>
-            <object class="NSMutableArray" key="children">
-              <bool key="EncodedWithXMLCoder">YES</bool>
-              <reference ref="716901297"/>
-            </object>
-            <reference key="parent" ref="247116589"/>
-          </object>
-          <object class="IBObjectRecord">
-            <int key="objectID">3512</int>
-            <reference key="object" ref="716901297"/>
-            <reference key="parent" ref="823832045"/>
-          </object>
           <object class="IBObjectRecord">
             <int key="objectID">2580</int>
             <reference key="object" ref="234498105"/>
@@ -11053,10 +10835,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>2563.IBPluginDependency</string>
           <string>2563.IBViewBoundsToFrameTransform</string>
           <string>2563.ImportedFromIB2</string>
-          <string>2570.IBPluginDependency</string>
-          <string>2570.ImportedFromIB2</string>
-          <string>2571.IBPluginDependency</string>
-          <string>2571.ImportedFromIB2</string>
           <string>2572.IBPluginDependency</string>
           <string>2572.IBViewBoundsToFrameTransform</string>
           <string>2572.ImportedFromIB2</string>
@@ -11135,11 +10913,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>2803.ImportedFromIB2</string>
           <string>3162.IBPluginDependency</string>
           <string>3162.ImportedFromIB2</string>
-          <string>3284.IBPluginDependency</string>
-          <string>3284.ImportedFromIB2</string>
-          <string>3285.CustomClassName</string>
-          <string>3285.IBPluginDependency</string>
-          <string>3285.ImportedFromIB2</string>
           <string>3434.IBPluginDependency</string>
           <string>3434.ImportedFromIB2</string>
           <string>3435.IBPluginDependency</string>
@@ -11207,10 +10980,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>3503.IBPluginDependency</string>
           <string>3504.IBPluginDependency</string>
           <string>3505.IBPluginDependency</string>
-          <string>3509.IBPluginDependency</string>
-          <string>3510.IBPluginDependency</string>
-          <string>3511.IBPluginDependency</string>
-          <string>3512.IBPluginDependency</string>
           <string>3513.IBPluginDependency</string>
           <string>3514.IBPluginDependency</string>
           <string>3515.IBPluginDependency</string>
@@ -11865,7 +11634,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
             <bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwvgAAA</bytes>
           </object>
           <boolean value="YES"/>
-          <string>{{441, 671}, {572, 533}}</string>
+          <string>{{389, 283}, {572, 473}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11874,10 +11643,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           </object>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
             <bytes key="NSTransformStruct">AUGIAABDagAAA</bytes>
           </object>
@@ -11967,7 +11732,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>NSSecureTextField</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -11979,14 +11743,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <boolean value="YES"/>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -12299,7 +12055,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSAffineTransform">
-            <bytes key="NSTransformStruct">P4AAAL+AAABCkgAAwigAAA</bytes>
+            <bytes key="NSTransformStruct">P4AAAL+AAABCkAAAwgwAAA</bytes>
           </object>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -13837,10 +13593,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>o_input_cachelevel_pop</string>
               <string>o_input_cachelevel_txt</string>
               <string>o_input_caching_box</string>
-              <string>o_input_httpproxy_fld</string>
-              <string>o_input_httpproxy_txt</string>
-              <string>o_input_httpproxypwd_sfld</string>
-              <string>o_input_httpproxypwd_txt</string>
               <string>o_input_mkv_preload_dir_ckb</string>
               <string>o_input_mux_box</string>
               <string>o_input_net_box</string>
@@ -14086,10 +13838,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -14138,10 +13886,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
               <string>o_input_cachelevel_pop</string>
               <string>o_input_cachelevel_txt</string>
               <string>o_input_caching_box</string>
-              <string>o_input_httpproxy_fld</string>
-              <string>o_input_httpproxy_txt</string>
-              <string>o_input_httpproxypwd_sfld</string>
-              <string>o_input_httpproxypwd_txt</string>
               <string>o_input_mkv_preload_dir_ckb</string>
               <string>o_input_mux_box</string>
               <string>o_input_net_box</string>
@@ -14413,22 +14157,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                 <string key="name">o_input_caching_box</string>
                 <string key="candidateClassName">id</string>
               </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_httpproxy_fld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_httpproxy_txt</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_httpproxypwd_sfld</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
-                <string key="name">o_input_httpproxypwd_txt</string>
-                <string key="candidateClassName">id</string>
-              </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_input_mkv_preload_dir_ckb</string>
                 <string key="candidateClassName">id</string>

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 21935cd51a3dc58b4500aa3ce931680f6e887ee7..6ea1c877f9b8499a40ffaf914ca2141d91859836 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -71,10 +71,6 @@
     IBOutlet id o_input_cachelevel_txt;
     IBOutlet id o_input_cachelevel_custom_txt;
     IBOutlet id o_input_caching_box;
-    IBOutlet id o_input_httpproxy_fld;
-    IBOutlet id o_input_httpproxy_txt;
-    IBOutlet id o_input_httpproxypwd_sfld;
-    IBOutlet id o_input_httpproxypwd_txt;
     IBOutlet id o_input_mux_box;
     IBOutlet id o_input_net_box;
     IBOutlet id o_input_avcodec_hw_txt;

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 4cae39e2c65e2d795853a2f07655f24f58b6be62..e96e2e2cb159e04f8761b2fcb6580fe2e5abe8fc 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -205,8 +205,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
     [o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")];
     [o_input_caching_box setTitle: _NS("Caching")];
     [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
-    [o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")];
-    [o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")];
     [o_input_mux_box setTitle: _NS("Codecs / Muxers")];
     [o_input_net_box setTitle: _NS("Network")];
     [o_input_avcodec_hw_txt setStringValue: _NS("Hardware Acceleration")];
@@ -548,8 +546,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
      * input & codecs settings *
      ***************************/
     [self setupField: o_input_record_fld forOption:"input-record-path"];
-    [self setupField: o_input_httpproxy_fld forOption:"http-proxy"];
-    [self setupField: o_input_httpproxypwd_sfld forOption:"http-proxy-pwd"];
     [o_input_postproc_fld setIntValue: config_GetInt(p_intf, "postproc-q")];
     [o_input_postproc_fld setToolTip: _NS(config_GetLabel(p_intf, "postproc-q"))];
     [self setupButton: o_input_avcodec_hw_pop forModuleList: "avcodec-hw"];
@@ -885,8 +881,6 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
      ***************************/
     if (b_inputSettingChanged) {
         config_PutPsz(p_intf, "input-record-path", [[o_input_record_fld stringValue] UTF8String]);
-        config_PutPsz(p_intf, "http-proxy", [[o_input_httpproxy_fld stringValue] UTF8String]);
-        config_PutPsz(p_intf, "http-proxy-pwd", [[o_input_httpproxypwd_sfld stringValue] UTF8String]);
         config_PutInt(p_intf, "postproc-q", [o_input_postproc_fld intValue]);
 
         SaveIntList(o_input_avi_pop, "avi-index");
@@ -1086,8 +1080,6 @@ static inline void save_module_list(intf_thread_t * p_intf, id object, const cha
        notificationObject == o_audio_vol_fld)
         b_audioSettingChanged = YES;
     else if (notificationObject == o_input_record_fld ||
-             notificationObject == o_input_httpproxy_fld ||
-            notificationObject == o_input_httpproxypwd_sfld ||
             notificationObject == o_input_postproc_fld)
         b_inputSettingChanged = YES;
     else if (notificationObject == o_osd_font_fld ||