[vlc-devel] [PATCH 4/6] Additional filters: UI control for the new features
Vianney Boyer
vlcvboyer at gmail.com
Thu Jul 25 07:44:57 CEST 2013
UI related to the new video filter (freeze, oldmovie, vhs) and puzzle
parameters
---
modules/gui/qt4/components/extended_panels.cpp | 12 +-
modules/gui/qt4/ui/video_effects.ui | 312
+++++++++++++++----------
2 files changed, 203 insertions(+), 121 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 532e811..44a6c01 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -165,7 +165,11 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf,
QTabWidget *_parent ) :
SETUP_VFILTER( puzzle )
SETUP_VFILTER_OPTION( puzzleRowsSpin, valueChanged( int ) )
SETUP_VFILTER_OPTION( puzzleColsSpin, valueChanged( int ) )
- SETUP_VFILTER_OPTION( puzzleBlackSlotCheck, stateChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleBorderSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzlePreviewCheck, stateChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzlePreviewSizeSlider, valueChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleRotationCombo, currentIndexChanged( int ) )
+ SETUP_VFILTER_OPTION( puzzleModeCombo, currentIndexChanged( int ) )
SETUP_VFILTER( magnify )
@@ -228,6 +232,12 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf,
QTabWidget *_parent ) :
SETUP_VFILTER( anaglyph )
+ SETUP_VFILTER( freeze )
+
+ SETUP_VFILTER( oldmovie )
+
+ SETUP_VFILTER( vhs )
+
#undef SETUP_VFILTER
#undef SETUP_VFILTER_OPTION
diff --git a/modules/gui/qt4/ui/video_effects.ui
b/modules/gui/qt4/ui/video_effects.ui
index e6ad2b3..a6a6702 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -864,80 +864,6 @@
</layout>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QGroupBox" name="puzzleEnable">
- <property name="title">
- <string>Puzzle game</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_27">
- <property name="text">
- <string>Rows</string>
- </property>
- <property name="buddy">
- <cstring>puzzleRowsSpin</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="puzzleRowsSpin">
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>16</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_26">
- <property name="text">
- <string>Columns</string>
- </property>
- <property name="buddy">
- <cstring>puzzleColsSpin</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="puzzleColsSpin">
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>2</number>
- </property>
- <property name="maximum">
- <number>16</number>
- </property>
- <property name="value">
- <number>4</number>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QCheckBox" name="puzzleBlackSlotCheck">
- <property name="text">
- <string>Black Slot</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_8">
@@ -1555,6 +1481,48 @@
<string>Advanced</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_12">
+ <item row="3" column="2">
+ <widget class="QCheckBox" name="motiondetectEnable">
+ <property name="text">
+ <string>Motion detect</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="2">
+ <widget class="QCheckBox" name="psychedelicEnable">
+ <property name="text">
+ <string>Psychedelic</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="2">
+ <widget class="QCheckBox" name="rippleEnable">
+ <property name="text">
+ <string>Water effect</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="2">
+ <widget class="QCheckBox" name="mirrorEnable">
+ <property name="text">
+ <string>Mirror</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="2">
+ <widget class="QCheckBox" name="waveEnable">
+ <property name="text">
+ <string>Waves</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="2">
+ <widget class="QCheckBox" name="anaglyphEnable">
+ <property name="text">
+ <string>Anaglyph 3D</string>
+ </property>
+ </widget>
+ </item>
<item row="3" column="0" rowspan="3">
<widget class="QGroupBox" name="motionblurEnable">
<property name="title">
@@ -1602,33 +1570,6 @@
</layout>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QCheckBox" name="motiondetectEnable">
- <property name="text">
- <string>Motion detect</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="QCheckBox" name="psychedelicEnable">
- <property name="text">
- <string>Psychedelic</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0">
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="2" column="0">
<widget class="QGroupBox" name="antiflickerEnable">
<property name="title">
@@ -1717,13 +1658,6 @@
</layout>
</widget>
</item>
- <item row="4" column="2">
- <widget class="QCheckBox" name="rippleEnable">
- <property name="text">
- <string>Water effect</string>
- </property>
- </widget>
- </item>
<item row="6" column="0" rowspan="2">
<widget class="QGroupBox" name="gaussianblurEnable">
<property name="title">
@@ -1771,29 +1705,170 @@
</layout>
</widget>
</item>
- <item row="6" column="2">
- <widget class="QCheckBox" name="mirrorEnable">
+ <item row="10" column="2">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="8" column="0">
+ <widget class="QCheckBox" name="vhsEnable">
<property name="text">
- <string>Mirror</string>
+ <string>VHS effect</string>
</property>
</widget>
</item>
- <item row="7" column="2">
- <widget class="QCheckBox" name="waveEnable">
+ <item row="9" column="2">
+ <widget class="QCheckBox" name="freezeEnable">
<property name="text">
- <string>Waves</string>
+ <string>Freeze an area selected by mouse pointer</string>
</property>
</widget>
</item>
- <item row="8" column="2">
- <widget class="QCheckBox" name="anaglyphEnable">
+ <item row="9" column="0">
+ <widget class="QCheckBox" name="oldmovieEnable">
<property name="text">
- <string>Anaglyph 3D</string>
+ <string>Old movie effect</string>
</property>
</widget>
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tab_4">
+ <attribute name="title">
+ <string>Game</string>
+ </attribute>
+ <widget class="QGroupBox" name="puzzleEnable">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>521</width>
+ <height>111</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Puzzle</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_21">
+ <item row="4" column="1" colspan="4">
+ <widget class="QSlider" name="puzzlePreviewSizeSlider">
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QCheckBox" name="puzzlePreviewCheck">
+ <property name="text">
+ <string>Preview</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_26">
+ <property name="text">
+ <string>border</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" colspan="4">
+ <widget class="QSlider" name="puzzleBorderSlider">
+ <property name="maximum">
+ <number>25</number>
+ </property>
+ <property name="pageStep">
+ <number>5</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="tickPosition">
+ <enum>QSlider::TicksBelow</enum>
+ </property>
+ <property name="tickInterval">
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QComboBox" name="puzzleModeCombo"/>
+ </item>
+ <item row="1" column="2">
+ <widget class="QSpinBox" name="puzzleRowsSpin">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> row</string>
+ </property>
+ <property name="prefix">
+ <string/>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="4">
+ <widget class="QComboBox" name="puzzleRotationCombo"/>
+ </item>
+ <item row="1" column="3">
+ <widget class="QSpinBox" name="puzzleColsSpin">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> col</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>20</number>
+ </property>
+ <property name="value">
+ <number>4</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
</widget>
<customwidgets>
<customwidget>
@@ -1823,9 +1898,6 @@
<tabstop>rotateEnable</tabstop>
<tabstop>rotateAngleDial</tabstop>
<tabstop>transformTypeCombo</tabstop>
- <tabstop>puzzleRowsSpin</tabstop>
- <tabstop>puzzleColsSpin</tabstop>
- <tabstop>puzzleBlackSlotCheck</tabstop>
<tabstop>colorthresEnable</tabstop>
<tabstop>colorthresColorText</tabstop>
<tabstop>colorthresSaturationthresSlider</tabstop>
--
1.8.1.2
More information about the vlc-devel
mailing list