Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / modules / gui / qt4 / ui / video_effects.ui

diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index 9f64edadaa4aa05fd2501390f6fe1ddcd0696956..2ecb66f72351fcc3deaab163c384e18a1484a06c 100644 (file)
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>619</width>
-    <height>280</height>
+    <width>542</width>
+    <height>276</height>
    </rect>
   </property>
   <property name="currentIndex">
@@ -17,29 +17,14 @@
    <attribute name="title">
     <string>Basic</string>
    </attribute>
-   <layout class="QGridLayout">
-    <item row="1" column="1">
-     <widget class="QGroupBox" name="transformEnable">
-      <property name="title">
-       <string>Transform</string>
-      </property>
-      <property name="checkable">
+   <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="checked">
-       <bool>false</bool>
-      </property>
-      <layout class="QGridLayout">
-       <item row="0" column="0">
-        <widget class="QComboBox" name="transformTypeCombo"/>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QGroupBox" name="sharpenEnable">
       <property name="title">
-       <string>Sharpen</string>
+       <string>Image adjust</string>
       </property>
       <property name="checkable">
        <bool>true</bool>
@@ -47,90 +32,103 @@
       <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="singleStep">
-          <number>1</number>
-         </property>
-         <property name="pageStep">
-          <number>10</number>
+          <number>360</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>60</number>
          </property>
         </widget>
        </item>
-      </layout>
-     </widget>
-    </item>
-    <item row="0" column="0" rowspan="2">
-     <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">
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Brightness</string>
+         </property>
+         <property name="buddy">
+          <cstring>brightnessSlider</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QSlider" name="brightnessSlider">
          <property name="maximum">
-          <number>360</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>60</number>
+          <number>50</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
-        <widget class="QSlider" name="gammaSlider">
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="brightnessThresholdCheck">
+         <property name="text">
+          <string>Brightness Threshold</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Contrast</string>
+         </property>
+         <property name="buddy">
+          <cstring>contrastSlider</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QSlider" name="contrastSlider">
          <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">
+       <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>300</number>
@@ -139,84 +137,174 @@
           <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="2" column="1">
-        <widget class="QSlider" name="brightnessSlider">
+       <item row="5" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Gamma</string>
+         </property>
+         <property name="buddy">
+          <cstring>gammaSlider</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="QSlider" name="gammaSlider">
          <property name="maximum">
-          <number>200</number>
+          <number>1000</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>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QSlider" name="contrastSlider">
+      </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_29">
+         <property name="text">
+          <string>Sigma</string>
+         </property>
+         <property name="buddy">
+          <cstring>sharpenSigmaSlider</cstring>
+         </property>
+        </widget>
+       </item>
+       <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::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
-          <number>100</number>
+          <number>50</number>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="label_5">
+      </layout>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QGroupBox" name="motionblurEnable">
+      <property name="title">
+       <string>Motion blur</string>
+      </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+      <layout class="QGridLayout" name="_3">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_34">
          <property name="text">
-          <string>Gamma</string>
+          <string>Factor</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>blurFactorSlider</cstring>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Brightness</string>
+       <item row="0" column="1">
+        <widget class="QSlider" name="blurFactorSlider">
+         <property name="minimum">
+          <number>1</number>
          </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_4">
-         <property name="text">
-          <string>Saturation</string>
+         <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="2" column="1">
+     <widget class="QGroupBox" name="gradfunEnable">
+      <property name="title">
+       <string>Gradient</string>
+      </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
-        <widget class="QLabel" name="label">
+        <widget class="QLabel" name="label_32">
          <property name="text">
-          <string>Hue</string>
+          <string>Radius</string>
+         </property>
+         <property name="buddy">
+          <cstring>gradfunRadiusSlider</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="gradfunRadiusSlider">
+         <property name="minimum">
+          <number>4</number>
+         </property>
+         <property name="maximum">
+          <number>32</number>
+         </property>
+         <property name="pageStep">
+          <number>4</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="tickPosition">
+          <enum>QSlider::TicksBelow</enum>
+         </property>
+         <property name="tickInterval">
+          <number>4</number>
          </property>
         </widget>
        </item>
@@ -235,6 +323,9 @@
       <property name="text">
        <string>Top</string>
       </property>
+      <property name="buddy">
+       <cstring>cropTopPx</cstring>
+      </property>
      </widget>
     </item>
     <item row="0" column="3">
@@ -252,6 +343,9 @@
       <property name="text">
        <string>Left</string>
       </property>
+      <property name="buddy">
+       <cstring>cropLeftPx</cstring>
+      </property>
      </widget>
     </item>
     <item row="1" column="1">
@@ -269,6 +363,9 @@
       <property name="text">
        <string>Right</string>
       </property>
+      <property name="buddy">
+       <cstring>cropRightPx</cstring>
+      </property>
      </widget>
     </item>
     <item row="1" column="5">
@@ -286,6 +383,9 @@
       <property name="text">
        <string>Bottom</string>
       </property>
+      <property name="buddy">
+       <cstring>cropBotPx</cstring>
+      </property>
      </widget>
     </item>
     <item row="2" column="3">
@@ -334,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>
@@ -392,6 +548,9 @@
          <property name="text">
           <string>Columns</string>
          </property>
+         <property name="buddy">
+          <cstring>puzzleColsSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="0">
@@ -399,40 +558,8 @@
          <property name="text">
           <string>Rows</string>
          </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-    <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 name="buddy">
+          <cstring>puzzleRowsSpin</cstring>
          </property>
         </widget>
        </item>
@@ -443,46 +570,10 @@
   </widget>
   <widget class="QWidget" name="tab_2">
    <attribute name="title">
-    <string>Color fun</string>
+    <string>Color</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">
-         <property name="text">
-          <string>Color</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="extractComponentText">
-         <property name="inputMask">
-          <string>&gt;HHHHHH;#</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </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="2">
+   <layout class="QGridLayout" name="gridLayout_7">
+    <item row="0" column="0">
      <widget class="QGroupBox" name="colorthresEnable">
       <property name="title">
        <string>Color threshold</string>
@@ -499,6 +590,9 @@
          <property name="text">
           <string>Similarity</string>
          </property>
+         <property name="buddy">
+          <cstring>colorthresSimilaritythresSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="2" column="1">
@@ -520,6 +614,9 @@
          <property name="text">
           <string>Saturation</string>
          </property>
+         <property name="buddy">
+          <cstring>colorthresSaturationthresSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="0">
@@ -527,64 +624,25 @@
          <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="colorthresColorText">
          <property name="inputMask">
           <string>&gt;HHHHHH;#</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="tab_7">
-   <attribute name="title">
-    <string>Image modification</string>
-   </attribute>
-   <layout class="QGridLayout">
-    <item row="2" column="0">
-     <widget class="QCheckBox" name="waveEnable">
-      <property name="text">
-       <string>Waves</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0">
-     <widget class="QCheckBox" name="rippleEnable">
-      <property name="text">
-       <string>Water effect</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QCheckBox" name="psychedelicEnable">
-      <property name="text">
-       <string>Psychedelic</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QCheckBox" name="noiseEnable">
-      <property name="text">
-       <string>Noise</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QCheckBox" name="motiondetectEnable">
-      <property name="text">
-       <string>Motion detect</string>
-      </property>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QGroupBox" name="motionblurEnable">
+     <widget class="QGroupBox" name="gradientEnable">
       <property name="title">
-       <string>Motion blur</string>
+       <string>Gradient</string>
       </property>
       <property name="checkable">
        <bool>true</bool>
@@ -592,43 +650,38 @@
       <property name="checked">
        <bool>false</bool>
       </property>
-      <layout class="QGridLayout">
+      <layout class="QGridLayout" name="_6">
        <item row="0" column="0">
         <widget class="QLabel" name="label_25">
          <property name="text">
-          <string>Factor</string>
+          <string>Mode</string>
          </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::TicksBothSides</enum>
+       <item row="1" column="0" colspan="2">
+        <widget class="QCheckBox" name="gradientTypeCheck">
+         <property name="text">
+          <string>Color</string>
          </property>
-         <property name="tickInterval">
-          <number>16</number>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="gradientCartoonCheck">
+         <property name="text">
+          <string>Cartoon</string>
          </property>
         </widget>
        </item>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="gradientModeCombo"/>
+       </item>
       </layout>
      </widget>
     </item>
-    <item row="0" column="0" rowspan="2">
-     <widget class="QGroupBox" name="gradientEnable">
+    <item row="1" column="0" rowspan="5">
+     <widget class="QGroupBox" name="extractEnable">
       <property name="title">
-       <string>Gradient</string>
+       <string>Color extraction</string>
       </property>
       <property name="checkable">
        <bool>true</bool>
@@ -638,32 +691,99 @@
       </property>
       <layout class="QGridLayout">
        <item row="0" column="0">
-        <widget class="QLabel" name="label_18">
+        <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Mode</string>
+          <string>Color</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="QCheckBox" name="gradientTypeCheck">
-         <property name="text">
-          <string>Color</string>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="extractComponentText">
+         <property name="inputMask">
+          <string>&gt;HHHHHH;#</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2">
-        <widget class="QCheckBox" name="gradientCartoonCheck">
+      </layout>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QGroupBox" name="posterizeEnable">
+      <property name="title">
+       <string>Posterize</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_33">
          <property name="text">
-          <string>Cartoon</string>
+          <string>Posterize level</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
-        <widget class="QComboBox" name="gradientModeCombo"/>
+        <widget class="QSpinBox" name="posterizeLevelSpin">
+         <property name="minimum">
+          <number>2</number>
+         </property>
+         <property name="maximum">
+          <number>256</number>
+         </property>
+         <property name="value">
+          <number>3</number>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>
     </item>
+    <item row="1" column="1">
+     <widget class="QCheckBox" name="invertEnable">
+      <property name="text">
+       <string>Invert colors</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="2">
+     <widget class="QCheckBox" name="rippleEnable">
+      <property name="text">
+       <string>Water effect</string>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QCheckBox" name="motiondetectEnable">
+      <property name="text">
+       <string>Motion detect</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QCheckBox" name="waveEnable">
+      <property name="text">
+       <string>Waves</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QCheckBox" name="noiseEnable">
+      <property name="text">
+       <string>Noise</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="2">
+     <widget class="QCheckBox" name="psychedelicEnable">
+      <property name="text">
+       <string>Psychedelic</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="tab_atmo">
@@ -691,6 +811,9 @@
          <property name="text">
           <string>Edge weightning</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoEdgeweightningSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -711,7 +834,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>3</number>
@@ -723,6 +846,9 @@
          <property name="text">
           <string>Output Color Filtermode</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoFiltermodeCombo</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -730,6 +856,9 @@
          <property name="text">
           <string>Brightness (%)</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoBrightnessSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -750,7 +879,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>10</number>
@@ -763,7 +892,10 @@
        <item row="2" column="0">
         <widget class="QLabel" name="label_39">
          <property name="text">
-          <string>Darknesslimit</string>
+          <string>Darkness limit</string>
+         </property>
+         <property name="buddy">
+          <cstring>atmoDarknesslimitSlider</cstring>
          </property>
         </widget>
        </item>
@@ -785,7 +917,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>1</number>
@@ -804,6 +936,9 @@
          <property name="text">
           <string>Filter length (ms)</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoMeanlengthSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="3" column="1">
@@ -827,7 +962,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>200</number>
@@ -839,6 +974,9 @@
          <property name="text">
           <string>Filter threshold (%)</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoMeanthresholdSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="4" column="1">
@@ -862,7 +1000,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>10</number>
@@ -874,6 +1012,9 @@
          <property name="text">
           <string>Filter smoothness (%)</string>
          </property>
+         <property name="buddy">
+          <cstring>atmoPercentnewSlider</cstring>
+         </property>
         </widget>
        </item>
        <item row="5" column="1">
@@ -897,7 +1038,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>10</number>
@@ -931,6 +1072,9 @@
          <property name="text">
           <string>Rows</string>
          </property>
+         <property name="buddy">
+          <cstring>wallRowsSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -938,6 +1082,9 @@
          <property name="text">
           <string>Columns</string>
          </property>
+         <property name="buddy">
+          <cstring>wallColsSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -980,6 +1127,9 @@
          <property name="text">
           <string>Position</string>
          </property>
+         <property name="buddy">
+          <cstring>marqPositionCombo</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="0">
@@ -987,6 +1137,9 @@
          <property name="text">
           <string>Text</string>
          </property>
+         <property name="buddy">
+          <cstring>marqMarqueeText</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -1015,6 +1168,9 @@
          <property name="text">
           <string>Rows</string>
          </property>
+         <property name="buddy">
+          <cstring>panoramixRowsSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -1032,6 +1188,9 @@
          <property name="text">
           <string>Columns</string>
          </property>
+         <property name="buddy">
+          <cstring>panoramixColsSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -1064,6 +1223,9 @@
          <property name="text">
           <string>Number of clones</string>
          </property>
+         <property name="buddy">
+          <cstring>cloneCountSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="0" column="1">
@@ -1098,58 +1260,154 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout">
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_22">
-         <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>
+         <property name="buddy">
+          <cstring>logoXSpin</cstring>
+         </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>
+         <property name="buddy">
+          <cstring>logoYSpin</cstring>
+         </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>
+       <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="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+         <property name="text">
+          <string>Logo</string>
          </property>
-         <property name="tickInterval">
-          <number>32</number>
+         <property name="buddy">
+          <cstring>logoFileText</cstring>
          </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="0" colspan="4">
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" 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::TicksBelow</enum>
+           </property>
+           <property name="tickInterval">
+            <number>32</number>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLabel" name="label_48">
+           <property name="font">
+            <font>
+             <pointsize>8</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>none</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+           </property>
+           <property name="buddy">
+            <cstring>logoOpacitySlider</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="2">
+          <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::AlignTop|Qt::AlignTrailing</set>
+           </property>
+           <property name="buddy">
+            <cstring>logoOpacitySlider</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="0" 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>
+           <property name="buddy">
+            <cstring>logoOpacitySlider</cstring>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
@@ -1168,16 +1426,34 @@
       <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>
+         <property name="buddy">
+          <cstring>eraseYSpin</cstring>
+         </property>
         </widget>
        </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>
+         <property name="buddy">
+          <cstring>eraseXSpin</cstring>
+         </property>
         </widget>
        </item>
        <item row="2" column="1">
@@ -1186,94 +1462,86 @@
        <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>
+         <property name="buddy">
+          <cstring>eraseMaskText</cstring>
+         </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>
    </layout>
   </widget>
-  <widget class="QWidget" name="tab_6">
-   <attribute name="title">
-    <string>Advanced video filter controls</string>
-   </attribute>
-   <layout class="QGridLayout">
-    <item row="2" column="1" colspan="2">
-     <widget class="QLineEdit" name="subpictureFilterText"/>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_34">
-      <property name="text">
-       <string>Subpicture filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1" colspan="2">
-     <widget class="QLineEdit" name="videoFilterText"/>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_33">
-      <property name="text">
-       <string>Video filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label_32">
-      <property name="text">
-       <string>Vout filters</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="2">
-     <widget class="QPushButton" name="filtersResetButton">
-      <property name="text">
-       <string>Reset</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="2">
-     <widget class="QPushButton" name="filtersUpdateButton">
-      <property name="text">
-       <string>Update</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1" colspan="2">
-     <widget class="QLineEdit" name="voutFilterText"/>
-    </item>
-   </layout>
-  </widget>
  </widget>
  <tabstops>
-  <tabstop>eraseEnable</tabstop>
-  <tabstop>eraseMaskText</tabstop>
-  <tabstop>eraseYSpin</tabstop>
-  <tabstop>eraseXSpin</tabstop>
+  <tabstop>adjustEnable</tabstop>
+  <tabstop>hueSlider</tabstop>
+  <tabstop>brightnessSlider</tabstop>
+  <tabstop>brightnessThresholdCheck</tabstop>
+  <tabstop>contrastSlider</tabstop>
   <tabstop>saturationSlider</tabstop>
   <tabstop>gammaSlider</tabstop>
-  <tabstop>brightnessThresholdCheck</tabstop>
   <tabstop>sharpenEnable</tabstop>
   <tabstop>sharpenSigmaSlider</tabstop>
-  <tabstop>transformEnable</tabstop>
-  <tabstop>transformTypeCombo</tabstop>
+  <tabstop>motionblurEnable</tabstop>
+  <tabstop>blurFactorSlider</tabstop>
+  <tabstop>gradfunEnable</tabstop>
+  <tabstop>gradfunRadiusSlider</tabstop>
   <tabstop>cropTopPx</tabstop>
   <tabstop>cropLeftPx</tabstop>
   <tabstop>cropRightPx</tabstop>
   <tabstop>cropBotPx</tabstop>
   <tabstop>topBotCropSync</tabstop>
   <tabstop>leftRightCropSync</tabstop>
-  <tabstop>magnifyEnable</tabstop>
+  <tabstop>transformEnable</tabstop>
+  <tabstop>transformTypeCombo</tabstop>
   <tabstop>rotateEnable</tabstop>
   <tabstop>rotateAngleDial</tabstop>
+  <tabstop>magnifyEnable</tabstop>
   <tabstop>puzzleEnable</tabstop>
   <tabstop>puzzleRowsSpin</tabstop>
   <tabstop>puzzleColsSpin</tabstop>
@@ -1282,19 +1550,19 @@
   <tabstop>colorthresColorText</tabstop>
   <tabstop>colorthresSaturationthresSlider</tabstop>
   <tabstop>colorthresSimilaritythresSlider</tabstop>
-  <tabstop>invertEnable</tabstop>
   <tabstop>extractEnable</tabstop>
   <tabstop>extractComponentText</tabstop>
   <tabstop>gradientEnable</tabstop>
   <tabstop>gradientModeCombo</tabstop>
   <tabstop>gradientTypeCheck</tabstop>
   <tabstop>gradientCartoonCheck</tabstop>
-  <tabstop>waveEnable</tabstop>
-  <tabstop>rippleEnable</tabstop>
-  <tabstop>motionblurEnable</tabstop>
-  <tabstop>blurFactorSlider</tabstop>
+  <tabstop>invertEnable</tabstop>
   <tabstop>motiondetectEnable</tabstop>
   <tabstop>noiseEnable</tabstop>
+  <tabstop>posterizeEnable</tabstop>
+  <tabstop>posterizeLevelSpin</tabstop>
+  <tabstop>waveEnable</tabstop>
+  <tabstop>rippleEnable</tabstop>
   <tabstop>psychedelicEnable</tabstop>
   <tabstop>atmoEnable</tabstop>
   <tabstop>atmoEdgeweightningSlider</tabstop>
@@ -1316,20 +1584,15 @@
   <tabstop>marqPositionCombo</tabstop>
   <tabstop>cloneEnable</tabstop>
   <tabstop>cloneCountSpin</tabstop>
-  <tabstop>brightnessSlider</tabstop>
-  <tabstop>contrastSlider</tabstop>
-  <tabstop>hueSlider</tabstop>
-  <tabstop>filtersResetButton</tabstop>
-  <tabstop>videoFilterText</tabstop>
-  <tabstop>filtersUpdateButton</tabstop>
-  <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>eraseEnable</tabstop>
+  <tabstop>eraseMaskText</tabstop>
+  <tabstop>eraseYSpin</tabstop>
+  <tabstop>eraseXSpin</tabstop>
  </tabstops>
  <resources/>
  <connections/>