Update render widget layout

svn path=/trunk/kdenlive/; revision=5921

diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp
index b22d6d73343ff653a74669097533f6e7b14979e2..dd4dbad5911528dd3f7f6e1d0833fc08a6509b5c 100644 (file)
--- a/src/renderwidget.cpp
+++ b/src/renderwidget.cpp
@@ -222,6 +222,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, QWidg
         m_view.shutdown->setEnabled(false);
 
     focusFirstVisibleItem();
+    adjustSize();
 }
 
 RenderWidget::~RenderWidget()

diff --git a/src/widgets/renderwidget_ui.ui b/src/widgets/renderwidget_ui.ui
index c705545d78d76a6afb25aa3732c7743ba6347a70..c188f49cb8920be0ec353873015932c2651a6241 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>382</width>
-    <height>682</height>
+    <width>402</width>
+    <height>681</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -37,7 +37,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="2" colspan="8">
+       <item row="0" column="2" colspan="2">
         <widget class="KComboBox" name="destination_list"/>
        </item>
        <item row="1" column="0" colspan="2">
@@ -47,7 +47,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="2" colspan="8">
+       <item row="1" column="2" colspan="2">
         <widget class="KUrlRequester" name="out_file"/>
        </item>
        <item row="2" column="0">
@@ -57,7 +57,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="7">
+       <item row="2" column="1" colspan="2">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -70,7 +70,7 @@
          </property>
         </spacer>
        </item>
-       <item row="2" column="8" colspan="2">
+       <item row="2" column="3">
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QToolButton" name="buttonFavorite">
@@ -102,7 +102,7 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="0" colspan="10">
+       <item row="3" column="0" colspan="4">
         <widget class="QSplitter" name="splitter_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -121,7 +121,7 @@
           </widget>
           <widget class="KListWidget" name="size_list">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
@@ -138,14 +138,14 @@
          </widget>
         </widget>
        </item>
-       <item row="4" column="0" colspan="3">
+       <item row="4" column="0" colspan="2">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Scanning</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="3" colspan="5">
+       <item row="4" column="2">
         <widget class="KComboBox" name="scanning_list">
          <item>
           <property name="text">
@@ -164,7 +164,76 @@
          </item>
         </widget>
        </item>
-       <item row="4" column="8" colspan="2">
+       <item row="4" column="3" rowspan="4">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Bitrate</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_9">
+          <item row="0" column="0">
+           <widget class="QLabel" name="bitrateLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Video</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="comboBitrates">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="frame">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="audiobitrateLabel">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Audio</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="comboAudioBitrates">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>Encoder threads</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="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="6" column="0" colspan="3">
         <widget class="QCheckBox" name="export_audio">
          <property name="text">
           <string>Export audio</string>
@@ -177,7 +246,21 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="10">
+       <item row="7" column="0" colspan="2">
+        <widget class="QCheckBox" name="checkTwoPass">
+         <property name="text">
+          <string>2 pass</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2">
+        <widget class="QCheckBox" name="proxy_render">
+         <property name="text">
+          <string>Render using proxy clips</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="4">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
           <widget class="QCheckBox" name="rescale">
@@ -225,6 +308,13 @@
               </property>
              </widget>
             </item>
+            <item row="0" column="0">
+             <widget class="KIntNumInput" name="rescale_width">
+              <property name="minimum">
+               <number>0</number>
+              </property>
+             </widget>
+            </item>
             <item row="0" column="4">
              <spacer name="horizontalSpacer_5">
               <property name="orientation">
@@ -238,47 +328,71 @@
               </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="8" column="0" colspan="10">
+       <item row="9" column="0" colspan="4">
         <widget class="QCheckBox" name="open_dvd">
          <property name="text">
           <string>Open Dvd wizard after rendering</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0" colspan="10">
+       <item row="10" column="0" colspan="4">
         <widget class="QCheckBox" name="create_chapter">
          <property name="text">
           <string>Create chapter file based on guides</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="0" colspan="10">
+       <item row="11" column="0" colspan="4">
         <widget class="QCheckBox" name="open_browser">
          <property name="text">
           <string>Open browser window after export</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="0" colspan="10">
+       <item row="12" column="0" colspan="4">
         <widget class="QCheckBox" name="play_after">
          <property name="text">
           <string>Play after render</string>
          </property>
         </widget>
        </item>
-       <item row="13" column="0" colspan="10">
+       <item row="13" column="0" colspan="4">
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <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>
+          <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>
+        </layout>
+       </item>
+       <item row="14" column="0" colspan="4">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>
           <widget class="QRadioButton" name="render_full">
@@ -319,7 +433,7 @@
          </item>
         </layout>
        </item>
-       <item row="14" column="0" colspan="10">
+       <item row="15" column="0" colspan="4">
         <widget class="QGroupBox" name="guides_box">
          <property name="title">
           <string/>
@@ -362,41 +476,45 @@
          </layout>
         </widget>
        </item>
-       <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="17" column="3" colspan="4">
-        <widget class="QPushButton" name="buttonGenerateScript">
-         <property name="text">
-          <string>Generate Script</string>
-         </property>
-        </widget>
-       </item>
-       <item row="17" column="7" colspan="2">
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>221</width>
-           <height>24</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="17" column="9">
-        <widget class="KPushButton" name="buttonClose">
-         <property name="text">
-          <string>Close</string>
-         </property>
-        </widget>
+       <item row="16" column="0" colspan="4">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QPushButton" name="buttonRender">
+           <property name="text">
+            <string>Render to File</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonGenerateScript">
+           <property name="text">
+            <string>Generate Script</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>221</width>
+             <height>24</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="KPushButton" name="buttonClose">
+           <property name="text">
+            <string>Close</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item row="18" column="0" colspan="10">
+       <item row="17" column="0" colspan="2">
         <widget class="QGroupBox" name="errorBox">
          <property name="title">
           <string/>
@@ -425,95 +543,6 @@
          </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="3" colspan="5">
-        <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="6">
-        <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="5">
-        <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="bitrateLabel">
-         <property name="text">
-          <string>Bitrate</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="8" colspan="2">
-        <widget class="QCheckBox" name="checkTwoPass">
-         <property name="text">
-          <string>2 pass</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="9">
-        <widget class="QComboBox" name="comboAudioBitrates">
-         <property name="editable">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="8">
-        <widget class="QLabel" name="audiobitrateLabel">
-         <property name="text">
-          <string>Audio</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">