Commit 8da8e605 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

GIT_SILENT Fix more unused warnings an "strutur" spelling

parent ed1fe7fd
Pipeline #79410 canceled with stage
......@@ -368,7 +368,7 @@ void ClipCreationDialog::createClipsCommand(KdenliveDoc *doc, const QString &par
QString dialogFilter = allExtensions + QLatin1Char('|') + i18n("All Supported Files") + QStringLiteral("\n*|") + i18n("All Files");
QCheckBox *b = new QCheckBox(i18n("Import image sequence"));
b->setChecked(KdenliveSettings::autoimagesequence());
QCheckBox *bf = new QCheckBox(i18n("Ignore subfolder structur"));
QCheckBox *bf = new QCheckBox(i18n("Ignore subfolder structure"));
bf->setChecked(KdenliveSettings::ignoresubdirstructure());
QFrame *f = new QFrame();
f->setFrameShape(QFrame::NoFrame);
......@@ -467,7 +467,7 @@ void ClipCreationDialog::clipWidget(QDockWidget* m_DockClipWidget)
QPushButton* importseq = new QPushButton(i18n("Import image sequence"));
// Make importseq checkable so that we can differentiate between a double click in filewidget and a click on the pushbutton
importseq->setCheckable(true);
QCheckBox *b = new QCheckBox(i18n("Ignore subfolder structur"));
QCheckBox *b = new QCheckBox(i18n("Ignore subfolder structure"));
b->setChecked(KdenliveSettings::ignoresubdirstructure());
QFrame *f = new QFrame();
f->setFrameShape(QFrame::NoFrame);
......
......@@ -5536,9 +5536,9 @@ void TimelineModel::requestResizeMix(int cid, int duration, MixAlignment align)
};
if (align == MixAlignment::AlignLeft) {
int updatedDuration = cutPos + duration - m_allClips.at(clipToResize)->getPosition();
int result = requestItemResize(clipToResize, updatedDuration, true, true, undo, redo);
requestItemResize(clipToResize, updatedDuration, true, true, undo, redo);
updatedDuration = m_allClips.at(cid)->getPosition() + m_allClips.at(cid)->getPlaytime() - cutPos;
result = requestItemResize(cid, updatedDuration, false, true, undo, redo);
requestItemResize(cid, updatedDuration, false, true, undo, redo);
Fun adjust_mix = [this, tid, cid, duration]() {
getTrackById_const(tid)->setMixDuration(cid, duration, duration);
QModelIndex ix = makeClipIndexFromID(cid);
......@@ -5549,9 +5549,9 @@ void TimelineModel::requestResizeMix(int cid, int duration, MixAlignment align)
UPDATE_UNDO_REDO(adjust_mix, adjust_mix_undo, undo, redo);
} else if (align == MixAlignment::AlignRight) {
int updatedDuration = m_allClips.at(cid)->getPosition() + m_allClips.at(cid)->getPlaytime() - cutPos + duration;
int result = requestItemResize(cid, updatedDuration, false, true, undo, redo);
requestItemResize(cid, updatedDuration, false, true, undo, redo);
updatedDuration = cutPos - m_allClips.at(clipToResize)->getPosition();
result = requestItemResize(clipToResize, updatedDuration, true, true, undo, redo);
requestItemResize(clipToResize, updatedDuration, true, true, undo, redo);
Fun adjust_mix = [this, tid, cid, duration]() {
getTrackById_const(tid)->setMixDuration(cid, duration, 0);
QModelIndex ix = makeClipIndexFromID(cid);
......
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