diff --git a/GUI/View/Mask/MaskEditorActions.cpp b/GUI/View/Mask/MaskEditorActions.cpp index 1d5d1e57e0dceca184967fe797254da60cd6341b..d2ee1a325b79b06527ab2495bb4b93984e6d67fc 100644 --- a/GUI/View/Mask/MaskEditorActions.cpp +++ b/GUI/View/Mask/MaskEditorActions.cpp @@ -35,13 +35,13 @@ MaskEditorActions::MaskEditorActions(QWidget* parent) connect(m_toggleMaskValueAction, &QAction::triggered, this, &MaskEditorActions::onToggleMaskValueAction); - m_bringToFrontAction->setIcon(QIcon(":/Mask/img/maskeditor_bringtofront.svg")); + m_bringToFrontAction->setIcon(QIcon(":/Mask/images/maskeditor_bringtofront.svg")); m_bringToFrontAction->setToolTip("Rise selected mask one level up (PgUp)"); m_bringToFrontAction->setShortcuts(QKeySequence::MoveToPreviousPage); connect(m_bringToFrontAction, &QAction::triggered, this, &MaskEditorActions::onBringToFrontAction); - m_sendToBackAction->setIcon(QIcon(":/Mask/img/maskeditor_sendtoback.svg")); + m_sendToBackAction->setIcon(QIcon(":/Mask/images/maskeditor_sendtoback.svg")); m_sendToBackAction->setToolTip("Lower selected mask one level down (PgDown)"); m_sendToBackAction->setShortcuts(QKeySequence::MoveToNextPage); connect(m_sendToBackAction, &QAction::triggered, this, &MaskEditorActions::onSendToBackAction); diff --git a/GUI/View/Mask/MaskEditorToolBar.cpp b/GUI/View/Mask/MaskEditorToolBar.cpp index 38447ea3c80655a5f98a6cd3298c1f84f5bb40a2..cf1d9073139940d702cf6604c993a5c21a70e7ac 100644 --- a/GUI/View/Mask/MaskEditorToolBar.cpp +++ b/GUI/View/Mask/MaskEditorToolBar.cpp @@ -109,7 +109,7 @@ void MaskEditorToolBar::setup_selection_group() add_separator(); auto* selectionButton = new QToolButton(this); - selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg")); + selectionButton->setIcon(QIcon(":/Mask/images/maskeditor_arrow.svg")); selectionButton->setToolTip("Select/modify mask"); selectionButton->setCheckable(true); addWidget(selectionButton); @@ -144,43 +144,43 @@ void MaskEditorToolBar::setup_maskvalue_group() void MaskEditorToolBar::setup_shapes_group() { auto* roiButton = new QToolButton(this); - roiButton->setIcon(QIcon(":/Mask/img/maskeditor_roi.svg")); + roiButton->setIcon(QIcon(":/Mask/images/maskeditor_roi.svg")); roiButton->setToolTip("Create region of interest"); roiButton->setCheckable(true); addWidget(roiButton); auto* rectangleButton = new QToolButton(this); - rectangleButton->setIcon(QIcon(":/Mask/img/maskeditor_rectangle.svg")); + rectangleButton->setIcon(QIcon(":/Mask/images/maskeditor_rectangle.svg")); rectangleButton->setToolTip("Create rectangle mask"); rectangleButton->setCheckable(true); addWidget(rectangleButton); auto* polygonButton = new QToolButton(this); - polygonButton->setIcon(QIcon(":/Mask/img/maskeditor_polygon.svg")); + polygonButton->setIcon(QIcon(":/Mask/images/maskeditor_polygon.svg")); polygonButton->setToolTip("Create polygon mask"); polygonButton->setCheckable(true); addWidget(polygonButton); auto* verticalLineButton = new QToolButton(this); - verticalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_verticalline.svg")); + verticalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_verticalline.svg")); verticalLineButton->setToolTip("Create vertical line mask"); verticalLineButton->setCheckable(true); addWidget(verticalLineButton); auto* horizontalLineButton = new QToolButton(this); - horizontalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_horizontalline.svg")); + horizontalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_horizontalline.svg")); horizontalLineButton->setToolTip("Create horizontal line mask"); horizontalLineButton->setCheckable(true); addWidget(horizontalLineButton); auto* ellipseButton = new QToolButton(this); - ellipseButton->setIcon(QIcon(":/Mask/img/maskeditor_ellipse.svg")); + ellipseButton->setIcon(QIcon(":/Mask/images/maskeditor_ellipse.svg")); ellipseButton->setToolTip("Create ellipse mask"); ellipseButton->setCheckable(true); addWidget(ellipseButton); // QToolButton *maskAllButton = new QToolButton(this); - // maskAllButton->setIcon(QIcon(":/Mask/img/maskeditor_maskall.svg")); + // maskAllButton->setIcon(QIcon(":/Mask/images/maskeditor_maskall.svg")); // maskAllButton->setToolTip("Create masked area covering whole detector plane\n" // "Will be placed beneath all masks. Only one instance is // allowed."); @@ -208,7 +208,7 @@ void MaskEditorToolBar::setup_maskmodify_group() void MaskEditorToolBar::setup_extratools_group() { auto* presentationButton = new QToolButton(this); - presentationButton->setIcon(QIcon(":/Mask/img/maskeditor_lightbulb.svg")); + presentationButton->setIcon(QIcon(":/Mask/images/maskeditor_lightbulb.svg")); presentationButton->setToolTip("Press and hold to see mask results."); addWidget(presentationButton); @@ -218,7 +218,7 @@ void MaskEditorToolBar::setup_extratools_group() &MaskEditorToolBar::onPresentationTypeReleased); auto* propertyPanelButton = new QToolButton(this); - propertyPanelButton->setIcon(QIcon(":/Mask/img/maskeditor_toolpanel.svg")); + propertyPanelButton->setIcon(QIcon(":/Mask/images/maskeditor_toolpanel.svg")); propertyPanelButton->setToolTip("Open panel with additional properties"); addWidget(propertyPanelButton); diff --git a/GUI/View/Mask/MaskWidgets.qrc b/GUI/View/Mask/MaskWidgets.qrc index a228cb0b503fc160b183cafed063ece11c5f40a9..b7d41f68afafbc84326969276666a0f90e63d42e 100644 --- a/GUI/View/Mask/MaskWidgets.qrc +++ b/GUI/View/Mask/MaskWidgets.qrc @@ -1,21 +1,21 @@ <RCC> <qresource prefix="/Mask"> - <file>image/maskeditor_arrow.svg</file> - <file>image/maskeditor_hand.svg</file> - <file>image/maskeditor_refresh.svg</file> - <file>image/maskeditor_rectangle.svg</file> - <file>image/maskeditor_ellipse.svg</file> - <file>image/maskeditor_polygon.svg</file> - <file>image/maskeditor_bringtofront.svg</file> - <file>image/maskeditor_sendtoback.svg</file> - <file>image/maskeditor_maskall.svg</file> - <file>image/maskeditor_verticalline.svg</file> - <file>image/maskeditor_horizontalline.svg</file> - <file>image/maskeditor_toolpanel.svg</file> - <file>image/maskeditor_masktrue.svg</file> - <file>image/maskeditor_maskfalse.svg</file> - <file>image/maskeditor_lightbulb.svg</file> - <file>image/maskeditor_roi.svg</file> - <file>image/maskeditor_save.svg</file> + <file>images/maskeditor_arrow.svg</file> + <file>images/maskeditor_hand.svg</file> + <file>images/maskeditor_refresh.svg</file> + <file>images/maskeditor_rectangle.svg</file> + <file>images/maskeditor_ellipse.svg</file> + <file>images/maskeditor_polygon.svg</file> + <file>images/maskeditor_bringtofront.svg</file> + <file>images/maskeditor_sendtoback.svg</file> + <file>images/maskeditor_maskall.svg</file> + <file>images/maskeditor_verticalline.svg</file> + <file>images/maskeditor_horizontalline.svg</file> + <file>images/maskeditor_toolpanel.svg</file> + <file>images/maskeditor_masktrue.svg</file> + <file>images/maskeditor_maskfalse.svg</file> + <file>images/maskeditor_lightbulb.svg</file> + <file>images/maskeditor_roi.svg</file> + <file>images/maskeditor_save.svg</file> </qresource> </RCC> diff --git a/GUI/View/Mask/image/maskeditor_arrow.svg b/GUI/View/Mask/images/maskeditor_arrow.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_arrow.svg rename to GUI/View/Mask/images/maskeditor_arrow.svg diff --git a/GUI/View/Mask/image/maskeditor_bringtofront.svg b/GUI/View/Mask/images/maskeditor_bringtofront.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_bringtofront.svg rename to GUI/View/Mask/images/maskeditor_bringtofront.svg diff --git a/GUI/View/Mask/image/maskeditor_details.svg b/GUI/View/Mask/images/maskeditor_details.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_details.svg rename to GUI/View/Mask/images/maskeditor_details.svg diff --git a/GUI/View/Mask/image/maskeditor_ellipse.svg b/GUI/View/Mask/images/maskeditor_ellipse.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_ellipse.svg rename to GUI/View/Mask/images/maskeditor_ellipse.svg diff --git a/GUI/View/Mask/image/maskeditor_hand.svg b/GUI/View/Mask/images/maskeditor_hand.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_hand.svg rename to GUI/View/Mask/images/maskeditor_hand.svg diff --git a/GUI/View/Mask/image/maskeditor_horizontalline.svg b/GUI/View/Mask/images/maskeditor_horizontalline.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_horizontalline.svg rename to GUI/View/Mask/images/maskeditor_horizontalline.svg diff --git a/GUI/View/Mask/image/maskeditor_lightbulb.svg b/GUI/View/Mask/images/maskeditor_lightbulb.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_lightbulb.svg rename to GUI/View/Mask/images/maskeditor_lightbulb.svg diff --git a/GUI/View/Mask/image/maskeditor_maskall.svg b/GUI/View/Mask/images/maskeditor_maskall.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_maskall.svg rename to GUI/View/Mask/images/maskeditor_maskall.svg diff --git a/GUI/View/Mask/image/maskeditor_maskfalse.svg b/GUI/View/Mask/images/maskeditor_maskfalse.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_maskfalse.svg rename to GUI/View/Mask/images/maskeditor_maskfalse.svg diff --git a/GUI/View/Mask/image/maskeditor_masktrue.svg b/GUI/View/Mask/images/maskeditor_masktrue.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_masktrue.svg rename to GUI/View/Mask/images/maskeditor_masktrue.svg diff --git a/GUI/View/Mask/image/maskeditor_polygon.svg b/GUI/View/Mask/images/maskeditor_polygon.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_polygon.svg rename to GUI/View/Mask/images/maskeditor_polygon.svg diff --git a/GUI/View/Mask/image/maskeditor_rectangle.svg b/GUI/View/Mask/images/maskeditor_rectangle.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_rectangle.svg rename to GUI/View/Mask/images/maskeditor_rectangle.svg diff --git a/GUI/View/Mask/image/maskeditor_refresh.svg b/GUI/View/Mask/images/maskeditor_refresh.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_refresh.svg rename to GUI/View/Mask/images/maskeditor_refresh.svg diff --git a/GUI/View/Mask/image/maskeditor_roi.svg b/GUI/View/Mask/images/maskeditor_roi.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_roi.svg rename to GUI/View/Mask/images/maskeditor_roi.svg diff --git a/GUI/View/Mask/image/maskeditor_save.svg b/GUI/View/Mask/images/maskeditor_save.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_save.svg rename to GUI/View/Mask/images/maskeditor_save.svg diff --git a/GUI/View/Mask/image/maskeditor_sendtoback.svg b/GUI/View/Mask/images/maskeditor_sendtoback.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_sendtoback.svg rename to GUI/View/Mask/images/maskeditor_sendtoback.svg diff --git a/GUI/View/Mask/image/maskeditor_toolpanel.svg b/GUI/View/Mask/images/maskeditor_toolpanel.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_toolpanel.svg rename to GUI/View/Mask/images/maskeditor_toolpanel.svg diff --git a/GUI/View/Mask/image/maskeditor_verticalline.svg b/GUI/View/Mask/images/maskeditor_verticalline.svg similarity index 100% rename from GUI/View/Mask/image/maskeditor_verticalline.svg rename to GUI/View/Mask/images/maskeditor_verticalline.svg diff --git a/GUI/View/Projection/ProjectionsToolBar.cpp b/GUI/View/Projection/ProjectionsToolBar.cpp index 0ec9ac06ffc26fd49190269566929e9cf1ec9efe..e90a9bdad5a0484d3edea1bb96553343930572d7 100644 --- a/GUI/View/Projection/ProjectionsToolBar.cpp +++ b/GUI/View/Projection/ProjectionsToolBar.cpp @@ -105,7 +105,7 @@ void ProjectionsToolBar::setup_selection_group() add_separator(); auto* selectionButton = new QToolButton(this); - selectionButton->setIcon(QIcon(":/Mask/img/maskeditor_arrow.svg")); + selectionButton->setIcon(QIcon(":/Mask/images/maskeditor_arrow.svg")); selectionButton->setToolTip(selection_mode_tooltip); selectionButton->setCheckable(true); addWidget(selectionButton); @@ -117,13 +117,13 @@ void ProjectionsToolBar::setup_selection_group() void ProjectionsToolBar::setup_shapes_group() { auto* horizontalLineButton = new QToolButton(this); - horizontalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_horizontalline.svg")); + horizontalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_horizontalline.svg")); horizontalLineButton->setToolTip(horizontal_mode_tooltip); horizontalLineButton->setCheckable(true); addWidget(horizontalLineButton); auto* verticalLineButton = new QToolButton(this); - verticalLineButton->setIcon(QIcon(":/Mask/img/maskeditor_verticalline.svg")); + verticalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_verticalline.svg")); verticalLineButton->setToolTip(vertical_mode_tooltip); verticalLineButton->setCheckable(true); addWidget(verticalLineButton); @@ -137,7 +137,7 @@ void ProjectionsToolBar::setup_shapes_group() void ProjectionsToolBar::setup_extratools_group() { auto* saveButton = new QToolButton(this); - saveButton->setIcon(QIcon(":/Mask/img/maskeditor_save.svg")); + saveButton->setIcon(QIcon(":/Mask/images/maskeditor_save.svg")); saveButton->setToolTip("Save created projections in multi-column ASCII file."); addWidget(saveButton); connect(saveButton, &QToolButton::clicked, m_editorActions,