[vlc-devel] [PATCH v2 4/4] qt: remove video-on-top from simple-pref

[Pierre Lamot]

---
 modules/gui/qt/components/simple_preferences.cpp |  1 -
 modules/gui/qt/ui/sprefs_video.ui                | 44 +++++++++---------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp
index 218630896f..90fe4fa7b4 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -351,7 +351,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                      ui.videoZone, setEnabled( bool ) );
 
             CONFIG_BOOL( "fullscreen", fullscreen );
-            CONFIG_BOOL( "video-on-top", alwaysOnTop );
             CONFIG_BOOL( "video-deco", windowDecorations );
             CONFIG_GENERIC( "vout", StringList, ui.voutLabel, outputModule );
 
diff --git a/modules/gui/qt/ui/sprefs_video.ui b/modules/gui/qt/ui/sprefs_video.ui
index 1becb97d5c..6c691f34ab 100644
--- a/modules/gui/qt/ui/sprefs_video.ui
+++ b/modules/gui/qt/ui/sprefs_video.ui
@@ -53,48 +53,41 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="overlay">
-           <property name="text">
-            <string>Accelerated video output (Overlay)</string>
+         <item row="3" column="1">
+          <widget class="QComboBox" name="outputModule">
+           <property name="maxVisibleItems">
+            <number>15</number>
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="hwYUVBox">
+         <item row="3" column="0">
+          <widget class="QLabel" name="voutLabel">
            <property name="text">
-            <string>Use hardware YUV->RGB conversions</string>
+            <string>O&utput</string>
+           </property>
+           <property name="buddy">
+            <cstring>outputModule</cstring>
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="alwaysOnTop">
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="overlay">
            <property name="text">
-            <string>Always on top</string>
+            <string>Accelerated video output (Overlay)</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="2" column="0">
           <widget class="QCheckBox" name="windowDecorations">
            <property name="text">
             <string>Window decorations</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="voutLabel">
+         <item row="0" column="1">
+          <widget class="QCheckBox" name="hwYUVBox">
            <property name="text">
-            <string>Output</string>
-           </property>
-           <property name="buddy">
-            <cstring>outputModule</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QComboBox" name="outputModule">
-           <property name="maxVisibleItems">
-            <number>15</number>
+            <string>Use hardware YUV->RGB conversions</string>
            </property>
           </widget>
          </item>
@@ -324,9 +317,6 @@
   <tabstop>enableVideo</tabstop>
   <tabstop>fullscreen</tabstop>
   <tabstop>overlay</tabstop>
-  <tabstop>hwYUVBox</tabstop>
-  <tabstop>alwaysOnTop</tabstop>
-  <tabstop>windowDecorations</tabstop>
   <tabstop>outputModule</tabstop>
   <tabstop>dXdisplayDevice</tabstop>
   <tabstop>kvaFixT23</tabstop>
-- 
2.14.1