Qt: change keep-size to autoresize in order to match the old wx names.

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 5a8443ca42ccac602fdbca430f50efa728524177..e1e361563714d9098eacf8b47d3df63cd35546a1 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -99,8 +99,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /* Set The Video In emebedded Mode or not */
     videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" );
 
-    /* Do we confine videos within a persistent resizeable window */
-    b_keep_size = config_GetInt( p_intf, "qt-keep-size" );
+    /* Does the interface resize to video size or the opposite */
+    b_keep_size = !config_GetInt( p_intf, "qt-video-autoresize" );
 
     /* Are we in the enhanced always-video mode or not ? */
     i_visualmode = config_GetInt( p_intf, "qt-display-mode" );

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 03e8d6ac07348992a31b5a00007d2190fb588c6c..1f5bdd2e512796a3d08fbde99050fbcc0ca21a61 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -84,11 +84,11 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 #define MINIMIZED_LONGTEXT N_( "VLC will start with just an icon in " \
                                "your taskbar" )
 
-#define KEEPSIZE_TEXT N_( "Confine video to a persistent resizable window" )
-#define KEEPSIZE_LONGTEXT N_( "You can choose to confine a video to a " \
-                              "persistent resizeable window or let it freely " \
-                              "expand to match the original size. " \
-                              "By default, videos are expanded to original size." )
+#define KEEPSIZE_TEXT N_( "Resize interface to the native video size" )
+#define KEEPSIZE_LONGTEXT N_( "You have two choices:\n" \
+            " - The interface will resize to the native video size\n" \
+            " - The video will fit to the interface size\n " \
+            "By default, interface resize to the native video size." )
 
 #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 " \
@@ -182,7 +182,7 @@ vlc_module_begin ()
               SYSTRAY_LONGTEXT, false);
     add_bool( "qt-start-minimized", false, NULL, MINIMIZED_TEXT,
               MINIMIZED_LONGTEXT, true);
-    add_bool( "qt-keep-size", false, NULL, KEEPSIZE_TEXT,
+    add_bool( "qt-video-autoresize", true, NULL, KEEPSIZE_TEXT,
               KEEPSIZE_LONGTEXT, false )
     add_bool( "qt-name-in-title", true, NULL, TITLE_TEXT,
               TITLE_LONGTEXT, false );