diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt
index 5cd5a70948ff76e2e9b95539015cc011f9fe9843..5b51f050b34a4ff13a373cec67fd990120302ac5 100644
--- a/GUI/CMakeLists.txt
+++ b/GUI/CMakeLists.txt
@@ -17,8 +17,6 @@ file(GLOB_RECURSE forms_files *.ui)
set(resource_files
gui.qrc
- View/Sample/Sample.qrc
- View/Canvas/Canvas.qrc
)
# --- Qt configuration ---------
diff --git a/GUI/Model/Sample/FormFactorItemCatalog.cpp b/GUI/Model/Sample/FormFactorItemCatalog.cpp
index 8452ba930a381a5fd55bc9f1337a38628412965c..e3f01f81ca1b7b007a1a3d9490a7509af4e690ad 100644
--- a/GUI/Model/Sample/FormFactorItemCatalog.cpp
+++ b/GUI/Model/Sample/FormFactorItemCatalog.cpp
@@ -136,133 +136,133 @@ UiInfo FormFactorItemCatalog::uiInfo(Type type)
switch (type) {
case Type::Pyramid2:
return {"Anisotropic pyramid", "Truncated pyramid with a rectangular base",
- ":/SampleDesignerToolbox/images/ff_Pyramid2_64x64.png"};
+ ":/images/ff_Pyramid2_64x64.png"};
case Type::BarGauss:
return {"BarGauss", "Rectangular cuboid",
- ":/SampleDesignerToolbox/images/ff_Box_64x64.png"};
+ ":/images/ff_Box_64x64.png"};
case Type::BarLorentz:
return {"BarLorentz", "Rectangular cuboid",
- ":/SampleDesignerToolbox/images/ff_Box_64x64.png"};
+ ":/images/ff_Box_64x64.png"};
case Type::Box:
- return {"Box", "Rectangular cuboid", ":/SampleDesignerToolbox/images/ff_Box_64x64.png"};
+ return {"Box", "Rectangular cuboid", ":/images/ff_Box_64x64.png"};
case Type::Cone:
return {"Cone", "Truncated cone with circular base",
- ":/SampleDesignerToolbox/images/ff_Cone_64x64.png"};
+ ":/images/ff_Cone_64x64.png"};
case Type::Pyramid6:
return {"Pyramid6", "A truncated pyramid, based on a regular hexagon",
- ":/SampleDesignerToolbox/images/ff_Pyramid6_64x64.png"};
+ ":/images/ff_Pyramid6_64x64.png"};
case Type::Bipyramid4:
return {"Bipyramid4",
"Compound of two truncated pyramids with a common square base "
"and opposite orientations",
- ":/SampleDesignerToolbox/images/ff_Bipyramid4_64x64.png"};
+ ":/images/ff_Bipyramid4_64x64.png"};
case Type::Dodecahedron:
return {"Dodecahedron", "Dodecahedron",
- ":/SampleDesignerToolbox/images/ff_Dodecahedron_64x64.png"};
+ ":/images/ff_Dodecahedron_64x64.png"};
case Type::Cylinder:
return {"Cylinder", "Cylinder with a circular base",
- ":/SampleDesignerToolbox/images/ff_Cylinder_64x64.png"};
+ ":/images/ff_Cylinder_64x64.png"};
case Type::EllipsoidalCylinder:
return {"Ellipsoidal cylinder", "Cylinder with an ellipse cross section",
- ":/SampleDesignerToolbox/images/ff_EllipsoidalCylinder_64x64.png"};
+ ":/images/ff_EllipsoidalCylinder_64x64.png"};
case Type::Sphere:
- return {"Full sphere", "Full sphere", ":/SampleDesignerToolbox/images/ff_Sphere_64x64.png"};
+ return {"Full sphere", "Full sphere", ":/images/ff_Sphere_64x64.png"};
case Type::Spheroid:
return {"Full spheroid",
"Full spheroid, generated by rotating an ellipse around the vertical axis",
- ":/SampleDesignerToolbox/images/ff_Spheroid_64x64.png"};
+ ":/images/ff_Spheroid_64x64.png"};
case Type::HemiEllipsoid:
return {"Hemi ellipsoid",
"A horizontally oriented ellipsoid, truncated at the central plane",
- ":/SampleDesignerToolbox/images/ff_HemiEllipsoid_64x64.png"};
+ ":/images/ff_HemiEllipsoid_64x64.png"};
case Type::Icosahedron:
return {"Icosahedron", "Icosahedron",
- ":/SampleDesignerToolbox/images/ff_Icosahedron_64x64.png"};
+ ":/images/ff_Icosahedron_64x64.png"};
case Type::Prism3:
return {"Prism3", "Prism with an equilateral triangle base",
- ":/SampleDesignerToolbox/images/ff_Prism3_64x64.png"};
+ ":/images/ff_Prism3_64x64.png"};
case Type::Prism6:
return {"Prism6", "Prism with a regular hexagonal base",
- ":/SampleDesignerToolbox/images/ff_Prism6_64x64.png"};
+ ":/images/ff_Prism6_64x64.png"};
case Type::Pyramid4:
return {"Pyramid4", "Truncated pyramid with a square base",
- ":/SampleDesignerToolbox/images/ff_Pyramid4_64x64.png"};
+ ":/images/ff_Pyramid4_64x64.png"};
case Type::CosineRippleBox:
return {"CosineRippleBox", "Particle with a cosine profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_CosineRipple_64x64.png"};
+ ":/images/ff_CosineRipple_64x64.png"};
case Type::CosineRippleGauss:
return {"CosineRippleGauss", "Particle with a cosine profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_CosineRipple_64x64.png"};
+ ":/images/ff_CosineRipple_64x64.png"};
case Type::CosineRippleLorentz:
return {"CosineRippleLorentz", "Particle with a cosine profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_CosineRipple_64x64.png"};
+ ":/images/ff_CosineRipple_64x64.png"};
case Type::SawtoothRippleBox:
return {"SawtoothRippleBox",
"Particle with an asymmetric triangle profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_SawtoothRipple_64x64.png"};
+ ":/images/ff_SawtoothRipple_64x64.png"};
case Type::SawtoothRippleGauss:
return {"SawtoothRippleGauss",
"Particle with an asymmetric triangle profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_SawtoothRipple_64x64.png"};
+ ":/images/ff_SawtoothRipple_64x64.png"};
case Type::SawtoothRippleLorentz:
return {"SawtoothRippleLorentz",
"Particle with an asymmetric triangle profile and a rectangular base",
- ":/SampleDesignerToolbox/images/ff_SawtoothRipple_64x64.png"};
+ ":/images/ff_SawtoothRipple_64x64.png"};
case Type::Pyramid3:
return {"Pyramid3",
"Truncated polyhedron with equilateral triangle base and cropped side faces",
- ":/SampleDesignerToolbox/images/ff_Pyramid3_64x64.png"};
+ ":/images/ff_Pyramid3_64x64.png"};
case Type::TruncatedCube:
return {"Truncated cube", "A cube whose eight vertices have been removed",
- ":/SampleDesignerToolbox/images/ff_TruncatedCube_64x64.png"};
+ ":/images/ff_TruncatedCube_64x64.png"};
case Type::TruncatedSphere:
return {"Truncated sphere", "Spherical dome",
- ":/SampleDesignerToolbox/images/ff_TruncatedSphere_64x64.png"};
+ ":/images/ff_TruncatedSphere_64x64.png"};
case Type::TruncatedSpheroid:
return {"Truncated spheroid", "Spheroidal dome",
- ":/SampleDesignerToolbox/images/ff_TruncatedSpheroid_64x64.png"};
+ ":/images/ff_TruncatedSpheroid_64x64.png"};
case Type::CantellatedCube:
return {"Cantellated cube", "A cube with truncated edges and vertices",
- ":/SampleDesignerToolbox/images/ff_CantellatedCube_64x64.png"};
+ ":/images/ff_CantellatedCube_64x64.png"};
case Type::HorizontalCylinder:
return {"Horizontal cylinder", "Cylinder with a circular base, lying in x direction",
- ":/SampleDesignerToolbox/images/ff_HorizontalCylinder_64x64.png"};
+ ":/images/ff_HorizontalCylinder_64x64.png"};
case Type::PlatonicOctahedron:
return {"Platonic octahedron", "Regular octahedron",
- ":/SampleDesignerToolbox/images/ff_PlatonicOctahedron_64x64.png"};
+ ":/images/ff_PlatonicOctahedron_64x64.png"};
case Type::PlatonicTetrahedron:
return {"Platonic tetrahedron", "Regular tetrahedron",
- ":/SampleDesignerToolbox/images/ff_PlatonicTetrahedron_64x64.png"};
+ ":/images/ff_PlatonicTetrahedron_64x64.png"};
default:
ASSERT_NEVER;
diff --git a/GUI/Model/Sample/InterferenceItemCatalog.cpp b/GUI/Model/Sample/InterferenceItemCatalog.cpp
index 087fb18b50c133ba2c585fcf6fc20b5333cc13f0..d1abbb716cec9b05e124c0d0b9c0f15c48c7f700 100644
--- a/GUI/Model/Sample/InterferenceItemCatalog.cpp
+++ b/GUI/Model/Sample/InterferenceItemCatalog.cpp
@@ -52,22 +52,22 @@ UiInfo InterferenceItemCatalog::uiInfo(Type type)
return {"None", "", ""};
case Type::RadialParacrystalRadial:
return {"Radial paracrystal", "Interference function of radial paracrystal",
- ":/SampleDesignerToolbox/images/Paracrystal1D.png"};
+ ":/images/Paracrystal1D.png"};
case Type::Paracrystal2D:
return {"2D paracrystal", "Interference function of two-dimensional paracrystal",
- ":/SampleDesignerToolbox/images/Paracrystal2D.png"};
+ ":/images/Paracrystal2D.png"};
case Type::Lattice1D:
return {"1D lattice", "Interference function of 1D lattice",
- ":/SampleDesignerToolbox/images/Lattice1D.png"};
+ ":/images/Lattice1D.png"};
case Type::Lattice2D:
return {"2D lattice", "Interference function of 2D lattice",
- ":/SampleDesignerToolbox/images/Lattice2D.png"};
+ ":/images/Lattice2D.png"};
case Type::FiniteLattice2D:
return {"Finite 2D lattice", "Interference function of finite 2D lattice",
- ":/SampleDesignerToolbox/images/Lattice2DFinite.png"};
+ ":/images/Lattice2DFinite.png"};
case Type::HardDisk:
return {"Hard disk Percus-Yevick", "Interference function for hard disk Percus-Yevick",
- ":/SampleDesignerToolbox/images/Lattice2D.png"};
+ ":/images/Lattice2D.png"};
default:
ASSERT_NEVER;
}
diff --git a/GUI/Model/Sample/ItemWithParticlesCatalog.cpp b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
index 88d1cdd2e1272faef81b656413e45af117e51538..78ac6f206fd1889f67bbd46be25767e8e90f1843 100644
--- a/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
+++ b/GUI/Model/Sample/ItemWithParticlesCatalog.cpp
@@ -52,13 +52,13 @@ UiInfo ItemWithParticlesCatalog::uiInfo(Type type)
return {"Particle", "", ""}; // particle is not on UI, only its form factor
case Type::Composition:
return {"Particle Composition", "Composition of particles with fixed positions",
- ":/SampleDesignerToolbox/images/Compound_64x64.png"};
+ ":/images/Compound_64x64.png"};
case Type::CoreShell:
return {"Core shell particle", "A particle with a core/shell geometry",
- ":/SampleDesignerToolbox/images/CoreAndShell_64x64.png"};
+ ":/images/CoreAndShell_64x64.png"};
case Type::Mesocrystal:
return {"Meso Crystal", "A 3D crystal structure of nanoparticles",
- ":/SampleDesignerToolbox/images/Mesocrystal_64x64.png"};
+ ":/images/Mesocrystal_64x64.png"};
default:
ASSERT_NEVER;
}
diff --git a/GUI/View/Canvas/Canvas.qrc b/GUI/View/Canvas/Canvas.qrc
deleted file mode 100644
index fdf067e3ec8e415630adb446e0f29e117b8426ad..0000000000000000000000000000000000000000
--- a/GUI/View/Canvas/Canvas.qrc
+++ /dev/null
@@ -1,21 +0,0 @@
-<RCC>
- <qresource prefix="/Mask">
- <file>images/maskeditor_arrow.svg</file>
- <file>images/maskeditor_bringtofront.svg</file>
- <file>images/maskeditor_ellipse.svg</file>
- <file>images/maskeditor_hand.svg</file>
- <file>images/maskeditor_horizontalline.svg</file>
- <file>images/maskeditor_lightbulb.svg</file>
- <file>images/maskeditor_maskall.svg</file>
- <file>images/maskeditor_maskfalse.svg</file>
- <file>images/maskeditor_masktrue.svg</file>
- <file>images/maskeditor_polygon.svg</file>
- <file>images/maskeditor_rectangle.svg</file>
- <file>images/maskeditor_refresh.svg</file>
- <file>images/maskeditor_roi.svg</file>
- <file>images/maskeditor_save.svg</file>
- <file>images/maskeditor_sendtoback.svg</file>
- <file>images/maskeditor_toolpanel.svg</file>
- <file>images/maskeditor_verticalline.svg</file>
- </qresource>
-</RCC>
diff --git a/GUI/View/Canvas/MaskEditorActions.cpp b/GUI/View/Canvas/MaskEditorActions.cpp
index 0d54df411313fbf419df4caa185d0e70bbabef36..3f994ee1946bcf7f00b9d2f5e13fd23bc3abc5a6 100644
--- a/GUI/View/Canvas/MaskEditorActions.cpp
+++ b/GUI/View/Canvas/MaskEditorActions.cpp
@@ -36,13 +36,13 @@ MaskEditorActions::MaskEditorActions(QWidget* parent)
connect(m_toggleMaskValueAction, &QAction::triggered, this,
&MaskEditorActions::onToggleMaskValueAction);
- m_bringToFrontAction->setIcon(QIcon(":/Mask/images/maskeditor_bringtofront.svg"));
+ m_bringToFrontAction->setIcon(QIcon(":/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/images/maskeditor_sendtoback.svg"));
+ m_sendToBackAction->setIcon(QIcon(":/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/Canvas/MaskEditorToolbar.cpp b/GUI/View/Canvas/MaskEditorToolbar.cpp
index 1fd37a3b0cf7223544b84fe2022cce48eee5cbbc..52db1519ce36b672aeb2349af2c6644d07292fc9 100644
--- a/GUI/View/Canvas/MaskEditorToolbar.cpp
+++ b/GUI/View/Canvas/MaskEditorToolbar.cpp
@@ -50,7 +50,7 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget*
add_separator();
auto* selectionButton = new QToolButton(this);
- selectionButton->setIcon(QIcon(":/Mask/images/maskeditor_arrow.svg"));
+ selectionButton->setIcon(QIcon(":/images/maskeditor_arrow.svg"));
selectionButton->setToolTip("Select/modify mask");
selectionButton->setCheckable(true);
addWidget(selectionButton);
@@ -61,43 +61,43 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget*
//... Shape creation tools
auto* roiButton = new QToolButton(this);
- roiButton->setIcon(QIcon(":/Mask/images/maskeditor_roi.svg"));
+ roiButton->setIcon(QIcon(":/images/maskeditor_roi.svg"));
roiButton->setToolTip("Create region of interest");
roiButton->setCheckable(true);
addWidget(roiButton);
auto* rectangleButton = new QToolButton(this);
- rectangleButton->setIcon(QIcon(":/Mask/images/maskeditor_rectangle.svg"));
+ rectangleButton->setIcon(QIcon(":/images/maskeditor_rectangle.svg"));
rectangleButton->setToolTip("Create rectangle mask");
rectangleButton->setCheckable(true);
addWidget(rectangleButton);
auto* polygonButton = new QToolButton(this);
- polygonButton->setIcon(QIcon(":/Mask/images/maskeditor_polygon.svg"));
+ polygonButton->setIcon(QIcon(":/images/maskeditor_polygon.svg"));
polygonButton->setToolTip("Create polygon mask");
polygonButton->setCheckable(true);
addWidget(polygonButton);
auto* verticalLineButton = new QToolButton(this);
- verticalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_verticalline.svg"));
+ verticalLineButton->setIcon(QIcon(":/images/maskeditor_verticalline.svg"));
verticalLineButton->setToolTip("Create vertical line mask");
verticalLineButton->setCheckable(true);
addWidget(verticalLineButton);
auto* horizontalLineButton = new QToolButton(this);
- horizontalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_horizontalline.svg"));
+ horizontalLineButton->setIcon(QIcon(":/images/maskeditor_horizontalline.svg"));
horizontalLineButton->setToolTip("Create horizontal line mask");
horizontalLineButton->setCheckable(true);
addWidget(horizontalLineButton);
auto* ellipseButton = new QToolButton(this);
- ellipseButton->setIcon(QIcon(":/Mask/images/maskeditor_ellipse.svg"));
+ ellipseButton->setIcon(QIcon(":/images/maskeditor_ellipse.svg"));
ellipseButton->setToolTip("Create ellipse mask");
ellipseButton->setCheckable(true);
addWidget(ellipseButton);
// QToolButton *maskAllButton = new QToolButton(this);
- // maskAllButton->setIcon(QIcon(":/Mask/images/maskeditor_maskall.svg"));
+ // maskAllButton->setIcon(QIcon(":/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.");
@@ -156,7 +156,7 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget*
//... Inspection tools
auto* presentationButton = new QToolButton(this);
- presentationButton->setIcon(QIcon(":/Mask/images/maskeditor_lightbulb.svg"));
+ presentationButton->setIcon(QIcon(":/images/maskeditor_lightbulb.svg"));
presentationButton->setToolTip("Press and hold to see mask results.");
addWidget(presentationButton);
@@ -165,7 +165,7 @@ MaskEditorToolbar::MaskEditorToolbar(MaskEditorActions* editorActions, QWidget*
[this]() { emit presentationChange(false); });
auto* propertyPanelButton = new QToolButton(this);
- propertyPanelButton->setIcon(QIcon(":/Mask/images/maskeditor_toolpanel.svg"));
+ propertyPanelButton->setIcon(QIcon(":/images/maskeditor_toolpanel.svg"));
propertyPanelButton->setToolTip("Open panel with additional properties");
addWidget(propertyPanelButton);
diff --git a/GUI/View/Sample/Sample.qrc b/GUI/View/Sample/Sample.qrc
deleted file mode 100644
index 121ef5d8c1684d8404e49a22b90267963d793e57..0000000000000000000000000000000000000000
--- a/GUI/View/Sample/Sample.qrc
+++ /dev/null
@@ -1,46 +0,0 @@
-<RCC>
- <qresource prefix="/SampleDesigner">
- <file>images/alpha-m-box.svg</file>
- <file>images/arrow-top-left.svg</file>
- <file>images/camera-metering-center.svg</file>
- <file>images/delete.svg</file>
- <file>images/hand-right.svg</file>
- <file>images/rotate-3d.svg</file>
- </qresource>
- <qresource prefix="/SampleDesignerToolbox">
- <file>images/Compound_64x64.png</file>
- <file>images/CoreAndShell_64x64.png</file>
- <file>images/Lattice1D.png</file>
- <file>images/Lattice2D.png</file>
- <file>images/Lattice2DFinite.png</file>
- <file>images/Layer.png</file>
- <file>images/Mesocrystal_64x64.png</file>
- <file>images/MultiLayer.png</file>
- <file>images/Paracrystal1D.png</file>
- <file>images/Paracrystal2D.png</file>
- <file>images/ParticleLayout.png</file>
- <file>images/Transformation.png</file>
- <file>images/ff_Bipyramid4_64x64.png</file>
- <file>images/ff_Box_64x64.png</file>
- <file>images/ff_Cone_64x64.png</file>
- <file>images/ff_CosineRipple_64x64.png</file>
- <file>images/ff_Cylinder_64x64.png</file>
- <file>images/ff_Dodecahedron_64x64.png</file>
- <file>images/ff_EllipsoidalCylinder_64x64.png</file>
- <file>images/ff_HemiEllipsoid_64x64.png</file>
- <file>images/ff_Icosahedron_64x64.png</file>
- <file>images/ff_Prism3_64x64.png</file>
- <file>images/ff_Prism6_64x64.png</file>
- <file>images/ff_Pyramid2_64x64.png</file>
- <file>images/ff_Pyramid3_64x64.png</file>
- <file>images/ff_Pyramid4_64x64.png</file>
- <file>images/ff_Pyramid6_64x64.png</file>
- <file>images/ff_SawtoothRipple_64x64.png</file>
- <file>images/ff_Sphere_64x64.png</file>
- <file>images/ff_Spheroid_64x64.png</file>
- <file>images/ff_TruncatedCube_64x64.png</file>
- <file>images/ff_TruncatedSphere_64x64.png</file>
- <file>images/ff_TruncatedSpheroid_64x64.png</file>
- <file>images/sample_layers2.png</file>
- </qresource>
-</RCC>
diff --git a/GUI/View/Sample/SampleListing.cpp b/GUI/View/Sample/SampleListing.cpp
index d5e90e14b6208420be47924f25e215584e7d6b44..c553a329fa0a50a57acbeaeac9512148da13789e 100644
--- a/GUI/View/Sample/SampleListing.cpp
+++ b/GUI/View/Sample/SampleListing.cpp
@@ -117,7 +117,7 @@ SampleListing::SampleListing(QWidget* parent, ProjectDocument* document)
for (const auto& exampleName : GUI::ExamplesFactory::exampleNames()) {
QString title, description;
std::tie(title, description) = GUI::ExamplesFactory::exampleInfo(exampleName);
- auto icon = QIcon(":/SampleDesignerToolbox/images/sample_layers2.png");
+ auto icon = QIcon(":/images/sample_layers2.png");
auto* action = menu->addAction(icon, title);
action->setToolTip(description);
connect(action, &QAction::triggered, [this, exampleName, title, description]() {
diff --git a/GUI/View/Sample/images/camera-metering-center.svg b/GUI/View/Sample/images/camera-metering-center.svg
deleted file mode 100644
index 4a1b48b4dc2d349757becefdb1a9ababe8ef0f67..0000000000000000000000000000000000000000
--- a/GUI/View/Sample/images/camera-metering-center.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="camera-metering-center.svg"
- id="svg4"
- viewBox="0 0 24 24"
- height="24"
- width="24"
- version="1.1">
- <metadata
- id="metadata10">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs8" />
- <sodipodi:namedview
- inkscape:current-layer="svg4"
- inkscape:window-maximized="0"
- inkscape:window-y="0"
- inkscape:window-x="0"
- inkscape:cy="12"
- inkscape:cx="12"
- inkscape:zoom="47.791667"
- showgrid="false"
- id="namedview6"
- inkscape:window-height="1389"
- inkscape:window-width="2085"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- style="fill:#838686;fill-opacity:1"
- id="path2"
- d="M4,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20H4A2,2 0 0,1 2,18V6A2,2 0 0,1 4,4M4,6V18H20V6H4M12,10.5A1.5,1.5 0 0,1 13.5,12A1.5,1.5 0 0,1 12,13.5A1.5,1.5 0 0,1 10.5,12A1.5,1.5 0 0,1 12,10.5M12,7.5C14.14,7.5 15.93,9 16.39,11H14.83C14.42,9.83 13.31,9 12,9C10.69,9 9.58,9.83 9.17,11H7.61C8.07,9 9.86,7.5 12,7.5M12,16.5C9.86,16.5 8.07,15 7.61,13H9.17C9.58,14.17 10.69,15 12,15C13.31,15 14.42,14.17 14.83,13H16.39C15.93,15 14.14,16.5 12,16.5Z" />
-</svg>
diff --git a/GUI/View/Sample/images/delete.svg b/GUI/View/Sample/images/delete.svg
deleted file mode 100644
index 291e7047b2461302f0ff037e88f1558f9916fc1c..0000000000000000000000000000000000000000
--- a/GUI/View/Sample/images/delete.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="delete.svg"
- id="svg4"
- viewBox="0 0 24 24"
- height="24"
- width="24"
- version="1.1">
- <metadata
- id="metadata10">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs8" />
- <sodipodi:namedview
- inkscape:current-layer="svg4"
- inkscape:window-maximized="1"
- inkscape:window-y="0"
- inkscape:window-x="0"
- inkscape:cy="12"
- inkscape:cx="12"
- inkscape:zoom="47.791667"
- showgrid="false"
- id="namedview6"
- inkscape:window-height="1363"
- inkscape:window-width="2500"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- style="fill:#838686;fill-opacity:1"
- id="path2"
- d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
-</svg>
diff --git a/GUI/View/Sample/images/hand-right.svg b/GUI/View/Sample/images/hand-right.svg
deleted file mode 100644
index d10541d008fa014265207a255d7d95b7506dc568..0000000000000000000000000000000000000000
--- a/GUI/View/Sample/images/hand-right.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
- sodipodi:docname="hand-right.svg"
- id="svg4"
- viewBox="0 0 24 24"
- height="24"
- width="24"
- version="1.1">
- <metadata
- id="metadata10">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs8" />
- <sodipodi:namedview
- inkscape:current-layer="svg4"
- inkscape:window-maximized="0"
- inkscape:window-y="117"
- inkscape:window-x="1466"
- inkscape:cy="12"
- inkscape:cx="12"
- inkscape:zoom="29.791667"
- showgrid="false"
- id="namedview6"
- inkscape:window-height="1365"
- inkscape:window-width="1817"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- style="fill:#838686;fill-opacity:1"
- id="path2"
- d="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
-</svg>
diff --git a/GUI/View/Setup/ProjectionsToolbar.cpp b/GUI/View/Setup/ProjectionsToolbar.cpp
index 9728683b03742e46e0080d87a954ec4c335f24bf..bb0cee015719179253a6a705cafec535bb9cbaa3 100644
--- a/GUI/View/Setup/ProjectionsToolbar.cpp
+++ b/GUI/View/Setup/ProjectionsToolbar.cpp
@@ -99,7 +99,7 @@ void ProjectionsToolbar::setup_selection_group()
add_separator();
auto* selectionButton = new QToolButton(this);
- selectionButton->setIcon(QIcon(":/Mask/images/maskeditor_arrow.svg"));
+ selectionButton->setIcon(QIcon(":/images/maskeditor_arrow.svg"));
selectionButton->setToolTip(selection_mode_tooltip);
selectionButton->setCheckable(true);
addWidget(selectionButton);
@@ -111,13 +111,13 @@ void ProjectionsToolbar::setup_selection_group()
void ProjectionsToolbar::setup_shapes_group()
{
auto* horizontalLineButton = new QToolButton(this);
- horizontalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_horizontalline.svg"));
+ horizontalLineButton->setIcon(QIcon(":/images/maskeditor_horizontalline.svg"));
horizontalLineButton->setToolTip(horizontal_mode_tooltip);
horizontalLineButton->setCheckable(true);
addWidget(horizontalLineButton);
auto* verticalLineButton = new QToolButton(this);
- verticalLineButton->setIcon(QIcon(":/Mask/images/maskeditor_verticalline.svg"));
+ verticalLineButton->setIcon(QIcon(":/images/maskeditor_verticalline.svg"));
verticalLineButton->setToolTip(vertical_mode_tooltip);
verticalLineButton->setCheckable(true);
addWidget(verticalLineButton);
@@ -131,7 +131,7 @@ void ProjectionsToolbar::setup_shapes_group()
void ProjectionsToolbar::setup_extratools_group()
{
auto* saveButton = new QToolButton(this);
- saveButton->setIcon(QIcon(":/Mask/images/maskeditor_save.svg"));
+ saveButton->setIcon(QIcon(":/images/maskeditor_save.svg"));
saveButton->setToolTip("Save created projections in multi-column ASCII file.");
addWidget(saveButton);
connect(saveButton, &QToolButton::clicked, m_editorActions, &ProjectionActions::onSaveAction);
diff --git a/GUI/gui.qrc b/GUI/gui.qrc
index aed12d2167b152aee804f8641054544142ffa6f2..0842d4c65bb3b77e3a18b0bbe2023ddf88e72e71 100644
--- a/GUI/gui.qrc
+++ b/GUI/gui.qrc
@@ -1,9 +1,23 @@
<RCC>
<qresource prefix="/">
<file>images/BornAgain.ico</file>
+ <file>images/Compound_64x64.png</file>
+ <file>images/CoreAndShell_64x64.png</file>
+ <file>images/Lattice1D.png</file>
+ <file>images/Lattice2D.png</file>
+ <file>images/Lattice2DFinite.png</file>
+ <file>images/Layer.png</file>
+ <file>images/Mesocrystal_64x64.png</file>
+ <file>images/MultiLayer.png</file>
+ <file>images/Paracrystal1D.png</file>
+ <file>images/Paracrystal2D.png</file>
+ <file>images/ParticleLayout.png</file>
+ <file>images/Transformation.png</file>
<file>images/about_icon.awk</file>
<file>images/about_icon.png</file>
<file>images/alpha-f-box.svg</file>
+ <file>images/alpha-m-box.svg</file>
+ <file>images/arrow-top-left.svg</file>
<file>images/camera-metering-center.svg</file>
<file>images/caret-down.svg</file>
<file>images/caret-right.svg</file>
@@ -23,6 +37,27 @@
<file>images/dock-float.svg</file>
<file>images/dock-right.svg</file>
<file>images/expand_arrow.png</file>
+ <file>images/ff_Bipyramid4_64x64.png</file>
+ <file>images/ff_Box_64x64.png</file>
+ <file>images/ff_Cone_64x64.png</file>
+ <file>images/ff_CosineRipple_64x64.png</file>
+ <file>images/ff_Cylinder_64x64.png</file>
+ <file>images/ff_Dodecahedron_64x64.png</file>
+ <file>images/ff_EllipsoidalCylinder_64x64.png</file>
+ <file>images/ff_HemiEllipsoid_64x64.png</file>
+ <file>images/ff_Icosahedron_64x64.png</file>
+ <file>images/ff_Prism3_64x64.png</file>
+ <file>images/ff_Prism6_64x64.png</file>
+ <file>images/ff_Pyramid2_64x64.png</file>
+ <file>images/ff_Pyramid3_64x64.png</file>
+ <file>images/ff_Pyramid4_64x64.png</file>
+ <file>images/ff_Pyramid6_64x64.png</file>
+ <file>images/ff_SawtoothRipple_64x64.png</file>
+ <file>images/ff_Sphere_64x64.png</file>
+ <file>images/ff_Spheroid_64x64.png</file>
+ <file>images/ff_TruncatedCube_64x64.png</file>
+ <file>images/ff_TruncatedSphere_64x64.png</file>
+ <file>images/ff_TruncatedSpheroid_64x64.png</file>
<file>images/gisas_instrument.svg</file>
<file>images/gisas_instrument_new.svg</file>
<file>images/gisas_instrument_shaded.svg</file>
@@ -38,6 +73,23 @@
<file>images/main_simulationview.svg</file>
<file>images/main_testview.svg</file>
<file>images/main_welcomeview.svg</file>
+ <file>images/maskeditor_arrow.svg</file>
+ <file>images/maskeditor_bringtofront.svg</file>
+ <file>images/maskeditor_ellipse.svg</file>
+ <file>images/maskeditor_hand.svg</file>
+ <file>images/maskeditor_horizontalline.svg</file>
+ <file>images/maskeditor_lightbulb.svg</file>
+ <file>images/maskeditor_maskall.svg</file>
+ <file>images/maskeditor_maskfalse.svg</file>
+ <file>images/maskeditor_masktrue.svg</file>
+ <file>images/maskeditor_polygon.svg</file>
+ <file>images/maskeditor_rectangle.svg</file>
+ <file>images/maskeditor_refresh.svg</file>
+ <file>images/maskeditor_roi.svg</file>
+ <file>images/maskeditor_save.svg</file>
+ <file>images/maskeditor_sendtoback.svg</file>
+ <file>images/maskeditor_toolpanel.svg</file>
+ <file>images/maskeditor_verticalline.svg</file>
<file>images/menu-open.svg</file>
<file>images/mode_script.png</file>
<file>images/move_up_down.svg</file>
@@ -48,7 +100,9 @@
<file>images/play.svg</file>
<file>images/radio-checked.svg</file>
<file>images/reset.png</file>
+ <file>images/rotate-3d.svg</file>
<file>images/rotate-left.svg</file>
+ <file>images/sample_layers2.png</file>
<file>images/shape-square-plus.svg</file>
<file>images/specular_instrument.svg</file>
<file>images/specular_instrument_new.svg</file>
diff --git a/GUI/View/Sample/images/Compound_64x64.png b/GUI/images/Compound_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/Compound_64x64.png
rename to GUI/images/Compound_64x64.png
diff --git a/GUI/View/Sample/images/CoreAndShell_64x64.png b/GUI/images/CoreAndShell_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/CoreAndShell_64x64.png
rename to GUI/images/CoreAndShell_64x64.png
diff --git a/GUI/View/Sample/images/Lattice1D.png b/GUI/images/Lattice1D.png
similarity index 100%
rename from GUI/View/Sample/images/Lattice1D.png
rename to GUI/images/Lattice1D.png
diff --git a/GUI/View/Sample/images/Lattice2D.png b/GUI/images/Lattice2D.png
similarity index 100%
rename from GUI/View/Sample/images/Lattice2D.png
rename to GUI/images/Lattice2D.png
diff --git a/GUI/View/Sample/images/Lattice2DFinite.png b/GUI/images/Lattice2DFinite.png
similarity index 100%
rename from GUI/View/Sample/images/Lattice2DFinite.png
rename to GUI/images/Lattice2DFinite.png
diff --git a/GUI/View/Sample/images/Layer.png b/GUI/images/Layer.png
similarity index 100%
rename from GUI/View/Sample/images/Layer.png
rename to GUI/images/Layer.png
diff --git a/GUI/View/Sample/images/Mesocrystal_64x64.png b/GUI/images/Mesocrystal_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/Mesocrystal_64x64.png
rename to GUI/images/Mesocrystal_64x64.png
diff --git a/GUI/View/Sample/images/MultiLayer.png b/GUI/images/MultiLayer.png
similarity index 100%
rename from GUI/View/Sample/images/MultiLayer.png
rename to GUI/images/MultiLayer.png
diff --git a/GUI/View/Sample/images/Paracrystal1D.png b/GUI/images/Paracrystal1D.png
similarity index 100%
rename from GUI/View/Sample/images/Paracrystal1D.png
rename to GUI/images/Paracrystal1D.png
diff --git a/GUI/View/Sample/images/Paracrystal2D.png b/GUI/images/Paracrystal2D.png
similarity index 100%
rename from GUI/View/Sample/images/Paracrystal2D.png
rename to GUI/images/Paracrystal2D.png
diff --git a/GUI/View/Sample/images/ParticleDistribution_64x64.png b/GUI/images/ParticleDistribution_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ParticleDistribution_64x64.png
rename to GUI/images/ParticleDistribution_64x64.png
diff --git a/GUI/View/Sample/images/ParticleLayout.png b/GUI/images/ParticleLayout.png
similarity index 100%
rename from GUI/View/Sample/images/ParticleLayout.png
rename to GUI/images/ParticleLayout.png
diff --git a/GUI/View/Sample/images/Transformation.png b/GUI/images/Transformation.png
similarity index 100%
rename from GUI/View/Sample/images/Transformation.png
rename to GUI/images/Transformation.png
diff --git a/GUI/View/Sample/images/alpha-m-box.svg b/GUI/images/alpha-m-box.svg
similarity index 100%
rename from GUI/View/Sample/images/alpha-m-box.svg
rename to GUI/images/alpha-m-box.svg
diff --git a/GUI/View/Sample/images/arrow-top-left.svg b/GUI/images/arrow-top-left.svg
similarity index 100%
rename from GUI/View/Sample/images/arrow-top-left.svg
rename to GUI/images/arrow-top-left.svg
diff --git a/GUI/View/Sample/images/ff_Bipyramid4_64x64.png b/GUI/images/ff_Bipyramid4_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Bipyramid4_64x64.png
rename to GUI/images/ff_Bipyramid4_64x64.png
diff --git a/GUI/View/Sample/images/ff_Box_64x64.png b/GUI/images/ff_Box_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Box_64x64.png
rename to GUI/images/ff_Box_64x64.png
diff --git a/GUI/View/Sample/images/ff_Cone_64x64.png b/GUI/images/ff_Cone_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Cone_64x64.png
rename to GUI/images/ff_Cone_64x64.png
diff --git a/GUI/View/Sample/images/ff_CosineRipple_64x64.png b/GUI/images/ff_CosineRipple_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_CosineRipple_64x64.png
rename to GUI/images/ff_CosineRipple_64x64.png
diff --git a/GUI/View/Sample/images/ff_Cylinder_64x64.png b/GUI/images/ff_Cylinder_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Cylinder_64x64.png
rename to GUI/images/ff_Cylinder_64x64.png
diff --git a/GUI/View/Sample/images/ff_Dodecahedron_64x64.png b/GUI/images/ff_Dodecahedron_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Dodecahedron_64x64.png
rename to GUI/images/ff_Dodecahedron_64x64.png
diff --git a/GUI/View/Sample/images/ff_EllipsoidalCylinder_64x64.png b/GUI/images/ff_EllipsoidalCylinder_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_EllipsoidalCylinder_64x64.png
rename to GUI/images/ff_EllipsoidalCylinder_64x64.png
diff --git a/GUI/View/Sample/images/ff_HemiEllipsoid_64x64.png b/GUI/images/ff_HemiEllipsoid_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_HemiEllipsoid_64x64.png
rename to GUI/images/ff_HemiEllipsoid_64x64.png
diff --git a/GUI/View/Sample/images/ff_Icosahedron_64x64.png b/GUI/images/ff_Icosahedron_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Icosahedron_64x64.png
rename to GUI/images/ff_Icosahedron_64x64.png
diff --git a/GUI/View/Sample/images/ff_Prism3_64x64.png b/GUI/images/ff_Prism3_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Prism3_64x64.png
rename to GUI/images/ff_Prism3_64x64.png
diff --git a/GUI/View/Sample/images/ff_Prism6_64x64.png b/GUI/images/ff_Prism6_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Prism6_64x64.png
rename to GUI/images/ff_Prism6_64x64.png
diff --git a/GUI/View/Sample/images/ff_Pyramid2_64x64.png b/GUI/images/ff_Pyramid2_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Pyramid2_64x64.png
rename to GUI/images/ff_Pyramid2_64x64.png
diff --git a/GUI/View/Sample/images/ff_Pyramid3_64x64.png b/GUI/images/ff_Pyramid3_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Pyramid3_64x64.png
rename to GUI/images/ff_Pyramid3_64x64.png
diff --git a/GUI/View/Sample/images/ff_Pyramid4_64x64.png b/GUI/images/ff_Pyramid4_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Pyramid4_64x64.png
rename to GUI/images/ff_Pyramid4_64x64.png
diff --git a/GUI/View/Sample/images/ff_Pyramid6_64x64.png b/GUI/images/ff_Pyramid6_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Pyramid6_64x64.png
rename to GUI/images/ff_Pyramid6_64x64.png
diff --git a/GUI/View/Sample/images/ff_SawtoothRipple_64x64.png b/GUI/images/ff_SawtoothRipple_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_SawtoothRipple_64x64.png
rename to GUI/images/ff_SawtoothRipple_64x64.png
diff --git a/GUI/View/Sample/images/ff_Sphere_64x64.png b/GUI/images/ff_Sphere_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Sphere_64x64.png
rename to GUI/images/ff_Sphere_64x64.png
diff --git a/GUI/View/Sample/images/ff_Spheroid_64x64.png b/GUI/images/ff_Spheroid_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_Spheroid_64x64.png
rename to GUI/images/ff_Spheroid_64x64.png
diff --git a/GUI/View/Sample/images/ff_TruncatedCube_64x64.png b/GUI/images/ff_TruncatedCube_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_TruncatedCube_64x64.png
rename to GUI/images/ff_TruncatedCube_64x64.png
diff --git a/GUI/View/Sample/images/ff_TruncatedSphere_64x64.png b/GUI/images/ff_TruncatedSphere_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_TruncatedSphere_64x64.png
rename to GUI/images/ff_TruncatedSphere_64x64.png
diff --git a/GUI/View/Sample/images/ff_TruncatedSpheroid_64x64.png b/GUI/images/ff_TruncatedSpheroid_64x64.png
similarity index 100%
rename from GUI/View/Sample/images/ff_TruncatedSpheroid_64x64.png
rename to GUI/images/ff_TruncatedSpheroid_64x64.png
diff --git a/GUI/View/Canvas/images/maskeditor_arrow.svg b/GUI/images/maskeditor_arrow.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_arrow.svg
rename to GUI/images/maskeditor_arrow.svg
diff --git a/GUI/View/Canvas/images/maskeditor_bringtofront.svg b/GUI/images/maskeditor_bringtofront.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_bringtofront.svg
rename to GUI/images/maskeditor_bringtofront.svg
diff --git a/GUI/View/Canvas/images/maskeditor_details.svg b/GUI/images/maskeditor_details.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_details.svg
rename to GUI/images/maskeditor_details.svg
diff --git a/GUI/View/Canvas/images/maskeditor_ellipse.svg b/GUI/images/maskeditor_ellipse.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_ellipse.svg
rename to GUI/images/maskeditor_ellipse.svg
diff --git a/GUI/View/Canvas/images/maskeditor_hand.svg b/GUI/images/maskeditor_hand.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_hand.svg
rename to GUI/images/maskeditor_hand.svg
diff --git a/GUI/View/Canvas/images/maskeditor_horizontalline.svg b/GUI/images/maskeditor_horizontalline.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_horizontalline.svg
rename to GUI/images/maskeditor_horizontalline.svg
diff --git a/GUI/View/Canvas/images/maskeditor_lightbulb.svg b/GUI/images/maskeditor_lightbulb.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_lightbulb.svg
rename to GUI/images/maskeditor_lightbulb.svg
diff --git a/GUI/View/Canvas/images/maskeditor_maskall.svg b/GUI/images/maskeditor_maskall.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_maskall.svg
rename to GUI/images/maskeditor_maskall.svg
diff --git a/GUI/View/Canvas/images/maskeditor_maskfalse.svg b/GUI/images/maskeditor_maskfalse.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_maskfalse.svg
rename to GUI/images/maskeditor_maskfalse.svg
diff --git a/GUI/View/Canvas/images/maskeditor_masktrue.svg b/GUI/images/maskeditor_masktrue.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_masktrue.svg
rename to GUI/images/maskeditor_masktrue.svg
diff --git a/GUI/View/Canvas/images/maskeditor_polygon.svg b/GUI/images/maskeditor_polygon.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_polygon.svg
rename to GUI/images/maskeditor_polygon.svg
diff --git a/GUI/View/Canvas/images/maskeditor_rectangle.svg b/GUI/images/maskeditor_rectangle.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_rectangle.svg
rename to GUI/images/maskeditor_rectangle.svg
diff --git a/GUI/View/Canvas/images/maskeditor_refresh.svg b/GUI/images/maskeditor_refresh.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_refresh.svg
rename to GUI/images/maskeditor_refresh.svg
diff --git a/GUI/View/Canvas/images/maskeditor_roi.svg b/GUI/images/maskeditor_roi.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_roi.svg
rename to GUI/images/maskeditor_roi.svg
diff --git a/GUI/View/Canvas/images/maskeditor_save.svg b/GUI/images/maskeditor_save.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_save.svg
rename to GUI/images/maskeditor_save.svg
diff --git a/GUI/View/Canvas/images/maskeditor_sendtoback.svg b/GUI/images/maskeditor_sendtoback.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_sendtoback.svg
rename to GUI/images/maskeditor_sendtoback.svg
diff --git a/GUI/View/Canvas/images/maskeditor_toolpanel.svg b/GUI/images/maskeditor_toolpanel.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_toolpanel.svg
rename to GUI/images/maskeditor_toolpanel.svg
diff --git a/GUI/View/Canvas/images/maskeditor_verticalline.svg b/GUI/images/maskeditor_verticalline.svg
similarity index 100%
rename from GUI/View/Canvas/images/maskeditor_verticalline.svg
rename to GUI/images/maskeditor_verticalline.svg
diff --git a/GUI/View/Sample/images/rotate-3d.svg b/GUI/images/rotate-3d.svg
similarity index 100%
rename from GUI/View/Sample/images/rotate-3d.svg
rename to GUI/images/rotate-3d.svg
diff --git a/GUI/View/Sample/images/sample_layers2.png b/GUI/images/sample_layers2.png
similarity index 100%
rename from GUI/View/Sample/images/sample_layers2.png
rename to GUI/images/sample_layers2.png
diff --git a/GUI/View/Sample/images/sample_layers3.png b/GUI/images/sample_layers3.png
similarity index 100%
rename from GUI/View/Sample/images/sample_layers3.png
rename to GUI/images/sample_layers3.png