Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
6c5c58af
Commit
6c5c58af
authored
Apr 15, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unfinished/broken disable image scaling feature
Update Appdata version
parent
09363b85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
83 additions
and
89 deletions
+83
-89
data/org.kde.kdenlive.appdata.xml
data/org.kde.kdenlive.appdata.xml
+1
-1
src/jobs/loadjob.cpp
src/jobs/loadjob.cpp
+3
-2
src/ui/configmisc_ui.ui
src/ui/configmisc_ui.ui
+79
-86
No files found.
data/org.kde.kdenlive.appdata.xml
View file @
6c5c58af
...
...
@@ -267,7 +267,7 @@
</ul>
</description>
<releases>
<release
date=
"2020-0
1-06"
version=
"20.03.7
0"
/>
<release
date=
"2020-0
4-15"
version=
"20.04.
0"
/>
</releases>
<url
type=
"homepage"
>
https://kdenlive.org/
</url>
<url
type=
"bugtracker"
>
https://bugs.kde.org
</url>
...
...
src/jobs/loadjob.cpp
View file @
6c5c58af
...
...
@@ -670,7 +670,8 @@ bool LoadJob::commitResult(Fun &undo, Fun &redo)
};
bool
ok
=
operation
();
if
(
ok
)
{
if
(
KdenliveSettings
::
disableimagescaling
()
&&
m_binClip
->
clipType
()
==
ClipType
::
Image
&&
!
m_binClip
->
hasEffects
())
{
// Currently broken because qtblend does not correctly handle scaling on source clip with size != profile. TBD in MLT
/*if (KdenliveSettings::disableimagescaling() && m_binClip->clipType() == ClipType::Image && !m_binClip->hasEffects()) {
// Add effect to have image at source size
QSize size = m_binClip->getFrameSize();
if (size.isValid() && !size.isNull() && size != pCore->getCurrentFrameSize()) {
...
...
@@ -692,7 +693,7 @@ bool LoadJob::commitResult(Fun &undo, Fun &redo)
m_binClip->getEffectStack()->fromXml(doc.documentElement(), undo, redo);
qDebug()<<"== DOC2: "<< doc.toString();
}
}
}
*/
m_readyCallBack
();
if
(
pCore
->
projectItemModel
()
->
clipsCount
()
==
1
)
{
// Always select first added clip
...
...
src/ui/configmisc_ui.ui
View file @
6c5c58af
...
...
@@ -6,59 +6,23 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
714
</width>
<height>
771
</height>
<width>
629
</width>
<height>
636
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QCheckBox"
name=
"kcfg_crashrecovery"
>
<property
name=
"text"
>
<string>
Activate crash recovery (auto save)
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_automultistreams"
>
<property
name=
"text"
>
<string>
Automatically import all streams in multi stream clips
</string>
</property>
</widget>
</item>
<item
row=
"8"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_use_magicLantern"
>
<property
name=
"text"
>
<string>
Get clip metadata created by Magic Lantern
</string>
</property>
</widget>
</item>
<item
row=
"3"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_usekuiserver"
>
<property
name=
"text"
>
<string>
Use KDE job tracking for render jobs
</string>
</property>
</widget>
</item>
<item
row=
"7"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_use_exiftool"
>
<property
name=
"text"
>
<string>
Get clip metadata with exiftool
</string>
</property>
</widget>
</item>
<item
row=
"4"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_disable_effect_parameters"
>
<property
name=
"text"
>
<string>
Disable parameters when the effect is disabled
</string>
<item
row=
"12"
column=
"0"
>
<spacer>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
</widget>
</item>
<item
row=
"2"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_checkfirstprojectclip"
>
<property
name=
"text"
>
<string>
Check if first added clip matches project profile
</string>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>
</size>
</property>
</
widget
>
</
spacer
>
</item>
<item
row=
"9"
column=
"1"
>
<widget
class=
"QComboBox"
name=
"kcfg_tabposition"
>
...
...
@@ -84,33 +48,6 @@
</item>
</widget>
</item>
<item
row=
"9"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<property
name=
"text"
>
<string>
Tab position
</string>
</property>
</widget>
</item>
<item
row=
"9"
column=
"2"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"0"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_openlastproject"
>
<property
name=
"text"
>
<string>
Open last project on startup
</string>
</property>
</widget>
</item>
<item
row=
"10"
column=
"0"
colspan=
"3"
>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
...
...
@@ -180,10 +117,24 @@
</layout>
</widget>
</item>
<item
row=
"
11
"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_auto
imagesequence
"
>
<item
row=
"
5
"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_auto
multistreams
"
>
<property
name=
"text"
>
<string>
Automatically import image sequences
</string>
<string>
Automatically import all streams in multi stream clips
</string>
</property>
</widget>
</item>
<item
row=
"3"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_usekuiserver"
>
<property
name=
"text"
>
<string>
Use KDE job tracking for render jobs
</string>
</property>
</widget>
</item>
<item
row=
"4"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_disable_effect_parameters"
>
<property
name=
"text"
>
<string>
Disable parameters when the effect is disabled
</string>
</property>
</widget>
</item>
...
...
@@ -194,23 +145,65 @@
</property>
</widget>
</item>
<item
row=
"13"
column=
"0"
>
<spacer>
<item
row=
"9"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<property
name=
"text"
>
<string>
Tab position
</string>
</property>
</widget>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QCheckBox"
name=
"kcfg_crashrecovery"
>
<property
name=
"text"
>
<string>
Activate crash recovery (auto save)
</string>
</property>
</widget>
</item>
<item
row=
"11"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_autoimagesequence"
>
<property
name=
"text"
>
<string>
Automatically import image sequences
</string>
</property>
</widget>
</item>
<item
row=
"8"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_use_magicLantern"
>
<property
name=
"text"
>
<string>
Get clip metadata created by Magic Lantern
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_checkfirstprojectclip"
>
<property
name=
"text"
>
<string>
Check if first added clip matches project profile
</string>
</property>
</widget>
</item>
<item
row=
"9"
column=
"2"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::
Vertic
al
</enum>
<enum>
Qt::
Horizont
al
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
2
0
</width>
<height>
4
0
</height>
<width>
4
0
</width>
<height>
2
0
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"
12
"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_
disableimagescaling
"
>
<item
row=
"
0
"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_
openlastproject
"
>
<property
name=
"text"
>
<string>
Keep images at original size
</string>
<string>
Open last project on startup
</string>
</property>
</widget>
</item>
<item
row=
"7"
column=
"0"
colspan=
"3"
>
<widget
class=
"QCheckBox"
name=
"kcfg_use_exiftool"
>
<property
name=
"text"
>
<string>
Get clip metadata with exiftool
</string>
</property>
</widget>
</item>
...
...
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