Remove old login dialog code

[vlc] / modules / gui / qt4 / dialogs_provider.cpp

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 241c59f6a32380ce6788ff8e8e96af401a630348..59f1af3a84f79a793a6303c34b1e7b852bd14225 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -44,6 +44,7 @@
 #include "dialogs/extended.hpp"
 #include "dialogs/vlm.hpp"
 #include "dialogs/sout.hpp"
+#include "dialogs/convert.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs/openurl.hpp"
 #include "dialogs/help.hpp"
@@ -80,7 +81,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
 
 DialogsProvider::~DialogsProvider()
 {
-    msg_Dbg( p_intf, "Destroying the Dialog Provider" );
     PlaylistDialog::killInstance();
     MediaInfoDialog::killInstance();
     MessagesDialog::killInstance();
@@ -90,6 +90,7 @@ DialogsProvider::~DialogsProvider()
 #ifdef UPDATE_CHECK
     UpdateDialog::killInstance();
 #endif
+    ToolbarEditDialog::killInstance();
 
     delete menusMapper;
     delete menusUpdateMapper;
@@ -99,7 +100,7 @@ DialogsProvider::~DialogsProvider()
 void DialogsProvider::quit()
 {
     b_isDying = true;
-    vlc_object_kill( p_intf->p_libvlc );
+    libvlc_Quit( p_intf->p_libvlc );
 }
 
 void DialogsProvider::customEvent( QEvent *event )
@@ -182,6 +183,11 @@ void DialogsProvider::extendedDialog()
     ExtendedDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::synchroDialog()
+{
+    ExtendedDialog::getInstance( p_intf )->showTab( 2 );
+}
+
 void DialogsProvider::messagesDialog()
 {
     MessagesDialog::getInstance( p_intf )->toggleVisible();
@@ -438,13 +444,12 @@ void DialogsProvider::openUrlDialog()
         QString url = oud->url();
         if( !url.isEmpty() )
         {
-            playlist_Add( THEPL, qtu( toNativeSeparators( url ) ),
+            playlist_Add( THEPL, qtu( url ),
                           NULL, !oud->shouldEnqueue() ?
                                   ( PLAYLIST_APPEND | PLAYLIST_GO )
                                 : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
                           PLAYLIST_END, true, false );
-            RecentsMRL::getInstance( p_intf )->addRecent(
-                                     toNativeSeparators( url ) );
+            RecentsMRL::getInstance( p_intf )->addRecent( url );
         }
     }
 }
@@ -511,8 +516,7 @@ void DialogsProvider::saveAPlaylist()
                                    qfu( p_intf->p_sys->psz_filepath ),
                                    qtr( "XSPF playlist (*.xspf);; " ) +
                                    qtr( "M3U playlist (*.m3u);; " ) +
-                                   qtr( "HTML playlist (*.html);;" ) +
-                                   qtr( "Any (*.*) " ) );
+                                   qtr( "HTML playlist (*.html)" ) );
     qfd->setFileMode( QFileDialog::AnyFile );
     qfd->setAcceptMode( QFileDialog::AcceptSave );
     qfd->setConfirmOverwrite( true );
@@ -568,14 +572,24 @@ void DialogsProvider::saveAPlaylist()
 void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
                                        bool b_transcode_only )
 {
-    SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
+    const char *psz_option;
+    if( !b_transcode_only )
+    {
+        SoutDialog *s = SoutDialog::getInstance( parent, p_intf, mrl );
+        if( s->exec() == QDialog::Accepted )
+            psz_option = qtu( s->getMrl() );
+    }else {
+        ConvertDialog *s = new ConvertDialog( parent, p_intf, mrl );
+        if( s->exec() == QDialog::Accepted )
+            psz_option = qtu( s->getMrl() );
+    }
+
 
-    if( s->exec() == QDialog::Accepted )
+    if( !EMPTY_STR( psz_option ) )
     {
-        const char *psz_option = qtu( s->getMrl() );
 
         msg_Dbg( p_intf, "Sout mrl %s", psz_option );
-        playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
+        playlist_AddExt( THEPL, qtu( mrl ), _("Streaming"),
                          PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
                         -1, 1, &psz_option, VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
         RecentsMRL::getInstance( p_intf )->addRecent( mrl );
@@ -700,8 +714,7 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
     case INTERACT_DESTROY:
         msg_Dbg( p_intf, "Destroy the Interaction Dialog" );
         qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
-            delete qdialog;
+        delete qdialog;
         p_dialog->i_status = DESTROYED_DIALOG;
         break;
     }