From 8ad1f92e544199f3e605da6ea4ca5f11b0bdf52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baton=20Th=C3=A9au?= <theau.baton@etu-amu.univ.fr>
Date: Tue, 23 Jan 2024 10:33:38 +0100
Subject: [PATCH] Ajout du color picker par merge
---
IHM_Retouche_Photo/colorpickerwidget.cpp | 1 +
IHM_Retouche_Photo/mainwindow.cpp | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/IHM_Retouche_Photo/colorpickerwidget.cpp b/IHM_Retouche_Photo/colorpickerwidget.cpp
index b44c2e4..f249f91 100644
--- a/IHM_Retouche_Photo/colorpickerwidget.cpp
+++ b/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);
diff --git a/IHM_Retouche_Photo/mainwindow.cpp b/IHM_Retouche_Photo/mainwindow.cpp
index 7f41ed7..71f075a 100644
--- a/IHM_Retouche_Photo/mainwindow.cpp
+++ b/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);
--
GitLab