aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <[email protected]>2015-04-06 12:41:24 +0200
committerJean-Baptiste Mardelle <[email protected]>2015-04-06 12:41:24 +0200
commite2c0e47bac617ad98ead405c41371859eec9ff59 (patch)
tree53fec846d679d1b11ec3d99cc23f42e4bf89233d
parentd77298557f40c77e103bc6e6ed347f32aefb9e8e (diff)
Fix color parameters broken
-rw-r--r--data/effects/movit_white_balance.xml4
-rw-r--r--src/effectslist/effectslistview.cpp3
-rw-r--r--src/effectstack/widgets/choosecolorwidget.cpp2
3 files changed, 6 insertions, 3 deletions
diff --git a/data/effects/movit_white_balance.xml b/data/effects/movit_white_balance.xml
index d8a0b37..2157535 100644
--- a/data/effects/movit_white_balance.xml
+++ b/data/effects/movit_white_balance.xml
@@ -2,10 +2,10 @@
<effect tag="movit.white_balance" id="movit.white_balance">
<name>White Balance (GPU)</name>
<author>Steinar H. Gunderson</author>
- <parameter type="color" name="neutral_color" default="0xffffffff">
+ <parameter type="color" name="neutral_color" default="0x7f7f7fff">
<name>Neutral Color</name>
</parameter>
- <parameter type="simplekeyframe" name="color_temperature" default="6500" min="1500" max="15000" factor="1">
+ <parameter type="double" name="color_temperature" default="6500" min="1000" max="15000" factor="1">
<name>Color Temperature</name>
</parameter>
</effect>
diff --git a/src/effectslist/effectslistview.cpp b/src/effectslist/effectslistview.cpp
index 8ffce14..da6a631 100644
--- a/src/effectslist/effectslistview.cpp
+++ b/src/effectslist/effectslistview.cpp
@@ -71,6 +71,9 @@ EffectsListView::EffectsListView(QWidget *parent) :
effectsAudio->setToolTip(i18n("Show audio effects"));
effectsGPU->setIcon(QIcon::fromTheme("kdenlive-show-gpu-effects"));
effectsGPU->setToolTip(i18n("Show GPU effects"));
+ if (!KdenliveSettings::gpu_accel()) {
+ effectsGPU->setHidden(true);
+ }
effectsCustom->setIcon(QIcon::fromTheme("kdenlive-show-custom"));
effectsCustom->setToolTip(i18n("Show custom effects"));
m_effectsFavorites = new MyDropButton(this);
diff --git a/src/effectstack/widgets/choosecolorwidget.cpp b/src/effectstack/widgets/choosecolorwidget.cpp
index a0c9a0c..9ade2b0 100644
--- a/src/effectstack/widgets/choosecolorwidget.cpp
+++ b/src/effectstack/widgets/choosecolorwidget.cpp
@@ -99,7 +99,7 @@ ChooseColorWidget::ChooseColorWidget(const QString &text, const QString &color,
rightSideLayout->setContentsMargins(0, 0, 0, 0);
rightSideLayout->setSpacing(0);
- m_button = new KColorButton(color, rightSide);
+ m_button = new KColorButton(stringToColor(color), rightSide);
if (alphaEnabled) m_button->setAlphaChannelEnabled(alphaEnabled);
// m_button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
ColorPickerWidget *picker = new ColorPickerWidget(rightSide);