Skip to content

V
vlc-gpu
Commit f4142bc8 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf
Browse files
Options

Qt: video_effects fix logo ui 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 2ed186ab
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 30 deletions
modules/gui/qt4/ui/video_effects.ui
View file @ f4142bc8
...@@ -1100,56 +1100,131 @@ ...@@ -1100,56 +1100,131 @@
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_22"> <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"> <property name="text">
<string>Transparency</string> <string>Transparency</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0">
<widget class="QLabel" name="label_21"> <widget class="QLabel" name="label_21">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Left</string> <string>Left</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0">
<widget class="QLabel" name="label_20"> <widget class="QLabel" name="label_20">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Top</string> <string>Top</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2"> <item row="0" column="0">
<widget class="QSlider" name="logoOpacitySlider"> <widget class="QLabel" name="label_19">
<property name="maximum"> <property name="minimumSize">
<number>255</number> <size>
</property> <width>50</width>
<property name="orientation"> <height>0</height>
<enum>Qt::Horizontal</enum> </size>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</property> </property>
<property name="tickInterval"> <property name="text">
<number>32</number> <string>Logo</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="2">
<widget class="QLineEdit" name="logoFileText"/>
</item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QSpinBox" name="logoXSpin"/> <widget class="QSpinBox" name="logoXSpin"/>
</item> </item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QSpinBox" name="logoYSpin"/> <widget class="QSpinBox" name="logoYSpin"/>
</item> </item>
<item row="0" column="0"> <item row="1" column="3">
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_45">
<property name="text"> <property name="text">
<string>Logo</string> <string>pixels</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="2" column="3">
<widget class="QLineEdit" name="logoFileText"/> <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> </item>
</layout> </layout>
</widget> </widget>
...@@ -1168,6 +1243,12 @@ ...@@ -1168,6 +1243,12 @@
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Top</string> <string>Top</string>
</property> </property>
...@@ -1175,6 +1256,12 @@ ...@@ -1175,6 +1256,12 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Left</string> <string>Left</string>
</property> </property>
...@@ -1186,16 +1273,52 @@ ...@@ -1186,16 +1273,52 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="eraseYSpin"/> <widget class="QSpinBox" name="eraseYSpin"/>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="eraseMaskText"/> <widget class="QLineEdit" name="eraseMaskText"/>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_15"> <widget class="QLabel" name="label_15">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Mask</string> <string>Mask</string>
</property> </property>
</widget> </widget>
</item> </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> </layout>
</widget> </widget>
</item> </item>
...@@ -1254,16 +1377,16 @@ ...@@ -1254,16 +1377,16 @@
</widget> </widget>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>logoEnable</tabstop>
<tabstop>logoFileText</tabstop>
<tabstop>logoYSpin</tabstop>
<tabstop>logoXSpin</tabstop>
<tabstop>logoOpacitySlider</tabstop>
<tabstop>eraseEnable</tabstop> <tabstop>eraseEnable</tabstop>
<tabstop>eraseMaskText</tabstop> <tabstop>eraseMaskText</tabstop>
<tabstop>eraseYSpin</tabstop> <tabstop>eraseYSpin</tabstop>
<tabstop>eraseXSpin</tabstop> <tabstop>eraseXSpin</tabstop>
<tabstop>saturationSlider</tabstop>
<tabstop>gammaSlider</tabstop>
<tabstop>brightnessThresholdCheck</tabstop>
<tabstop>sharpenEnable</tabstop> <tabstop>sharpenEnable</tabstop>
<tabstop>sharpenSigmaSlider</tabstop>
<tabstop>transformEnable</tabstop>
<tabstop>transformTypeCombo</tabstop> <tabstop>transformTypeCombo</tabstop>
<tabstop>cropTopPx</tabstop> <tabstop>cropTopPx</tabstop>
<tabstop>cropLeftPx</tabstop> <tabstop>cropLeftPx</tabstop>
...@@ -1325,11 +1448,11 @@ ...@@ -1325,11 +1448,11 @@
<tabstop>subpictureFilterText</tabstop> <tabstop>subpictureFilterText</tabstop>
<tabstop>voutFilterText</tabstop> <tabstop>voutFilterText</tabstop>
<tabstop>adjustEnable</tabstop> <tabstop>adjustEnable</tabstop>
<tabstop>logoEnable</tabstop> <tabstop>transformEnable</tabstop>
<tabstop>logoFileText</tabstop> <tabstop>brightnessThresholdCheck</tabstop>
<tabstop>logoYSpin</tabstop> <tabstop>gammaSlider</tabstop>
<tabstop>logoXSpin</tabstop> <tabstop>sharpenSigmaSlider</tabstop>
<tabstop>logoOpacitySlider</tabstop> <tabstop>saturationSlider</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment