Ajout du color picker par merge

IHM_Retouche_Photo/colorpickerwidget.cpp

@@ -7,6 +7,7 @@
 #include <QPushButton>
 #include <QPushButton>
 #include <QKeyEvent>
+
 ColorPickerWidget::ColorPickerWidget(QWidget *parent)
     : QWidget(parent) {
     QVBoxLayout *layout = new QVBoxLayout(this);

IHM_Retouche_Photo/mainwindow.cpp

@@ -32,7 +32,6 @@ MainWindow::MainWindow(QWidget * parent)
     QObject::connect(this->_remove_selectable_element, SIGNAL(released()), this->_fileselectorManager, SLOT(removeSelectedItem()));
     QObject::connect(this->_add_selectable_element, SIGNAL(released()), this->_fileselectorManager, SLOT(pushItem()));
 
-<<<<<<< HEAD
     ColorWindow = findChild<QPushButton*>("ColorWindow");
 
         // Connect the button's clicked signal to the openColorPicker slot
@@ -42,9 +41,9 @@ MainWindow::MainWindow(QWidget * parent)
      ctrlCAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_C)); // Change the shortcut
      connect(ctrlCAction, &QAction::triggered, this, &MainWindow::handleCtrlCKey);
      addAction(ctrlCAction);
-=======
+
     qDebug() << "Mark_2";
->>>>>>> dev
+
 
     this->_viewManager = new ui::ViewManager(this->_fileselectorManager, this->_imageTabs);