Qt menus: remove useless FindActionWithText

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index b8adf662ff06d35ad7d11ef9a83c31673380c790..59ea6810f6cf7db1547d4c45c784d6c5ec766441 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -57,7 +57,7 @@ static int  OpenDialogs  ( vlc_object_t * );
 static int  WindowOpen   ( vlc_object_t * );
 static void WindowClose  ( vlc_object_t * );
 static void Run          ( intf_thread_t * );
-static void Init         ( intf_thread_t * );
+static void *Init        ( vlc_object_t * );
 static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 /*****************************************************************************
@@ -195,7 +195,7 @@ vlc_module_begin();
 #ifdef UPDATE_CHECK
         add_bool( "qt-updates-notif", true, NULL, UPDATER_TEXT,
                 UPDATER_LONGTEXT, false );
-        add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT,
+        add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
                 UPDATER_DAYS_TEXT, false );
 #endif
         add_string( "qt-slider-colours",
@@ -239,6 +239,7 @@ static int Open( vlc_object_t *p_this )
     memset( p_intf->p_sys, 0, sizeof( intf_sys_t ) );
 
     p_intf->pf_run = Run;
+    p_intf->p_sys->p_mi = NULL;
 
     /* Access to the playlist */
     p_intf->p_sys->p_playlist = pl_Yield( p_intf );
@@ -271,9 +272,12 @@ static void Close( vlc_object_t *p_this )
 
     if( p_intf->p_sys->b_isDialogProvider )
     {
-        DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
-        QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
-
+        if( DialogsProvider::isAlive() )
+        {
+            msg_Dbg( p_intf, "Asking the DP to quit nicely" );
+            DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
+            QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
+        }
         vlc_thread_join( p_intf );
     }
 
@@ -294,14 +298,15 @@ static void Run( intf_thread_t *p_intf )
             msg_Err( p_intf, "failed to create Qt dialogs thread" );
     }
     else
-        Init( p_intf );
+        Init( VLC_OBJECT(p_intf) );
 }
 
 static QMutex windowLock;
 static QWaitCondition windowWait;
 
-static void Init( intf_thread_t *p_intf )
+static void *Init( vlc_object_t *obj )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)obj;
     vlc_value_t val;
     char dummy[] = "";
     char *argv[] = { dummy };
@@ -344,6 +349,22 @@ static void Init( intf_thread_t *p_intf )
 
     QPointer<MainInterface> *miP = NULL;
 
+#ifdef UPDATE_CHECK
+    /* Checking for VLC updates */
+    if( config_GetInt( p_intf, "qt-updates-notif" ) &&
+        !config_GetInt( p_intf, "qt-privacy-ask" ) )
+    {
+        int interval = config_GetInt( p_intf, "qt-updates-days" );
+        if( QDate::currentDate() >
+             getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
+        {
+            /* The constructor of the update Dialog will do the 1st request */
+            UpdateDialog::getInstance( p_intf );
+            getSettings()->setValue( "updatedate", QDate::currentDate() );
+        }
+    }
+#endif
+
     /* Create the normal interface in non-DP mode */
     if( !p_intf->pf_show_dialog )
     {
@@ -369,7 +390,15 @@ static void Init( intf_thread_t *p_intf )
 
 #ifdef ENABLE_NLS
     // Translation - get locale
-    QLocale ql = QLocale::system();
+#   if defined (WIN32) || defined (__APPLE__)
+    char* psz_tmp = config_GetPsz( p_intf, "language" );
+    QString lang = qfu( psz_tmp );
+    free( psz_tmp);
+    if (lang == "auto")
+        lang = QLocale::system().name();
+#   else
+    QString lang = QLocale::system().name();
+#   endif
     // Translations for qt's own dialogs
     QTranslator qtTranslator( 0 );
     // Let's find the right path for the translation file
@@ -380,7 +409,7 @@ static void Init( intf_thread_t *p_intf )
                             "locale" + DIR_SEP + "qt4" + DIR_SEP );
 #endif
     // files depending on locale
-    bool b_loaded = qtTranslator.load( path + "qt_" + ql.name());
+    bool b_loaded = qtTranslator.load( path + "qt_" + lang );
     if (!b_loaded)
         msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
     app->installTranslator( &qtTranslator );
@@ -394,29 +423,20 @@ static void Init( intf_thread_t *p_intf )
     p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
                                                         : config_GetHomeDir();
 
-#ifdef UPDATE_CHECK
-    /* Checking for VLC updates */
-    if( config_GetInt( p_intf, "qt-updates-notif" ) )
-    {
-        int interval = config_GetInt( p_intf, "qt-updates-days" );
-        if( QDate::currentDate() >
-             getSettings()->value( "updatedate" ).toDate().addDays( interval ) )
-        {
-            /* The constructor of the update Dialog will do the 1st request */
-            UpdateDialog::getInstance( p_intf );
-            getSettings()->setValue( "updatedate", QDate::currentDate() );
-        }
-    }
-#endif
-
     /* Launch */
     app->exec();
 
     /* And quit */
+    msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
 
     if (miP)
     {
         QMutexLocker locker (&windowLock);
+
+        /* We need to warn to detach from any vout before
+         * deleting miP (WindowClose will not be called after it) */
+        p_intf->p_sys->p_mi->releaseVideo( NULL );
+
         val.p_address = NULL;
         var_Set (p_intf, "window_widget", val);
         delete miP;
@@ -426,16 +446,19 @@ static void Init( intf_thread_t *p_intf )
        in the MainInputManager */
     delete p_intf->p_sys->p_mi;
 
-    /* Destroy then other windows, because some are connected to some slots
-       in the MainInputManager */
+    /* Destroy all remaining windows,
+       because some are connected to some slots
+       in the MainInputManager
+       Settings must be destroyed after that.
+     */
     DialogsProvider::killInstance();
 
+    /* Delete the configuration. Application has to be deleted after that. */
+    delete p_intf->p_sys->mainSettings;
+
     /* Destroy the MainInputManager */
     MainInputManager::killInstance();
 
-    /* Delete the configuration */
-    delete p_intf->p_sys->mainSettings;
-
     /* Delete the application */
     delete app;
 
@@ -512,6 +535,10 @@ static int WindowOpen (vlc_object_t *obj)
     wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
                                         &wnd->width, &wnd->height);
     windowLock.unlock ();
+
+    if (!wnd->handle)
+        return VLC_EGENERIC;
+
     wnd->control = WindowControl;
     wnd->p_private = miP;
     return VLC_SUCCESS;
@@ -534,6 +561,6 @@ static void WindowClose (vlc_object_t *obj)
     QMutexLocker locker (&windowLock);
 
     if (!miP->isNull ())
-        (*miP)->releaseVideo( wnd->vout, wnd->handle );
+        (*miP)->releaseVideo( wnd->handle );
     delete miP;
 }