[vlc-commits] Qt: spref, move DirectX specific options to the DirectX GroupBox

[Pierre Lamot]

vlc/vlc-3.0 | branch: master | Pierre Lamot <pierre at videolabs.io> | Wed Dec 20 17:58:10 2017 +0100| [c5a26d280979b2581ad25f0cf1c593579ef9ba49] | committer: Hugo Beauzée-Luyssen

Qt: spref, move DirectX specific options to the DirectX GroupBox

Ref #19305

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 430994e0cfe1aa1e2df0a7e5b3bfb90699e98447)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c5a26d280979b2581ad25f0cf1c593579ef9ba49
---

 modules/gui/qt/components/simple_preferences.cpp |  2 --
 modules/gui/qt/ui/sprefs_video.ui                | 36 +++++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp
index 0e40eff9d6..8d4c66e8d8 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -369,8 +369,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONNECT( ui.overlay, toggled( bool ), ui.hwYUVBox, setEnabled( bool ) );
 #else
             ui.directXBox->setVisible( false );
-            ui.overlay->setVisible( false );
-            ui.hwYUVBox->setVisible( false );
 #endif
 
 #ifdef __OS2__
diff --git a/modules/gui/qt/ui/sprefs_video.ui b/modules/gui/qt/ui/sprefs_video.ui
index 6c691f34ab..abfc1ad3c3 100644
--- a/modules/gui/qt/ui/sprefs_video.ui
+++ b/modules/gui/qt/ui/sprefs_video.ui
@@ -8,7 +8,7 @@
     <x>0</x>
     <y>0</y>
     <width>682</width>
-    <height>577</height>
+    <height>679</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -70,13 +70,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="overlay">
-           <property name="text">
-            <string>Accelerated video output (Overlay)</string>
-           </property>
-          </widget>
-         </item>
          <item row="2" column="0">
           <widget class="QCheckBox" name="windowDecorations">
            <property name="text">
@@ -84,13 +77,6 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="hwYUVBox">
-           <property name="text">
-            <string>Use hardware YUV->RGB conversions</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
@@ -100,7 +86,21 @@
          <string>DirectX</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_4">
+         <item row="2" column="0">
+          <widget class="QCheckBox" name="hwYUVBox">
+           <property name="text">
+            <string>Use hardware YUV->RGB conversions</string>
+           </property>
+          </widget>
+         </item>
          <item row="0" column="0">
+          <widget class="QCheckBox" name="overlay">
+           <property name="text">
+            <string>Accelerated video output (Overlay)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
           <widget class="QLabel" name="dxDeviceLabel">
            <property name="text">
             <string>Display device</string>
@@ -110,7 +110,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
+         <item row="3" column="1">
           <widget class="QComboBox" name="dXdisplayDevice"/>
          </item>
         </layout>
@@ -316,8 +316,10 @@
  <tabstops>
   <tabstop>enableVideo</tabstop>
   <tabstop>fullscreen</tabstop>
-  <tabstop>overlay</tabstop>
+  <tabstop>windowDecorations</tabstop>
   <tabstop>outputModule</tabstop>
+  <tabstop>overlay</tabstop>
+  <tabstop>hwYUVBox</tabstop>
   <tabstop>dXdisplayDevice</tabstop>
   <tabstop>kvaFixT23</tabstop>
   <tabstop>kvaVideoMode</tabstop>