[vlmc-devel] Slightly increase the size of the track controls panel
Ludovic Fauvet
git at videolan.org
Sat Mar 1 19:38:32 CET 2014
vlmc | branch: master | Ludovic Fauvet <etix at videolan.org> | Sat Mar 1 19:37:36 2014 +0100| [95b5d8618044648a9ef0b3f2ca578b5e1c8dc9a1] | committer: Ludovic Fauvet
Slightly increase the size of the track controls panel
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=95b5d8618044648a9ef0b3f2ca578b5e1c8dc9a1
---
src/Gui/timeline/TracksControls.cpp | 3 +--
src/Gui/ui/Timeline.ui | 15 ++++++++++++---
src/Gui/widgets/ui/TrackControls.ui | 19 +++++++++++++++++--
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/Gui/timeline/TracksControls.cpp b/src/Gui/timeline/TracksControls.cpp
index 3b0394b..ef362cf 100644
--- a/src/Gui/timeline/TracksControls.cpp
+++ b/src/Gui/timeline/TracksControls.cpp
@@ -47,6 +47,7 @@ TracksControls::TracksControls( QWidget* parent )
m_separator->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Fixed );
m_separator->setMinimumHeight( 20 );
m_separator->setMaximumHeight( 20 );
+ m_separator->setMinimumWidth( 120 );
m_layout->addWidget( m_separator );
m_centralWidget->setLayout( m_layout );
@@ -57,7 +58,6 @@ void
TracksControls::addVideoTrack( GraphicsTrack* track )
{
TrackControls* item = new TrackControls( track, m_centralWidget );
- item->setMinimumWidth( 108 );
item->setMinimumHeight( track->height() );
item->setContentsMargins( 0, 0, 0, 0 );
m_layout->insertWidget( 0, item );
@@ -67,7 +67,6 @@ void
TracksControls::addAudioTrack( GraphicsTrack* track )
{
TrackControls* item = new TrackControls( track, m_centralWidget );
- item->setMinimumWidth( 108 );
item->setMinimumHeight( track->height() );
item->setContentsMargins( 0, 0, 0, 0 );
m_layout->insertWidget( -1, item );
diff --git a/src/Gui/ui/Timeline.ui b/src/Gui/ui/Timeline.ui
index 882dc38..baae4bc 100644
--- a/src/Gui/ui/Timeline.ui
+++ b/src/Gui/ui/Timeline.ui
@@ -23,7 +23,16 @@
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
@@ -87,13 +96,13 @@
</property>
<property name="minimumSize">
<size>
- <width>108</width>
+ <width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>108</width>
+ <width>120</width>
<height>16777215</height>
</size>
</property>
diff --git a/src/Gui/widgets/ui/TrackControls.ui b/src/Gui/widgets/ui/TrackControls.ui
index 6bc956c..23b1155 100644
--- a/src/Gui/widgets/ui/TrackControls.ui
+++ b/src/Gui/widgets/ui/TrackControls.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -23,7 +23,16 @@
<property name="spacing">
<number>1</number>
</property>
- <property name="margin">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>4</number>
+ </property>
+ <property name="bottomMargin">
<number>0</number>
</property>
<item>
@@ -82,6 +91,9 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
@@ -95,6 +107,9 @@
<property name="text">
<string>TextLabel</string>
</property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
</widget>
</item>
</layout>
More information about the Vlmc-devel
mailing list