Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Multimedia
Kdenlive
Commits
be2e8a1a
Commit
be2e8a1a
authored
Jan 16, 2021
by
Jean-Baptiste Mardelle
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various typo fixes, patch by Kunda Ki
Fixes
#879
parent
086008f6
Pipeline
#47904
passed with stage
in 10 minutes and 34 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
29 additions
and
29 deletions
+29
-29
data/effects/avfilter/avfilter_doubleweave.xml
data/effects/avfilter/avfilter_doubleweave.xml
+1
-1
data/effects/avfilter/avfilter_field.xml
data/effects/avfilter/avfilter_field.xml
+1
-1
fuzzer/fakeit_standalone.hpp
fuzzer/fakeit_standalone.hpp
+2
-2
src/assets/keyframes/view/keyframeview.cpp
src/assets/keyframes/view/keyframeview.cpp
+1
-1
src/bin/projectclip.cpp
src/bin/projectclip.cpp
+9
-9
src/monitor/view/OverlayCenterDiagonal.qml
src/monitor/view/OverlayCenterDiagonal.qml
+3
-3
src/statusbarmessagelabel.h
src/statusbarmessagelabel.h
+1
-1
src/timeline2/model/timelinefunctions.cpp
src/timeline2/model/timelinefunctions.cpp
+1
-1
src/timeline2/model/timelinemodel.hpp
src/timeline2/model/timelinemodel.hpp
+1
-1
src/titler/patternsmodel.h
src/titler/patternsmodel.h
+3
-3
src/titler/titledocument.h
src/titler/titledocument.h
+2
-2
src/transitions/transitionlist/view/transitionlistwidget.cpp
src/transitions/transitionlist/view/transitionlistwidget.cpp
+1
-1
src/utils/resourcewidget.cpp
src/utils/resourcewidget.cpp
+1
-1
tests/fakeit.hpp
tests/fakeit.hpp
+2
-2
No files found.
data/effects/avfilter/avfilter_doubleweave.xml
View file @
be2e8a1a
...
...
@@ -3,7 +3,7 @@
<name>
Doubleweave
</name>
<description>
Weave input video fields into double number of frames
</description>
<author>
libavfilter
</author>
<parameter
type=
"list"
name=
"av.first_field"
default=
"top"
paramlist=
"top;botom"
>
<parameter
type=
"list"
name=
"av.first_field"
default=
"top"
paramlist=
"top;bot
t
om"
>
<paramlistdisplay>
Top field first,Bottom field first
</paramlistdisplay>
<name>
First Field
</name>
</parameter>
...
...
data/effects/avfilter/avfilter_field.xml
View file @
be2e8a1a
...
...
@@ -3,7 +3,7 @@
<name>
Field Extractor
</name>
<description>
Extract a field from the input video
</description>
<author>
libavfilter
</author>
<parameter
type=
"list"
name=
"av.type"
default=
"top"
paramlist=
"top;botom"
>
<parameter
type=
"list"
name=
"av.type"
default=
"top"
paramlist=
"top;bot
t
om"
>
<paramlistdisplay>
Top field first,Bottom field first
</paramlistdisplay>
<name>
Field priority
</name>
</parameter>
...
...
fuzzer/fakeit_standalone.hpp
View file @
be2e8a1a
...
...
@@ -5337,12 +5337,12 @@ namespace fakeit {
template
<
typename
C
>
static
unsigned
int
getVTSize
()
{
struct
Der
r
ived
:
public
C
{
struct
Derived
:
public
C
{
virtual
void
endOfVt
()
{
}
};
unsigned
int
vtSize
=
getOffset
(
&
Der
r
ived
::
endOfVt
);
unsigned
int
vtSize
=
getOffset
(
&
Derived
::
endOfVt
);
return
vtSize
;
}
};
...
...
src/assets/keyframes/view/keyframeview.cpp
View file @
be2e8a1a
...
...
@@ -245,7 +245,7 @@ void KeyframeView::slotCenterKeyframe()
QVector
<
int
>
updatedSelection
;
for
(
int
kf
:
m_selectedKeyframes
)
{
if
(
kf
==
0
)
{
// Don
t
't allow moving first keyframe
// Don't allow moving first keyframe
continue
;
}
GenTime
initPos
(
kf
+
offset
,
pCore
->
getCurrentFps
());
...
...
src/bin/projectclip.cpp
View file @
be2e8a1a
...
...
@@ -1392,8 +1392,8 @@ bool ProjectClip::matches(const QString &condition)
bool
ProjectClip
::
rename
(
const
QString
&
name
,
int
column
)
{
QMap
<
QString
,
QString
>
newProper
i
tes
;
QMap
<
QString
,
QString
>
oldProper
i
tes
;
QMap
<
QString
,
QString
>
newPropert
i
es
;
QMap
<
QString
,
QString
>
oldPropert
i
es
;
bool
edited
=
false
;
switch
(
column
)
{
case
0
:
...
...
@@ -1401,8 +1401,8 @@ bool ProjectClip::rename(const QString &name, int column)
return
false
;
}
// Rename clip
oldProper
i
tes
.
insert
(
QStringLiteral
(
"kdenlive:clipname"
),
m_name
);
newProper
i
tes
.
insert
(
QStringLiteral
(
"kdenlive:clipname"
),
name
);
oldPropert
i
es
.
insert
(
QStringLiteral
(
"kdenlive:clipname"
),
m_name
);
newPropert
i
es
.
insert
(
QStringLiteral
(
"kdenlive:clipname"
),
name
);
m_name
=
name
;
edited
=
true
;
break
;
...
...
@@ -1412,18 +1412,18 @@ bool ProjectClip::rename(const QString &name, int column)
}
// Rename clip
if
(
m_clipType
==
ClipType
::
TextTemplate
)
{
oldProper
i
tes
.
insert
(
QStringLiteral
(
"templatetext"
),
m_description
);
newProper
i
tes
.
insert
(
QStringLiteral
(
"templatetext"
),
name
);
oldPropert
i
es
.
insert
(
QStringLiteral
(
"templatetext"
),
m_description
);
newPropert
i
es
.
insert
(
QStringLiteral
(
"templatetext"
),
name
);
}
else
{
oldProper
i
tes
.
insert
(
QStringLiteral
(
"kdenlive:description"
),
m_description
);
newProper
i
tes
.
insert
(
QStringLiteral
(
"kdenlive:description"
),
name
);
oldPropert
i
es
.
insert
(
QStringLiteral
(
"kdenlive:description"
),
m_description
);
newPropert
i
es
.
insert
(
QStringLiteral
(
"kdenlive:description"
),
name
);
}
m_description
=
name
;
edited
=
true
;
break
;
}
if
(
edited
)
{
pCore
->
bin
()
->
slotEditClipCommand
(
m_binId
,
oldProper
i
tes
,
newProper
i
tes
);
pCore
->
bin
()
->
slotEditClipCommand
(
m_binId
,
oldPropert
i
es
,
newPropert
i
es
);
}
return
edited
;
}
...
...
src/monitor/view/OverlayCenterDiagonal.qml
View file @
be2e8a1a
...
...
@@ -4,7 +4,7 @@ import QtQuick 2.11
Item
{
id
:
overlay
property
double
diagonalLeng
h
t
:
Math
.
sqrt
(
Math
.
pow
(
parent
.
height
,
2
)
+
Math
.
pow
(
parent
.
width
,
2
))
property
double
diagonalLengt
h
:
Math
.
sqrt
(
Math
.
pow
(
parent
.
height
,
2
)
+
Math
.
pow
(
parent
.
width
,
2
))
function
degreesRotation
(
width
,
height
)
{
var
a
=
height
/
width
;
...
...
@@ -15,7 +15,7 @@ Item {
Rectangle
{
color
:
root
.
overlayColor
width
:
overlay
.
diagonalLeng
h
t
width
:
overlay
.
diagonalLengt
h
height
:
1
rotation
:
degreesRotation
(
parent
.
height
,
parent
.
width
)
anchors.centerIn
:
parent
...
...
@@ -24,7 +24,7 @@ Item {
Rectangle
{
color
:
root
.
overlayColor
height
:
overlay
.
diagonalLeng
h
t
height
:
overlay
.
diagonalLengt
h
width
:
1
rotation
:
degreesRotation
(
parent
.
width
,
parent
.
height
)
anchors.centerIn
:
parent
...
...
src/statusbarmessagelabel.h
View file @
be2e8a1a
...
...
@@ -104,7 +104,7 @@ public slots:
void
setMessage
(
const
QString
&
text
,
MessageType
type
=
DefaultMessage
,
int
timeoutMS
=
0
);
/** @brief Display a key binding info in status bar */
void
setKeyMap
(
const
QString
&
text
);
/** @brief Display a temporary key binding info in status bar, revert to defaut one if text is empty */
/** @brief Display a temporary key binding info in status bar, revert to defau
l
t one if text is empty */
void
setTmpKeyMap
(
const
QString
&
text
);
private
slots
:
...
...
src/timeline2/model/timelinefunctions.cpp
View file @
be2e8a1a
...
...
@@ -677,7 +677,7 @@ bool TimelineFunctions::requestItemCopy(const std::shared_ptr<TimelineItemModel>
}
mapping
[
id
]
=
newId
;
}
qDebug
()
<<
"Successful copy, coping groups..."
;
qDebug
()
<<
"Successful copy, cop
y
ing groups..."
;
res
=
timeline
->
m_groups
->
copyGroups
(
mapping
,
undo
,
redo
);
if
(
!
res
)
{
bool
undone
=
undo
();
...
...
src/timeline2/model/timelinemodel.hpp
View file @
be2e8a1a
...
...
@@ -176,7 +176,7 @@ public:
*/
void
loadTractor
();
/* @brief Returns the current tractor's producer, useful fo control seeking, playing, etc
/* @brief Returns the current tractor's producer, useful fo
r
control seeking, playing, etc
*/
std
::
shared_ptr
<
Mlt
::
Producer
>
producer
();
Mlt
::
Profile
*
getProfile
();
...
...
src/titler/patternsmodel.h
View file @
be2e8a1a
...
...
@@ -58,8 +58,8 @@ public:
virtual
void
addScene
(
const
QString
&
pattern
);
/**
* @brief Serial
z
ie all patterns
* @reurn byte QByteArray
* @brief Seriali
z
e all patterns
* @re
t
urn byte QByteArray
*/
virtual
QByteArray
serialize
();
/**
...
...
@@ -75,7 +75,7 @@ public:
int
getModifiedCounter
()
const
{
return
modified_counter
;
}
/**
* @brief Repaint all scenes. Useful
l
when e.g. background was changed.
* @brief Repaint all scenes. Useful when e.g. background was changed.
*/
virtual
void
repaintScenes
();
...
...
src/titler/titledocument.h
View file @
be2e8a1a
...
...
@@ -43,10 +43,10 @@ public:
enum
TitleProperties
{
OutlineWidth
=
101
,
OutlineColor
,
LineSpacing
,
Gradient
,
RotateFactor
,
ZoomFactor
};
void
setScene
(
QGraphicsScene
*
scene
,
int
width
,
int
height
);
bool
saveDocument
(
const
QUrl
&
url
,
QGraphicsRectItem
*
startv
,
QGraphicsRectItem
*
endv
,
int
duration
,
bool
embed_images
=
false
);
/** @brief Save XML for this title. It calls static version fo the function.
/** @brief Save XML for this title. It calls static version fo
r
the function.
*/
QDomDocument
xml
(
QGraphicsRectItem
*
startv
,
QGraphicsRectItem
*
endv
,
bool
embed_images
=
false
);
/** @brief Load XML for this title. It calls static version fo the function.
/** @brief Load XML for this title. It calls static version fo
r
the function.
*/
int
loadFromXml
(
const
QDomDocument
&
doc
,
QGraphicsRectItem
*
startv
,
QGraphicsRectItem
*
endv
,
int
*
duration
,
const
QString
&
projectpath
=
QString
());
/** \brief Get the background color (incl. alpha) from the document, if possibly
...
...
src/transitions/transitionlist/view/transitionlistwidget.cpp
View file @
be2e8a1a
...
...
@@ -100,7 +100,7 @@ void TransitionListWidget::downloadNewLumas()
{
if
(
getNewStuff
(
QStringLiteral
(
":data/kdenlive_wipes.knsrc"
))
>
0
)
{
MltConnection
::
refreshLumas
();
// TODO: refresh currently displayd trans ?
// TODO: refresh currently display
e
d trans ?
}
}
...
...
src/utils/resourcewidget.cpp
View file @
be2e8a1a
...
...
@@ -619,7 +619,7 @@ void ResourceWidget::parseLicense(const QString &licenseUrl)
/**
* @brief ResourceWidget::licenseNameFromUrl returns a name for the licence based on the license URL
* @param licenseUrl
* @param shortName wether the like "Attribution-NonCommercial-ShareAlike 3.0" or the short name like "CC BY-ND-SA 3.0" should be returned
* @param shortName w
h
ether the like "Attribution-NonCommercial-ShareAlike 3.0" or the short name like "CC BY-ND-SA 3.0" should be returned
* @return the license name
*/
QString
ResourceWidget
::
licenseNameFromUrl
(
const
QString
&
licenseUrl
,
const
bool
shortName
)
...
...
tests/fakeit.hpp
View file @
be2e8a1a
...
...
@@ -5364,12 +5364,12 @@ namespace fakeit {
template
<
typename
C
>
static
unsigned
int
getVTSize
()
{
struct
Der
r
ived
:
public
C
{
struct
Derived
:
public
C
{
virtual
void
endOfVt
()
{
}
};
unsigned
int
vtSize
=
getOffset
(
&
Der
r
ived
::
endOfVt
);
unsigned
int
vtSize
=
getOffset
(
&
Derived
::
endOfVt
);
return
vtSize
;
}
};
...
...
Kunda Ki
@kundak
mentioned in issue
#920 (closed)
·
Jan 18, 2021
mentioned in issue
#920 (closed)
mentioned in issue #920
Toggle commit list
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