Skip to content
GitLab
Menu
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
7c8a26e9
Commit
7c8a26e9
authored
Oct 25, 2019
by
Jean-Baptiste Mardelle
Browse files
Reduced composition switch ui spacing
parent
882576af
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/assets/assetpanel.cpp
View file @
7c8a26e9
...
...
@@ -54,13 +54,13 @@ AssetPanel::AssetPanel(QWidget *parent)
,
m_effectStackWidget
(
new
EffectStackView
(
this
))
{
auto
*
buttonToolbar
=
new
QToolBar
(
this
);
buttonToolbar
->
addWidget
(
m_assetTitle
);
m_titleAction
=
buttonToolbar
->
addWidget
(
m_assetTitle
);
int
size
=
style
()
->
pixelMetric
(
QStyle
::
PM_SmallIconSize
);
QSize
iconSize
(
size
,
size
);
buttonToolbar
->
setIconSize
(
iconSize
);
// Edit composition button
m_switchCompoButton
=
new
QComboBox
(
this
);
m_switchCompoButton
->
setF
ont
(
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
)
);
m_switchCompoButton
->
setF
rame
(
false
);
auto
allTransitions
=
TransitionsRepository
::
get
()
->
getNames
();
for
(
const
auto
&
transition
:
allTransitions
)
{
m_switchCompoButton
->
addItem
(
transition
.
second
,
transition
.
first
);
...
...
@@ -149,8 +149,8 @@ void AssetPanel::showTransition(int tid, const std::shared_ptr<AssetParameterMod
QString
transitionId
=
transitionModel
->
getAssetId
();
m_switchCompoButton
->
setCurrentIndex
(
m_switchCompoButton
->
findData
(
transitionId
));
m_switchAction
->
setVisible
(
true
);
QString
transitionName
=
TransitionsRepository
::
get
()
->
g
et
Name
(
transitionId
);
m_assetTitle
->
setText
(
i18n
(
"Properties for"
)
);
m_titleAction
->
s
et
Visible
(
false
);
m_assetTitle
->
clear
(
);
m_transitionWidget
->
setVisible
(
true
);
m_timelineButton
->
setVisible
(
true
);
m_enableStackButton
->
setVisible
(
false
);
...
...
@@ -200,6 +200,7 @@ void AssetPanel::showEffectStack(const QString &itemName, const std::shared_ptr<
break
;
}
m_assetTitle
->
setText
(
title
);
m_titleAction
->
setVisible
(
true
);
m_splitButton
->
setVisible
(
showSplit
);
m_enableStackButton
->
setVisible
(
id
.
first
!=
ObjectType
::
TimelineComposition
);
m_enableStackButton
->
setActive
(
effectsModel
->
isStackEnabled
());
...
...
src/assets/assetpanel.hpp
View file @
7c8a26e9
...
...
@@ -84,6 +84,7 @@ protected:
private:
QToolButton
*
m_switchBuiltStack
;
QComboBox
*
m_switchCompoButton
;
QAction
*
m_titleAction
;
QAction
*
m_switchAction
;
KDualAction
*
m_splitButton
;
KDualAction
*
m_enableStackButton
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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