Skip to content
Snippets Groups Projects
Commit 0288bce0 authored by BIOUD Youcef's avatar BIOUD Youcef
Browse files

Merge branch 'revert-d21adfcd' into 'youcef'

Revert "Merge branch 'dev' into 'youcef'"

See merge request !3
parents d21adfcd 366dd897
No related branches found
No related tags found
1 merge request!3Revert "Merge branch 'dev' into 'youcef'"
Showing
with 53 additions and 999 deletions
......@@ -10,23 +10,15 @@ CONFIG += c++17
SOURCES += \
colorpickerwidget.cpp \
dialog/rescaledialog.cpp \
dialog/resizedialog.cpp \
main.cpp \
mainwindow.cpp \
tools/editable.cpp \
tools/hand.cpp \
tools/selectionable/ellipse.cpp \
tools/selectionable/polygone.cpp \
tools/selectionable/rectangle.cpp \
tools/selectionable/rectangleTriangle.cpp \
tools/selectionable/triangle.cpp \
tools/selectionnable.cpp \
tools/tool.cpp \
ui/files/treefileselector.cpp \
ui/menu/displaymenulambda.cpp \
ui/menu/filemenulambda.cpp \
ui/menu/imagemenulambda.cpp \
ui/menu/menubarmanager.cpp \
ui/toolbox/toolRegister.cpp \
ui/view/imagearea.cpp \
......@@ -35,23 +27,15 @@ SOURCES += \
HEADERS += \
colorpickerwidget.h \
dialog/rescaledialog.h \
dialog/resizedialog.h \
mainwindow.h \
tools/editable.h \
tools/hand.h \
tools/selectionable/ellipse.h \
tools/selectionable/polygone.h \
tools/selectionable/rectangle.h \
tools/selectionable/rectangleTriangle.h \
tools/selectionable/triangle.h \
tools/selectionnable.h \
tools/tool.h \
ui/files/fileselector.h \
ui/files/treefileselector.h \
ui/menu/displaymenulambda.h \
ui/menu/filemenulambda.h \
ui/menu/imagemenulambda.h \
ui/menu/menubarmanager.h \
ui/toolbox/toolRegister.h \
ui/view/imagearea.h \
......@@ -59,8 +43,6 @@ HEADERS += \
ui/view/viewmanager.h
FORMS += \
dialog/rescaledialog.ui \
dialog/resizedialog.ui \
mainwindow.ui
# Default rules for deployment.
......
#include "rescaledialog.h"
namespace dialog {
ReScaleDialog::ReScaleDialog(ui::ViewManager * manager,bool defaultSize, QWidget * parent)
: QDialog(parent), _viewManager(manager) {
this->setupUi(this);
this->_selectSizeButton->setChecked(defaultSize);
this->_selectPourcentButton->setChecked(!defaultSize);
emit this->_selectSizeButton->toggled(defaultSize);
emit this->_selectPourcentButton->toggled(!defaultSize);
QObject::connect(this, SIGNAL(accepted()), this, SLOT(apply()));
this->_samplingCombobox->addItem(sampling::BILINIEAR);
this->_samplingCombobox->addItem(sampling::CLOSE_NEIGHBOR);
this->_samplingCombobox->setCurrentIndex(0);
this->setWindowTitle("Redimensionnement");
}
void ReScaleDialog::use() {
if(this->_viewManager != nullptr) {
ui::ImageArea * area = this->_viewManager->currentView();
if(area != nullptr) {
this->_pourcentSpinbox->setValue(100);
this->_widthSpinbox->setValue(area->image().width());
this->_heightSpinbox->setValue(area->image().height());
this->show();
}
}
}
void ReScaleDialog::apply() {
ui::ImageArea * area = this->_viewManager->currentView();
if(area != nullptr) {
Qt::TransformationMode mode = this->_samplingCombobox->currentText() == sampling::CLOSE_NEIGHBOR ? Qt::TransformationMode::FastTransformation : Qt::TransformationMode::SmoothTransformation;
QPoint resize = QPoint(0, 0);
if(this->usePourcent()) {
resize = QPoint(
area->image().width() * (static_cast<float>(this->getPourcentValue())/100),
area->image().height() * (static_cast<float>(this->getPourcentValue())/100)
);
}
else if(this->useAbsoluteSize()) {
resize = this->getAbsoluteSizeValue();
}
area->setScale(resize, mode);
}
}
}
#pragma once
#include <QDialog>
#include "ui_rescaledialog.h"
#include "ui/view/viewmanager.h"
namespace dialog {
namespace sampling {
static const QString CLOSE_NEIGHBOR = "Proche Voisin";
static const QString BILINIEAR = "Bilinéaire";
}
class ReScaleDialog : public QDialog, public Ui::ReScaleDialog {
Q_OBJECT
private:
ui::ViewManager * _viewManager;
public:
ReScaleDialog(ui::ViewManager * ,bool defaultSize = true, QWidget *parent = nullptr);
inline bool usePourcent() const {return this->_selectPourcentButton->isChecked();}
inline bool useAbsoluteSize() const {return this->_selectSizeButton->isChecked();}
inline unsigned int getPourcentValue() const {return this->_pourcentSpinbox->value();}
inline QPoint getAbsoluteSizeValue() const {return QPoint(this->_widthSpinbox->value(), this->_heightSpinbox->value());}
public slots:
void use();
void apply();
};
}
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReScaleDialog</class>
<widget class="QDialog" name="ReScaleDialog">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>306</width>
<height>207</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<layout class="QHBoxLayout" name="_pourcentArea">
<item>
<widget class="QRadioButton" name="_selectPourcentButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>En Pourcentage :</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_pourcentSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string>%</string>
</property>
<property name="prefix">
<string/>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999999</number>
</property>
<property name="stepType">
<enum>QAbstractSpinBox::AdaptiveDecimalStepType</enum>
</property>
<property name="value">
<number>100</number>
</property>
<property name="displayIntegerBase">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="_sizeArea">
<property name="spacing">
<number>10</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QRadioButton" name="_selectSizeButton">
<property name="text">
<string>En Taille Absolue :</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="_heightArea">
<property name="leftMargin">
<number>16</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<item>
<widget class="QLabel" name="_heightLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Height </string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_heightSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_widthArea">
<property name="leftMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<item>
<widget class="QLabel" name="_widthLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Width </string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_widthSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="_samplingArea">
<item>
<widget class="QLabel" name="_samplingLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Ré-Chantillionage :</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="_samplingCombobox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_exitArea">
<item>
<spacer name="_exitSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="_validatePushButton">
<property name="text">
<string>Valider</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="_cancelPushButton">
<property name="text">
<string>Annuler</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>_selectSizeButton</sender>
<signal>toggled(bool)</signal>
<receiver>_heightSpinbox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>89</x>
<y>104</y>
</hint>
<hint type="destinationlabel">
<x>83</x>
<y>140</y>
</hint>
</hints>
</connection>
<connection>
<sender>_selectSizeButton</sender>
<signal>toggled(bool)</signal>
<receiver>_widthSpinbox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>249</x>
<y>104</y>
</hint>
<hint type="destinationlabel">
<x>233</x>
<y>177</y>
</hint>
</hints>
</connection>
<connection>
<sender>_selectPourcentButton</sender>
<signal>toggled(bool)</signal>
<receiver>_pourcentSpinbox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>81</x>
<y>53</y>
</hint>
<hint type="destinationlabel">
<x>182</x>
<y>54</y>
</hint>
</hints>
</connection>
<connection>
<sender>_validatePushButton</sender>
<signal>released()</signal>
<receiver>ReScaleDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>218</x>
<y>213</y>
</hint>
<hint type="destinationlabel">
<x>310</x>
<y>206</y>
</hint>
</hints>
</connection>
<connection>
<sender>_cancelPushButton</sender>
<signal>clicked()</signal>
<receiver>ReScaleDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>304</x>
<y>213</y>
</hint>
<hint type="destinationlabel">
<x>254</x>
<y>168</y>
</hint>
</hints>
</connection>
</connections>
</ui>
#include "resizedialog.h"
namespace dialog {
ReSizeDialog::ReSizeDialog(ui::ViewManager * manager, QWidget * parent)
: QDialog(parent), _viewManager(manager) {
this->setupUi(this);
QObject::connect(this, SIGNAL(accepted()), this, SLOT(apply()));
this->setWindowTitle("Rognage");
}
void ReSizeDialog::use() {
if(this->_viewManager != nullptr) {
ui::ImageArea * area = this->_viewManager->currentView();
if(area != nullptr) {
this->_xSpinbox->setValue(0);
this->_ySpinbox->setValue(0);
this->_widthSpinbox->setValue(area->image().width());
this->_heightSpinbox->setValue(area->image().height());
this->show();
}
}
}
void ReSizeDialog::apply() {
ui::ImageArea * area = this->_viewManager->currentView();
if(area != nullptr) {
area->setSize(this->getAnchor(), this->getSize());
}
}
}
#pragma once
#include <QDialog>
#include "ui_resizedialog.h"
#include "ui/view/viewmanager.h"
namespace dialog {
class ReSizeDialog : public QDialog, public Ui::ReSizeDialog {
Q_OBJECT
private:
ui::ViewManager * _viewManager;
public:
ReSizeDialog(ui::ViewManager *, QWidget * parent = nullptr);
inline QPoint getAnchor() const {return QPoint(this->_xSpinbox->value(), this->_ySpinbox->value());}
inline QPoint getSize() const {return QPoint(this->_widthSpinbox->value(), this->_heightSpinbox->value());}
public slots:
void use();
void apply();
};
}
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ReSizeDialog</class>
<widget class="QDialog" name="ReSizeDialog">
<property name="windowModality">
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>330</width>
<height>177</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<layout class="QVBoxLayout" name="_sizeArea">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="bottomMargin">
<number>16</number>
</property>
<item>
<layout class="QVBoxLayout" name="_anchorArea">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>16</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<item>
<widget class="QLabel" name="_anchorLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Anchor :</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="_xArea">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="_xlabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>x :</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_xSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999999</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_yArea">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="_yLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>y :</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_ySpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999999</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_heightArea">
<property name="leftMargin">
<number>16</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<item>
<widget class="QLabel" name="_heightLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Height </string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_heightSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_widthArea">
<property name="leftMargin">
<number>20</number>
</property>
<property name="rightMargin">
<number>16</number>
</property>
<item>
<widget class="QLabel" name="_widthLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Width </string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="_widthSpinbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>99999</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="_exitArea">
<item>
<spacer name="_exitSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="_validatePushButton">
<property name="text">
<string>Valider</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="_cancelPushButton">
<property name="text">
<string>Annuler</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>_validatePushButton</sender>
<signal>released()</signal>
<receiver>ReSizeDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>218</x>
<y>213</y>
</hint>
<hint type="destinationlabel">
<x>310</x>
<y>206</y>
</hint>
</hints>
</connection>
<connection>
<sender>_cancelPushButton</sender>
<signal>clicked()</signal>
<receiver>ReSizeDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>304</x>
<y>213</y>
</hint>
<hint type="destinationlabel">
<x>254</x>
<y>168</y>
</hint>
</hints>
</connection>
</connections>
</ui>
......@@ -12,16 +12,10 @@
#include <ui/menu/filemenulambda.h>
#include <ui/menu/displaymenulambda.h>
#include <ui/menu/imagemenulambda.h>
#include <ui/files/treefileselector.h>
#include <tools/hand.h>
#include <tools/selectionable/rectangle.h>
#include <tools/selectionable/rectangleTriangle.h>
#include <tools/selectionable/triangle.h>
#include <tools/selectionable/ellipse.h>
#include <tools/selectionable/polygone.h>
MainWindow::MainWindow(QWidget * parent)
: QMainWindow(parent), _toolRegister(), _fileselectorManager(nullptr), _viewManager(nullptr) {
......@@ -38,9 +32,7 @@ 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()));
qDebug() << "Mark_2";
ColorWindow = this->_colorPicker;
ColorWindow = findChild<QPushButton*>("ColorWindow");
// Connect the button's clicked signal to the openColorPicker slot
connect(ColorWindow, &QPushButton::clicked, this, &MainWindow::openColorPicker);
......@@ -50,42 +42,27 @@ MainWindow::MainWindow(QWidget * parent)
connect(ctrlCAction, &QAction::triggered, this, &MainWindow::handleCtrlCKey);
addAction(ctrlCAction);
qDebug() << "Mark_3";
this->_viewManager = new ui::ViewManager(this->_fileselectorManager, this->_imageTabs);
qDebug() << "Mark_4";
this->_rescaleDialog = new dialog::ReScaleDialog(this->_viewManager);
QObject::connect(this->_rescaleButton, SIGNAL(released()), this->_rescaleDialog, SLOT(use()));
qDebug() << "Mark_2";
this->_resizeDialog = new dialog::ReSizeDialog(this->_viewManager);
QObject::connect(this->_resizeButton, SIGNAL(released()), this->_resizeDialog, SLOT(use()));
qDebug() << "Mark_5";
this->_viewManager = new ui::ViewManager(this->_fileselectorManager, this->_imageTabs);
qDebug() << "Mark_3";
this->_toolRegister.setToolbox(this->_toolbox);
this->_toolRegister.setViewManager(this->_viewManager);
this->_toolRegister.push_back(QSharedPointer<tool::Tool>(new tool::Hand()));
this->_toolRegister.push_back(QSharedPointer<tool::Rectangle>(new tool::Rectangle()));
this->_toolRegister.push_back(QSharedPointer<tool::RectangleTriangle>(new tool::RectangleTriangle()));
this->_toolRegister.push_back(QSharedPointer<tool::Triangle>(new tool::Triangle()));
this->_toolRegister.push_back(QSharedPointer<tool::Ellipse>(new tool::Ellipse()));
this->_toolRegister.push_back(QSharedPointer<tool::Polygone>(new tool::Polygone()));
this->_toolRegister.update();
qDebug() << "Mark_6";
qDebug() << "Mark_4";
this->_menubarManager.insert(this->_menuFile, QSharedPointer<ui::MenuLambda>(new ui::FilemenuLambda(this->_fileselectorManager, this->_viewManager)));
this->_menubarManager.insert(this->_menuAffichage, QSharedPointer<ui::MenuLambda>(new ui::DisplayMenuLambda(this->_viewManager)));
this->_menubarManager.insert(this->_menuImage, QSharedPointer<ui::MenuLambda>(new ui::imagemenulambda(this->_rescaleDialog, this->_resizeDialog, this->_viewManager)));
this->_menubarManager.update();
qDebug() << "Mark_7";
qDebug() << "Mark_5";
}
void MainWindow::dragEnterEvent(QDragEnterEvent *e) {
......@@ -110,7 +87,5 @@ void MainWindow::handleCtrlCKey()
MainWindow::~MainWindow() {
delete this->_fileselectorManager;
delete this->_viewManager;
delete this->_rescaleDialog;
delete this->_resizeDialog;
}
......@@ -9,10 +9,6 @@
#include "ui/menu/menubarmanager.h"
#include "ui/files/fileselector.h"
#include "ui/view/viewmanager.h"
#include "dialog/rescaledialog.h"
#include "dialog/resizedialog.h"
#include <colorpickerwidget.h>
class QAction;
......@@ -33,6 +29,9 @@ class MainWindow : public QMainWindow, private Ui::MainWindow {
virtual void dropEvent(QDropEvent * e);
virtual void dragEnterEvent(QDragEnterEvent *e);
private slots:
void openColorPicker(); // Slot to open the ColorPickerWidget
void handleCtrlCKey(); // New slot for Ctrl+C
private:
ColorPickerWidget colorPickerWidget; // Declare ColorPickerWidget as a private member
......
This diff is collapsed.
<RCC>
<qresource prefix="/test/16x16">
<qresource prefix="/image/test/icons/16x16">
<file>ressource/image/test/icons/16x16/Circle.png</file>
<file>ressource/image/test/icons/16x16/Cube.png</file>
<file>ressource/image/test/icons/16x16/Diamond.png</file>
......@@ -9,7 +9,7 @@
<file>ressource/image/test/icons/16x16/Star.png</file>
<file>ressource/image/test/icons/16x16/Triangle.png</file>
</qresource>
<qresource prefix="/oxygen/16x16">
<qresource prefix="/image/oxygen/icons/16x16">
<file>ressource/image/oxygen/icons/16x16/document-close.png</file>
<file>ressource/image/oxygen/icons/16x16/document-new.png</file>
<file>ressource/image/oxygen/icons/16x16/document-open.png</file>
......@@ -415,64 +415,6 @@
<file>ressource/image/oxygen/icons/16x16/zoom-previous.png</file>
<file>ressource/image/oxygen/icons/16x16/zoom-select.png</file>
<file>ressource/image/oxygen/icons/16x16/align-none.png</file>
<file>ressource/image/oxygen/icons/16x16/actions-fill-color-icon.png</file>
</qresource>
<qresource prefix="/stylesheet"/>
<qresource prefix="/oxygen/64x64">
<file>ressource/image/oxygen/icons/64x64/application-exit.png</file>
<file>ressource/image/oxygen/icons/64x64/calligraflow.png</file>
<file>ressource/image/oxygen/icons/64x64/chronometer.png</file>
<file>ressource/image/oxygen/icons/64x64/configure.png</file>
<file>ressource/image/oxygen/icons/64x64/continue-data-project.png</file>
<file>ressource/image/oxygen/icons/64x64/dialog-ok.png</file>
<file>ressource/image/oxygen/icons/64x64/dialog-ok-apply.png</file>
<file>ressource/image/oxygen/icons/64x64/document-edit.png</file>
<file>ressource/image/oxygen/icons/64x64/document-preview.png</file>
<file>ressource/image/oxygen/icons/64x64/document-preview-archive.png</file>
<file>ressource/image/oxygen/icons/64x64/edit-bomb.png</file>
<file>ressource/image/oxygen/icons/64x64/edit-find.png</file>
<file>ressource/image/oxygen/icons/64x64/edit-paste.png</file>
<file>ressource/image/oxygen/icons/64x64/go-bottom.png</file>
<file>ressource/image/oxygen/icons/64x64/go-down.png</file>
<file>ressource/image/oxygen/icons/64x64/go-first.png</file>
<file>ressource/image/oxygen/icons/64x64/go-first-view-page.png</file>
<file>ressource/image/oxygen/icons/64x64/go-last.png</file>
<file>ressource/image/oxygen/icons/64x64/go-last-view-page.png</file>
<file>ressource/image/oxygen/icons/64x64/go-next.png</file>
<file>ressource/image/oxygen/icons/64x64/go-next-view-page.png</file>
<file>ressource/image/oxygen/icons/64x64/go-previous.png</file>
<file>ressource/image/oxygen/icons/64x64/go-previous-view-page.png</file>
<file>ressource/image/oxygen/icons/64x64/go-top.png</file>
<file>ressource/image/oxygen/icons/64x64/go-up.png</file>
<file>ressource/image/oxygen/icons/64x64/insert-horizontal-rule.png</file>
<file>ressource/image/oxygen/icons/64x64/insert-link.png</file>
<file>ressource/image/oxygen/icons/64x64/kcolorchooser.png</file>
<file>ressource/image/oxygen/icons/64x64/list-remove.png</file>
<file>ressource/image/oxygen/icons/64x64/mail-receive.png</file>
<file>ressource/image/oxygen/icons/64x64/preferences-desktop-color.png</file>
<file>ressource/image/oxygen/icons/64x64/preferences-system.png</file>
<file>ressource/image/oxygen/icons/64x64/roll.png</file>
<file>ressource/image/oxygen/icons/64x64/system-log-out.png</file>
<file>ressource/image/oxygen/icons/64x64/system-reboot.png</file>
<file>ressource/image/oxygen/icons/64x64/system-run.png</file>
<file>ressource/image/oxygen/icons/64x64/system-search.png</file>
<file>ressource/image/oxygen/icons/64x64/system-shutdown.png</file>
<file>ressource/image/oxygen/icons/64x64/system-suspend.png</file>
<file>ressource/image/oxygen/icons/64x64/system-suspend-hibernate.png</file>
<file>ressource/image/oxygen/icons/64x64/system-switch-user.png</file>
<file>ressource/image/oxygen/icons/64x64/tool-animator.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-media-optical-burn.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-media-optical-burn-image.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-media-optical-erase.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-media-optical-format.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-report-bug.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-rip-audio-cd.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-rip-video-cd.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-rip-video-dvd.png</file>
<file>ressource/image/oxygen/icons/64x64/tools-wizard.png</file>
<file>ressource/image/oxygen/icons/64x64/transform-crop-and-resize.png</file>
<file>ressource/image/oxygen/icons/64x64/transform-move.png</file>
<file>ressource/image/oxygen/icons/64x64/transform-scale.png</file>
<file>ressource/image/oxygen/icons/64x64/view-conversation-balloon.png</file>
</qresource>
</RCC>
IHM_Retouche_Photo/ressource/image/oxygen/icons/16x16/document-swap.png

385 B

IHM_Retouche_Photo/ressource/image/oxygen/icons/32x32/document-close.png

1.49 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/32x32/document-new.png

1.38 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/32x32/document-open.png

1.76 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/48x48/document-close.png

2.55 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/48x48/document-new.png

2.4 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/48x48/document-open.png

2.73 KiB

IHM_Retouche_Photo/ressource/image/oxygen/icons/64x64/application-exit.png

4.18 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment