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
3ab5c48d
Commit
3ab5c48d
authored
Nov 11, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix some UI strings todo
parent
acb8f339
Pipeline
#10231
passed with stage
in 13 minutes and 37 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/assets/keyframes/model/keyframemodellist.cpp
View file @
3ab5c48d
...
...
@@ -491,8 +491,7 @@ void KeyframeModelList::checkConsistency()
for
(
auto
&
time
:
fullList
)
{
if
(
!
list
.
contains
(
time
))
{
qDebug
()
<<
" = = =
\n\n
= = = =
\n\n
WARNING; MISSING KF DETECTED AT: "
<<
time
.
seconds
()
<<
"
\n\n
= = =
\n\n
= = ="
;
//TODO: add better error message after string freeze
pCore
->
displayMessage
(
i18n
(
"Keyframe interpolation"
),
ErrorMessage
);
pCore
->
displayMessage
(
i18n
(
"Missing keyframe detected at %1, automatically re-added"
,
time
.
seconds
()),
ErrorMessage
);
QVariant
missingVal
=
param
.
second
->
getInterpolatedValue
(
time
);
local_update
=
param
.
second
->
addKeyframe_lambda
(
time
,
type
,
missingVal
,
false
);
local_update
();
...
...
src/assets/model/assetparametermodel.cpp
View file @
3ab5c48d
...
...
@@ -26,6 +26,7 @@
#include
"klocalizedstring.h"
#include
"profiles/profilemodel.hpp"
#include
<QDebug>
#include
<QDir>
#include
<QJsonArray>
#include
<QJsonObject>
#include
<QLocale>
...
...
@@ -661,7 +662,6 @@ void AssetParameterModel::deletePreset(const QString &presetFile, const QString
QByteArray
saveData
=
loadFile
.
readAll
();
QJsonDocument
loadDoc
(
QJsonDocument
::
fromJson
(
saveData
));
if
(
loadDoc
.
isArray
())
{
qDebug
()
<<
" * * ** JSON IS AN ARRAY, DELETING: "
<<
presetName
;
array
=
loadDoc
.
array
();
QList
<
int
>
toDelete
;
for
(
int
i
=
0
;
i
<
array
.
size
();
i
++
)
{
...
...
@@ -684,15 +684,21 @@ void AssetParameterModel::deletePreset(const QString &presetFile, const QString
array
.
append
(
obj
);
}
loadFile
.
close
();
}
else
if
(
!
loadFile
.
open
(
QIODevice
::
ReadWrite
))
{
// TODO: error message
}
}
if
(
!
loadFile
.
open
(
QIODevice
::
WriteOnly
))
{
// TODO: error message
pCore
->
displayMessage
(
i18n
(
"Cannot open preset file %1"
,
presetFile
),
ErrorMessage
);
return
;
}
if
(
array
.
isEmpty
())
{
QDir
dir
(
QStandardPaths
::
writableLocation
(
QStandardPaths
::
AppDataLocation
)
+
QStringLiteral
(
"/effects/presets/"
));
if
(
dir
.
exists
(
presetFile
))
{
// Ensure we don't delete an unwanted file
loadFile
.
remove
();
}
}
else
{
loadFile
.
write
(
QJsonDocument
(
array
).
toJson
());
}
//TODO: delete file if there are no more presets in it
loadFile
.
write
(
QJsonDocument
(
array
).
toJson
());
}
void
AssetParameterModel
::
savePreset
(
const
QString
&
presetFile
,
const
QString
&
presetName
)
...
...
@@ -725,12 +731,11 @@ void AssetParameterModel::savePreset(const QString &presetFile, const QString &p
array
.
append
(
obj
);
}
loadFile
.
close
();
}
else
if
(
!
loadFile
.
open
(
QIODevice
::
ReadWrite
))
{
// TODO: error message
}
}
if
(
!
loadFile
.
open
(
QIODevice
::
WriteOnly
))
{
// TODO: error message
pCore
->
displayMessage
(
i18n
(
"Cannot open preset file %1"
,
presetFile
),
ErrorMessage
);
return
;
}
object
[
presetName
]
=
doc
.
array
();
array
.
append
(
object
);
...
...
src/jobs/cutclipjob.cpp
View file @
3ab5c48d
...
...
@@ -55,8 +55,7 @@ CutClipJob::CutClipJob(const QString &binId, const QString sourcePath, GenTime i
const
QString
CutClipJob
::
getDescription
()
const
{
//TODO: add better description after string freeze
return
i18n
(
"Extract Zone"
);
return
i18n
(
"Extract Clip Zone"
);
}
// static
...
...
src/jobs/filterclipjob.cpp
View file @
3ab5c48d
...
...
@@ -44,7 +44,7 @@ FilterClipJob::FilterClipJob(const QString &binId, int cid, std::weak_ptr<AssetP
const
QString
FilterClipJob
::
getDescription
()
const
{
//TODO: add better description after string freeze
return
i18n
(
"A
nalyse c
lip"
);
return
i18n
(
"A
pply Filter on C
lip"
);
}
void
FilterClipJob
::
configureConsumer
()
...
...
src/jobs/transcodeclipjob.cpp
View file @
3ab5c48d
...
...
@@ -47,7 +47,7 @@ TranscodeJob::TranscodeJob(const QString &binId, QString params)
const
QString
TranscodeJob
::
getDescription
()
const
{
//TODO: add better description after string freeze
return
i18n
(
"Transcode"
);
return
i18n
(
"Transcode
Clip
"
);
}
bool
TranscodeJob
::
startJob
()
...
...
src/library/librarywidget.cpp
View file @
3ab5c48d
...
...
@@ -365,7 +365,7 @@ void LibraryWidget::slotAddFolder()
}
QDir
dir
(
parentFolder
);
if
(
dir
.
exists
(
name
))
{
// TODO: warn user
showMessage
(
i18n
(
"Folder %1 already exists"
,
name
));
return
;
}
if
(
!
dir
.
mkdir
(
name
))
{
...
...
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