X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdoubleparameterwidget.cpp;h=ec2af5137f8ed18148e414be4e4d2ebf12a753a0;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=e258dbcbe0ed06b8bf7a8f38566602b9e199663a;hpb=2b77390fdc4a38d58407cc483430b07b7570f222;p=kdenlive

diff --git a/src/doubleparameterwidget.cpp b/src/doubleparameterwidget.cpp
index e258dbcb..ec2af513 100644
--- a/src/doubleparameterwidget.cpp
+++ b/src/doubleparameterwidget.cpp
@@ -1,4 +1,4 @@
-/***************************************************************************
+/**************************************************************************
  *   Copyright (C) 2010 by Till Theato (root@ttill.de)                     *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,94 +19,83 @@
 
 
 #include "doubleparameterwidget.h"
+#include "dragvalue.h"
 
-#include <QHBoxLayout>
+#include <QGridLayout>
 #include <QLabel>
-#include <QSlider>
 #include <QSpinBox>
 #include <QToolButton>
 
+#include <KDebug>
 #include <KIcon>
 #include <KLocalizedString>
 
 
-DoubleParameterWidget::DoubleParameterWidget(const QString &name, int value, int min, int max, int defaultValue, const QString &comment, const QString suffix, QWidget *parent) :
-        QWidget(parent),
-        m_default(defaultValue),
-        m_comment(comment)
+DoubleParameterWidget::DoubleParameterWidget(const QString &name, double value, double min, double max, double defaultValue, const QString &comment, int id, const QString &suffix, int decimals, QWidget *parent) :
+    QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
+    QGridLayout *layout = new QGridLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+    
+    m_dragVal = new DragValue(name, defaultValue, decimals, min, max, id, suffix, this);
+    layout->addWidget(m_dragVal, 0, 1);
 
-    m_name = new QLabel(name, this);
-    layout->addWidget(m_name);
-
-    m_slider = new QSlider(Qt::Horizontal, this);
-    m_slider->setRange(min, max);
-    //m_slider->setPageStep((max - min) / 10);
-    layout->addWidget(m_slider);
-
-    m_spinBox = new QSpinBox(this);
-    m_spinBox->setRange(min, max);
-    m_spinBox->setKeyboardTracking(false);
-    if (!suffix.isEmpty())
-        m_spinBox->setSuffix(suffix);
-    layout->addWidget(m_spinBox);
-
-    QToolButton *reset = new QToolButton(this);
-    reset->setAutoRaise(true);
-    reset->setIcon(KIcon("edit-undo"));
-    reset->setToolTip(i18n("Reset to default value"));
-    layout->addWidget(reset);
-
-    if (m_comment != QString()) {
-        QToolButton *showComment  = new QToolButton(this);
-        showComment->setAutoRaise(true);
-        showComment->setIcon(KIcon("help-about"));
-        layout->addWidget(showComment);
-
-        connect(showComment, SIGNAL(clicked(bool)), this, SLOT(slotShowComment()));
+    if (!comment.isEmpty()) {
+        setToolTip(comment);
     }
-
-    connect(m_slider,  SIGNAL(valueChanged(int)), this, SLOT(setValue(int)));
-    connect(m_spinBox, SIGNAL(valueChanged(int)), this, SLOT(setValue(int)));
-    connect(reset,     SIGNAL(clicked(bool)),     this, SLOT(slotReset()));
-
-    m_spinBox->setValue(value);
+    m_dragVal->setValue(value, false);
+    connect(m_dragVal, SIGNAL(valueChanged(double,bool)), this, SLOT(slotSetValue(double,bool)));
+    connect(m_dragVal, SIGNAL(inTimeline(int)), this, SIGNAL(setInTimeline(int)));
 }
 
-void DoubleParameterWidget::setValue(int value)
+DoubleParameterWidget::~DoubleParameterWidget()
 {
-    m_slider->blockSignals(true);
-    m_spinBox->blockSignals(true);
+    delete m_dragVal;
+}
 
-    m_slider->setValue(value);
-    m_spinBox->setValue(value);
+int DoubleParameterWidget::spinSize()
+{
+    return m_dragVal->spinSize();
+}
 
-    m_slider->blockSignals(false);
-    m_spinBox->blockSignals(false);
+void DoubleParameterWidget::setSpinSize(int width)
+{
+    m_dragVal->setSpinSize(width);
+}
 
-    emit valueChanged(value);
+void DoubleParameterWidget::setValue(double value)
+{
+    m_dragVal->blockSignals(true);
+    m_dragVal->setValue(value);
+    m_dragVal->blockSignals(false);
 }
 
-int DoubleParameterWidget::getValue()
+void DoubleParameterWidget::slotSetValue(double value, bool final)
 {
-    return m_spinBox->value();
+    if (final) {
+        emit valueChanged(value);
+    }
 }
 
-void DoubleParameterWidget::setName(const QString& name)
+double DoubleParameterWidget::getValue()
 {
-    m_name->setText(name);
+    return m_dragVal->value();
 }
 
 void DoubleParameterWidget::slotReset()
 {
-    setValue(m_default);
+    m_dragVal->slotReset();
+}
+
+void DoubleParameterWidget::setInTimelineProperty(bool intimeline)
+{
+    m_dragVal->setInTimelineProperty(intimeline);
 }
 
-void DoubleParameterWidget::slotShowComment()
+void DoubleParameterWidget::slotShowComment( bool show)
 {
-    emit showComment(m_comment);
 }
 
 #include "doubleparameterwidget.moc"