X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fqt4.cpp;h=6781f743b6cf5dbe0d2b42a8003523c8e9cf4145;hb=0871d444bc2cdbe581329afc5d5f990c4a7b4434;hp=41bdd26d395d6065b0b619c5af880a3a9466daf3;hpb=7cd22823b1e7e4b6a3f23e8f6624ded298459b73;p=vlc

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 41bdd26d39..6781f743b6 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -63,7 +63,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ADVANCED_PREFS_TEXT N_( "Show advanced prefs over simple ones" )
+#define ADVANCED_PREFS_TEXT N_( "Show advanced preferences over simple ones" )
 #define ADVANCED_PREFS_LONGTEXT N_( "Show advanced preferences and not simple "\
                                     "preferences when opening the preferences "\
                                     "dialog." )
@@ -71,16 +71,15 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define SYSTRAY_TEXT N_( "Systray icon" )
 #define SYSTRAY_LONGTEXT N_( "Show an icon in the systray " \
                              "allowing you to control VLC media player " \
-                             "for basic actions" )
+                             "for basic actions." )
 
 #define MINIMIZED_TEXT N_( "Start VLC with only a systray icon" )
-#define MINIMIZED_LONGTEXT N_( "When you launch VLC with that option, " \
-                               "VLC will start with just an icon in" \
+#define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
                                "your taskbar" )
 
 #define TITLE_TEXT N_( "Show playing item name in window title" )
 #define TITLE_LONGTEXT N_( "Show the name of the song or video in the " \
-                           "controler window title" )
+                           "controler window title." )
 
 #define FILEDIALOG_PATH_TEXT N_( "Path to use in openfile dialog" )
 
@@ -91,7 +90,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 #define ADVANCED_OPTIONS_TEXT N_( "Advanced options" )
 #define ADVANCED_OPTIONS_LONGTEXT N_( "Show all the advanced options " \
-                                      "in the dialogs" )
+                                      "in the dialogs." )
 
 #define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
 #define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
@@ -103,7 +102,8 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 #define UPDATER_TEXT N_( "Activate the updates availability notification" )
 #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \
-                            "versions of the software. It runs once a week." )
+                            "versions of the software. It runs once every " \
+                            "two weeks." )
 #define UPDATER_DAYS_TEXT N_("Number of days between two update checks")
 
 #define COMPLETEVOL_TEXT N_( "Allow the volume to be set to 400%" )
@@ -118,10 +118,10 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 #define PRIVACY_TEXT N_( "Ask for network policy at start" )
 
-#define SLIDERCOL_TEXT N_( "Define the colours of the volume slider " )
-#define SLIDERCOL_LONGTEXT N_( "Define the colours of the volume slider\n " \
-                       "By specifying the 12 numbers separated by a ';'\n " \
-            "Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n " \
+#define SLIDERCOL_TEXT N_( "Define the colors of the volume slider " )
+#define SLIDERCOL_LONGTEXT N_( "Define the colors of the volume slider\n" \
+                       "By specifying the 12 numbers separated by a ';'\n" \
+            "Default is '255;255;255;20;226;20;255;176;15;235;30;20'\n" \
             "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' ")
 
 #define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
@@ -129,7 +129,7 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define QT_MODE_TEXT N_( "Selection of the starting mode and look " )
 #define QT_MODE_LONGTEXT N_( "Start VLC with:\n" \
                              " - normal mode\n"  \
-                             " - a zone always present to show information" \
+                             " - a zone always present to show information " \
                                   "as lyrics, album arts...\n" \
                              " - minimal mode with limited controls" )
 
@@ -205,6 +205,7 @@ vlc_module_begin();
 
         add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
                 false );
+            change_internal();
 
         set_callbacks( OpenDialogs, Close );
 
@@ -467,6 +468,9 @@ static int WindowOpen (vlc_object_t *obj)
 {
     vout_window_t *wnd = (vout_window_t *)obj;
 
+    if (config_GetInt (obj, "embedded-video") <= 0)
+        return VLC_EGENERIC;
+
     intf_thread_t *intf = (intf_thread_t *)
         vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
     if (intf == NULL)
@@ -495,12 +499,6 @@ static int WindowOpen (vlc_object_t *obj)
     if (miP->isNull ())
         return VLC_EGENERIC;
 
-    if (config_GetInt (obj, "embedded-video") <= 0)
-    {
-        (*miP)->requestNotEmbeddedVideo (wnd->vout);
-        return VLC_EGENERIC;
-    }
-
     wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
                                         &wnd->width, &wnd->height);
     windowLock.unlock ();
@@ -526,6 +524,6 @@ static void WindowClose (vlc_object_t *obj)
     QMutexLocker locker (&windowLock);
 
     if (!miP->isNull ())
-        (*miP)->releaseVideo (wnd->handle);
+        (*miP)->releaseVideo( wnd->vout, wnd->handle );
     delete miP;
 }