Commit ddb69692 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4: rework on the video effect dialog

Changing places of items depending on their actual usefulness
Removing one tab
Reordering tabs according to usefulness
Reordering of tab order and buddies
parent 9e94d810
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>619</width>
<height>308</height>
<width>542</width>
<height>276</height>
</rect>
</property>
<property name="currentIndex">
......@@ -17,11 +17,14 @@
<attribute name="title">
<string>Basic</string>
</attribute>
<layout class="QGridLayout">
<item row="0" column="1">
<widget class="QGroupBox" name="sharpenEnable">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="adjustEnable">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Sharpen</string>
<string>Image adjust</string>
</property>
<property name="checkable">
<bool>true</bool>
......@@ -29,21 +32,21 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QLabel" name="label_29">
<widget class="QLabel" name="label">
<property name="text">
<string>Sigma</string>
<string>Hue</string>
</property>
<property name="buddy">
<cstring>hueSlider</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="sharpenSigmaSlider">
<widget class="QSlider" name="hueSlider">
<property name="maximum">
<number>200</number>
</property>
<property name="pageStep">
<number>10</number>
<number>360</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
......@@ -52,81 +55,55 @@
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>100</number>
<number>60</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="adjustEnable">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Image adjust</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="1">
<widget class="QSlider" name="hueSlider">
<property name="maximum">
<number>360</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Brightness</string>
</property>
<property name="tickInterval">
<number>60</number>
<property name="buddy">
<cstring>brightnessSlider</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSlider" name="gammaSlider">
<item row="1" column="1">
<widget class="QSlider" name="brightnessSlider">
<property name="maximum">
<number>500</number>
<number>200</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>50</number>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSlider" name="saturationSlider">
<property name="maximum">
<number>300</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="2" column="1">
<widget class="QCheckBox" name="brightnessThresholdCheck">
<property name="text">
<string>Brightness Threshold</string>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Contrast</string>
</property>
<property name="tickInterval">
<number>100</number>
<property name="buddy">
<cstring>contrastSlider</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="brightnessSlider">
<item row="3" column="1">
<widget class="QSlider" name="contrastSlider">
<property name="maximum">
<number>200</number>
</property>
......@@ -134,78 +111,116 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>100</number>
<number>50</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="contrastSlider">
<item row="4" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Saturation</string>
</property>
<property name="buddy">
<cstring>saturationSlider</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSlider" name="saturationSlider">
<property name="maximum">
<number>200</number>
<number>300</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBothSides</enum>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>100</number>
<number>50</number>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Gamma</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Contrast</string>
<property name="buddy">
<cstring>gammaSlider</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Brightness</string>
<item row="5" column="1">
<widget class="QSlider" name="gammaSlider">
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Saturation</string>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>100</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="sharpenEnable">
<property name="title">
<string>Sharpen</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_29">
<property name="text">
<string>Hue</string>
<string>Sigma</string>
</property>
<property name="buddy">
<cstring>sharpenSigmaSlider</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="brightnessThresholdCheck">
<property name="text">
<string>Brightness threshold</string>
<item row="0" column="1">
<widget class="QSlider" name="sharpenSigmaSlider">
<property name="maximum">
<number>200</number>
</property>
<property name="pageStep">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>50</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="transformEnable">
<item row="1" column="1">
<widget class="QGroupBox" name="motionblurEnable">
<property name="title">
<string>Transform</string>
<string>Motion blur</string>
</property>
<property name="checkable">
<bool>true</bool>
......@@ -213,14 +228,43 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="_3">
<item row="0" column="0">
<widget class="QComboBox" name="transformTypeCombo"/>
<widget class="QLabel" name="label_34">
<property name="text">
<string>Factor</string>
</property>
<property name="buddy">
<cstring>blurFactorSlider</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="blurFactorSlider">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>80</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>16</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QGroupBox" name="gradfunEnable">
<property name="title">
<string>Gradient</string>
......@@ -237,6 +281,9 @@
<property name="text">
<string>Radius</string>
</property>
<property name="buddy">
<cstring>gradfunRadiusSlider</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
......@@ -276,6 +323,9 @@
<property name="text">
<string>Top</string>
</property>
<property name="buddy">
<cstring>cropTopPx</cstring>
</property>
</widget>
</item>
<item row="0" column="3">
......@@ -293,6 +343,9 @@
<property name="text">
<string>Left</string>
</property>
<property name="buddy">
<cstring>cropLeftPx</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
......@@ -310,6 +363,9 @@
<property name="text">
<string>Right</string>
</property>
<property name="buddy">
<cstring>cropRightPx</cstring>
</property>
</widget>
</item>
<item row="1" column="5">
......@@ -327,6 +383,9 @@
<property name="text">
<string>Bottom</string>
</property>
<property name="buddy">
<cstring>cropBotPx</cstring>
</property>
</widget>
</item>
<item row="2" column="3">
......@@ -375,15 +434,71 @@
<attribute name="title">
<string>Geometry</string>
</attribute>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QGroupBox" name="transformEnable">
<property name="title">
<string>Transform</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="_4">
<item row="0" column="0">
<widget class="QComboBox" name="transformTypeCombo"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="magnifyEnable">
<property name="text">
<string>Magnification/Zoom</string>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="2">
<item row="1" column="0">
<widget class="QGroupBox" name="rotateEnable">
<property name="title">
<string>Rotate</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="1">
<widget class="QDial" name="rotateAngleDial">
<property name="maximum">
<number>359</number>
</property>
<property name="value">
<number>180</number>
</property>
<property name="sliderPosition">
<number>180</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Angle</string>
</property>
<property name="buddy">
<cstring>rotateAngleDial</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="puzzleEnable">
<property name="title">
<string>Puzzle game</string>
......@@ -433,6 +548,9 @@
<property name="text">
<string>Columns</string>
</property>
<property name="buddy">
<cstring>puzzleColsSpin</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
......@@ -440,15 +558,25 @@
<property name="text">
<string>Rows</string>
</property>
<property name="buddy">
<cstring>puzzleRowsSpin</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="rotateEnable">
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Color</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QGroupBox" name="colorthresEnable">
<property name="title">
<string>Rotate</string>
<string>Color threshold</string>
</property>
<property name="checkable">
<bool>true</bool>
......@@ -457,57 +585,52 @@
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="1">
<widget class="QDial" name="rotateAngleDial">
<property name="maximum">
<number>359</number>
<item row="2" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Similarity</string>
</property>
<property name="value">
<number>180</number>
<property name="buddy">
<cstring>colorthresSimilaritythresSlider</cstring>
</property>
<property name="sliderPosition">
<number>180</number>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="colorthresSimilaritythresSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_28">
<item row="1" column="1">
<widget class="QSlider" name="colorthresSaturationthresSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Angle</string>
<string>Saturation</string>
</property>
<property name="buddy">
<cstring>colorthresSaturationthresSlider</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Color fun</string>
</attribute>
<layout class="QGridLayout">
<item row="1" column="1">
<widget class="QGroupBox" name="extractEnable">
<property name="title">
<string>Color extraction</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Color</string>
</property>
<property name="buddy">
<cstring>colorthresColorText</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="extractComponentText">
<widget class="QLineEdit" name="colorthresColorText">
<property name="inputMask">
<string>&gt;HHHHHH;#</string>
</property>
......@@ -517,16 +640,9 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="invertEnable">
<property name="text">
<string>Invert colors</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="colorthresEnable">
<widget class="QGroupBox" name="gradientEnable">
<property name="title">
<string>Color threshold</string>
<string>Gradient</string>
</property>
<property name="checkable">
<bool>true</bool>
......@@ -534,44 +650,55 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="2" column="0">
<widget class="QLabel" name="label_14">
<layout class="QGridLayout" name="_6">
<item row="0" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>Similarity</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="colorthresSimilaritythresSlider">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<string>Mode</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSlider" name="colorthresSaturationthresSlider">