Skip to content
Snippets Groups Projects
Commit f4dc307a authored by Matthias Puchner's avatar Matthias Puchner
Browse files

fix toolbar images

this fixes #151
parent c3ef91ac
No related branches found
No related tags found
1 merge request!576fix toolbar images
Pipeline #52966 passed
Showing
with 29 additions and 29 deletions
...@@ -35,13 +35,13 @@ MaskEditorActions::MaskEditorActions(QWidget* parent) ...@@ -35,13 +35,13 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
connect(m_toggleMaskValueAction, &QAction::triggered, this, connect(m_toggleMaskValueAction, &QAction::triggered, this,
&MaskEditorActions::onToggleMaskValueAction); &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->setToolTip("Rise selected mask one level up (PgUp)");
m_bringToFrontAction->setShortcuts(QKeySequence::MoveToPreviousPage); m_bringToFrontAction->setShortcuts(QKeySequence::MoveToPreviousPage);
connect(m_bringToFrontAction, &QAction::triggered, this, connect(m_bringToFrontAction, &QAction::triggered, this,
&MaskEditorActions::onBringToFrontAction); &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->setToolTip("Lower selected mask one level down (PgDown)");
m_sendToBackAction->setShortcuts(QKeySequence::MoveToNextPage); m_sendToBackAction->setShortcuts(QKeySequence::MoveToNextPage);
connect(m_sendToBackAction, &QAction::triggered, this, &MaskEditorActions::onSendToBackAction); connect(m_sendToBackAction, &QAction::triggered, this, &MaskEditorActions::onSendToBackAction);
......
...@@ -109,7 +109,7 @@ void MaskEditorToolBar::setup_selection_group() ...@@ -109,7 +109,7 @@ void MaskEditorToolBar::setup_selection_group()
add_separator(); add_separator();
auto* selectionButton = new QToolButton(this); 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->setToolTip("Select/modify mask");
selectionButton->setCheckable(true); selectionButton->setCheckable(true);
addWidget(selectionButton); addWidget(selectionButton);
...@@ -144,43 +144,43 @@ void MaskEditorToolBar::setup_maskvalue_group() ...@@ -144,43 +144,43 @@ void MaskEditorToolBar::setup_maskvalue_group()
void MaskEditorToolBar::setup_shapes_group() void MaskEditorToolBar::setup_shapes_group()
{ {
auto* roiButton = new QToolButton(this); 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->setToolTip("Create region of interest");
roiButton->setCheckable(true); roiButton->setCheckable(true);
addWidget(roiButton); addWidget(roiButton);
auto* rectangleButton = new QToolButton(this); 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->setToolTip("Create rectangle mask");
rectangleButton->setCheckable(true); rectangleButton->setCheckable(true);
addWidget(rectangleButton); addWidget(rectangleButton);
auto* polygonButton = new QToolButton(this); 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->setToolTip("Create polygon mask");
polygonButton->setCheckable(true); polygonButton->setCheckable(true);
addWidget(polygonButton); addWidget(polygonButton);
auto* verticalLineButton = new QToolButton(this); 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->setToolTip("Create vertical line mask");
verticalLineButton->setCheckable(true); verticalLineButton->setCheckable(true);
addWidget(verticalLineButton); addWidget(verticalLineButton);
auto* horizontalLineButton = new QToolButton(this); 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->setToolTip("Create horizontal line mask");
horizontalLineButton->setCheckable(true); horizontalLineButton->setCheckable(true);
addWidget(horizontalLineButton); addWidget(horizontalLineButton);
auto* ellipseButton = new QToolButton(this); 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->setToolTip("Create ellipse mask");
ellipseButton->setCheckable(true); ellipseButton->setCheckable(true);
addWidget(ellipseButton); addWidget(ellipseButton);
// QToolButton *maskAllButton = new QToolButton(this); // 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" // maskAllButton->setToolTip("Create masked area covering whole detector plane\n"
// "Will be placed beneath all masks. Only one instance is // "Will be placed beneath all masks. Only one instance is
// allowed."); // allowed.");
...@@ -208,7 +208,7 @@ void MaskEditorToolBar::setup_maskmodify_group() ...@@ -208,7 +208,7 @@ void MaskEditorToolBar::setup_maskmodify_group()
void MaskEditorToolBar::setup_extratools_group() void MaskEditorToolBar::setup_extratools_group()
{ {
auto* presentationButton = new QToolButton(this); 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."); presentationButton->setToolTip("Press and hold to see mask results.");
addWidget(presentationButton); addWidget(presentationButton);
...@@ -218,7 +218,7 @@ void MaskEditorToolBar::setup_extratools_group() ...@@ -218,7 +218,7 @@ void MaskEditorToolBar::setup_extratools_group()
&MaskEditorToolBar::onPresentationTypeReleased); &MaskEditorToolBar::onPresentationTypeReleased);
auto* propertyPanelButton = new QToolButton(this); 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"); propertyPanelButton->setToolTip("Open panel with additional properties");
addWidget(propertyPanelButton); addWidget(propertyPanelButton);
......
<RCC> <RCC>
<qresource prefix="/Mask"> <qresource prefix="/Mask">
<file>image/maskeditor_arrow.svg</file> <file>images/maskeditor_arrow.svg</file>
<file>image/maskeditor_hand.svg</file> <file>images/maskeditor_hand.svg</file>
<file>image/maskeditor_refresh.svg</file> <file>images/maskeditor_refresh.svg</file>
<file>image/maskeditor_rectangle.svg</file> <file>images/maskeditor_rectangle.svg</file>
<file>image/maskeditor_ellipse.svg</file> <file>images/maskeditor_ellipse.svg</file>
<file>image/maskeditor_polygon.svg</file> <file>images/maskeditor_polygon.svg</file>
<file>image/maskeditor_bringtofront.svg</file> <file>images/maskeditor_bringtofront.svg</file>
<file>image/maskeditor_sendtoback.svg</file> <file>images/maskeditor_sendtoback.svg</file>
<file>image/maskeditor_maskall.svg</file> <file>images/maskeditor_maskall.svg</file>
<file>image/maskeditor_verticalline.svg</file> <file>images/maskeditor_verticalline.svg</file>
<file>image/maskeditor_horizontalline.svg</file> <file>images/maskeditor_horizontalline.svg</file>
<file>image/maskeditor_toolpanel.svg</file> <file>images/maskeditor_toolpanel.svg</file>
<file>image/maskeditor_masktrue.svg</file> <file>images/maskeditor_masktrue.svg</file>
<file>image/maskeditor_maskfalse.svg</file> <file>images/maskeditor_maskfalse.svg</file>
<file>image/maskeditor_lightbulb.svg</file> <file>images/maskeditor_lightbulb.svg</file>
<file>image/maskeditor_roi.svg</file> <file>images/maskeditor_roi.svg</file>
<file>image/maskeditor_save.svg</file> <file>images/maskeditor_save.svg</file>
</qresource> </qresource>
</RCC> </RCC>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment