Compare commits

...

8 Commits

Author SHA1 Message Date
Jean-Baptiste Mardelle
b112192abd Fix empty warning dialog on missing font in project
BUG: 401903
2019-01-07 13:24:05 +01:00
Jean-Baptiste Mardelle
822d219c06 Fix bin item description cannot be edited if it contains zone subclips
BUG: 402817
2019-01-07 11:58:58 +01:00
Jean-Baptiste Mardelle
dc13bd5e13 Merge branch 'cherry-pick-b8e8b66d' into 'Applications/18.12'
Fix screengrab with audio broken

See merge request kde/kdenlive!5
2019-01-07 08:36:06 +00:00
Akhil K Gangadharan
0839ebf4c4 Fix screengrab with audio broken
Differential revision: https://phabricator.kde.org/D17948


(cherry picked from commit b8e8b66d4c)
2019-01-07 08:23:43 +00:00
l10n daemon script
1c3c1382d1 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2019-01-06 08:41:43 +01:00
Jean-Baptiste Mardelle
a584c8908d Merge branch 'cherry-pick-187a0f8e' into 'Applications/18.12'
Move Gain effect to "Audio correction" category

See merge request kde/kdenlive!3
2019-01-05 13:52:54 +00:00
Jean-Baptiste Mardelle
a899240c6b Move Gain effect to "Audio correction" category
Patch by Juku Trump
https://phabricator.kde.org/D17968

(cherry picked from commit 187a0f8e44)
2019-01-05 13:28:24 +00:00
Christoph Feck
d8ac1c1e89 GIT_SILENT Upgrade KDE Applications version to 18.12.1. 2019-01-03 22:56:25 +01:00
6 changed files with 14 additions and 12 deletions

View File

@@ -6,7 +6,7 @@ project(Kdenlive)
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "18")
set (KDE_APPLICATIONS_VERSION_MINOR "12")
set (KDE_APPLICATIONS_VERSION_MICRO "0")
set (KDE_APPLICATIONS_VERSION_MICRO "1")
set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
cmake_minimum_required(VERSION 3.0)

View File

@@ -10,7 +10,7 @@ MJPEG=-vf yadif,scale=960:-2 -qscale 3 -vcodec mjpeg -acodec pcm_s16le;mkv
[screengrab]
X264 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov
X264 with audio=-i pulse -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
X264 with audio=-f pulse -i default -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
[video4linux]
x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov

View File

@@ -380,7 +380,7 @@ Name[tr]=Hata
Name[ug]=خاتالىق
Name[uk]=Помилка
Name[x-test]=xxErrorxx
Name[zh_CN]=
Name[zh_CN]=误
Name[zh_TW]=錯誤
Comment=An error occurred in Kdenlive
Comment[ar]=حدث خطأ في «كدينلايڤ»

View File

@@ -13,7 +13,7 @@
<group list="volume,normalise,gain,ladspa.1049,ladspa.1048,ladspa.1413,mute">
<text>Audio correction</text>
</group>
<group list="audiobalance,audiopan,gain,swapchannels,ladspa.1406,channelcopy">
<group list="audiobalance,audiopan,swapchannels,ladspa.1406,channelcopy">
<text>Audio channels</text>
</group>
<group list="audiowave,audiospectrum,frei0r.pr0be,frei0r.pr0file,frei0r.rgbparade,frei0r.timeout,frei0r.vectorscope">

View File

@@ -1955,10 +1955,14 @@ void Bin::slotItemDoubleClicked(const QModelIndex &ix, const QPoint pos)
return;
}
} else {
if (item->count() > 0) {
QTreeView *view = static_cast<QTreeView *>(m_itemView);
view->setExpanded(ix, !view->isExpanded(ix));
return;
if (ix.column() == 0 && item->count() > 0) {
QRect IconRect = m_itemView->visualRect(ix);
IconRect.setWidth((double)IconRect.height() / m_itemView->iconSize().height() * m_itemView->iconSize().width());
if (!pos.isNull() && (IconRect.contains(pos) || pos.y() > (IconRect.y() + IconRect.height()/2))) {
QTreeView *view = static_cast<QTreeView *>(m_itemView);
view->setExpanded(ix, !view->isExpanded(ix));
return;
}
}
}
if (ix.isValid()) {

View File

@@ -394,17 +394,15 @@ bool DocumentChecker::hasErrorInClips()
}
}
//TODO the following loop is disabled because m_missingFonts is cleared (line 124), but not filled, that looks suspicious
/*foreach (const QString &font, m_missingFonts) {
foreach (const QString &font, m_missingFonts) {
QString clipType = i18n("Title Font");
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui.treeWidget, QStringList() << clipType);
item->setData(0, statusRole, CLIPPLACEHOLDER);
item->setIcon(0, KoIconUtils::themedIcon(QStringLiteral("dialog-warning")));
item->setToolTip(1, e.attribute(QStringLiteral("name")));
QString newft = QFontInfo(QFont(font)).family();
item->setText(1, i18n("%1 will be replaced by %2", font, newft));
item->setData(0, typeRole, CLIPMISSING);
}*/
}
if (!m_missingClips.isEmpty()) {
m_ui.infoLabel->setText(i18n("The project file contains missing clips or files"));