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

# Conflicts:
#   IHM_Retouche_Photo/mainwindow.h
#   IHM_Retouche_Photo/mainwindow.ui
parents d45c5749 18c95666
No related branches found
No related tags found
1 merge request!2Dev
Show whitespace changes
Inline Side-by-side
IHM_Retouche_Photo/mainwindow.h
+ 4
− 11
View file @ 6371a499
...@@ -26,13 +26,6 @@ class MainWindow : public QMainWindow, private Ui::MainWindow { ...@@ -26,13 +26,6 @@ class MainWindow : public QMainWindow, private Ui::MainWindow {
ui::FileSelector * _fileselectorManager; ui::FileSelector * _fileselectorManager;
ui::ViewManager * _viewManager; ui::ViewManager * _viewManager;
dialog::ReScaleDialog * _rescaleDialog;
dialog::ReSizeDialog * _resizeDialog;
ColorPickerWidget colorPickerWidget; // Declare ColorPickerWidget as a private member
QPushButton *ColorWindow; // Assuming you have a QPushButton in your UI
QAction *ctrlCAction; // New QAction for Ctrl+C
public: public:
MainWindow(QWidget * parent = nullptr); MainWindow(QWidget * parent = nullptr);
...@@ -41,8 +34,8 @@ class MainWindow : public QMainWindow, private Ui::MainWindow { ...@@ -41,8 +34,8 @@ class MainWindow : public QMainWindow, private Ui::MainWindow {
virtual void dropEvent(QDropEvent * e); virtual void dropEvent(QDropEvent * e);
virtual void dragEnterEvent(QDragEnterEvent *e); virtual void dragEnterEvent(QDragEnterEvent *e);
private slots: private:
void openColorPicker(); // Slot to open the ColorPickerWidget ColorPickerWidget colorPickerWidget; // Declare ColorPickerWidget as a private member
void handleCtrlCKey(); // New slot for Ctrl+C QPushButton *ColorWindow; // Assuming you have a QPushButton in your UI
QAction *ctrlCAction; // New QAction for Ctrl+C
}; };
IHM_Retouche_Photo/mainwindow.ui
+ 12
− 77
View file @ 6371a499
...@@ -561,12 +561,19 @@ ...@@ -561,12 +561,19 @@
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="_actionNouveau"/> <addaction name="_action_new"/>
<addaction name="_action_enregistrer"/> <addaction name="_action_close"/>
<addaction name="separator"/>
<addaction name="_action_save"/>
<addaction name="_action_saveAs"/>
<addaction name="_action_zoom_in"/>
<addaction name="_action_zoom_out"/>
<addaction name="_action_rotate_left_90"/>
<addaction name="_action_rotate_right_90"/>
<addaction name="_action_rotate_180"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="_actionEnregistrer_sous"/> <addaction name="_action_turn_verticaly"/>
<addaction name="_actionFermer"/> <addaction name="_action_turn_horizonaly"/>
<addaction name="actionZoom_avant"/>
</widget> </widget>
<action name="_action_new"> <action name="_action_new">
<property name="icon"> <property name="icon">
...@@ -974,78 +981,6 @@ ...@@ -974,78 +981,6 @@
<string>Ctrl+Shift+O</string> <string>Ctrl+Shift+O</string>
</property> </property>
</action> </action>
<action name="_action_enregistrer">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-save.png</normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-save.png</iconset>
</property>
<property name="text">
<string>Enregistrer</string>
</property>
<property name="toolTip">
<string>Enregistrer</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="_actionEnregistrer_sous">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-save-all.png</normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-save-all.png</iconset>
</property>
<property name="text">
<string>Enregistrer sous</string>
</property>
<property name="toolTip">
<string>Enregistrer sous</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+S</string>
</property>
</action>
<action name="_actionNouveau">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-new.png</normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-new.png</iconset>
</property>
<property name="text">
<string>Nouveau</string>
</property>
<property name="toolTip">
<string>Nouveau</string>
</property>
<property name="shortcut">
<string>Ctrl+N</string>
</property>
</action>
<action name="_actionFermer">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-close.png</normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/document-close.png</iconset>
</property>
<property name="text">
<string>Fermer</string>
</property>
<property name="toolTip">
<string>Fermer</string>
</property>
<property name="shortcut">
<string>Del</string>
</property>
</action>
<action name="actionZoom_avant">
<property name="icon">
<iconset resource="ressource.qrc">
<normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/image-zoom-in.png</normaloff>:/oxygen/16x16/ressource/image/oxygen/icons/16x16/image-zoom-in.png</iconset>
</property>
<property name="text">
<string>Zoom avant</string>
</property>
<property name="toolTip">
<string>Zoom avant</string>
</property>
</action>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>_imageTabs</tabstop> <tabstop>_imageTabs</tabstop>
......
IHM_Retouche_Photo/ui/view/imagearea.cpp
+ 2
− 0
View file @ 6371a499
...@@ -131,12 +131,14 @@ namespace ui { ...@@ -131,12 +131,14 @@ namespace ui {
} }
void ImageArea::increaseZoom() { void ImageArea::increaseZoom() {
qDebug() << "Increase Zoom called";
this->_zoom += 1; this->_zoom += 1;
emit this->zoomChange(this->_zoom); emit this->zoomChange(this->_zoom);
this->repaint(); this->repaint();
} }
void ImageArea::decreaseZoom() { void ImageArea::decreaseZoom() {
qDebug() << "Decrease Zoom called";
if(this->_zoom > 1) { if(this->_zoom > 1) {
this->_zoom -= 1; this->_zoom -= 1;
emit this->zoomChange(this->_zoom); emit this->zoomChange(this->_zoom);
......
build-IHM_Retouche_Photo-Desktop_Qt_6_3_0_GCC_64bit-Debug/ui_mainwindow.h
+ 22
− 7
View file @ 6371a499
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <QtWidgets/QSpacerItem> #include <QtWidgets/QSpacerItem>
#include <QtWidgets/QStatusBar> #include <QtWidgets/QStatusBar>
#include <QtWidgets/QTabWidget> #include <QtWidgets/QTabWidget>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QTreeView> #include <QtWidgets/QTreeView>
#include <QtWidgets/QVBoxLayout> #include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
...@@ -82,7 +83,6 @@ public: ...@@ -82,7 +83,6 @@ public:
QGraphicsView *_imageView; QGraphicsView *_imageView;
QWidget *_imageTabs_2; QWidget *_imageTabs_2;
QVBoxLayout *_toolLayout; QVBoxLayout *_toolLayout;
QPushButton *ColorWindow;
QListWidget *_toolbox; QListWidget *_toolbox;
QVBoxLayout *_toolParameterLayout; QVBoxLayout *_toolParameterLayout;
QMenuBar *_menubar; QMenuBar *_menubar;
...@@ -95,6 +95,7 @@ public: ...@@ -95,6 +95,7 @@ public:
QMenu *_menuAffichage; QMenu *_menuAffichage;
QMenu *_menuSelection; QMenu *_menuSelection;
QStatusBar *_statusbar; QStatusBar *_statusbar;
QToolBar *toolBar;
void setupUi(QMainWindow *MainWindow) void setupUi(QMainWindow *MainWindow)
{ {
...@@ -377,11 +378,6 @@ public: ...@@ -377,11 +378,6 @@ public:
_toolLayout = new QVBoxLayout(); _toolLayout = new QVBoxLayout();
_toolLayout->setSpacing(0); _toolLayout->setSpacing(0);
_toolLayout->setObjectName(QString::fromUtf8("_toolLayout")); _toolLayout->setObjectName(QString::fromUtf8("_toolLayout"));
ColorWindow = new QPushButton(_mainArea);
ColorWindow->setObjectName(QString::fromUtf8("ColorWindow"));
_toolLayout->addWidget(ColorWindow);
_toolbox = new QListWidget(_mainArea); _toolbox = new QListWidget(_mainArea);
_toolbox->setObjectName(QString::fromUtf8("_toolbox")); _toolbox->setObjectName(QString::fromUtf8("_toolbox"));
sizePolicy.setHeightForWidth(_toolbox->sizePolicy().hasHeightForWidth()); sizePolicy.setHeightForWidth(_toolbox->sizePolicy().hasHeightForWidth());
...@@ -433,6 +429,11 @@ public: ...@@ -433,6 +429,11 @@ public:
_statusbar = new QStatusBar(MainWindow); _statusbar = new QStatusBar(MainWindow);
_statusbar->setObjectName(QString::fromUtf8("_statusbar")); _statusbar->setObjectName(QString::fromUtf8("_statusbar"));
MainWindow->setStatusBar(_statusbar); MainWindow->setStatusBar(_statusbar);
toolBar = new QToolBar(MainWindow);
toolBar->setObjectName(QString::fromUtf8("toolBar"));
toolBar->setEnabled(true);
toolBar->setMovable(false);
MainWindow->addToolBar(Qt::TopToolBarArea, toolBar);
QWidget::setTabOrder(_imageTabs, _imageView); QWidget::setTabOrder(_imageTabs, _imageView);
_menubar->addAction(_menuFile->menuAction()); _menubar->addAction(_menuFile->menuAction());
...@@ -473,6 +474,20 @@ public: ...@@ -473,6 +474,20 @@ public:
_menuAffichage->addAction(_action_zoom_in); _menuAffichage->addAction(_action_zoom_in);
_menuAffichage->addAction(_action_zoom_out); _menuAffichage->addAction(_action_zoom_out);
_menuSelection->addAction(_action_del); _menuSelection->addAction(_action_del);
toolBar->addSeparator();
toolBar->addAction(_action_new);
toolBar->addAction(_action_close);
toolBar->addSeparator();
toolBar->addAction(_action_save);
toolBar->addAction(_action_saveAs);
toolBar->addAction(_action_zoom_in);
toolBar->addAction(_action_zoom_out);
toolBar->addAction(_action_rotate_left_90);
toolBar->addAction(_action_rotate_right_90);
toolBar->addAction(_action_rotate_180);
toolBar->addSeparator();
toolBar->addAction(_action_turn_verticaly);
toolBar->addAction(_action_turn_horizonaly);
retranslateUi(MainWindow); retranslateUi(MainWindow);
...@@ -695,7 +710,6 @@ public: ...@@ -695,7 +710,6 @@ public:
#endif // QT_CONFIG(shortcut) #endif // QT_CONFIG(shortcut)
_imageTabs->setTabText(_imageTabs->indexOf(_imageTabs_1), QCoreApplication::translate("MainWindow", "Blank", nullptr)); _imageTabs->setTabText(_imageTabs->indexOf(_imageTabs_1), QCoreApplication::translate("MainWindow", "Blank", nullptr));
_imageTabs->setTabText(_imageTabs->indexOf(_imageTabs_2), QCoreApplication::translate("MainWindow", "Tab 2", nullptr)); _imageTabs->setTabText(_imageTabs->indexOf(_imageTabs_2), QCoreApplication::translate("MainWindow", "Tab 2", nullptr));
ColorWindow->setText(QCoreApplication::translate("MainWindow", "Open Color Picker (Ctrl+Shift+C)", nullptr));
#if QT_CONFIG(tooltip) #if QT_CONFIG(tooltip)
_toolbox->setToolTip(QString()); _toolbox->setToolTip(QString());
#endif // QT_CONFIG(tooltip) #endif // QT_CONFIG(tooltip)
...@@ -710,6 +724,7 @@ public: ...@@ -710,6 +724,7 @@ public:
_menuHelp->setTitle(QCoreApplication::translate("MainWindow", "Aide", nullptr)); _menuHelp->setTitle(QCoreApplication::translate("MainWindow", "Aide", nullptr));
_menuAffichage->setTitle(QCoreApplication::translate("MainWindow", "Affichage", nullptr)); _menuAffichage->setTitle(QCoreApplication::translate("MainWindow", "Affichage", nullptr));
_menuSelection->setTitle(QCoreApplication::translate("MainWindow", "Selection", nullptr)); _menuSelection->setTitle(QCoreApplication::translate("MainWindow", "Selection", nullptr));
toolBar->setWindowTitle(QCoreApplication::translate("MainWindow", "toolBar", nullptr));
} // retranslateUi } // retranslateUi
}; };
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment