Commit ce495944 authored by Laurent Montel's avatar Laurent Montel

Merge remote-tracking branch 'origin/Applications/16.12'

parents 214a4bda c4f1aa9d
......@@ -895,16 +895,21 @@ void AnimationWidget::slotAdjustKeyframeValue(double value)
m_animController = m_animProperties.get_animation(m_inTimeline.toUtf8().constData());
int pos = m_ruler->position() - m_offset;
mlt_keyframe_type type = m_selectType->isEnabled() ? (mlt_keyframe_type) m_selectType->currentAction()->data().toInt() : (mlt_keyframe_type) KdenliveSettings::defaultkeyframeinterp();
if (m_animController.is_key(pos)) {
// This is a keyframe
m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value / slider->factor, pos, m_outPoint, (mlt_keyframe_type) m_selectType->currentAction()->data().toInt());
emit parameterChanged();
type = m_animController.keyframe_type(pos);
m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value / slider->factor, pos, m_outPoint, type);
emit parameterChanged();
} else if (m_animController.key_count() <= 1) {
pos = m_animController.key_get_frame(0);
if (pos >= 0) {
m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value / slider->factor, pos, m_outPoint, (mlt_keyframe_type) m_selectType->currentAction()->data().toInt());
emit parameterChanged();
}
pos = m_animController.key_get_frame(0);
if (pos >= 0) {
if (m_animController.is_key(pos)) {
type = m_animController.keyframe_type(pos);
}
m_animProperties.anim_set(m_inTimeline.toUtf8().constData(), value / slider->factor, pos, m_outPoint, type);
emit parameterChanged();
}
}
}
......
......@@ -68,10 +68,6 @@ int main(int argc, char *argv[])
}
}
bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
if (forceBreeze) {
QIcon::setThemeName(QStringLiteral("breeze"));
}
// Create KAboutData
KAboutData aboutData(QByteArray("kdenlive"),
i18n("Kdenlive"), KDENLIVE_VERSION,
......@@ -100,12 +96,6 @@ int main(int argc, char *argv[])
// Register about data
KAboutData::setApplicationData(aboutData);
#ifndef __MINGW32__
// Add rcc stored icons to the search path so that we always find our icons
KIconLoader *loader = KIconLoader::global();
loader->reconfigure(QStringLiteral("kdenlive"), QStringList() << QStringLiteral(":/pics"));
#endif
// Set app stuff from about data
app.setApplicationDisplayName(aboutData.displayName());
app.setOrganizationDomain(aboutData.organizationDomain());
......@@ -134,6 +124,15 @@ int main(int argc, char *argv[])
KCrash::setCrashHandler(KCrash::defaultCrashHandler);
#endif
// Add rcc stored icons to the search path so that we always find our icons
KIconLoader *loader = KIconLoader::global();
loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
bool forceBreeze = grp.readEntry("force_breeze", QVariant(false)).toBool();
if (forceBreeze) {
QIcon::setThemeName("breeze");
}
// see if we are starting with session management
if (qApp->isSessionRestored()) {
int n = 1;
......
......@@ -1317,7 +1317,8 @@ void MainWindow::setupActions()
monitorGamma->setCurrentItem(KdenliveSettings::monitor_gamma());
connect(monitorGamma, SIGNAL(triggered(int)), this, SLOT(slotSetMonitorGamma(int)));
addAction(QStringLiteral("switch_trim"), i18n("Trim Mode"), this, SLOT(slotSwitchTrimMode()), KoIconUtils::themedIcon(QStringLiteral("cursor-arrow")), Qt::CTRL + Qt::Key_T);
addAction(QStringLiteral("switch_trim"), i18n("Trim Mode"), this, SLOT(slotSwitchTrimMode()), KoIconUtils::themedIcon(QStringLiteral("cursor-arrow")));
// disable shortcut until fully working, Qt::CTRL + Qt::Key_T);
addAction(QStringLiteral("insert_project_tree"), i18n("Insert Zone in Project Bin"), this, SLOT(slotInsertZoneToTree()), QIcon(), Qt::CTRL + Qt::Key_I);
addAction(QStringLiteral("insert_timeline"), i18n("Insert Zone in Timeline"), this, SLOT(slotInsertZoneToTimeline()), QIcon(), Qt::SHIFT + Qt::CTRL + Qt::Key_I);
......
......@@ -47,19 +47,11 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
}
KdenliveSettings::setMltpath(basePath);
QString meltPath = basePath.section('/', 0, -3) + "/bin/melt";
if (!QFile::exists(meltPath)) {
meltPath = qgetenv("MLT_PREFIX") + "/bin/melt";
}
if (!QFile::exists(meltPath)) {
meltPath = KdenliveSettings::rendererpath();
}
if (!QFile::exists(meltPath)) {
meltPath = QStringLiteral(MLT_MELTBIN);
}
if (!QFile::exists(meltPath)) {
meltPath = QStandardPaths::findExecutable(QStringLiteral("melt"));
}
QString meltPath = QDir::cleanPath(basePath).section('/', 0, -3) + "/bin/melt";
if (!QFile::exists(meltPath)) meltPath = qgetenv("MLT_PREFIX") + "/bin/melt";
if (!QFile::exists(meltPath)) meltPath = KdenliveSettings::rendererpath();
if (!QFile::exists(meltPath)) meltPath = QStringLiteral(MLT_MELTBIN);
if (!QFile::exists(meltPath)) meltPath = QStandardPaths::findExecutable("melt");
KdenliveSettings::setRendererpath(meltPath);
if (KdenliveSettings::rendererpath().isEmpty()) {
......
......@@ -1397,9 +1397,10 @@ void Timeline::checkTrackHeight(bool force)
if (m_trackview->checkTrackHeight(force)) {
m_doc->clipManager()->clearCache();
m_ruler->updateFrameSize();
m_trackview->updateSceneFrameWidth();
slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y());
slotSetZone(m_doc->zone(), false);
m_ruler->setPixelPerMark(m_doc->zoom().x(), true);
m_trackview->updateSceneFrameWidth();
}
}
......
......@@ -302,7 +302,6 @@ EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, con
{
QString effectName;
QDomElement namenode = effect.firstChildElement(QStringLiteral("name"));
qCDebug(KDENLIVE_LOG) << "editing EFFECT; " << namenode.text();
if (!namenode.isNull()) {
effectName = i18n(namenode.text().toUtf8().constData());
} else {
......
Markdown is supported
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