Qt4 - make GNOME and KDE people happy.

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

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 209cea7d6a63453fc63d172c3e647286d33a02b5..362189537445b11aa73f7772473f636d866c924b 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -41,8 +41,12 @@
 #include "dialogs/extended.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;
 
@@ -67,6 +71,7 @@ DialogsProvider::~DialogsProvider()
 {
     PlaylistDialog::killInstance();
     MediaInfoDialog::killInstance();
+    fixed_timer->stop();
 }
 
 void DialogsProvider::quit()
@@ -92,6 +97,8 @@ void DialogsProvider::customEvent( QEvent *event )
             case INTF_DIALOG_SAT:
             case INTF_DIALOG_CAPTURE:
                 openCaptureDialog(); break;
+            case INTF_DIALOG_DIRECTORY:
+                PLAppendDir(); break;
             case INTF_DIALOG_PLAYLIST:
                 playlistDialog(); break;
             case INTF_DIALOG_MESSAGES:
@@ -104,7 +111,10 @@ void DialogsProvider::customEvent( QEvent *event )
                bookmarksDialog(); break;
             case INTF_DIALOG_EXTENDED:
                extendedDialog(); break;
-               /* We might want to make it better with custom functions */
+            case INTF_DIALOG_VLM:
+               vlmDialog(); break;
+            case INTF_DIALOG_INTERACTION:
+               doInteraction( de->p_arg ); break;
             case INTF_DIALOG_POPUPMENU:
                QVLCMenu::PopupMenu( p_intf, (de->i_arg != 0) ); break;
             case INTF_DIALOG_AUDIOPOPUPMENU:
@@ -113,11 +123,8 @@ void DialogsProvider::customEvent( QEvent *event )
                QVLCMenu::VideoPopupMenu( p_intf ); break;
             case INTF_DIALOG_MISCPOPUPMENU:
                QVLCMenu::MiscPopupMenu( p_intf ); break;
-            case INTF_DIALOG_INTERACTION:
-               doInteraction( de->p_arg ); break;
-            case INTF_DIALOG_VLM:
-               vlmDialog(); break;
             case INTF_DIALOG_WIZARD:
+            case INTF_DIALOG_STREAMWIZARD:
             case INTF_DIALOG_UPDATEVLC:
             case INTF_DIALOG_EXIT:
             default:
@@ -155,8 +162,7 @@ void DialogsProvider::gotoTimeDialog()
 
 void DialogsProvider::vlmDialog()
 {
-    /* FIXME - Implement me */
-    /*  VLMDialog::getInstance( p_intf )->toggleVisible(); */
+    VLMDialog::getInstance( p_intf )->toggleVisible();
 }
 
 void DialogsProvider::helpDialog()
@@ -185,6 +191,12 @@ void DialogsProvider::bookmarksDialog()
     /*  BookmarkDialog::getInstance( p_intf )->toggleVisible(); */
 }
 
+void DialogsProvider::podcastConfigureDialog()
+{
+    PodcastConfigDialog::getInstance( p_intf )->toggleVisible();
+}
+
+
 /****************************************************************************
  * All the open/add stuff
  * Open Dialog first - Simple Open then
@@ -298,9 +310,9 @@ void DialogsProvider::simpleOpenDialog()
  * pl helps you to choose from playlist or media library,
  * go to start or enqueue
  **/
-static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
+static void openDirectory( intf_thread_t *p_intf, bool pl, bool go )
 {
-    QString dir = QFileDialog::getExistingDirectory ( 0, qtr("Open directory") );
+    QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open directory") );
     if (!dir.isEmpty()) {
         input_item_t *p_input = input_ItemNewExt( THEPL, qtu(dir), NULL,
                                                0, NULL, -1 );
@@ -312,11 +324,6 @@ static void openDirectory( intf_thread_t* p_intf, bool pl, bool go )
     }
 }
 
-void DialogsProvider::openDirDialog()
-{
-    openDirectory( p_intf, true, true );
-}
-
 void DialogsProvider::PLAppendDir()
 {
     openDirectory( p_intf, true, false );
@@ -356,7 +363,7 @@ void DialogsProvider::savePlaylist()
         if( qfd->selectedFiles().count() > 0 )
         {
             static const char psz_xspf[] = "export-xspf",
-                              psz_m3u[] = "esport-m3u";
+                              psz_m3u[] = "export-m3u";
             const char *psz_module;
 
             QString file = qfd->selectedFiles().first();
@@ -395,11 +402,11 @@ void DialogsProvider::streamingDialog( QString mrl, bool b_transcode_only )
                                                     b_transcode_only );
     if( s->exec() == QDialog::Accepted )
     {
-        msg_Err(p_intf, "mrl %s\n", qta(s->mrl));
+        msg_Err( p_intf, "mrl %s\n", qta( s->getMrl() ) );
         /* Just do it */
-        int i_len = strlen( qtu(s->mrl) ) + 10;
+        int i_len = strlen( qtu( s->getMrl() ) ) + 10;
         char *psz_option = (char*)malloc(i_len);
-        snprintf( psz_option, i_len - 1, ":sout=%s", qtu(s->mrl));
+        snprintf( psz_option, i_len - 1, "%s", qtu( s->getMrl() ) );
 
         playlist_AddExt( THEPL, qtu( mrl ), "Streaming",
                          PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END,