[vlc-devel] [PATCH 4/4] subtitles tab

Yuval Tze yuvaltze at gmail.com
Thu Mar 24 23:22:52 CET 2011


new tab in video effects widget that contains subsdelay basic parameters.
---
 modules/gui/qt4/components/extended_panels.cpp |    9 ++-
 modules/gui/qt4/ui/video_effects.ui            |  139 ++++++++++++++++++++++++
 2 files changed, 147 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index afb6681..af46a3d 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -238,6 +238,12 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
         _parent->removeTab( _parent->indexOf( ui.tab_atmo ) );
     }
 
+
+    SETUP_VFILTER( subsdelay )
+    SETUP_VFILTER_OPTION( subsdelayModeCombo, currentIndexChanged( QString ) )
+    SETUP_VFILTER_OPTION( subsdelayFactorSpin, valueChanged( double ) )
+    SETUP_VFILTER_OPTION( subsdelayOverlapSpin, valueChanged( int ) )
+
 #undef SETUP_VFILTER
 #undef SETUP_VFILTER_OPTION
 
@@ -299,7 +305,8 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
     {
         psz_filter_type = "video-filter";
     }
-    else if( module_provides( p_obj, "sub filter" ) )
+    else if( module_provides( p_obj, "sub filter" ) ||
+             module_provides( p_obj, "sub filter2" ) )
     {
         psz_filter_type = "sub-filter";
     }
diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index d79679f..5a4d7db 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -1599,6 +1599,141 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWidget" name="tab_4">
+   <attribute name="title">
+    <string>Subtitles</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_11" columnstretch="0,0" columnminimumwidth="0,0">
+    <item row="0" column="0">
+     <widget class="QGroupBox" name="subsdelayEnable">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="title">
+       <string>Subtitles delay</string>
+      </property>
+      <property name="checkable">
+       <bool>true</bool>
+      </property>
+      <property name="checked">
+       <bool>false</bool>
+      </property>
+      <layout class="QGridLayout" name="gridLayout_10">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_69">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Mode</string>
+         </property>
+         <property name="buddy">
+          <cstring>logoFileText</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="subsdelayModeCombo">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_68">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Factor</string>
+         </property>
+         <property name="buddy">
+          <cstring>logoYSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QDoubleSpinBox" name="subsdelayFactorSpin">
+         <property name="maximum">
+          <double>20.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.100000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_67">
+         <property name="minimumSize">
+          <size>
+           <width>50</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>Overlap</string>
+         </property>
+         <property name="buddy">
+          <cstring>logoXSpin</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QSpinBox" name="subsdelayOverlapSpin">
+         <property name="wrapping">
+          <bool>true</bool>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>4</number>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <tabstops>
   <tabstop>adjustEnable</tabstop>
@@ -1680,6 +1815,10 @@
   <tabstop>eraseMaskText</tabstop>
   <tabstop>eraseYSpin</tabstop>
   <tabstop>eraseXSpin</tabstop>
+  <tabstop>subsdelayEnable</tabstop>
+  <tabstop>subsdelayModeCombo</tabstop>
+  <tabstop>subsdelayFactorSpin</tabstop>
+  <tabstop>subsdelayOverlapSpin</tabstop>
  </tabstops>
  <resources/>
  <connections/>
-- 
1.7.1




More information about the vlc-devel mailing list