Commit 02e3fa95 authored by Vivek Yadav's avatar Vivek Yadav
Browse files

Fix user-facing and non-user-facing typos

parent bc104195
......@@ -12,7 +12,7 @@
<parameter type="constant" name="av.blend" default="0" max="1" min="0" decimals="2">
<name>Blend</name>
</parameter>
<paramter type="bool" name="av.yuv" default="false">
<parameter type="bool" name="av.yuv" default="false">
<name>for YUV color</name>
</parameter>
</effect>
......@@ -3,9 +3,9 @@
<name>DeBlock</name>
<description>Remove blocking artifacts from input video.</description>
<author>libavfilter</author>
<parameter type="list" name="av.fiter" default="strong" paramlist="weak;strong">
<parameter type="list" name="av.filter" default="strong" paramlist="weak;strong">
<paramlistdisplay>All,Y,U,V,Alpha,Red,Green,Blue</paramlistdisplay>
<name>Filter strenght</name>
<name>Filter strength</name>
</parameter>
<parameter type="constant" name="av.block" default="8" min="4" max="512" factor="1">
<name>Block size</name>
......
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.first_field" default="top" paramlist="top;botom">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>First Fied</name>
<name>First Field</name>
</parameter>
</effect>
......@@ -4,7 +4,7 @@
<description>Apply posterize effect, using the ELBG algorithm</description>
<author>libavfilter</author>
<parameter type="constant" name="av.l" default="50" min="1" max="50" factor="1" suffix=" Colors">
<name>Codebook Lenght</name>
<name>Codebook Length</name>
</parameter>
<parameter type="constant" name="av.n" default="1" min="1" max="10" factor="1">
<name>Steps</name>
......
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.type" default="top" paramlist="top;botom">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>Fied priority</name>
<name>Field priority</name>
</parameter>
</effect>
......@@ -5,6 +5,6 @@
<author>libavfilter</author>
<parameter type="list" name="av.order" default="tff" paramlist="tff;bff">
<paramlistdisplay>Top field first,Bottom field first</paramlistdisplay>
<name>Fied priority</name>
<name>Field priority</name>
</parameter>
</effect>
......@@ -13,7 +13,7 @@
<name>Top</name>
</parameter>
<parameter type="constant" name="av.bottom" default="0" min="0" max="%height/2" factor="1">
<name>Botton</name>
<name>Bottom</name>
</parameter>
<parameter type="list" name="av.mode" default="smear" paramlist="smear;mirror;fixed">
<paramlistdisplay>Smear,Mirror,Fixed</paramlistdisplay>
......
......@@ -3,7 +3,7 @@
<name>Invert</name>
<description>Negate (invert) the input video.</description>
<author>libavfilter</author>
<paramter type="bool" name="av.negate_alpha" default="0">
<parameter type="bool" name="av.negate_alpha" default="0">
<name>Negate alpha</name>
</parameter>
</effect>
......@@ -7,7 +7,7 @@
<name>Luma radius</name>
</parameter>
<parameter type="constant" name="av.ls" default="1.0" min="-1.0" max="1.0" decimals="1">
<name>Luma strenght</name>
<name>Luma strength</name>
</parameter>
<parameter type="constant" name="av.lt" default="0" min="-30" max="+30" factor="1">
<name>Luma Threshold</name>
......@@ -16,7 +16,7 @@
<name>Chroma radius</name>
</parameter>
<parameter type="constant" name="av.cs" default="1.0" min="-1.0" max="1.0" decimals="1">
<name>Chroma strenght</name>
<name>Chroma strength</name>
</parameter>
<parameter type="constant" name="av.ct" default="0" min="-30" max="+30" factor="1">
<name>Chroma Threshold</name>
......
......@@ -3,10 +3,10 @@
<name>Light Show</name>
<description>An audio visualization filter that colors the image proportional to the magnitude of the audio spectrum.</description>
<author>Brian Matherly</author>
<parameter type="integer" name="frequency_low" deafult="20" min="20" max="20000" factor="1" suffix=" Hz">
<parameter type="integer" name="frequency_low" default="20" min="20" max="20000" factor="1" suffix=" Hz">
<name>Low frequency</name>
</parameter>
<parameter type="integer" name="frequency_high" deafult="20000" min="20" max="20000" factor="1" suffix=" Hz">
<parameter type="integer" name="frequency_high" default="20000" min="20" max="20000" factor="1" suffix=" Hz">
<name>High frequency</name>
</parameter>
<parameter type="float" name="threshold" default="-30" min="-100" max="0" factor="1" suffix=" db">
......
......@@ -48,7 +48,7 @@ public:
void deregisterTrack(int tid);
void setModel(std::shared_ptr<TimelineItemModel> model);
void cleanup();
/** @brief Connect the mixer widgets to the correspondant filters */
/** @brief Connect the mixer widgets to the correspondent filters */
void connectMixer(bool doConnect);
void collapseMixers();
/** @brief Pause/unpause audio monitoring */
......
......@@ -60,13 +60,13 @@ public:
void clear();
static void property_changed( mlt_service , MixerWidget *self, char *name );
void setMute(bool mute);
/** @brief Returs true if track is muted
/** @brief Returns true if track is muted
* */
bool isMute() const;
/** @brief Uncheck the solo button
* */
void unSolo();
/** @brief Connect the mixer widgets to the correspondant filters */
/** @brief Connect the mixer widgets to the correspondent filters */
void connectMixer(bool doConnect);
/** @brief Disable/enable monitoring by disabling/enabling filter */
void pauseMonitoring(bool pause);
......
......@@ -1567,7 +1567,7 @@ void Bin::slotReplaceClip()
newProps.insert(QStringLiteral("kdenlive:clipname"), QFileInfo(fileName).fileName());
// Check if replacement clip is long enough
if (currentItem->hasLimitedDuration() && currentItem->isIncludedInTimeline()) {
// Clip is used in timeline, make sure lentgh is similar
// Clip is used in timeline, make sure length is similar
std::unique_ptr<Mlt::Producer> replacementProd(new Mlt::Producer(pCore->getCurrentProfile()->profile(), fileName.toUtf8().constData()));
int currentDuration = (int)currentItem->frameDuration();
if (replacementProd->is_valid()) {
......@@ -2294,7 +2294,7 @@ void Bin::contextMenuEvent(QContextMenuEvent *event)
continue;
}
if (noCodecInfo) {
// No audio / video codec, this is an MLT clip, disable conditionnal transcoding
// No audio / video codec, this is an MLT clip, disable conditional transcoding
transcodeActions.at(i)->setEnabled(false);
continue;
}
......@@ -4222,12 +4222,12 @@ void Bin::slotBack()
}
std::shared_ptr<AbstractProjectItem> item = m_itemModel->getBinItemByIndex(m_proxyModel->mapToSource(currentRootIx));
if (!item) {
qDebug()<<"=== ERRO CANNOT FIND ROOT FOR CURRENT VIEW";
qDebug()<<"=== ERROR CANNOT FIND ROOT FOR CURRENT VIEW";
return;
}
std::shared_ptr<AbstractProjectItem> parentItem = item->parent();
if (!parentItem) {
qDebug()<<"=== ERRO CANNOT FIND PARENT FOR CURRENT VIEW";
qDebug()<<"=== ERROR CANNOT FIND PARENT FOR CURRENT VIEW";
return;
}
if (parentItem != m_itemModel->getRootFolder()) {
......
......@@ -61,7 +61,7 @@ public:
GenTime stringtoTime(QString &str);
/** @brief Return model data item according to the role passed */
QVariant data(const QModelIndex &index, int role) const override;
QHash<int, QByteArray> roleNames() const override;// overide the same function of QAbstractListModel
QHash<int, QByteArray> roleNames() const override;// override the same function of QAbstractListModel
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
/** @brief Returns all subtitles in the model */
......
......@@ -245,7 +245,7 @@ public:
QStringList getAudioStreamEffect(int streamIndex) const override;
/** @brief Calculate the folder's hash (based on the files it contains). */
static const QByteArray getFolderHash(QDir dir, QString fileName);
/** @brief Check if the clip is included in timeline and reset its occurences on producer reload. */
/** @brief Check if the clip is included in timeline and reset its occurrences on producer reload. */
void updateTimelineOnReload();
protected:
......@@ -292,7 +292,7 @@ private:
QList<int> m_requestedThumbs;
const QString geometryWithOffset(const QString &data, int offset);
QMap <QString, QByteArray> m_audioLevels;
/** @brief If true, all timeline occurences of this clip will be replaced from a fresh producer on reload. */
/** @brief If true, all timeline occurrences of this clip will be replaced from a fresh producer on reload. */
bool m_resetTimelineOccurences;
// This is a helper function that creates the disabled producer. This is a clone of the original one, with audio and video disabled
......
......@@ -66,7 +66,7 @@ public:
virtual void unplantClone(const std::weak_ptr<Mlt::Service> &service) = 0;
protected:
/* @brief Toogles the mlt effect according to the current activation state*/
/* @brief Toggles the mlt effect according to the current activation state*/
virtual void updateEnable(bool updateTimeline = true) = 0;
EffectItemType m_effectItemType;
......
......@@ -36,7 +36,7 @@ class CutClipJob : public AbstractClipJob
Q_OBJECT
public:
/** @brief Extract part of a clip with ffmpeg whithout re-encoding
/** @brief Extract part of a clip with ffmpeg without re-encoding
*/
CutClipJob(const QString &binId, const QString sourcePath, GenTime inTime, GenTime outTime, const QString destPath, QStringList encodingParams);
......
......@@ -133,7 +133,7 @@ public:
protected:
// Helper function to launch a given job.
// This has to be launched asynchrnously since it blocks until all parents are finished
// This has to be launched asynchronously since it blocks until all parents are finished
void createJob(const std::shared_ptr<Job_t> &job);
void updateJobCount();
......
......@@ -69,7 +69,7 @@ void AudioEnvelope::startComputeEnvelope()
bool AudioEnvelope::hasComputationStarted() const
{
// An empty qFuture is canceled. QtConcurrent::run() returns a
// future that does not support cancelation, so this is a good way
// future that does not support cancellation, so this is a good way
// to check whether the computations have started.
return !m_audioSummary.isCanceled();
}
......
......@@ -268,7 +268,7 @@ const QVector<float> FFTTools::interpolatePeakPreserving(const QVector<float> &i
// Use linear interpolation in order to get smoother display
if (xi == 0 || xi == (int)in.size() - 1) {
// ... except if we are at the left or right border of the input sigal.
// ... except if we are at the left or right border of the input signal.
// Special case here since we consider previous and future values as well for
// the actual interpolation (not possible here).
out[i] = in[xi];
......
......@@ -3728,8 +3728,8 @@ void MainWindow::slotAlignPlayheadToMousePos()
void MainWindow::triggerKey(QKeyEvent *ev)
{
// Hack: The QQuickWindow that displays fullscreen monitor does not integrate quith QActions.
// so on keypress events we parse keys and check for shortcuts in all existing actions
// Hack: The QQuickWindow that displays fullscreen monitor does not integrate with QActions.
// So on keypress events we parse keys and check for shortcuts in all existing actions
QKeySequence seq;
// Remove the Num modifier or some shortcuts like "*" will not work
if (ev->modifiers() != Qt::KeypadModifier) {
......
......@@ -46,7 +46,7 @@
refreshScope() function returns, the ScopeWidget will automatically request
the GUI thread to update(). A well implemented ScopeWidget will be designed
such that most of the CPU intensive work will be done in refreshScope() and
the paintEvent() implementation will complete quicly to avoid hanging up the
the paintEvent() implementation will complete quickly to avoid hanging up the
GUI thread.
Subclasses shall also implement getTitle() so that the application can display
......
......@@ -556,7 +556,7 @@ void ProjectManager::doOpenFile(const QUrl &url, KAutoSaveFile *stale)
} else {
doc->m_autosave = stale;
stale->setParent(doc);
// if loading from an autosave of unnamed file, or restor failed then keep unnamed
// if loading from an autosave of unnamed file, or restore failed then keep unnamed
bool loadingFailed = doc->url().isEmpty();
if (url.fileName().contains(QStringLiteral("_untitled.kdenlive"))) {
doc->setUrl(QUrl());
......
......@@ -150,7 +150,7 @@ public slots:
/** @brief Make current timeline track active/inactive*/
void slotSwitchTrackActive();
/** @brief Toogle the active/inactive state of all tracks*/
/** @brief Toggle the active/inactive state of all tracks*/
void slotSwitchAllTrackActive();
/** @brief Make all tracks active or inactive */
void slotMakeAllTrackActive();
......
......@@ -53,7 +53,7 @@ class TrackModel;
This is the entry point for any modifications that has to be made on an element. The dataflow beyond this entry point may vary, for example when the user
request a clip resize, the call is deferred to the clip itself, that check if there is enough data to extend by the requested amount, compute the new in and
out, and then asks the track if there is enough room for extension. To avoid any confusion on which function to call first, rembember to always call the
out, and then asks the track if there is enough room for extension. To avoid any confusion on which function to call first, remember to always call the
version in timeline. This is also required to generate the Undo/Redo operators
The undo/redo system is designed around lambda functions. Each time a function executes an elementary change to the model, it writes the corresponding
......
......@@ -2248,7 +2248,7 @@ bool TrackModel::reAssignEndMix(int currentId, int newId)
void TrackModel::switchMix(int cid, const QString composition, Fun &undo, Fun &redo)
{
// First remove exisiting mix
// First remove existing mix
// lock MLT playlist so that we don't end up with invalid frames in monitor
const QString currentAsset = m_sameCompositions[cid]->getAssetId();
Fun local_redo = [this, cid, composition]() {
......
......@@ -187,7 +187,7 @@ protected:
@param undo Lambda function containing the current undo stack. Will be updated with current operation
@param redo Lambda function containing the current redo queue. Will be updated with current operation
@param groupMove If true, this is part of a larger operation and some operations like checking track duration will not be performed and have to be performed separately
@param finalDeletion If true, the clip will be deselected (should be false if this is a clip move doing delte/insert)
@param finalDeletion If true, the clip will be deselected (should be false if this is a clip move doing delete/insert)
*/
bool requestClipDeletion(int clipId, bool updateView, bool finalMove, Fun &undo, Fun &redo, bool groupMove, bool finalDeletion);
/* @brief This function returns a lambda that performs the requested operation */
......@@ -306,7 +306,7 @@ protected:
/* @brief Import effects from a service that contains some (another track) */
bool importEffects(std::weak_ptr<Mlt::Service> service);
/* @brief Copy effects from anoter effect stack */
/* @brief Copy effects from another effect stack */
bool copyEffect(const std::shared_ptr<EffectStackModel> &stackModel, int rowId);
/* @brief Returns true if we have a blank at position for duration */
bool isAvailable(int position, int duration, int playlist);
......
......@@ -970,7 +970,7 @@ Rectangle {
id: compOutArea
anchors.right: parent.right
anchors.bottom: parent.bottom
width: Math.min(root.baseUnit, container.height / 3)
width: Math.min(root.baseUnit, container.height)
height: width
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
......@@ -1092,7 +1092,7 @@ Rectangle {
background: Rectangle {
color: activePalette.alternateBase
border.color: activePalette.light
}
}
contentItem: Label {
color: activePalette.text
font: miniFont
......
......@@ -194,6 +194,7 @@ Item {
root.mousePosChanged(Math.round(mapped / timeline.scaleFactor))
}
}
onWheel: zoomByWheel(wheel)
}
......@@ -214,7 +215,6 @@ Item {
anchors.fill: displayRect
anchors.margins:1.5
clip: true
Rectangle {
// text background
id: labelRect
......
......@@ -82,7 +82,7 @@ Item {
if (subtitleBase.x < 0)
subtitleBase.x = 0
if (oldStartFrame != snappedFrame) {
console.log("old start frame",oldStartFrame/timeline.scaleFactor, "new frame afer shifting ",oldStartFrame/timeline.scaleFactor + delta)
console.log("old start frame",oldStartFrame/timeline.scaleFactor, "new frame after shifting ",oldStartFrame/timeline.scaleFactor + delta)
controller.requestSubtitleMove(subId, oldStartFrame, false, false);
controller.requestSubtitleMove(subId, snappedFrame, true, true);
x = snappedFrame * root.timeScale
......
......@@ -69,7 +69,7 @@ Rectangle {
root.textColor = activePalette.text
playhead.fillColor = activePalette.windowText
ruler.repaintRuler()
// Disable caching fot track header icons
// Disable caching for track header icons
root.paletteUnchanged = false
}
......
......@@ -246,7 +246,7 @@ public:
Q_INVOKABLE void triggerAction(const QString &name);
Q_INVOKABLE const QString actionText(const QString &name);
/* @brief Returns id of the timeline selcted clip if there is only 1 clip selected
/* @brief Returns id of the timeline selected clip if there is only 1 clip selected
* or an AVSplit group. If allowComposition is true, returns composition id if
* only 1 is selected, otherwise returns -1. If restrictToCurrentPos is true, it will
* only return the id if timeline cursor is inside item
......@@ -421,7 +421,7 @@ public:
/** @brief Make current timeline track active/inactive*/
Q_INVOKABLE void switchTrackActive(int trackId = -1);
/** @brief Toogle the active/inactive state of all tracks*/
/** @brief Toggle the active/inactive state of all tracks*/
void switchAllTrackActive();
/** @brief Make all tracks active or inactive */
void makeAllTrackActive();
......@@ -550,7 +550,7 @@ public:
void updatePreviewConnection(bool enable);
/** @brief Display project master effects */
Q_INVOKABLE void showMasterEffects();
/** @brief Return true if an instance of this bin clip is currently undet timeline cursor */
/** @brief Return true if an instance of this bin clip is currently under timeline cursor */
bool refreshIfVisible(int cid);
/** @brief Collapse / expand active track */
void collapseActiveTrack();
......
......@@ -131,7 +131,7 @@ void OtioConvertions::slotImportProject()
if (importedFile.isNull()) {
return;
}
// Start convertion process
// Start conversion process
QProcess convert;
convert.start(QStringLiteral("otioconvert"), {"-i", importFile, "-o", importedFile});
convert.waitForFinished();
......
......@@ -3091,7 +3091,7 @@ public:
// The following functions create the actual matcher objects.
// The user has to explicitly specify type to the function, because
// infering std::function<bool(T const&)> is hard (but possible) and
// inferring std::function<bool(T const&)> is hard (but possible) and
// requires a lot of TMP.
template<typename T>
Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
......@@ -9591,7 +9591,7 @@ namespace Catch {
if (strerror_s(buffer, errno)) {
CATCH_RUNTIME_ERROR("Could not translate errno to a string");
}
CATCH_RUNTIME_ERROR("Coul dnot open the temp file: '" << m_buffer << "' because: " << buffer);
CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
}
}
#else
......
......@@ -96,7 +96,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]")
REQUIRE(groups.getSubtree(5) == std::unordered_set<int>({5, 8}));
}
SECTION("Test root retieving")
SECTION("Test root retrieving")
{
std::set<int> first_tree = {0, 1, 2, 3, 4, 6, 7, 9};
for (int n : first_tree) {
......@@ -138,7 +138,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]")
REQUIRE(groups.getSubtree(5) == std::unordered_set<int>({5, 8, 3, 4, 6, 7, 9}));
}
SECTION("Test root retieving 2")
SECTION("Test root retrieving 2")
{
std::set<int> first_tree = {0, 1, 2};
for (int n : first_tree) {
......@@ -180,7 +180,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]")
REQUIRE(groups.getSubtree(5) == std::unordered_set<int>({5, 8, 3, 4, 6, 7, 9}));
}
SECTION("Test root retieving 3")
SECTION("Test root retrieving 3")
{
for (int i = 0; i < 10; i++) {
CAPTURE(i);
......@@ -216,7 +216,7 @@ TEST_CASE("Functional test of the group hierarchy", "[GroupsModel]")
REQUIRE(groups.getSubtree(5) == std::unordered_set<int>({5}));
}
SECTION("Test root retieving 4")
SECTION("Test root retrieving 4")
{
std::set<int> first_tree = {0, 1, 2, 5};
for (int n : first_tree) {
......@@ -552,7 +552,7 @@ TEST_CASE("Integration with timeline", "[GroupsModel]")
qDebug() << "ERROR: did not find correspondence for group" << gid;
}
} else {
// we find correspondances of all the children
// we find correspondences of all the children
auto children = timeline2->m_groups->getDirectChildren(gid);
std::unordered_set<int> corresp;
for (int c : children) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment