Commit 435856a2 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Make raising effect/transition properties panel configurable, patch by Harald Albrecht

REVIEW: 129000
parent 8b78b8b9
......@@ -245,6 +245,21 @@
<default>1</default>
</entry>
<entry name="raisepropsclips" type="Bool">
<label>Raise property pane when selecting timeline clips.</label>
<default>true</default>
</entry>
<entry name="raisepropstransitions" type="Bool">
<label>Raise property pane when selecting timeline transitions.</label>
<default>true</default>
</entry>
<entry name="raisepropstracks" type="Bool">
<label>Raise property pane when selecting timeline tracks.</label>
<default>true</default>
</entry>
</group>
<group name="sdl">
......
......@@ -2656,20 +2656,24 @@ void MainWindow::slotTimelineClipSelected(ClipItem* item, bool reloadStack)
{
m_effectStack->slotClipItemSelected(item, m_projectMonitor, reloadStack);
m_projectMonitor->slotSetSelectedClip(item);
if (KdenliveSettings::raisepropsclips()) {
m_effectStack->raiseWindow(m_effectStackDock);
}
}
void MainWindow::slotTrackSelected(int index, const TrackInfo &info, bool raise)
{
m_effectStack->slotTrackItemSelected(index, info, m_projectMonitor);
if (raise) {
if (raise && KdenliveSettings::raisepropstracks()) {
m_effectStack->raiseWindow(m_effectStackDock);
}
}
void MainWindow::slotActivateTransitionView(Transition *transition)
{
if (transition)
if (transition && KdenliveSettings::raisepropstransitions()) {
m_effectStack->raiseWindow(m_effectStackDock);
}
}
void MainWindow::slotSnapRewind()
......
......@@ -11,7 +11,7 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="12" column="0">
<item row="11" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
......@@ -88,12 +88,12 @@
<widget class="QComboBox" name="kcfg_clipcornertype">
<item>
<property name="text">
<string>Rounded</string>
<string>rounded</string>
</property>
</item>
<item>
<property name="text">
<string>Straight</string>
<string>straight</string>
</property>
</item>
</widget>
......@@ -191,8 +191,51 @@
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Raise properties pane when selecting in timeline</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="kcfg_raisepropsclips">
<property name="text">
<string>Clips</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_raisepropstransitions">
<property name="text">
<string>Transitions</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="kcfg_raisepropstracks">
<property name="text">
<string>Tracks</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>kcfg_videothumbnails</tabstop>
<tabstop>kcfg_audiothumbnails</tabstop>
<tabstop>kcfg_displayallchannels</tabstop>
<tabstop>kcfg_ffmpegaudiothumbnails</tabstop>
<tabstop>kcfg_showmarkers</tabstop>
<tabstop>kcfg_autoscroll</tabstop>
<tabstop>kcfg_verticalzoom</tabstop>
<tabstop>kcfg_splitaudio</tabstop>
<tabstop>kcfg_automatictransitions</tabstop>
<tabstop>kcfg_trackheight</tabstop>
<tabstop>kcfg_clipcornertype</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment