Commit 05517b1c authored by Julius Künzel's avatar Julius Künzel
Browse files

Cleanup for shortcut list

parent 717121c4
Pipeline #55002 passed with stage
in 10 minutes and 16 seconds
......@@ -969,6 +969,7 @@ Bin::Bin(std::shared_ptr<ProjectItemModel> model, QWidget *parent)
// View type
KSelectAction *listType = new KSelectAction(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18n("View Mode"), this);
pCore->window()->actionCollection()->addAction(QStringLiteral("bin_view_mode"), listType);
pCore->window()->actionCollection()->setShortcutsConfigurable(listType, false);
QAction *treeViewAction = listType->addAction(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18n("Tree View"));
listType->addAction(treeViewAction);
treeViewAction->setData(BinTreeView);
......
......@@ -39,6 +39,7 @@ LayoutManagement::LayoutManagement(QObject *parent)
// Prepare layout actions
KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), pCore->window()->actionCollection());
m_loadLayout = new KSelectAction(i18n("Load Layout"), pCore->window()->actionCollection());
pCore->window()->actionCollection()->setShortcutsConfigurable(m_loadLayout, false);
// Required to enable user to add the load layout action to toolbar
layoutActions->addAction(QStringLiteral("load_layouts"), m_loadLayout);
......
......@@ -1074,6 +1074,7 @@ void MainWindow::setupActions()
sceneMode->setCurrentItem(0);
connect(sceneMode, static_cast<void (KSelectAction::*)(QAction *)>(&KSelectAction::triggered), this, &MainWindow::slotChangeEdit);
addAction(QStringLiteral("timeline_mode"), sceneMode);
actionCollection()->setShortcutsConfigurable(sceneMode, false);
m_useTimelineZone = new KDualAction(i18n("Do not Use Timeline Zone for Insert"), i18n("Use Timeline Zone for Insert"), this);
m_useTimelineZone->setActiveIcon(QIcon::fromTheme(QStringLiteral("timeline-use-zone-on")));
......@@ -1113,6 +1114,7 @@ void MainWindow::setupActions()
}
connect(m_compositeAction, static_cast<void (KSelectAction::*)(QAction *)>(&KSelectAction::triggered), this, &MainWindow::slotUpdateCompositing);
addAction(QStringLiteral("timeline_compositing"), m_compositeAction);
actionCollection()->setShortcutsConfigurable(m_compositeAction, false);
QAction *splitView = new QAction(QIcon::fromTheme(QStringLiteral("view-split-top-bottom")), i18n("Split Audio Tracks"), this);
addAction(QStringLiteral("timeline_view_split"), splitView);
......@@ -1448,27 +1450,28 @@ void MainWindow::setupActions()
#if LIBMLT_VERSION_INT >= QT_VERSION_CHECK(6,20,0)
// Monitor resolution scaling
KActionCategory *resolutionActionCategory = new KActionCategory(i18n("Preview Resolution"), actionCollection());
m_scaleGroup = new QActionGroup(this);
m_scaleGroup->setExclusive(true);
m_scaleGroup->setEnabled(!KdenliveSettings::external_display());
QAction *scale_no = new QAction(i18n("Full Resolution (1:1)"), m_scaleGroup);
addAction(QStringLiteral("scale_no_preview"), scale_no);
addAction(QStringLiteral("scale_no_preview"), scale_no, QKeySequence(), resolutionActionCategory);
scale_no->setCheckable(true);
scale_no->setData(1);
QAction *scale_2 = new QAction(i18n("720p"), m_scaleGroup);
addAction(QStringLiteral("scale_2_preview"), scale_2);
addAction(QStringLiteral("scale_2_preview"), scale_2, QKeySequence(), resolutionActionCategory);
scale_2->setCheckable(true);
scale_2->setData(2);
QAction *scale_4 = new QAction(i18n("540p"), m_scaleGroup);
addAction(QStringLiteral("scale_4_preview"), scale_4);
addAction(QStringLiteral("scale_4_preview"), scale_4, QKeySequence(), resolutionActionCategory);
scale_4->setCheckable(true);
scale_4->setData(4);
QAction *scale_8 = new QAction(i18n("360p"), m_scaleGroup);
addAction(QStringLiteral("scale_8_preview"), scale_8);
addAction(QStringLiteral("scale_8_preview"), scale_8, QKeySequence(), resolutionActionCategory);
scale_8->setCheckable(true);
scale_8->setData(8);
QAction *scale_16 = new QAction(i18n("270p"), m_scaleGroup);
addAction(QStringLiteral("scale_16_preview"), scale_16);
addAction(QStringLiteral("scale_16_preview"), scale_16, QKeySequence(), resolutionActionCategory);
scale_16->setCheckable(true);
scale_16->setData(16);
connect(pCore->monitorManager(), &MonitorManager::scalingChanged, this, [scale_2, scale_4, scale_8, scale_16, scale_no]() {
......@@ -1511,6 +1514,7 @@ void MainWindow::setupActions()
addAction(QStringLiteral("mlt_gamma"), monitorGamma);
monitorGamma->setCurrentItem(KdenliveSettings::monitor_gamma());
connect(monitorGamma, static_cast<void (KSelectAction::*)(int)>(&KSelectAction::triggered), this, &MainWindow::slotSetMonitorGamma);
actionCollection()->setShortcutsConfigurable(monitorGamma, false);
addAction(QStringLiteral("switch_trim"), i18n("Trim Mode"), this, SLOT(slotSwitchTrimMode()), QIcon::fromTheme(QStringLiteral("cursor-arrow")));
// disable shortcut until fully working, Qt::CTRL + Qt::Key_T);
......
......@@ -463,6 +463,7 @@ void MonitorManager::setupActions()
}
connect(interlace, static_cast<void (KSelectAction::*)(int)>(&KSelectAction::triggered), this, &MonitorManager::slotSetDeinterlacer);
pCore->window()->addAction(QStringLiteral("mlt_interlace"), interlace);
pCore->window()->actionCollection()->setShortcutsConfigurable(interlace, false);
KSelectAction *interpol = new KSelectAction(i18n("Interpolation"), this);
interpol->addAction(i18n("Nearest Neighbor (fast)"));
......@@ -480,6 +481,7 @@ void MonitorManager::setupActions()
}
connect(interpol, static_cast<void (KSelectAction::*)(int)>(&KSelectAction::triggered), this, &MonitorManager::slotSetInterpolation);
pCore->window()->addAction(QStringLiteral("mlt_interpolation"), interpol);
pCore->window()->actionCollection()->setShortcutsConfigurable(interpol, false);
QAction *zoneStart = new QAction(QIcon::fromTheme(QStringLiteral("media-seek-backward")), i18n("Go to Zone Start"), this);
connect(zoneStart, &QAction::triggered, this, &MonitorManager::slotZoneStart);
......
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