Commit 61bf3c8b authored by Julius Künzel's avatar Julius Künzel
Browse files

Ripple: several fixes

- Show "Ripple" in status bar if the tool is active (like other tools
did too)
- Fix monitor overlayers are hidden once you start trimming
- Don't allow speed change in ripple mode (crashing atm, to be
implemented later)
- remove unused, invalid QML code left-over
parent c8806156
......@@ -3271,8 +3271,15 @@ void MainWindow::showToolMessage()
toolLabel = i18n("Spacer");
} else if (m_buttonSlipTool->isChecked()) {
message = xi18nc("@info:whatsthis", "<shortcut>Click</shortcut> on an item to slip, <shortcut>Shift click</shortcut> for multiple selection");
toolLabel = i18n("Slip");
} else if (m_buttonMulticamTool->isChecked()) {
toolLabel = i18nc("Timeline Tool", "Slip");
} /*else if (m_buttonSlideTool->isChecked()) { // TODO implement Slide
toolLabel = i18nc("Timeline Tool", "Slide");
}*/ else if (m_buttonRippleTool->isChecked()) {
message = xi18nc("@info:whatsthis", "<shortcut>Shift drag</shortcut> for rubber-band selection, <shortcut>Shift click</shortcut> for multiple selection, <shortcut>Ctrl drag</shortcut> to pan");
toolLabel = i18nc("Timeline Tool", "Ripple");
} /*else if (m_buttonRollTool->isChecked()) { // TODO implement Slide
toolLabel = i18nc("Timeline Tool", "Roll");
}*/ else if (m_buttonMulticamTool->isChecked()) {
message = xi18nc("@info:whatsthis", "<shortcut>Click</shortcut> on a track view in the project monitor to perform a lift of all tracks except active one");
toolLabel = i18n("Multicam");
}
......
......@@ -1932,6 +1932,9 @@ void Monitor::enableEffectScene(bool enable)
void Monitor::slotShowEffectScene(MonitorSceneType sceneType, bool temporary, QVariant sceneData)
{
if (m_trimmingbar->isVisible()) {
return;
}
if (sceneType == MonitorSceneNone) {
// We just want to revert to normal scene
if (m_qmlManager->sceneType() == MonitorSceneSplit || m_qmlManager->sceneType() == MonitorSceneDefault) {
......
......@@ -134,10 +134,6 @@ Rectangle {
}
}
onInPointChanged: useFakeInOut = false;
onOutPointChanged: useFakeInOut = false;
onModelStartChanged: {
x = modelStart * timeScale;
}
......
......@@ -304,7 +304,7 @@ Item{
root.groupTrimData = controller.getGroupData(clip.clipId)
}
onTrimmingIn: {
if (controlTrim) {
if (root.activeTool === ProjectTool.SelectTool && controlTrim) {
newDuration = controller.requestItemSpeedChange(clip.clipId, newDuration, false, root.snapping)
if (!speedController.visible) {
// Store original speed
......@@ -360,7 +360,7 @@ Item{
controller.requestItemResize(clip.clipId, clip.originalDuration, false, false, 0, shiftTrim)
}
if (controlTrim) {
if (root.activeTool === ProjectTool.SelectTool && controlTrim) {
// Update speed
speedController.visible = false
controller.requestClipResizeAndTimeWarp(clip.clipId, speedController.lastValidDuration, false, root.snapping, shiftTrim, clip.originalDuration * speedController.originalSpeed / speedController.lastValidDuration)
......@@ -380,7 +380,7 @@ Item{
root.groupTrimData = undefined
}
onTrimmingOut: {
if (controlTrim) {
if (root.activeTool === ProjectTool.SelectTool && controlTrim) {
if (!speedController.visible) {
// Store original speed
speedController.originalSpeed = clip.speed
......@@ -431,7 +431,7 @@ Item{
controller.requestItemResize(clip.clipId, clip.originalDuration, true, false, 0, shiftTrim)
}
if (controlTrim) {
if (root.activeTool === ProjectTool.SelectTool && controlTrim) {
speedController.visible = false
// Update speed
controller.requestClipResizeAndTimeWarp(clip.clipId, speedController.lastValidDuration, true, root.snapping, shiftTrim, clip.originalDuration * speedController.originalSpeed / speedController.lastValidDuration)
......
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