Minor Layout modifications in Extended filters.

Adding Panoramix there.

diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index 555db2e63d8405ec554e963293dce4b9951016a4..30dbbb41f394c18d419535cb46da1f600d195955 100644 (file)
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="currentIndex" >
-   <number>0</number>
+   <number>4</number>
   </property>
   <widget class="QWidget" name="tab" >
    <attribute name="title" >
@@ -326,51 +326,16 @@
   </widget>
   <widget class="QWidget" name="tab_5" >
    <attribute name="title" >
-    <string>_("Some random name")</string>
+    <string>_("Geometry")</string>
    </attribute>
    <layout class="QGridLayout" >
-    <item row="1" column="0" >
+    <item row="0" column="0" >
      <widget class="QCheckBox" name="magnifyEnable" >
       <property name="text" >
        <string>_("Magnification")</string>
       </property>
      </widget>
     </item>
-    <item row="0" 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>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </item>
     <item rowspan="2" row="0" column="1" >
      <widget class="QGroupBox" name="puzzleEnable" >
       <property name="title" >
@@ -427,6 +392,41 @@
       </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>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="tab_7" >
@@ -556,13 +556,13 @@
   </widget>
   <widget class="QWidget" name="tab_9" >
    <attribute name="title" >
-    <string>_("Find a name")</string>
+    <string>_("Vout/Overlay")</string>
    </attribute>
    <layout class="QGridLayout" >
-    <item rowspan="2" row="0" column="1" >
-     <widget class="QGroupBox" name="eraseEnable" >
+    <item row="0" column="0" >
+     <widget class="QGroupBox" name="wallEnable" >
       <property name="title" >
-       <string>_("Logo erase")</string>
+       <string>_("Wall")</string>
       </property>
       <property name="checkable" >
        <bool>true</bool>
@@ -571,43 +571,47 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_16" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_31" >
          <property name="text" >
-          <string>_("Top")</string>
+          <string>_("Rows")</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" >
-        <widget class="QLabel" name="label_17" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_30" >
          <property name="text" >
-          <string>_("Left")</string>
+          <string>_("Columns")</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1" >
-        <widget class="QSpinBox" name="eraseXSpin" />
-       </item>
        <item row="1" column="1" >
-        <widget class="QSpinBox" name="eraseYSpin" />
+        <widget class="QSpinBox" name="wallColsSpin" >
+         <property name="minimum" >
+          <number>1</number>
+         </property>
+         <property name="value" >
+          <number>3</number>
+         </property>
+        </widget>
        </item>
        <item row="0" column="1" >
-        <widget class="QLineEdit" name="eraseMaskText" />
-       </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label_15" >
-         <property name="text" >
-          <string>_("Mask")</string>
+        <widget class="QSpinBox" name="wallRowsSpin" >
+         <property name="minimum" >
+          <number>1</number>
+         </property>
+         <property name="value" >
+          <number>3</number>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
     </item>
-    <item row="1" column="0" >
-     <widget class="QGroupBox" name="cloneEnable" >
+    <item row="0" column="1" >
+     <widget class="QGroupBox" name="marqEnable" >
       <property name="title" >
-       <string>_("Clone")</string>
+       <string>_("Add text")</string>
       </property>
       <property name="checkable" >
        <bool>true</bool>
@@ -616,30 +620,33 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-       <item row="0" column="0" >
-        <widget class="QLabel" name="label_9" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_24" >
          <property name="text" >
-          <string>_("Number of clones")</string>
+          <string>_("Position")</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QSpinBox" name="cloneCountSpin" >
-         <property name="minimum" >
-          <number>1</number>
-         </property>
-         <property name="value" >
-          <number>2</number>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_23" >
+         <property name="text" >
+          <string>_("Text")</string>
          </property>
         </widget>
        </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="marqMarqueeText" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QComboBox" name="marqPositionCombo" />
+       </item>
       </layout>
      </widget>
     </item>
-    <item row="0" column="0" >
-     <widget class="QGroupBox" name="wallEnable" >
+    <item row="1" column="0" >
+     <widget class="QGroupBox" name="groupBox" >
       <property name="title" >
-       <string>_("Wall")</string>
+       <string>_("Panoramix")</string>
       </property>
       <property name="checkable" >
        <bool>true</bool>
@@ -649,21 +656,14 @@
       </property>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
-        <widget class="QLabel" name="label_31" >
+        <widget class="QLabel" name="label_36" >
          <property name="text" >
           <string>_("Rows")</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_30" >
-         <property name="text" >
-          <string>_("Columns")</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" >
-        <widget class="QSpinBox" name="wallColsSpin" >
+       <item row="0" column="1" >
+        <widget class="QSpinBox" name="panorRowsSpin" >
          <property name="minimum" >
           <number>1</number>
          </property>
@@ -672,8 +672,15 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QSpinBox" name="wallRowsSpin" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_35" >
+         <property name="text" >
+          <string>_("Columns")</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QSpinBox" name="panoColsSpin" >
          <property name="minimum" >
           <number>1</number>
          </property>
@@ -685,17 +692,10 @@
       </layout>
      </widget>
     </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="tab_8" >
-   <attribute name="title" >
-    <string>_("Overlay")</string>
-   </attribute>
-   <layout class="QGridLayout" >
-    <item row="0" column="0" >
-     <widget class="QGroupBox" name="marqEnable" >
+    <item row="1" column="1" >
+     <widget class="QGroupBox" name="cloneEnable" >
       <property name="title" >
-       <string>_("Add text")</string>
+       <string>_("Clone")</string>
       </property>
       <property name="checkable" >
        <bool>true</bool>
@@ -704,30 +704,34 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-       <item row="1" column="0" >
-        <widget class="QLabel" name="label_24" >
-         <property name="text" >
-          <string>_("Position")</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="0" >
-        <widget class="QLabel" name="label_23" >
+        <widget class="QLabel" name="label_9" >
          <property name="text" >
-          <string>_("Text")</string>
+          <string>_("Number of clones")</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1" >
-        <widget class="QLineEdit" name="marqMarqueeText" />
-       </item>
-       <item row="1" column="1" >
-        <widget class="QComboBox" name="marqPositionCombo" />
+        <widget class="QSpinBox" name="cloneCountSpin" >
+         <property name="minimum" >
+          <number>1</number>
+         </property>
+         <property name="value" >
+          <number>2</number>
+         </property>
+        </widget>
        </item>
       </layout>
      </widget>
     </item>
-    <item row="0" column="1" >
+   </layout>
+  </widget>
+  <widget class="QWidget" name="tab_8" >
+   <attribute name="title" >
+    <string>_("Logo")</string>
+   </attribute>
+   <layout class="QGridLayout" >
+    <item row="0" column="0" >
      <widget class="QGroupBox" name="logoEnable" >
       <property name="title" >
        <string>_("Add logo")</string>
@@ -795,6 +799,51 @@
       </layout>
      </widget>
     </item>
+    <item row="0" column="1" >
+     <widget class="QGroupBox" name="eraseEnable" >
+      <property name="title" >
+       <string>_("Logo erase")</string>
+      </property>
+      <property name="checkable" >
+       <bool>true</bool>
+      </property>
+      <property name="checked" >
+       <bool>false</bool>
+      </property>
+      <layout class="QGridLayout" >
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_16" >
+         <property name="text" >
+          <string>_("Top")</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_17" >
+         <property name="text" >
+          <string>_("Left")</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QSpinBox" name="eraseXSpin" />
+       </item>
+       <item row="1" column="1" >
+        <widget class="QSpinBox" name="eraseYSpin" />
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="eraseMaskText" />
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_15" >
+         <property name="text" >
+          <string>_("Mask")</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="tab_6" >