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
c37e3656
Commit
c37e3656
authored
Jan 01, 2022
by
Yuri Chornoivan
Browse files
Fix minor typos
parent
efcfb2e3
Pipeline
#116708
failed with stage
in 2 minutes and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/audiomixer/mixermanager.cpp
View file @
c37e3656
...
...
@@ -28,7 +28,7 @@ MixerManager::MixerManager(QWidget *parent)
,
m_masterMixer
(
nullptr
)
,
m_visibleMixerManager
(
false
)
,
m_expandedWidth
(
-
1
)
,
m_recomm
a
ndedWidth
(
300
)
,
m_recomm
e
ndedWidth
(
300
)
{
m_masterBox
=
new
QHBoxLayout
;
setContentsMargins
(
0
,
0
,
0
,
0
);
...
...
@@ -100,8 +100,8 @@ void MixerManager::registerTrack(int tid, std::shared_ptr<Mlt::Tractor> service,
line
->
setFrameShadow
(
QFrame
::
Sunken
);
m_channelsLayout
->
insertWidget
(
0
,
line
);
m_channelsLayout
->
insertWidget
(
0
,
mixer
.
get
());
m_recomm
a
ndedWidth
=
(
mixer
->
minimumWidth
()
+
12
+
line
->
minimumWidth
())
*
(
qMin
(
2
,
int
(
m_mixers
.
size
())));
m_channelsBox
->
setMinimumWidth
(
m_recomm
a
ndedWidth
);
m_recomm
e
ndedWidth
=
(
mixer
->
minimumWidth
()
+
12
+
line
->
minimumWidth
())
*
(
qMin
(
2
,
int
(
m_mixers
.
size
())));
m_channelsBox
->
setMinimumWidth
(
m_recomm
e
ndedWidth
);
}
void
MixerManager
::
deregisterTrack
(
int
tid
)
...
...
@@ -204,7 +204,7 @@ void MixerManager::collapseMixers()
}
else
{
//m_line->setMaximumWidth(QWIDGETSIZE_MAX);
m_channelsBox
->
setMaximumWidth
(
QWIDGETSIZE_MAX
);
m_channelsBox
->
setMinimumWidth
(
m_recomm
a
ndedWidth
);
m_channelsBox
->
setMinimumWidth
(
m_recomm
e
ndedWidth
);
setFixedWidth
(
m_expandedWidth
);
QMetaObject
::
invokeMethod
(
this
,
"resetSizePolicy"
,
Qt
::
QueuedConnection
);
}
...
...
@@ -218,7 +218,7 @@ void MixerManager::resetSizePolicy()
QSize
MixerManager
::
sizeHint
()
const
{
return
QSize
(
m_recomm
a
ndedWidth
,
0
);
return
QSize
(
m_recomm
e
ndedWidth
,
0
);
}
void
MixerManager
::
pauseMonitoring
(
bool
pause
)
...
...
src/mltcontroller/clippropertiescontroller.cpp
View file @
c37e3656
...
...
@@ -974,7 +974,7 @@ ClipPropertiesController::ClipPropertiesController(ClipController *controller, Q
// Check for variable frame rate
if
(
m_properties
->
get_int
(
"meta.media.variable_frame_rate"
))
{
m_warningMessage
.
setText
(
i18n
(
"File uses a variable frame rate, not recomm
a
nded"
));
m_warningMessage
.
setText
(
i18n
(
"File uses a variable frame rate, not recomm
e
nded"
));
QAction
*
ac
=
new
QAction
(
i18n
(
"Transcode"
));
QObject
::
connect
(
ac
,
&
QAction
::
triggered
,
[
id
=
m_id
,
resource
=
controller
->
clipUrl
()]()
{
QMetaObject
::
invokeMethod
(
pCore
->
bin
(),
"requestTranscoding"
,
Qt
::
QueuedConnection
,
Q_ARG
(
QString
,
resource
),
Q_ARG
(
QString
,
id
),
Q_ARG
(
bool
,
false
));
...
...
Write
Preview
Markdown
is supported
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