Changeset 8f2dc55470a22af908c8b4070e85ce5e27d37f01

Timestamp:

10/19/07 12:30:34 (11 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1192789834 +0000

git-parent:

[0a90b9b0ce696148940522698703ad0ed73ea7f5]

git-author:

Rafaël Carré <funman@videolan.org> 1192789834 +0000

Message:

qt4: fix the use of HTTP in open dialog

Files:

• modules/gui/qt4/components/open.cpp (modified) (1 diff)
• modules/gui/qt4/components/simple_preferences.cpp (modified) (3 diffs)
• modules/gui/qt4/components/simple_preferences.hpp (modified) (1 diff)
• modules/gui/qt4/ui/sprefs_audio.ui (modified) (2 diffs)

modules/gui/qt4/components/open.cpp

@@ -424 +424 @@
-        case 0:
-            mrl = "http://" + addr;
+            emit methodChanged("http-caching");
+            break;
-        case 1:
-            mrl = "https://" + addr;

modules/gui/qt4/components/simple_preferences.cpp

@@ -35 +35 @@
-
-#include <vlc_config_cat.h>
+#include "vlc_control.h"
-
-#include <QString>
@@ -244 +245 @@
-                 volNormalizer );
-         CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
+
+
+        if( control_Exists( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
+            ui.lastfm->setCheckState( Qt::Checked );
+        else
+            ui.lastfm->setCheckState( Qt::Unchecked );
+        CONNECT( ui.lastfm, stateChanged( int ), this , lastfm_Changed( int ) );
+
+         CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
+                         lastfm_user_edit );
+         CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label,
+                         lastfm_pass_edit );
-        END_SPREFS_CAT;
-
@@ -376 +389 @@
-{}
-
+void SPrefsPanel::lastfm_Changed( int i_state )
+{
+    if( i_state == Qt::Checked )
+        control_Add( VLC_OBJECT( p_intf ), "audioscrobbler" );
+    else if( i_state == Qt::Unchecked )
+        control_Remove( VLC_OBJECT( p_intf ), "audioscrobbler" );
+}

modules/gui/qt4/components/simple_preferences.hpp

@@ -83 +83 @@
-private slots:
-    void AudioDeviceChanged();
+    void lastfm_Changed( int );
-};
-

modules/gui/qt4/ui/sprefs_audio.ui

@@ -8 +8 @@
-    <y>0</y>
-    <width>461</width>
-554
+682
-   </rect>
-  </property>
@@ -238 +238 @@
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_4" >
+     <property name="title" >
+      <string>_("Last.fm")</string>
+     </property>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QCheckBox" name="lastfm" >
+        <property name="text" >
+         <string>_("Enable")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lastfm_user_edit" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="lastfm_user_label" >
+        <property name="text" >
+         <string>_("Username")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="lastfm_pass_label" >
+        <property name="text" >
+         <string>_("Password")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2" >
+       <widget class="QLineEdit" name="lastfm_pass_edit" >
+        <property name="echoMode" >
+         <enum>QLineEdit::PasswordEchoOnEdit</enum>
-        </property>
-       </widget>