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
83e633cd
Commit
83e633cd
authored
Dec 20, 2019
by
Yuri Chornoivan
Browse files
Fix minor EBN issues
parent
539f6b30
Pipeline
#12203
failed with stage
in 5 minutes and 17 seconds
Changes
21
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
data/org.kde.kdenlive.desktop
View file @
83e633cd
...
...
@@ -122,7 +122,7 @@ Type=Application
Exec=kdenlive %F
Icon=kdenlive
X-DocPath=kdenlive/index.html
X-DocPath[cs]=http://cs.wikibooks.org/wiki/Kdenlive
X-DocPath[cs]=http
s
://cs.wikibooks.org/wiki/Kdenlive
Terminal=false
MimeType=application/x-kdenlive;
Categories=Qt;KDE;AudioVideo;AudioVideoEditing;
...
...
src/CMakeLists.txt
View file @
83e633cd
...
...
@@ -2,7 +2,7 @@
find_package
(
LibV4L2
)
set_package_properties
(
LibV4L2 PROPERTIES
DESCRIPTION
"video4linux support libraries"
URL
"http://
freecode.com/projects/libv4l
"
URL
"http
s
://
linuxtv.org/downloads/v4l-utils/
"
TYPE RUNTIME
PURPOSE
"Required for better webcam support"
)
...
...
src/assets/view/widgets/listparamwidget.h
View file @
83e633cd
...
...
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifndef LISTPARAM
ETER
WIDGET_H
#define LISTPARAM
ETER
WIDGET_H
#ifndef LISTPARAMWIDGET_H
#define LISTPARAMWIDGET_H
#include
"assets/view/widgets/abstractparamwidget.hpp"
#include
"ui_listparamwidget_ui.h"
...
...
src/colortools.h
View file @
83e633cd
...
...
@@ -34,7 +34,7 @@ public:
scaling defines how far to zoom in (or out). Lower value = zoom in.
The modified version always scales the RGB values so that at least one of them attains 255.
If not the full rect should be filled, set circleOnly to true.
See also: http://en.wikipedia.org/wiki/YUV and http://de.wikipedia.org/wiki/Vektorskop
See also: http
s
://en.wikipedia.org/wiki/YUV and http
s
://de.wikipedia.org/wiki/Vektorskop
*/
QImage
yuvColorWheel
(
const
QSize
&
size
,
int
Y
,
float
scaling
,
bool
modifiedVersion
,
bool
circleOnly
);
/**
...
...
@@ -65,7 +65,7 @@ public:
@brief Draws a YPbPr plane with Pb on the x axis and Pr on the y axis.
Y is the Y value to use.
scaling defines how far to zoom in (or out). Lower value = zoom in.
See also: http://de.wikipedia.org/wiki/YPbPr-Farbmodell and http://www.poynton.com/ColorFAQ.html
See also: http
s
://de.wikipedia.org/wiki/YPbPr-Farbmodell and http
s
://www.poynton.com/ColorFAQ.html
*/
QImage
yPbPrColorWheel
(
const
QSize
&
size
,
int
Y
,
float
scaling
,
bool
circleOnly
);
/**
...
...
@@ -73,7 +73,7 @@ public:
This is for the Bézier Curves widget which allows to change the hue (y) of a certain hue.
MIN/MAX give the minimum/maximum hue difference, e.g. -128,+128.
For the value ranges see:
http://doc.qt.
nokia.com/latest
/qcolor.html#the-hsv-color-model
http
s
://doc.qt.
io/qt-5
/qcolor.html#the-hsv-color-model
*/
static
QImage
hsvHueShiftPlane
(
const
QSize
&
size
,
int
S
,
int
V
,
int
MIN
,
int
MAX
);
...
...
src/dialogs/renderwidget.cpp
View file @
83e633cd
...
...
@@ -1873,7 +1873,7 @@ void RenderWidget::refreshView()
}
if
(
params
.
contains
(
QStringLiteral
(
" profile="
))
||
params
.
startsWith
(
QLatin1String
(
"profile="
)))
{
// changed in MLT commit d8a3a5c9190646aae72048f71a39ee7446a3bd45
// (http://
www.mltframework.org/gitweb/mlt.git?p=mltframework.org/mlt.git;a=
commit
;h=
d8a3a5c9190646aae72048f71a39ee7446a3bd45)
// (http
s
://
github.com/mltframework/mlt/
commit
/
d8a3a5c9190646aae72048f71a39ee7446a3bd45)
item
->
setData
(
0
,
ErrorRole
,
i18n
(
"This render profile uses a 'profile' parameter.<br />Unless you know what you are doing you will probably "
"have to change it to 'mlt_profile'."
));
...
...
src/dialogs/wizard.cpp
View file @
83e633cd
...
...
@@ -909,7 +909,7 @@ void Wizard::slotOpenManual()
void
Wizard
::
slotShowWebInfos
()
{
KRun
::
runUrl
(
QUrl
(
"http://kdenlive.org/discover/"
+
QString
(
kdenlive_version
).
section
(
QLatin1Char
(
' '
),
0
,
0
)),
QStringLiteral
(
"text/html"
),
this
,
KRun
::
runUrl
(
QUrl
(
"http
s
://kdenlive.org/discover/"
+
QString
(
kdenlive_version
).
section
(
QLatin1Char
(
' '
),
0
,
0
)),
QStringLiteral
(
"text/html"
),
this
,
KRun
::
RunFlags
());
}
...
...
src/doc/kdenlivedoc.cpp
View file @
83e633cd
...
...
@@ -957,7 +957,7 @@ void KdenliveDoc::updateProjectFolderPlacesEntry()
{
/*
* For similar and more code have a look at kfileplacesmodel.cpp and the included files:
* http://
websvn
.kde.org/
trunk/KDE/kdelibs/kfile
/kfileplacesmodel
.
cpp
?view=markup
* http
s
://
api
.kde.org/
frameworks/kio/html
/kfileplacesmodel
_8
cpp
_source.html
*/
const
QString
file
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
GenericDataLocation
)
+
QStringLiteral
(
"/user-places.xbel"
);
...
...
src/jobs/filterclipjob.h
View file @
83e633cd
...
...
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#ifndef FILTCLIPJOB
#define FILTCLIPJOB
#ifndef FILT
ER
CLIPJOB
#define FILT
ER
CLIPJOB
#include
"meltjob.h"
#include
"assets/model/assetparametermodel.hpp"
...
...
src/lib/audio/audioEnvelope.cpp
View file @
83e633cd
...
...
@@ -54,7 +54,7 @@ AudioEnvelope::~AudioEnvelope()
// finished, m_watcher might be finished, but the signal
// 'envelopeReady' might still be pending while AudioEnvelope is
// being deleted, which can cause a crash according to
// http://doc.qt.io/qt-5/qobject.html#dtor.QObject.
// http
s
://doc.qt.io/qt-5/qobject.html#dtor.QObject.
m_audioSummary
.
waitForFinished
();
m_watcher
.
waitForFinished
();
}
...
...
src/lib/audio/audioEnvelope.h
View file @
83e633cd
...
...
@@ -25,7 +25,7 @@ class QImage;
with frame resolution. One entry is calculated by the sum
of the absolute values of all samples in the current frame.
See also: http://bemasc.net/wordpress/2011/07/26/an-auto-aligner-for-pitivi/
See also:
http://web.archive.org/web/20180626235917/
http://bemasc.net/wordpress/2011/07/26/an-auto-aligner-for-pitivi/
*/
class
AudioEnvelope
:
public
QObject
{
...
...
src/lib/audio/fftTools.cpp
View file @
83e633cd
...
...
@@ -46,7 +46,7 @@ const QString FFTTools::cfgSignature(const int size)
return
QStringLiteral
(
"s%1"
).
arg
(
size
);
}
// http://cplusplus.syntaxerrors.info/index.php?title=Cannot_declare_member_function_%E2%80%98static_int_Foo::bar%28%29%E2%80%99_to_have_static_linkage
// http
s
://cplusplus.syntaxerrors.info/index.php?title=Cannot_declare_member_function_%E2%80%98static_int_Foo::bar%28%29%E2%80%99_to_have_static_linkage
const
QVector
<
float
>
FFTTools
::
window
(
const
WindowType
windowType
,
const
int
size
,
const
float
param
)
{
Q_ASSERT
(
size
>
0
);
...
...
src/main.cpp
View file @
83e633cd
...
...
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
// Create KAboutData
KAboutData
aboutData
(
QByteArray
(
"kdenlive"
),
i18n
(
"Kdenlive"
),
KDENLIVE_VERSION
,
i18n
(
"An open source video editor."
),
KAboutLicense
::
GPL
,
i18n
(
"Copyright © 2007–2019 Kdenlive authors"
),
i18n
(
"Please report bugs to http://bugs.kde.org"
),
i18n
(
"Copyright © 2007–2019 Kdenlive authors"
),
i18n
(
"Please report bugs to http
s
://bugs.kde.org"
),
QStringLiteral
(
"https://kdenlive.org"
));
aboutData
.
addAuthor
(
i18n
(
"Jean-Baptiste Mardelle"
),
i18n
(
"MLT and KDE SC 4 / KF5 port, main developer and maintainer"
),
QStringLiteral
(
"jb@kdenlive.org"
));
aboutData
.
addAuthor
(
i18n
(
"Nicolas Carion"
),
i18n
(
"Code re-architecture & timeline rewrite"
),
QStringLiteral
(
"french.ebook.lover@gmail.com"
));
...
...
src/monitor/glwidget.cpp
View file @
83e633cd
...
...
@@ -4,7 +4,7 @@
* Modified for Kdenlive: Jean-Baptiste Mardelle
*
* GL shader based on BSD licensed code from Peter Bengtsson:
* http://www.fourcc.org/source/YUV420P-OpenGL-GLSLang.c
* http
s
://www.fourcc.org/source/YUV420P-OpenGL-GLSLang.c
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
src/project/dialogs/profilewidget.h
View file @
83e633cd
...
...
@@ -20,8 +20,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PROFILE
SELECT
WIDGET_H
#define PROFILE
SELECT
WIDGET_H
#ifndef PROFILEWIDGET_H
#define PROFILEWIDGET_H
#include
"dialogs/profilesdialog.h"
#include
<memory>
...
...
src/scopes/abstractscopewidget.cpp
View file @
83e633cd
...
...
@@ -178,7 +178,7 @@ void AbstractScopeWidget::prodScopeThread()
Q_ASSERT
(
m_accelFactorScope
>
0
);
// See http://doc.qt.
nokia.com/latest
/qtconcurrentrun.html
#run
about
// See http
s
://doc.qt.
io/qt-5
/qtconcurrentrun.html about
// running member functions in a thread
m_threadScope
=
QtConcurrent
::
run
(
this
,
&
AbstractScopeWidget
::
renderScope
,
m_accelFactorScope
);
m_requestForcedUpdate
=
false
;
...
...
src/scopes/audioscopes/spectrogram.h
View file @
83e633cd
...
...
@@ -9,7 +9,7 @@
***************************************************************************/
/** This Spectrogram shows the spectral power distribution of incoming audio samples
over time. See http://en.wikipedia.org/wiki/Spectrogram.
over time. See http
s
://en.wikipedia.org/wiki/Spectrogram.
The Spectrogram makes use of two caches:
* A cached image where only the most recent line needs to be appended instead of
...
...
src/scopes/colorscopes/vectorscopegenerator.cpp
View file @
83e633cd
...
...
@@ -58,8 +58,8 @@ mRgb2YPbPr = r =
See also:
http://www.poynton.com/ColorFAQ.html
http://de.wikipedia.org/wiki/Vektorskop
http://www.elektroniktutor.de/techn
o
/vektskop.html
http
s
://de.wikipedia.org/wiki/Vektorskop
http
s
://www.elektroniktutor.de/
geraete
techn
ik
/vektskop.html
*/
...
...
@@ -133,7 +133,7 @@ QImage VectorscopeGenerator::calculateVectorscope(const QSize &vectorscopeSize,
// Just an average for the number of image pixels per scope pixel.
// NOTE: byteCount() has to be replaced by (img.bytesPerLine()*img.height()) for Qt 4.5 to compile, see:
// http://doc.
trolltech.org/4.6
/qimage.html#bytesPerLine
// http
s
://doc.
qt.io/qt-5
/qimage.html#bytesPerLine
double
avgPxPerPx
=
(
double
)
image
.
depth
()
/
8
*
(
image
.
bytesPerLine
()
*
image
.
height
())
/
scope
.
size
().
width
()
/
scope
.
size
().
height
()
/
accelFactor
;
for
(
int
i
=
0
;
i
<
(
image
.
bytesPerLine
()
*
image
.
height
());
i
+=
stepsize
)
{
...
...
src/titler/graphicsscenerectmove.cpp
View file @
83e633cd
...
...
@@ -601,7 +601,7 @@ void GraphicsSceneRectMove::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e)
m_resizeMode
=
NoResize
;
m_selectedItem
=
nullptr
;
// http://www.kdenlive.org/mantis/view.php?id=1035
//
http://web.archive.org/web/20140728070013/
http://www.kdenlive.org/mantis/view.php?id=1035
QList
<
QGraphicsItem
*>
i
=
items
(
QRectF
(
p
,
QSizeF
(
4
,
4
)).
toRect
());
if
(
i
.
isEmpty
())
{
return
;
...
...
src/titler/unicodedialog.cpp
View file @
83e633cd
...
...
@@ -75,7 +75,7 @@ UnicodeWidget::UnicodeWidget(UnicodeDialog::InputMethod inputMeth, QWidget *pare
arrowUp
->
setShortcut
(
Qt
::
Key_Up
);
arrowDown
->
setShortcut
(
Qt
::
Key_Down
);
unicode_link
->
setText
(
i18n
(
"Information about unicode characters: <a href=
\"
http://decodeunicode.org
\"
>http://decodeunicode.org</a>"
));
unicode_link
->
setText
(
i18n
(
"Information about unicode characters: <a href=
\"
http
s
://decodeunicode.org
\"
>http
s
://decodeunicode.org</a>"
));
arrowUp
->
setToolTip
(
i18n
(
"Previous Unicode character (Arrow Up)"
));
arrowDown
->
setToolTip
(
i18n
(
"Next Unicode character (Arrow Down)"
));
unicodeNumber
->
setToolTip
(
i18n
(
"Enter your Unicode number here. Allowed characters: [0-9] and [a-f]."
));
...
...
@@ -143,7 +143,7 @@ QString UnicodeWidget::unicodeInfo(const QString &unicode)
if
(
controlCharacter
(
u
))
{
infoText
=
i18n
(
"Control character. Cannot be inserted/printed. See <a href=
\"
http://en.wikipedia.org/wiki/Control_character
\"
>Wikipedia:Control_character</a>"
);
"Control character. Cannot be inserted/printed. See <a href=
\"
http
s
://en.wikipedia.org/wiki/Control_character
\"
>Wikipedia:Control_character</a>"
);
}
else
if
(
u
==
QLatin1String
(
"a"
))
{
infoText
=
i18n
(
"Line Feed (newline character,
\\\\
n)"
);
}
else
if
(
u
==
QLatin1String
(
"20"
))
{
...
...
@@ -155,7 +155,7 @@ QString UnicodeWidget::unicodeInfo(const QString &unicode)
i18n
(
"<p><strong>«</strong> (u+00ab, <code>&lfquo;</code> in HTML) and <strong>»</strong> (u+00bb, <code>&rfquo;</code> in "
"HTML) are called Guillemets or angle quotes. Usage in different countries: France (with non-breaking Space 0x00a0), Switzerland, Germany, "
"Finland and Sweden.</p><p><strong>‹</strong> and <strong>›</strong> (U+2039/203a, <code>&lsaquo;/&rsaquo;</code>) are "
"their single quote equivalents.</p><p>See <a href=
\"
http://en.wikipedia.org/wiki/Guillemets
\"
>Wikipedia:Guillemets</a></p>"
);
"their single quote equivalents.</p><p>See <a href=
\"
http
s
://en.wikipedia.org/wiki/Guillemets
\"
>Wikipedia:Guillemets</a></p>"
);
}
else
if
(
u
==
QLatin1String
(
"2002"
))
{
infoText
=
i18n
(
"En Space (width of an n)"
);
}
else
if
(
u
==
QLatin1String
(
"2003"
))
{
...
...
@@ -172,42 +172,42 @@ QString UnicodeWidget::unicodeInfo(const QString &unicode)
infoText
=
i18n
(
"Punctuation Space. Width the same as between a punctuation character and the next character."
);
}
else
if
(
u
==
QLatin1String
(
"2009"
))
{
infoText
=
i18n
(
"Thin space, in HTML also &thinsp;. See U+202f and <a "
"href=
\"
http://en.wikipedia.org/wiki/Space_(punctuation)
\"
>Wikipedia:Space_(punctuation)</a>"
);
"href=
\"
http
s
://en.wikipedia.org/wiki/Space_(punctuation)
\"
>Wikipedia:Space_(punctuation)</a>"
);
}
else
if
(
u
==
QLatin1String
(
"200a"
))
{
infoText
=
i18n
(
"Hair Space. Thinner than U+2009."
);
}
else
if
(
u
==
QLatin1String
(
"2019"
))
{
infoText
=
i18n
(
"Punctuation Apostrophe. Should be used instead of U+0027. See <a href=
\"
http://en.wikipedia.org/wiki/Apostrophe
\"
>Wikipedia:Apostrophe</a>"
);
i18n
(
"Punctuation Apostrophe. Should be used instead of U+0027. See <a href=
\"
http
s
://en.wikipedia.org/wiki/Apostrophe
\"
>Wikipedia:Apostrophe</a>"
);
}
else
if
(
u
==
QLatin1String
(
"2013"
))
{
infoText
=
i18n
(
"<p>An en Dash (dash of the width of an n).</p><p>Usage examples: In English language for value ranges (1878–1903), for "
"relationships/connections (Zurich–Dublin). In the German language it is also used (with spaces!) for showing thoughts: "
"“Es war – wie immer in den Ferien – ein regnerischer Tag.</p> <p>See <a "
"href=
\"
http://en.wikipedia.org/wiki/Dash
\"
>Wikipedia:Dash</a></p>"
);
"href=
\"
http
s
://en.wikipedia.org/wiki/Dash
\"
>Wikipedia:Dash</a></p>"
);
}
else
if
(
u
==
QLatin1String
(
"2014"
))
{
infoText
=
i18n
(
"<p>An em Dash (dash of the width of an m).</p><p>Usage examples: In English language to mark—like here—thoughts. "
"Traditionally without spaces. </p><p>See <a href=
\"
http://en.wikipedia.org/wiki/Dash
\"
>Wikipedia:Dash</a></p>"
);
"Traditionally without spaces. </p><p>See <a href=
\"
http
s
://en.wikipedia.org/wiki/Dash
\"
>Wikipedia:Dash</a></p>"
);
}
else
if
(
u
==
QLatin1String
(
"202f"
))
{
infoText
=
i18n
(
"<p>Narrow no-break space. Has the same width as U+2009.</p><p>Usage: For units (spaces are marked with U+2423, ␣): "
"230␣V, −21␣°C, 50␣lb, <em>but</em> 90° (no space). In German for abbreviations (like: "
"i. d. R. instead of i. d. R. with U+00a0).</p><p>See <a "
"href=
\"
http://de.wikipedia.org/wiki/Schmales_Leerzeichen
\"
>Wikipedia:de:Schmales_Leerzeichen</a></p>"
);
"href=
\"
http
s
://de.wikipedia.org/wiki/Schmales_Leerzeichen
\"
>Wikipedia:de:Schmales_Leerzeichen</a></p>"
);
}
else
if
(
u
==
QLatin1String
(
"2026"
))
{
infoText
=
i18n
(
"Ellipsis: If text has been left o… See <a href=
\"
http://en.wikipedia.org/wiki/Ellipsis
\"
>Wikipedia:Ellipsis</a>"
);
infoText
=
i18n
(
"Ellipsis: If text has been left o… See <a href=
\"
http
s
://en.wikipedia.org/wiki/Ellipsis
\"
>Wikipedia:Ellipsis</a>"
);
}
else
if
(
u
==
QLatin1String
(
"2212"
))
{
infoText
=
i18n
(
"Minus sign. For numbers: −42"
);
}
else
if
(
u
==
QLatin1String
(
"2423"
))
{
infoText
=
i18n
(
"Open box; stands for a space."
);
}
else
if
(
u
==
QLatin1String
(
"2669"
))
{
infoText
=
i18n
(
"Quarter note (Am.) or crochet (Brit.). See <a href=
\"
http://en.wikipedia.org/wiki/Quarter_note
\"
>Wikipedia:Quarter_note</a>"
);
infoText
=
i18n
(
"Quarter note (Am.) or crochet (Brit.). See <a href=
\"
http
s
://en.wikipedia.org/wiki/Quarter_note
\"
>Wikipedia:Quarter_note</a>"
);
}
else
if
(
u
==
QLatin1String
(
"266a"
)
||
u
==
QLatin1String
(
"266b"
))
{
infoText
=
i18n
(
"Eighth note (Am.) or quaver (Brit.). Half as long as a quarter note (U+2669). See <a "
"href=
\"
http://en.wikipedia.org/wiki/Eighth_note
\"
>Wikipedia:Eighth_note</a>"
);
"href=
\"
http
s
://en.wikipedia.org/wiki/Eighth_note
\"
>Wikipedia:Eighth_note</a>"
);
}
else
if
(
u
==
QLatin1String
(
"266c"
))
{
infoText
=
i18n
(
"Sixteenth note (Am.) or semiquaver (Brit.). Half as long as an eighth note (U+266a). See <a "
"href=
\"
http://en.wikipedia.org/wiki/Sixteenth_note
\"
>Wikipedia:Sixteenth_note</a>"
);
"href=
\"
http
s
://en.wikipedia.org/wiki/Sixteenth_note
\"
>Wikipedia:Sixteenth_note</a>"
);
}
else
if
(
u
==
QLatin1String
(
"1D162"
))
{
infoText
=
i18n
(
"Thirty-second note (Am.) or demisemiquaver (Brit.). Half as long as a sixteenth note (U+266b). See <a "
"href=
\"
http://en.wikipedia.org/wiki/Thirty-second_note
\"
>Wikipedia:Thirty-second_note</a>"
);
"href=
\"
http
s
://en.wikipedia.org/wiki/Thirty-second_note
\"
>Wikipedia:Thirty-second_note</a>"
);
}
else
{
infoText
=
i18n
(
"<small>No additional information available for this character.</small>"
);
}
...
...
src/widgets/colorpickerwidget.cpp
View file @
83e633cd
...
...
@@ -24,7 +24,6 @@
#include
<QFrame>
#include
<QHBoxLayout>
#include
<QMouseEvent>
#include
<QScreen>
#include
<QTimer>
#include
<QToolButton>
#include
<klocalizedstring.h>
...
...
Prev
1
2
Next
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