summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-24 17:38:39 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-24 17:38:39 (GMT)
commit435856a29f81881e4814b5cc26d5923de57f74d0 (patch)
tree2af80b095776e296584286023aa7ead1bac9b8cf
parent8b78b8b9518ac98016e3844269daa3a00e785eb5 (diff)
Make raising effect/transition properties panel configurable, patch by Harald Albrecht
REVIEW: 129000
-rw-r--r--src/kdenlivesettings.kcfg15
-rw-r--r--src/mainwindow.cpp8
-rw-r--r--src/ui/configtimeline_ui.ui49
3 files changed, 67 insertions, 5 deletions
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 5145fa2..c7fa515 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -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">
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8022226..465fc50 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -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()
diff --git a/src/ui/configtimeline_ui.ui b/src/ui/configtimeline_ui.ui
index 165f903..3cbf99b 100644
--- a/src/ui/configtimeline_ui.ui
+++ b/src/ui/configtimeline_ui.ui
@@ -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>