Some smaller UI improvements on the settings for on-monitor widgets

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

diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp
index 6ae670f4418eb66c5ec99b4e41be35dd3532b638..44b876a814de5ca037fd03e3603d294ae55f57a2 100644 (file)
--- a/src/cornerswidget.cpp
+++ b/src/cornerswidget.cpp
@@ -48,8 +48,11 @@ CornersWidget::CornersWidget(Monitor* monitor, int clipPos, bool isEffect, int f
 
     m_config = new MonitorSceneControlWidget(m_scene, m_ui.frameConfig);
     QHBoxLayout *layout = new QHBoxLayout(m_ui.frameConfig);
-    layout->addWidget(m_config->getShowHideButton());
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_config);
+    QHBoxLayout *layout2 = new QHBoxLayout(m_ui.widgetConfigButton);
+    layout2->setContentsMargins(0, 0, 0, 0);
+    layout2->addWidget(m_config->getShowHideButton());
 
     int width = m_monitor->render->frameRenderWidth();
     int height = m_monitor->render->renderHeight();

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 4fb694849de529f1572b21136e1e10d658808433..7b2bca0950d50ab4be97f7eea1f0284e5b00b250 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -127,7 +127,7 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     QHBoxLayout *settingsLayout = new QHBoxLayout(m_ui.frameSettings);
     settingsLayout->addWidget(m_config);
     settingsLayout->setContentsMargins(0, 0, 0, 0);
-    ((QGridLayout *)m_ui.widgetFirstColumn->layout())->addWidget(m_config->getShowHideButton(), 1, 2);
+    ((QGridLayout *)m_ui.widgetConfigButton->layout())->addWidget(m_config->getShowHideButton(), 1, 1);
     connect(m_config, SIGNAL(showScene(bool)), this, SLOT(slotShowScene(bool)));
 
 

diff --git a/src/widgets/cornerswidget_ui.ui b/src/widgets/cornerswidget_ui.ui
index 926a803fc1855ab5256c7ea6b93430929b043afd..4c38aec3f7014d0192ce67b4776c2c895d86b27f 100644 (file)
--- a/src/widgets/cornerswidget_ui.ui
+++ b/src/widgets/cornerswidget_ui.ui
@@ -145,27 +145,8 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4" rowspan="5">
-    <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>
-   <item row="5" column="0" colspan="5">
+   <item row="5" column="0" colspan="7">
     <widget class="QFrame" name="frameConfig">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
@@ -174,7 +155,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="5">
+   <item row="6" column="0" colspan="7">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -187,6 +168,35 @@
      </property>
     </spacer>
    </item>
+   <item row="0" column="4" rowspan="4" colspan="3">
+    <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>
+   <item row="4" column="6">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="5">
+    <widget class="QWidget" name="widgetConfigButton" native="true"/>
+   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/src/widgets/geometrywidget_ui.ui b/src/widgets/geometrywidget_ui.ui
index 9c57f465c3abeca89bdbf1673f509c81773831ba..3127be739fbb8e8c149a137e8979c35b1a83be91 100644 (file)
--- a/src/widgets/geometrywidget_ui.ui
+++ b/src/widgets/geometrywidget_ui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>364</width>
-    <height>183</height>
+    <height>187</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -283,20 +283,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="2">
-    <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>
-   <item row="0" column="0" colspan="3">
+   <item row="0" column="0" colspan="4">
     <widget class="QWidget" name="widgetTimeWrapper" native="true">
      <layout class="QGridLayout" name="gridLayout_4">
       <property name="margin">
@@ -396,8 +383,31 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QWidget" name="widgetFirstColumn" native="true">
+   <item row="3" column="0" colspan="4">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QFrame" name="frameSettings">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QWidget" name="widgetConfigButton" native="true">
      <layout class="QGridLayout" name="gridLayout_6">
       <property name="leftMargin">
        <number>0</number>
@@ -411,28 +421,28 @@
       <property name="spacing">
        <number>0</number>
       </property>
-      <item row="0" column="0" rowspan="2">
-       <spacer name="horizontalSpacer_2">
+      <item row="0" column="1">
+       <spacer name="verticalSpacer">
         <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+         <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>40</width>
-          <height>20</height>
+          <width>20</width>
+          <height>40</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="0" column="1">
-       <spacer name="verticalSpacer">
+      <item row="0" column="2">
+       <spacer name="horizontalSpacer_2">
         <property name="orientation">
-         <enum>Qt::Vertical</enum>
+         <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
        </spacer>
@@ -440,29 +450,19 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3">
-    <spacer name="verticalSpacer_2">
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>40</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QFrame" name="frameSettings">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/src/widgets/monitorscenecontrolwidget_ui.ui b/src/widgets/monitorscenecontrolwidget_ui.ui
index 57f1c7e6cd69cc1fcee2c15e6a41d321a30a35d8..64b1e88a7788dd855e1aa824df034583f6e66a80 100644 (file)
--- a/src/widgets/monitorscenecontrolwidget_ui.ui
+++ b/src/widgets/monitorscenecontrolwidget_ui.ui
@@ -6,18 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>340</width>
-    <height>114</height>
+    <width>332</width>
+    <height>80</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item row="0" column="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Settings</string>
+      <string/>
      </property>
      <property name="flat">
       <bool>true</bool>
@@ -26,6 +29,9 @@
       <bool>false</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item row="1" column="0">
        <widget class="QToolButton" name="buttonZoomFit">
         <property name="text">