diff --git a/IHM_Retouche_Photo/mainwindow.h b/IHM_Retouche_Photo/mainwindow.h index 5f37e63e01f7e447c0944cbedd6a202676986c95..afb140341c28b7472becf200a49778c999ac0ec4 100644 --- a/IHM_Retouche_Photo/mainwindow.h +++ b/IHM_Retouche_Photo/mainwindow.h @@ -22,6 +22,7 @@ class MainWindow : public QMainWindow, private Ui::MainWindow { ui::FileSelector * _fileselectorManager; ui::ViewManager * _viewManager; + public: MainWindow(QWidget * parent = nullptr); ~MainWindow(); @@ -32,7 +33,6 @@ 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 QPushButton *ColorWindow; // Assuming you have a QPushButton in your UI diff --git a/IHM_Retouche_Photo/mainwindow.ui b/IHM_Retouche_Photo/mainwindow.ui index 3010daa4adcdba2f5653b5a8f57fe95365ef5235..3efbe751cad2f3a5ad4746fde7a11495a13e71b3 100644 --- a/IHM_Retouche_Photo/mainwindow.ui +++ b/IHM_Retouche_Photo/mainwindow.ui @@ -484,12 +484,19 @@ <bool>false</bool> </attribute> <addaction name="separator"/> - <addaction name="_actionNouveau"/> - <addaction name="_action_enregistrer"/> + <addaction name="_action_new"/> + <addaction name="_action_close"/> <addaction name="separator"/> - <addaction name="_actionEnregistrer_sous"/> - <addaction name="_actionFermer"/> - <addaction name="actionZoom_avant"/> + <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="_action_turn_verticaly"/> + <addaction name="_action_turn_horizonaly"/> </widget> <action name="_action_new"> <property name="icon"> @@ -897,78 +904,6 @@ <string>Ctrl+Shift+O</string> </property> </action> - <action name="_action_enregistrer"> - <property name="icon"> - <iconset resource="ressource.qrc"> - <normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save.png</normaloff>:/image/oxygen/icons/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>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save-as.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-save-as.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>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-new.png</normaloff>:/image/oxygen/icons/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>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/document-close.png</normaloff>:/image/oxygen/icons/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>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/zoom-in.png</normaloff>:/image/oxygen/icons/16x16/ressource/image/oxygen/icons/16x16/zoom-in.png</iconset> - </property> - <property name="text"> - <string>Zoom avant</string> - </property> - <property name="toolTip"> - <string>Zoom avant</string> - </property> - </action> </widget> <tabstops> <tabstop>_imageTabs</tabstop> diff --git a/IHM_Retouche_Photo/ui/view/imagearea.cpp b/IHM_Retouche_Photo/ui/view/imagearea.cpp index 242b7e4d532642432e226027ed25f7f7ee062c85..93c3603700bae1d41312d0b1f760a1594b846c44 100644 --- a/IHM_Retouche_Photo/ui/view/imagearea.cpp +++ b/IHM_Retouche_Photo/ui/view/imagearea.cpp @@ -129,12 +129,14 @@ namespace ui { } void ImageArea::increaseZoom() { + qDebug() << "Increase Zoom called"; this->_zoom += 1; emit this->zoomChange(this->_zoom); this->repaint(); } void ImageArea::decreaseZoom() { + qDebug() << "Decrease Zoom called"; if(this->_zoom > 1) { this->_zoom -= 1; emit this->zoomChange(this->_zoom); diff --git a/build-IHM_Retouche_Photo-Desktop_Qt_6_3_0_GCC_64bit-Debug/ui_mainwindow.h b/build-IHM_Retouche_Photo-Desktop_Qt_6_3_0_GCC_64bit-Debug/ui_mainwindow.h index 5e402ea57951bab42e77615d067170df1a8a7351..d18e6d8bccf9e0ad0cde91c763954930fa8c50bb 100644 --- a/build-IHM_Retouche_Photo-Desktop_Qt_6_3_0_GCC_64bit-Debug/ui_mainwindow.h +++ b/build-IHM_Retouche_Photo-Desktop_Qt_6_3_0_GCC_64bit-Debug/ui_mainwindow.h @@ -24,6 +24,7 @@ #include <QtWidgets/QSpacerItem> #include <QtWidgets/QStatusBar> #include <QtWidgets/QTabWidget> +#include <QtWidgets/QToolBar> #include <QtWidgets/QTreeView> #include <QtWidgets/QVBoxLayout> #include <QtWidgets/QWidget> @@ -82,7 +83,6 @@ public: QGraphicsView *_imageView; QWidget *_imageTabs_2; QVBoxLayout *_toolLayout; - QPushButton *ColorWindow; QListWidget *_toolbox; QVBoxLayout *_toolParameterLayout; QMenuBar *_menubar; @@ -95,6 +95,7 @@ public: QMenu *_menuAffichage; QMenu *_menuSelection; QStatusBar *_statusbar; + QToolBar *toolBar; void setupUi(QMainWindow *MainWindow) { @@ -377,11 +378,6 @@ public: _toolLayout = new QVBoxLayout(); _toolLayout->setSpacing(0); _toolLayout->setObjectName(QString::fromUtf8("_toolLayout")); - ColorWindow = new QPushButton(_mainArea); - ColorWindow->setObjectName(QString::fromUtf8("ColorWindow")); - - _toolLayout->addWidget(ColorWindow); - _toolbox = new QListWidget(_mainArea); _toolbox->setObjectName(QString::fromUtf8("_toolbox")); sizePolicy.setHeightForWidth(_toolbox->sizePolicy().hasHeightForWidth()); @@ -433,6 +429,11 @@ public: _statusbar = new QStatusBar(MainWindow); _statusbar->setObjectName(QString::fromUtf8("_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); _menubar->addAction(_menuFile->menuAction()); @@ -473,6 +474,20 @@ public: _menuAffichage->addAction(_action_zoom_in); _menuAffichage->addAction(_action_zoom_out); _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); @@ -695,7 +710,6 @@ public: #endif // QT_CONFIG(shortcut) _imageTabs->setTabText(_imageTabs->indexOf(_imageTabs_1), QCoreApplication::translate("MainWindow", "Blank", 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) _toolbox->setToolTip(QString()); #endif // QT_CONFIG(tooltip) @@ -710,6 +724,7 @@ public: _menuHelp->setTitle(QCoreApplication::translate("MainWindow", "Aide", nullptr)); _menuAffichage->setTitle(QCoreApplication::translate("MainWindow", "Affichage", nullptr)); _menuSelection->setTitle(QCoreApplication::translate("MainWindow", "Selection", nullptr)); + toolBar->setWindowTitle(QCoreApplication::translate("MainWindow", "toolBar", nullptr)); } // retranslateUi };