Fix calculation of profiles frame rate, remove useless PAL/NTSC combobox

[kdenlive] / src / widgets / renderwidget_ui.ui

diff --git a/src/widgets/renderwidget_ui.ui b/src/widgets/renderwidget_ui.ui
index 7dfc60046662e6b1751f3279989976cf42f77911..314f0c19f38a153de4c37ba17fa0b1505709d567 100644 (file)
--- a/src/widgets/renderwidget_ui.ui
+++ b/src/widgets/renderwidget_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>362</width>
-    <height>554</height>
+    <width>461</width>
+    <height>686</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -57,28 +57,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Format</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="2" colspan="3">
-        <widget class="KComboBox" name="format_selection">
-         <item>
-          <property name="text">
-           <string>PAL</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>NTSC</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="2" column="5" colspan="3">
+       <item row="2" column="1" colspan="7">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -159,14 +138,14 @@
          </widget>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2">
+       <item row="4" column="0" colspan="3">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Scanning</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="2" colspan="4">
+       <item row="4" column="3" colspan="3">
         <widget class="KComboBox" name="scanning_list">
          <item>
           <property name="text">
@@ -185,7 +164,7 @@
          </item>
         </widget>
        </item>
-       <item row="4" column="6" colspan="4">
+       <item row="4" column="7" colspan="3">
         <widget class="QCheckBox" name="export_audio">
          <property name="text">
           <string>Export audio</string>
@@ -198,7 +177,7 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="10">
+       <item row="7" column="0" colspan="10">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QCheckBox" name="rescale">
@@ -222,13 +201,6 @@
             <property name="margin">
              <number>0</number>
             </property>
-            <item row="0" column="0">
-             <widget class="KIntNumInput" name="rescale_width">
-              <property name="minimum">
-               <number>0</number>
-              </property>
-             </widget>
-            </item>
             <item row="0" column="1">
              <widget class="QLabel" name="label_8">
               <property name="text">
@@ -266,47 +238,47 @@
               </property>
              </spacer>
             </item>
+            <item row="0" column="0">
+             <widget class="KIntNumInput" name="rescale_width">
+              <property name="minimum">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
         </layout>
        </item>
-       <item row="6" column="0" colspan="10">
+       <item row="8" column="0" colspan="10">
         <widget class="QCheckBox" name="open_dvd">
          <property name="text">
           <string>Open Dvd wizard after rendering</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="10">
+       <item row="9" column="0" colspan="10">
         <widget class="QCheckBox" name="create_chapter">
          <property name="text">
           <string>Create chapter file based on guides</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="0" colspan="10">
+       <item row="10" column="0" colspan="10">
         <widget class="QCheckBox" name="open_browser">
          <property name="text">
           <string>Open browser window after export</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="4">
+       <item row="11" column="0" colspan="4">
         <widget class="QCheckBox" name="play_after">
          <property name="text">
           <string>Play after render</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="4" colspan="6">
-        <widget class="QCheckBox" name="tc_overlay">
-         <property name="text">
-          <string>Timecode overlay</string>
-         </property>
-        </widget>
-       </item>
-       <item row="10" column="0" colspan="10">
+       <item row="13" column="0" colspan="10">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QRadioButton" name="render_full">
@@ -347,7 +319,7 @@
          </item>
         </layout>
        </item>
-       <item row="11" column="0" colspan="10">
+       <item row="14" column="0" colspan="10">
         <widget class="QGroupBox" name="guides_box">
          <property name="title">
           <string/>
@@ -390,21 +362,21 @@
          </layout>
         </widget>
        </item>
-       <item row="13" column="0" colspan="3">
+       <item row="17" column="0" colspan="3">
         <widget class="QPushButton" name="buttonRender">
          <property name="text">
           <string>Render to File</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="3" colspan="4">
+       <item row="17" column="3" colspan="4">
         <widget class="QPushButton" name="buttonGenerateScript">
          <property name="text">
           <string>Generate Script</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="7" colspan="2">
+       <item row="17" column="7" colspan="2">
         <spacer name="horizontalSpacer">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -417,14 +389,14 @@
          </property>
         </spacer>
        </item>
-       <item row="13" column="9">
+       <item row="17" column="9">
         <widget class="KPushButton" name="buttonClose">
          <property name="text">
           <string>Close</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="0" colspan="10">
+       <item row="18" column="0" colspan="10">
         <widget class="QGroupBox" name="errorBox">
          <property name="title">
           <string/>
@@ -453,6 +425,81 @@
          </layout>
         </widget>
        </item>
+       <item row="16" column="0" colspan="10">
+        <widget class="QCheckBox" name="proxy_render">
+         <property name="text">
+          <string>Render using proxy clips</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0" colspan="3">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Encoder threads</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="4" colspan="2">
+        <widget class="KIntNumInput" name="encoder_threads">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>999</number>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="0" colspan="3">
+        <widget class="QCheckBox" name="tc_overlay">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Overlay</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="4" colspan="4">
+        <widget class="KComboBox" name="tc_type">
+         <item>
+          <property name="text">
+           <string>hh:mm:ss:ff</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Frames</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="5" column="3" colspan="3">
+        <widget class="QComboBox" name="comboBitrates">
+         <property name="editable">
+          <bool>true</bool>
+         </property>
+         <property name="frame">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="3">
+        <widget class="QLabel" name="label_10">
+         <property name="text">
+          <string>Bitrate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="7" colspan="3">
+        <widget class="QCheckBox" name="checkTwoPass">
+         <property name="text">
+          <string>2 pass</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">