Updated ui for vertical zoom

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

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
index dce590848f6455be6c8a421a77d14ea8cb71568a..347f6aa40820a785bb5df9abeb1aac4de890393e 100644 (file)
--- a/src/widgets/configdisplay_ui.ui
+++ b/src/widgets/configdisplay_ui.ui
@@ -1,34 +1,35 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ConfigDisplay_UI</class>
- <widget class="QWidget" name="ConfigDisplay_UI" >
-  <property name="geometry" >
+ <widget class="QWidget" name="ConfigDisplay_UI">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>353</width>
+    <width>396</width>
     <height>197</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <item row="0" column="0" colspan="3" >
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
       <string>Thumbnails</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="kcfg_videothumbnails" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="kcfg_videothumbnails">
+        <property name="text">
          <string>Video</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <spacer name="horizontalSpacer" >
-        <property name="orientation" >
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>96</width>
           <height>20</height>
@@ -36,16 +37,16 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="kcfg_audiothumbnails" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="kcfg_audiothumbnails">
+        <property name="text">
          <string>Audio</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs" >
-        <property name="text" >
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs">
+        <property name="text">
          <string>Normalise audio for thumbnails</string>
         </property>
        </widget>
@@ -53,36 +54,36 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QCheckBox" name="kcfg_showmarkers" >
-     <property name="text" >
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="kcfg_showmarkers">
+     <property name="text">
       <string>Display clip markers comments</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QCheckBox" name="kcfg_autoscroll" >
-     <property name="text" >
+   <item row="2" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_autoscroll">
+     <property name="text">
       <string>Autoscroll while playing</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <item row="3" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Track height</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
-    <widget class="QSpinBox" name="kcfg_trackheight" />
+   <item row="3" column="1">
+    <widget class="QSpinBox" name="kcfg_defaulttrackheight"/>
    </item>
-   <item row="3" column="2" >
-    <spacer name="horizontalSpacer_2" >
-     <property name="orientation" >
+   <item row="3" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>166</width>
        <height>20</height>
@@ -90,12 +91,12 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="1" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+   <item row="5" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>23</height>

diff --git a/src/widgets/timeline_ui.ui b/src/widgets/timeline_ui.ui
index db00f60f69727909150fae72eb82f8f4f49305e2..e5ae1606aeccaa110db9a7627c5693aa411c860e 100644 (file)
--- a/src/widgets/timeline_ui.ui
+++ b/src/widgets/timeline_ui.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>342</width>
+    <width>308</width>
     <height>163</height>
    </rect>
   </property>
@@ -17,6 +17,25 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <item row="0" column="0">
+    <widget class="QFrame" name="size_frame">
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>20</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="1">
     <widget class="QFrame" name="ruler_frame">
      <property name="enabled">
@@ -88,17 +107,27 @@
         <number>0</number>
        </property>
        <item row="0" column="0">
-        <widget class="QWidget" name="headers_container" native="true"/>
+        <widget class="QWidget" name="headers_container" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
        </item>
        <item row="1" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
-           <height>148</height>
+           <width>57</width>
+           <height>145</height>
           </size>
          </property>
         </spacer>

diff --git a/src/widgets/trackheader_ui.ui b/src/widgets/trackheader_ui.ui
index f07fbc070f730313a0750bbdcd1d3a80c9ac971a..759354c1a8efee7ded4af0e51c639342d94234b3 100644 (file)
--- a/src/widgets/trackheader_ui.ui
+++ b/src/widgets/trackheader_ui.ui
@@ -1,119 +1,129 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>TrackHeader_UI</class>
- <widget class="QWidget" name="TrackHeader_UI" >
-  <property name="geometry" >
+ <widget class="QWidget" name="TrackHeader_UI">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>58</width>
-    <height>54</height>
+    <width>86</width>
+    <height>51</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <property name="margin" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="margin">
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QFrame" name="frame" >
-     <property name="frameShape" >
+   <item row="0" column="0">
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>2</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>2</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
-      <property name="spacing" >
-       <number>-1</number>
+      <property name="spacing">
+       <number>0</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QToolButton" name="buttonLock" >
-        <property name="maximumSize" >
+      <item row="0" column="0">
+       <widget class="QToolButton" name="buttonLock">
+        <property name="maximumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="arrowType" >
+        <property name="arrowType">
          <enum>Qt::NoArrow</enum>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="track_number" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
+      <item row="0" column="2">
+       <widget class="QLabel" name="track_number">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>0</string>
         </property>
-        <property name="alignment" >
+        <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QToolButton" name="buttonAudio" >
-        <property name="maximumSize" >
+      <item row="1" column="0">
+       <widget class="QToolButton" name="buttonAudio">
+        <property name="maximumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>A</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="arrowType" >
+        <property name="arrowType">
          <enum>Qt::NoArrow</enum>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="QToolButton" name="buttonVideo" >
-        <property name="maximumSize" >
+      <item row="1" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>29</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="buttonVideo">
+        <property name="maximumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>V</string>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" 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>
    </item>