Move undo commands to their own subdirectory

[kdenlive] / src / choosecolorwidget.cpp

diff --git a/src/choosecolorwidget.cpp b/src/choosecolorwidget.cpp
index fce036f916f7a67786a1f9634151266cf35760b1..1b81ca3123536d11f667a43adeaa75d088df1299 100644 (file)
--- a/src/choosecolorwidget.cpp
+++ b/src/choosecolorwidget.cpp
@@ -32,14 +32,21 @@ ChooseColorWidget::ChooseColorWidget(QString text, QColor color, QWidget *parent
         QWidget(parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->addWidget(new QLabel(text));
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    QLabel *label = new QLabel(text, this);
     m_button = new KColorButton(color, this);
-    layout->addWidget(m_button);
+    m_button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     ColorPickerWidget *picker = new ColorPickerWidget(this);
-    layout->addWidget(picker);
+
+    layout->addWidget(label);
+    layout->addWidget(m_button);
+    layout->addWidget(picker, 0, Qt::AlignRight);
 
     connect(picker, SIGNAL(colorPicked(QColor)), this, SLOT(setColor(QColor)));
-    connect(m_button, SIGNAL(clicked(bool)), this, SIGNAL(modified()));
+    connect(picker, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int)));
+    connect(m_button, SIGNAL(changed(QColor)), this, SIGNAL(modified()));
 }
 
 QColor ChooseColorWidget::getColor()
@@ -50,7 +57,6 @@ QColor ChooseColorWidget::getColor()
 void ChooseColorWidget::setColor(QColor color)
 {
     m_button->setColor(color);
-    emit modified();
 }
 
 #include "choosecolorwidget.moc"