[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Merge branch '16.12'
From: Jean-Baptiste Mardelle <null () kde ! org>
Date: 2016-12-31 9:31:45
Message-ID: E1cNG0v-00045A-0i () code ! kde ! org
[Download RAW message or body]
Git commit 6d0ab5ed5915807d8226ebbe97906d8239e26d3e by Jean-Baptiste Mardel=
le.
Committed on 31/12/2016 at 09:31.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +3 -3 src/mainwindow.cpp
M +0 -1 src/project/projectmanager.cpp
https://commits.kde.org/kdenlive/6d0ab5ed5915807d8226ebbe97906d8239e26d3e
diff --cc src/project/projectmanager.cpp
index 0062c1ff8,0b1ab2ef5..11ce8761f
--- a/src/project/projectmanager.cpp
+++ b/src/project/projectmanager.cpp
@@@ -579,9 -583,8 +579,8 @@@ void ProjectManager::doOpenFile(const Q
}
m_trackView->setDuration(m_trackView->duration());
=
- pCore->window()->slotGotProgressInfo(QString(), -1);
+ pCore->window()->slotGotProgressInfo(QString(), 100);
pCore->monitorManager()->projectMonitor()->adjustRulerSize(m_trackVie=
w->duration() - 1);
- pCore->monitorManager()->projectMonitor()->slotZoneMoved(m_trackView-=
>inPoint(), m_trackView->outPoint());
if (openBackup) {
slotOpenBackup(url);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic