Add support for the http proxy password setting to the simple prefs and make sure...

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
index 813db45c27ac7292bb3d27d44b6d703ecef82938..88b5dccea0cace56f6950debd75632d6fc3b6cd0 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
@@ -4,6 +4,14 @@
 <dict>
        <key>IBClasses</key>
        <array>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSApplication</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</string>
+               </dict>
                <dict>
                        <key>CLASS</key>
                        <string>VLCHotkeyChangeWindow</string>
@@ -56,7 +64,7 @@
                                <string>id</string>
                                <key>o_audio_last_ckb</key>
                                <string>id</string>
-                               <key>o_audio_lastpwd_fld</key>
+                               <key>o_audio_lastpwd_sfld</key>
                                <string>id</string>
                                <key>o_audio_lastpwd_txt</key>
                                <string>id</string>
@@ -128,6 +136,10 @@
                                <string>id</string>
                                <key>o_input_httpproxy_txt</key>
                                <string>id</string>
+                               <key>o_input_httpproxypwd_sfld</key>
+                               <string>id</string>
+                               <key>o_input_httpproxypwd_txt</key>
+                               <string>id</string>
                                <key>o_input_mux_box</key>
                                <string>id</string>
                                <key>o_input_net_box</key>
@@ -262,11 +274,9 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSApplication</string>
+                       <string>NSObject</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
                </dict>
                <dict>
                        <key>CLASS</key>
@@ -276,12 +286,6 @@
                        <key>SUPERCLASS</key>
                        <string>NSObject</string>
                </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSObject</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-               </dict>
                <dict>
                        <key>ACTIONS</key>
                        <dict>

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index 53e051167c3d93a91f3d766f6dd115313a78fa56..381fe051e348ce018f2314080281b2eaf09e4d51 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
        <key>IBFramework Version</key>
-       <string>648</string>
+       <string>667</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../vlc.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2668</integer>
-               <integer>2678</integer>
-               <integer>2562</integer>
                <integer>2311</integer>
-               <integer>2330</integer>
-               <integer>2523</integer>
                <integer>2410</integer>
+               <integer>2678</integer>
+               <integer>2523</integer>
+               <integer>2668</integer>
+               <integer>2330</integer>
+               <integer>2563</integer>
                <integer>2440</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9C7010</string>
+       <string>9D34</string>
        <key>targetFramework</key>
        <string>IBCocoaFramework</string>
 </dict>

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 81daca9ee29119753871460bff9636c529874f40..d73c2c8575d3f50d0d7cc008ca48314736c230d0 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index 6f7d4643ce64dd7dd55cd687e8a1d056b443f1a0..04ff0361069404b86c623970458701be6f49bcf3 100644 (file)
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -37,7 +37,7 @@
     IBOutlet id o_audio_lang_txt;
     IBOutlet id o_audio_last_box;
     IBOutlet id o_audio_last_ckb;
-    IBOutlet id o_audio_lastpwd_fld;
+    IBOutlet id o_audio_lastpwd_sfld;
     IBOutlet id o_audio_lastpwd_txt;
     IBOutlet id o_audio_lastuser_fld;
     IBOutlet id o_audio_lastuser_txt;
@@ -74,6 +74,8 @@
     IBOutlet id o_input_dump_ckb;
     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_postproc_fld;

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 2f8e51cb90e43db3350527bf1cad8f2daae31059..54f6139bc5be6a4ecb03bbf5169de73a9279bbee 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -244,6 +244,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
     [o_input_dump_ckb setTitle: _NS("Dump")];
     [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_postproc_txt setStringValue: _NS("Post-Processing Quality")];
@@ -391,19 +392,19 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     if( module_Exists( p_intf, "audioscrobbler" ) )
     {
         [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" )]];
-        [o_audio_lastpwd_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]];
+        [o_audio_lastpwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-password" )]];
 
         if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
         {
             [o_audio_last_ckb setState: NSOnState];
             [o_audio_lastuser_fld setEnabled: YES];
-            [o_audio_lastpwd_fld setEnabled: YES];
+            [o_audio_lastpwd_sfld setEnabled: YES];
         }
         else
         {
             [o_audio_last_ckb setState: NSOffState];
             [o_audio_lastuser_fld setEnabled: NO];
-            [o_audio_lastpwd_fld setEnabled: NO];
+            [o_audio_lastpwd_sfld setEnabled: NO];
         }
     }
     else
@@ -457,6 +458,8 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [o_input_serverport_fld setIntValue: config_GetInt( p_intf, "server-port" )];
     if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
         [o_input_httpproxy_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy" )]];
+    if( config_GetPsz( p_intf, "http-proxy" ) != NULL )
+        [o_input_httpproxypwd_sfld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "http-proxy-pwd" )]];
     [o_input_postproc_fld setIntValue: config_GetInt( p_intf, "ffmpeg-pp-q" )];
 
     SetupIntList( o_input_avi_pop, "avi-index" );
@@ -738,7 +741,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
                 config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
 
             config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] );
-            config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_fld stringValue] UTF8String] );
+            config_PutPsz( p_intf, "lastfm-password", [[o_audio_lastpwd_sfld stringValue] UTF8String] );
         }
         else
             [o_audio_last_ckb setEnabled: NO];
@@ -795,6 +798,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     {
         config_PutInt( p_intf, "server-port", [o_input_serverport_fld intValue] );
         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, "ffmpeg-pp-q", [o_input_postproc_fld intValue] );
 
         SaveIntList( o_input_avi_pop, "avi-index" );
@@ -979,12 +983,12 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     {
         if( [o_audio_last_ckb state] == NSOnState )
         {
-            [o_audio_lastpwd_fld setEnabled: YES];
+            [o_audio_lastpwd_sfld setEnabled: YES];
             [o_audio_lastuser_fld setEnabled: YES];
         }
         else
         {
-            [o_audio_lastpwd_fld setEnabled: NO];
+            [o_audio_lastpwd_sfld setEnabled: NO];
             [o_audio_lastuser_fld setEnabled: NO];
         }
     }