Changeset e783b74eca272d40c90c1bf3982894e074f11808

Timestamp:

06/13/08 18:46:17 (3 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1213375577 +0200

git-parent:

[1de3029270b6aeb6a7301aead3b6587ae0a006bb]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1213375558 +0200

Message:

Add support for the http proxy password setting to the simple prefs and make sure that the last.fm password isn't displayed as plain text

Files:

• extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib (modified) (5 diffs)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib (modified) (2 diffs)
• extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib (modified) (previous)
• modules/gui/macosx/simple_prefs.h (modified) (2 diffs)
• modules/gui/macosx/simple_prefs.m (modified) (8 diffs)

extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

@@ -7 +7 @@
-        <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>
-            <key>LANGUAGE</key>
@@ -57 +65 @@
-                <key>o_audio_last_ckb</key>
-                <string>id</string>
-
+s
-                <string>id</string>
-                <key>o_audio_lastpwd_txt</key>
@@ -129 +137 @@
-                <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>
@@ -263 +275 @@
-        <dict>
-            <key>CLASS</key>
-
-
-
-
-
+
+
+
-        </dict>
-        <dict>
@@ -276 +286 @@
-            <key>SUPERCLASS</key>
-            <string>NSObject</string>
-        </dict>
-        <dict>
-            <key>CLASS</key>
-            <string>NSObject</string>
-            <key>LANGUAGE</key>
-            <string>ObjC</string>
-        </dict>
-        <dict>

extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

@@ -4 +4 @@
-<dict>
-    <key>IBFramework Version</key>
-48
+67
-    <key>IBLastKnownRelativeProjectPath</key>
-    <string>../../vlc.xcodeproj</string>
@@ -11 +11 @@
-    <key>IBOpenObjects</key>
-    <array>
+        <integer>2311</integer>
+        <integer>2410</integer>
+        <integer>2678</integer>
+        <integer>2523</integer>
-        <integer>2668</integer>
-        <integer>2678</integer>
-        <integer>2562</integer>
-        <integer>2311</integer>
-        <integer>2330</integer>
-
-
+
-        <integer>2440</integer>
-    </array>
-    <key>IBSystem Version</key>
-C7010
+D34
-    <key>targetFramework</key>
-    <string>IBCocoaFramework</string>

modules/gui/macosx/simple_prefs.h

@@ -38 +38 @@
-    IBOutlet id o_audio_last_box;
-    IBOutlet id o_audio_last_ckb;
-
+s
-    IBOutlet id o_audio_lastpwd_txt;
-    IBOutlet id o_audio_lastuser_fld;
@@ -75 +75 @@
-    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;

modules/gui/macosx/simple_prefs.m

@@ -245 +245 @@
-    [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")];
@@ -392 +393 @@
-    {
-        [o_audio_lastuser_fld setStringValue: [NSString stringWithUTF8String: config_GetPsz( p_intf, "lastfm-username" )]];
-
+s
-
-        if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
@@ -398 +399 @@
-            [o_audio_last_ckb setState: NSOnState];
-            [o_audio_lastuser_fld setEnabled: YES];
-
+s
-        }
-        else
@@ -404 +405 @@
-            [o_audio_last_ckb setState: NSOffState];
-            [o_audio_lastuser_fld setEnabled: NO];
-
+s
-        }
-    }
@@ -458 +459 @@
-    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" )];
-
@@ -739 +742 @@
-
-            config_PutPsz( p_intf, "lastfm-username", [[o_audio_lastuser_fld stringValue] UTF8String] );
-
+s
-        }
-        else
@@ -796 +799 @@
-        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] );
-
@@ -980 +984 @@
-        if( [o_audio_last_ckb state] == NSOnState )
-        {
-
+s
-            [o_audio_lastuser_fld setEnabled: YES];
-        }
-        else
-        {
-
+s
-            [o_audio_lastuser_fld setEnabled: NO];
-        }