Commit 74c2e4c3 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch 'master' of invent.kde.org:multimedia/kdenlive

parents ef8a9ac5 39953946
Pipeline #177566 passed with stage
in 6 minutes and 6 seconds
......@@ -171,6 +171,7 @@ RenderWidget::RenderWidget(bool enableProxy, QWidget *parent)
}
});
m_view.optionsGroup->setVisible(m_view.options->isChecked());
m_view.optionsGroup->setMinimumWidth(m_view.optionsGroup->width() + m_view.optionsGroup->verticalScrollBar()->width());
connect(m_view.options, &QAbstractButton::toggled, m_view.optionsGroup, &QWidget::setVisible);
connect(m_view.out_file, &KUrlRequester::textChanged, this, static_cast<void (RenderWidget::*)()>(&RenderWidget::slotUpdateButtons));
......@@ -335,7 +336,7 @@ void RenderWidget::slotShareActionFinished(const QJsonObject &output, int error,
QSize RenderWidget::sizeHint() const
{
// Make sure the widget has minimum size on opening
return {200, 200};
return {200, qMax(200, screen()->availableGeometry().height())};
}
RenderWidget::~RenderWidget()
......
......@@ -1817,7 +1817,7 @@ void MainWindow::setupActions()
addAction(QStringLiteral("add_guide"), i18n("Add/Remove Guide"), this, SLOT(slotAddGuide()), QIcon::fromTheme(QStringLiteral("list-add")), Qt::Key_G);
addAction(QStringLiteral("delete_guide"), i18n("Delete Guide"), this, SLOT(slotDeleteGuide()), QIcon::fromTheme(QStringLiteral("edit-delete")));
addAction(QStringLiteral("edit_guide"), i18n("Edit Guide…"), this, SLOT(slotEditGuide()), QIcon::fromTheme(QStringLiteral("document-properties")));
addAction(QStringLiteral("export_guides"), i18n("Export Guides"), this, SLOT(slotExportGuides()), QIcon::fromTheme(QStringLiteral("document-properties")));
addAction(QStringLiteral("export_guides"), i18n("Export Guides"), this, SLOT(slotExportGuides()), QIcon::fromTheme(QStringLiteral("document-export")));
QAction *lockGuides = addAction(QStringLiteral("lock_guides"), i18n("Guides Locked"), this, SLOT(slotLockGuides(bool)), QIcon::fromTheme(QStringLiteral("kdenlive-lock")));
lockGuides->setCheckable(true);
......@@ -2369,13 +2369,6 @@ void MainWindow::connectDocument()
getMainTimeline()->focusTimeline();
}
void MainWindow::slotGuidesUpdated()
{
if (m_renderWidget) {
m_renderWidget->setGuides(pCore->currentDoc()->getGuideModel());
}
}
void MainWindow::slotEditKeys()
{
KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
......
......@@ -438,7 +438,6 @@ private slots:
void slotLockGuides(bool lock);
void slotDeleteGuide();
void slotDeleteAllGuides();
void slotGuidesUpdated();
void slotCopy();
void slotPaste();
......
This diff is collapsed.
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