X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fdialogs_provider.cpp;h=758ebec6ad212421743a869f129b9daca5101fd2;hb=84091c6692d4e22e6082ecf692c4df6e9e292b2f;hp=85b2e8d116a911e1d59b87d4eb25fefe1b039322;hpb=a654574f57b5240be411be5fd8196dc4e818adb5;p=vlc

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 85b2e8d116..758ebec6ad 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -21,32 +21,36 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <QEvent>
 #include <QApplication>
 #include <QSignalMapper>
 #include <QFileDialog>
 
+#include <vlc_common.h>
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
 #include "main_interface.hpp"
 #include "menus.hpp"
 #include <vlc_intf_strings.h>
+#include "input_manager.hpp"
 
 /* The dialogs */
 #include "dialogs/playlist.hpp"
+#include "dialogs/bookmarks.hpp"
 #include "dialogs/preferences.hpp"
 #include "dialogs/mediainfo.hpp"
 #include "dialogs/messages.hpp"
 #include "dialogs/extended.hpp"
+#include "dialogs/vlm.hpp"
 #include "dialogs/sout.hpp"
 #include "dialogs/open.hpp"
-#include "dialogs/vlm.hpp"
 #include "dialogs/help.hpp"
 #include "dialogs/gototime.hpp"
 #include "dialogs/podcast_configuration.hpp"
-#include "dialogs/vlm.hpp"
-
 
 DialogsProvider* DialogsProvider::instance = NULL;
 
@@ -69,14 +73,23 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
 
 DialogsProvider::~DialogsProvider()
 {
+    msg_Dbg( p_intf, "Destroying the Dialog Provider" );
     PlaylistDialog::killInstance();
     MediaInfoDialog::killInstance();
+    MessagesDialog::killInstance();
+    ExtendedDialog::killInstance();
+    BookmarksDialog::killInstance();
+    HelpDialog::killInstance();
+#ifdef UPDATE_CHECK
+    UpdateDialog::killInstance();
+#endif
+
     fixed_timer->stop();
 }
 
 void DialogsProvider::quit()
 {
-    vlc_object_kill( p_intf );
+    vlc_object_kill( p_intf->p_libvlc );
     QApplication::closeAllWindows();
     QApplication::quit();
 }
@@ -112,8 +125,10 @@ void DialogsProvider::customEvent( QEvent *event )
            bookmarksDialog(); break;
         case INTF_DIALOG_EXTENDED:
            extendedDialog(); break;
+#ifdef ENABLE_VLM
         case INTF_DIALOG_VLM:
            vlmDialog(); break;
+#endif
         case INTF_DIALOG_INTERACTION:
            doInteraction( de->p_arg ); break;
         case INTF_DIALOG_POPUPMENU:
@@ -126,8 +141,13 @@ void DialogsProvider::customEvent( QEvent *event )
            QVLCMenu::MiscPopupMenu( p_intf ); break;
         case INTF_DIALOG_WIZARD:
         case INTF_DIALOG_STREAMWIZARD:
+            openThenStreamingDialogs(); break;
+#ifdef UPDATE_CHECK
         case INTF_DIALOG_UPDATEVLC:
+            updateDialog(); break;
+#endif
         case INTF_DIALOG_EXIT:
+            quit(); break;
         default:
            msg_Warn( p_intf, "unimplemented dialog" );
         }
@@ -162,22 +182,24 @@ void DialogsProvider::gotoTimeDialog()
     GotoTimeDialog::getInstance( p_intf )->toggleVisible();
 }
 
+#ifdef ENABLE_VLM
 void DialogsProvider::vlmDialog()
 {
     VLMDialog::getInstance( p_intf )->toggleVisible();
 }
+#endif
 
 void DialogsProvider::helpDialog()
 {
     HelpDialog::getInstance( p_intf )->toggleVisible();
 }
 
+#ifdef UPDATE_CHECK
 void DialogsProvider::updateDialog()
 {
-#ifdef UPDATE_CHECK
     UpdateDialog::getInstance( p_intf )->toggleVisible();
-#endif
 }
+#endif
 
 void DialogsProvider::aboutDialog()
 {
@@ -196,8 +218,7 @@ void DialogsProvider::mediaCodecDialog()
 
 void DialogsProvider::bookmarksDialog()
 {
-    /* TODO - Implement me */
-    /*  BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
+    BookmarksDialog::getInstance( p_intf )->toggleVisible();
 }
 
 void DialogsProvider::podcastConfigureDialog()
@@ -245,8 +266,7 @@ void DialogsProvider::PLAppendDialog()
 
 /* Unimplemmented yet - Usefull ? */
 void DialogsProvider::MLAppendDialog()
-{
-}
+{}
 
 /**
  * Simple open
@@ -277,7 +297,7 @@ QStringList DialogsProvider::showSimpleOpen( QString help,
     fileTypes.replace(QString(";*"), QString(" *"));
     return QFileDialog::getOpenFileNames( NULL,
         help.isNull() ? qfu(I_OP_SEL_FILES ) : help,
-        path.isNull() ? qfu( p_intf->p_libvlc->psz_homedir ) : path,
+        path.isNull() ? qfu( p_intf->p_sys->psz_filepath ) : path,
         fileTypes );
 }
 
@@ -298,7 +318,7 @@ void DialogsProvider::addFromSimple( bool pl, bool go)
                                                ( i ? PLAYLIST_PREPARSE : 0 ) )
                          : ( PLAYLIST_APPEND | PLAYLIST_PREPARSE ),
                       PLAYLIST_END,
-                      pl ? VLC_TRUE : VLC_FALSE, VLC_FALSE );
+                      pl ? true : false, false );
         i++;
     }
 }
@@ -326,22 +346,25 @@ void DialogsProvider::simpleMLAppendDialog()
  **/
 static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
 {
-    QString dir = QFileDialog::getExistingDirectory( 0, qtr(I_OP_OPDIR) );
+    QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") );
     if (!dir.isEmpty()) {
         input_item_t *p_input = input_ItemNewExt( THEPL,
                                         qtu( "directory://" + dir ), NULL,
                                         0, NULL, -1 );
 
+        /* FIXME: playlist_AddInput() can fail */
         playlist_AddInput( THEPL, p_input,
                        go ? ( PLAYLIST_APPEND | PLAYLIST_GO ) : PLAYLIST_APPEND,
-                       PLAYLIST_END, pl, VLC_FALSE );
-        input_Read( THEPL, p_input, VLC_FALSE );
+                       PLAYLIST_END, pl, pl_Unlocked );
+        /* Why this ?
+         * input_Read( THEPL, p_input, false ); */
+        vlc_gc_decref( p_input );
     }
 }
 
 void DialogsProvider::PLAppendDir()
 {
-    openDirectory( p_intf, true, false );
+    openDirectory( p_intf, true, true );
 }
 
 void DialogsProvider::MLAppendDir()
@@ -366,7 +389,7 @@ void DialogsProvider::saveAPlaylist()
 {
     QFileDialog *qfd = new QFileDialog( NULL,
                                    qtr( "Choose a filename to save playlist" ),
-                                   qfu( p_intf->p_libvlc->psz_homedir ),
+                                   qfu( p_intf->p_sys->psz_filepath ),
                                    qtr( "XSPF playlist (*.xspf);; " ) +
                                    qtr( "M3U playlist (*.m3u);; Any (*.*) " ) );
     qfd->setFileMode( QFileDialog::AnyFile );
@@ -410,14 +433,14 @@ void DialogsProvider::saveAPlaylist()
  * Sout emulation
  ****************************************************************************/
 
-//FIXME !!
-void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
+void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
+                                       bool b_transcode_only )
 {
-    SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf,
-                                                    b_transcode_only );
+    SoutDialog *s = SoutDialog::getInstance( parent, p_intf, b_transcode_only );
+
     if( s->exec() == QDialog::Accepted )
     {
-        msg_Err( p_intf, "mrl %s", qta( s->getMrl() ) );
+        msg_Dbg( p_intf, "Sout mrl %s", qta( s->getMrl() ) );
         /* Just do it */
         int i_len = strlen( qtu( s->getMrl() ) ) + 10;
         char *psz_option = (char*)malloc( i_len );
@@ -425,9 +448,8 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
 
         playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
                          PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
-                        -1, &psz_option, 1, VLC_TRUE, VLC_FALSE );
+                        -1, &psz_option, 1, true, pl_Unlocked );
     }
-    delete s;
 }
 
 void DialogsProvider::openThenStreamingDialogs()
@@ -441,30 +463,6 @@ void DialogsProvider::openThenTranscodingDialogs()
     OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, OPEN_AND_SAVE )
                                 ->showTab( 0 );
 }
-/*
-void DialogsProvider::streamingDialog()
-{
-    OpenDialog *o = new OpenDialog( p_intf->p_sys->p_mi, p_intf, true );
-    if ( o->exec() == QDialog::Accepted )
-    {
-        SoutDialog *s = new SoutDialog( p_intf->p_sys->p_mi, p_intf );
-        if( s->exec() == QDialog::Accepted )
-        {
-            msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
-            /* Just do it
-            int i_len = strlen( qtu(s->mrl) ) + 10;
-            char *psz_option = (char*)malloc(i_len);
-            snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
-
-            playlist_AddExt( THEPL, qtu( o->mrl ), "Streaming",
-                             PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,
-                             -1, &psz_option, 1, VLC_TRUE, VLC_FALSE );
-        }
-        delete s;
-    }
-    delete o;
-}*/
-
 
 /****************************************************************************
  * Menus / Interaction
@@ -505,8 +503,19 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
         break;
     case INTERACT_UPDATE:
         qdialog = (InteractionDialog*)(p_dialog->p_private);
-        if( qdialog)
+        if( qdialog )
             qdialog->update();
+        else
+        {
+            /* The INTERACT_NEW message was forgotten
+               so we must create the dialog and update it*/
+            qdialog = new InteractionDialog( p_intf, p_dialog );
+            p_dialog->p_private = (void*)qdialog;
+            if( !(p_dialog->i_status == ANSWERED_DIALOG) )
+                qdialog->show();
+            if( qdialog )
+                qdialog->update();
+        }
         break;
     case INTERACT_HIDE:
         qdialog = (InteractionDialog*)(p_dialog->p_private);
@@ -523,7 +532,17 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
     }
 }
 
-void DialogsProvider::switchToSkins()
+void DialogsProvider::loadSubtitlesFile()
 {
-    var_SetString( p_intf, "intf-switch", "skins2" );
+    input_thread_t *p_input = THEMIM->getInput();
+    if( !p_input )
+        return;
+    QString qsFile = QFileDialog::getOpenFileName(
+             NULL,
+             qtr( "Choose subtitles file" ),
+             "",
+             qtr( "Subtitles files (*.cdg *.idx *.srt *.sub *.utf);;"
+                  "All files (*)" ) );
+    if( !input_AddSubtitles( p_input, qtu( qsFile ), true ) )
+        msg_Warn( p_intf, "unable to load subtitles file..." );
 }