[vlc-commits] commit: Qt4: put gradfun in the UI (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep  3 22:45:29 2010 +0200| [6232433c7e5e60f508fb55dd933db3ce7f9956e0] | committer: Jean-Baptiste Kempf 

Qt4: put gradfun in the UI

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6232433c7e5e60f508fb55dd933db3ce7f9956e0
---

 modules/gui/qt4/components/extended_panels.cpp |    3 +
 modules/gui/qt4/ui/video_effects.ui            |   88 +++++++++++++++++-------
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 2c15dfa..8313536 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -208,6 +208,9 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) )
     SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) )
 
+    SETUP_VFILTER( gradfun )
+    SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) )
+
     if( module_exists( "atmo" ) )
     {
         SETUP_VFILTER( atmo )
diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index f5f4436..65f52ee 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -18,24 +18,6 @@
     <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">
-       <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">
@@ -60,9 +42,6 @@
          <property name="maximum">
           <number>200</number>
          </property>
-         <property name="singleStep">
-          <number>1</number>
-         </property>
          <property name="pageStep">
           <number>10</number>
          </property>
@@ -70,7 +49,7 @@
           <enum>Qt::Horizontal</enum>
          </property>
          <property name="tickPosition">
-          <enum>QSlider::TicksBothSides</enum>
+          <enum>QSlider::TicksBelow</enum>
          </property>
          <property name="tickInterval">
           <number>100</number>
@@ -80,7 +59,7 @@
       </layout>
      </widget>
     </item>
-    <item row="0" column="0" rowspan="2">
+    <item row="0" column="0" rowspan="3">
      <widget class="QGroupBox" name="adjustEnable">
       <property name="enabled">
        <bool>true</bool>
@@ -223,6 +202,68 @@
       </layout>
      </widget>
     </item>
+    <item row="2" column="1">
+     <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">
+       <item row="0" column="0">
+        <widget class="QComboBox" name="transformTypeCombo"/>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="1" 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_32">
+         <property name="text">
+          <string>Radius</string>
+         </property>
+        </widget>
+       </item>
+       <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>
+      </layout>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="tab_3">
@@ -1392,7 +1433,6 @@
   <tabstop>contrastSlider</tabstop>
   <tabstop>hueSlider</tabstop>
   <tabstop>adjustEnable</tabstop>
-  <tabstop>transformEnable</tabstop>
   <tabstop>brightnessThresholdCheck</tabstop>
   <tabstop>gammaSlider</tabstop>
   <tabstop>sharpenSigmaSlider</tabstop>