From f4142bc80fd66221f41270c866d2d5f5ea0c18a6 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Wed, 14 Jul 2010 18:29:34 +0200
Subject: [PATCH] Qt: video_effects fix logo ui

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
 modules/gui/qt4/ui/video_effects.ui | 183 +++++++++++++++++++++++-----
 1 file changed, 153 insertions(+), 30 deletions(-)

diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index 70d81d0cd5..1c4375f853 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -1100,56 +1100,131 @@
       <layout class="QGridLayout">
        <item row="3" column="0">
         <widget class="QLabel" name="label_22">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Transparency</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
+       <item row="2" column="0">
         <widget class="QLabel" name="label_21">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Left</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2">
+       <item row="1" column="0">
         <widget class="QLabel" name="label_20">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Top</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
-        <widget class="QSlider" name="logoOpacitySlider">
-         <property name="maximum">
-          <number>255</number>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_19">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
          </property>
-         <property name="tickInterval">
-          <number>32</number>
+         <property name="text">
+          <string>Logo</string>
          </property>
         </widget>
        </item>
+       <item row="0" column="2" colspan="2">
+        <widget class="QLineEdit" name="logoFileText"/>
+       </item>
        <item row="2" column="2">
         <widget class="QSpinBox" name="logoXSpin"/>
        </item>
        <item row="1" column="2">
         <widget class="QSpinBox" name="logoYSpin"/>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_19">
+       <item row="1" column="3">
+        <widget class="QLabel" name="label_45">
          <property name="text">
-          <string>Logo</string>
+          <string>pixels</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
-        <widget class="QLineEdit" name="logoFileText"/>
+       <item row="2" column="3">
+        <widget class="QLabel" name="label_44">
+         <property name="text">
+          <string>pixels</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2" colspan="2">
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0" colspan="2">
+          <widget class="QSlider" name="logoOpacitySlider">
+           <property name="maximum">
+            <number>255</number>
+           </property>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="tickPosition">
+            <enum>QSlider::TicksBothSides</enum>
+           </property>
+           <property name="tickInterval">
+            <number>32</number>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_48">
+           <property name="font">
+            <font>
+             <pointsize>8</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>none</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="label_49">
+           <property name="font">
+            <font>
+             <pointsize>8</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>full</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
@@ -1168,6 +1243,12 @@
       <layout class="QGridLayout">
        <item row="1" column="0">
         <widget class="QLabel" name="label_16">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Top</string>
          </property>
@@ -1175,6 +1256,12 @@
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_17">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Left</string>
          </property>
@@ -1186,16 +1273,52 @@
        <item row="1" column="1">
         <widget class="QSpinBox" name="eraseYSpin"/>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="1" colspan="2">
         <widget class="QLineEdit" name="eraseMaskText"/>
        </item>
        <item row="0" column="0">
         <widget class="QLabel" name="label_15">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="text">
           <string>Mask</string>
          </property>
         </widget>
        </item>
+       <item row="1" column="2">
+        <widget class="QLabel" name="label_46">
+         <property name="text">
+          <string>pixels</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2">
+        <widget class="QLabel" name="label_47">
+         <property name="text">
+          <string>pixels</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="3">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
@@ -1254,16 +1377,16 @@
   </widget>
  </widget>
  <tabstops>
+  <tabstop>logoEnable</tabstop>
+  <tabstop>logoFileText</tabstop>
+  <tabstop>logoYSpin</tabstop>
+  <tabstop>logoXSpin</tabstop>
+  <tabstop>logoOpacitySlider</tabstop>
   <tabstop>eraseEnable</tabstop>
   <tabstop>eraseMaskText</tabstop>
   <tabstop>eraseYSpin</tabstop>
   <tabstop>eraseXSpin</tabstop>
-  <tabstop>saturationSlider</tabstop>
-  <tabstop>gammaSlider</tabstop>
-  <tabstop>brightnessThresholdCheck</tabstop>
   <tabstop>sharpenEnable</tabstop>
-  <tabstop>sharpenSigmaSlider</tabstop>
-  <tabstop>transformEnable</tabstop>
   <tabstop>transformTypeCombo</tabstop>
   <tabstop>cropTopPx</tabstop>
   <tabstop>cropLeftPx</tabstop>
@@ -1325,11 +1448,11 @@
   <tabstop>subpictureFilterText</tabstop>
   <tabstop>voutFilterText</tabstop>
   <tabstop>adjustEnable</tabstop>
-  <tabstop>logoEnable</tabstop>
-  <tabstop>logoFileText</tabstop>
-  <tabstop>logoYSpin</tabstop>
-  <tabstop>logoXSpin</tabstop>
-  <tabstop>logoOpacitySlider</tabstop>
+  <tabstop>transformEnable</tabstop>
+  <tabstop>brightnessThresholdCheck</tabstop>
+  <tabstop>gammaSlider</tabstop>
+  <tabstop>sharpenSigmaSlider</tabstop>
+  <tabstop>saturationSlider</tabstop>
  </tabstops>
  <resources/>
  <connections/>
-- 
2.39.2