Commit 2b423244 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '2008'

parents 423523c7 f68fb0cd
Pipeline #28544 passed with stage
in 24 minutes and 32 seconds
......@@ -64,8 +64,6 @@ public slots:
signals:
/** @brief Emitted whenever a different color was chosen. */
void modified(QColor = QColor());
void disableCurrentFilter(bool);
};
#endif
......@@ -760,6 +760,11 @@ std::pair<std::shared_ptr<Mlt::Producer>, bool> ProjectClip::giveMasterAndGetTim
// Color, image and text clips always use master producer in timeline
m_videoProducers[tid] = std::make_shared<Mlt::Producer>(&master->parent());
m_effectStack->loadService(m_videoProducers[tid]);
} else {
// Ensure clip out = length - 1 so that effects work correctly
if (out != master->parent().get_length() - 1) {
master->parent().set("out", master->parent().get_length() - 1);
}
}
return {master, true};
}
......
......@@ -147,6 +147,7 @@ void LayoutManagement::initializeLayouts()
load->setText(i18n("Layout %1: %2", i, layoutName));
if (i < 6) {
QPushButton *lab = new QPushButton(i18n(layoutName.toUtf8().constData()), m_container);
lab->setFocusPolicy(Qt::NoFocus);
lab->setCheckable(true);
lab->setFlat(true);
lab->setFont(main->menuBar()->font());
......
......@@ -73,12 +73,15 @@ private:
{
int column = treeWidget()->sortColumn();
switch (column) {
case 0:
return text(column).toLower() < other.text(column).toLower();
break;
default:
return data(column, Qt::UserRole) < other.data(column, Qt::UserRole);
break;
case 1:
return data(column, Qt::UserRole).toULongLong() < other.data(column, Qt::UserRole).toULongLong();
break;
case 2:
return data(column, Qt::UserRole).toDateTime() < other.data(column, Qt::UserRole).toDateTime();
break;
default:
return text(column).toLower() < other.text(column).toLower();
break;
}
}
};
......
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