Cleanup track header widget and fix crash when bringing context menu while editing...

[kdenlive] / src / widgets / configdisplay_ui.ui

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
index 1f0645aae19d8ef2f838a92c46004d113b02d880..e88fe3c82bd3634bc2dafdf217cda6eb56a59fec 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>348</width>
-    <height>187</height>
+    <width>398</width>
+    <height>213</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
-   <item row="0" column="0" >
-    <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,26 +54,70 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QCheckBox" name="kcfg_autoscroll" >
-     <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">
       <string>Autoscroll while playing</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
+   <item row="4" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Track height</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QSpinBox" name="kcfg_trackheight">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="value">
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>166</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" 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>56</height>
+       <height>23</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_verticalzoom">
+     <property name="text">
+      <string>Zoom using vertical drag in ruler</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>