Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
37d7fe25
Commit
37d7fe25
authored
Aug 14, 2022
by
Julius Künzel
💬
Browse files
Port remaining + to | for QKeySequences
parent
1fc508e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/bin/bin.cpp
View file @
37d7fe25
...
...
@@ -5350,7 +5350,7 @@ void Bin::processMultiStream(const QString &clipId, QList<int> videoStreams, QLi
mainLayout
->
addWidget
(
mainWidget
);
QPushButton
*
okButton
=
buttonBox
->
button
(
QDialogButtonBox
::
Ok
);
okButton
->
setDefault
(
true
);
okButton
->
setShortcut
(
QKeySequence
(
Qt
::
CTRL
+
Qt
::
Key_Return
));
okButton
->
setShortcut
(
QKeySequence
(
Qt
::
CTRL
|
Qt
::
Key_Return
));
dialog
->
connect
(
buttonBox
,
&
QDialogButtonBox
::
accepted
,
dialog
.
data
(),
&
QDialog
::
accept
);
dialog
->
connect
(
buttonBox
,
&
QDialogButtonBox
::
rejected
,
dialog
.
data
(),
&
QDialog
::
reject
);
okButton
->
setText
(
i18n
(
"Import selected clips"
));
...
...
src/mainwindow.cpp
View file @
37d7fe25
...
...
@@ -1563,7 +1563,7 @@ void MainWindow::setupActions()
addAction
(
QStringLiteral
(
"delete_all_clip_markers"
),
i18n
(
"Delete All Markers"
),
this
,
SLOT
(
slotDeleteAllClipMarkers
()),
QIcon
::
fromTheme
(
QStringLiteral
(
"edit-delete"
)));
addAction
(
QStringLiteral
(
"add_marker_guide_quickly"
),
i18n
(
"Add Marker/Guide quickly"
),
this
,
SLOT
(
slotAddMarkerGuideQuickly
()),
QIcon
::
fromTheme
(
QStringLiteral
(
"bookmark-new"
)),
Qt
::
KeypadModifier
+
Qt
::
Key_Asterisk
);
QIcon
::
fromTheme
(
QStringLiteral
(
"bookmark-new"
)),
QKeySequence
(
Qt
::
KeypadModifier
|
Qt
::
Key_Asterisk
)
)
;
// Clip actions. We set some category info on the action data to enable/disable it contextually in timelinecontroller
KActionCategory
*
clipActionCategory
=
new
KActionCategory
(
i18n
(
"Current Selection"
),
actionCollection
());
...
...
src/titler/titlewidget.cpp
View file @
37d7fe25
...
...
@@ -329,7 +329,7 @@ TitleWidget::TitleWidget(const QUrl &url, QString projectTitlePath, Monitor *mon
buttonSelectRects
->
setEnabled
(
false
);
m_selectImages
=
new
QAction
(
QIcon
::
fromTheme
(
QStringLiteral
(
"kdenlive-select-images"
)),
QString
(),
this
);
m_selectImages
->
setShortcut
(
Qt
::
CTRL
+
Qt
::
Key_I
);
m_selectImages
->
setShortcut
(
Qt
::
CTRL
|
Qt
::
Key_I
);
m_selectImages
->
setToolTip
(
i18n
(
"Keep only image items selected"
));
connect
(
m_selectImages
,
&
QAction
::
triggered
,
this
,
&
TitleWidget
::
slotSelectImages
);
buttonSelectImages
->
setDefaultAction
(
m_selectImages
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment