diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
index 605e3c2023c9abb289ada1c7659e878e053fd188..f60c56267dba08f1e42cef9973a4a165b67d4c95 100644
--- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget.cpp
@@ -70,7 +70,7 @@ FitComparisonWidget::FitComparisonWidget(QWidget *parent)
m_resetViewAction = new QAction(this);
m_resetViewAction->setText("Reset View");
- m_resetViewAction->setIcon(QIcon(":/images/toolbar_refresh.png"));
+ m_resetViewAction->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
m_resetViewAction->setToolTip("Reset View");
connect(m_resetViewAction, SIGNAL(triggered()), this, SLOT(onResetViewAction()));
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
index 3839653ee6fc791142dc3703937a4c4327c0dd85..d348efa80cbffaceb4ff9da6ffcf7833c7630d49 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.cpp
@@ -72,6 +72,10 @@ ColorMap *ColorMapCanvas::colorMap()
return m_colorMap;
}
+QCustomPlot *ColorMapCanvas::customPlot() {
+ return m_colorMap->customPlot();
+}
+
void ColorMapCanvas::setStatusLabelEnabled(bool flag)
{
m_statusLabel->setLabelEnabled(flag);
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
index 72062fd0a25ab16cd9b5d7be8fb3b5b698e2c94b..6a843aaafa91ebda2764520b0b0a386051bf102b 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/ColorMapCanvas.h
@@ -21,6 +21,7 @@
#include <QWidget>
class ColorMap;
+class QCustomPlot;
class ColorMapCanvasEvent;
class IntensityDataItem;
class ColorMapLabel;
@@ -40,6 +41,7 @@ public:
void setItem(IntensityDataItem *intensityDataItem);
ColorMap *colorMap();
+ QCustomPlot *customPlot();
void setStatusLabelEnabled(bool flag);
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..fb4b6cdda9f509fadb00dbda2728281c43fdb350
--- /dev/null
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
@@ -0,0 +1,89 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.cpp
+//! @brief Implements class IntensityDataWidget
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
+//! @authors Walter Van Herck, Joachim Wuttke
+//
+// ************************************************************************** //
+
+#include "IntensityDataWidget.h"
+#include "ColorMapCanvas.h"
+#include "IntensityDataItem.h"
+#include "SavePlotAssistant.h"
+#include "AppSvc.h"
+#include "projectmanager.h"
+#include <QVBoxLayout>
+#include <QAction>
+
+IntensityDataWidget::IntensityDataWidget(QWidget *parent)
+ : SessionItemWidget(parent)
+ , m_colorMap(new ColorMapCanvas(this))
+ , m_resetViewAction(0)
+ , m_savePlotAction(0)
+{
+ setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ layout->addWidget(m_colorMap);
+ setLayout(layout);
+
+ m_colorMap->setStatusLabelEnabled(true);
+}
+
+void IntensityDataWidget::setItem(SessionItem *item)
+{
+ IntensityDataItem *intensityItem = dynamic_cast<IntensityDataItem *>(item);
+ Q_ASSERT(intensityItem);
+ setIntensityData(intensityItem);
+}
+
+void IntensityDataWidget::setIntensityData(IntensityDataItem *intensityItem)
+{
+ m_currentItem = intensityItem;
+ m_colorMap->setItem(intensityItem);
+}
+
+QList<QAction *> IntensityDataWidget::actionList()
+{
+ return QList<QAction *>() << m_resetViewAction << m_savePlotAction;
+}
+
+void IntensityDataWidget::onResetViewAction()
+{
+ m_currentItem->resetView();
+}
+
+void IntensityDataWidget::onSavePlotAction()
+{
+ QString dirname = AppSvc::projectManager()->userExportDir();
+ SavePlotAssistant saveAssistant;
+ saveAssistant.savePlot(dirname, m_colorMap->customPlot(), m_currentItem);
+
+}
+
+void IntensityDataWidget::initActions()
+{
+ m_resetViewAction = new QAction(this);
+ m_resetViewAction->setText("Reset");
+ m_resetViewAction->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
+ m_resetViewAction->setToolTip("Reset View");
+ connect(m_resetViewAction, SIGNAL(triggered()), this, SLOT(onResetViewAction()));
+
+ m_savePlotAction = new QAction(this);
+ m_savePlotAction->setText("Save");
+ m_savePlotAction->setIcon(QIcon(":/images/toolbar16light_save.svg"));
+ m_savePlotAction->setToolTip("Save Plot");
+ connect(m_savePlotAction, SIGNAL(triggered()), this, SIGNAL(savePlot()));
+
+}
+
diff --git a/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
new file mode 100644
index 0000000000000000000000000000000000000000..64d00051ce6905a13b18a787e17e58c246a5fdde
--- /dev/null
+++ b/GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
@@ -0,0 +1,57 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file GUI/coregui/Views/IntensityDataWidgets/IntensityDataWidget.h
+//! @brief Declares class IntensityDataWidget
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
+//! @authors Walter Van Herck, Joachim Wuttke
+//
+// ************************************************************************** //
+
+#ifndef INTENSITYDATAWIDGET_H
+#define INTENSITYDATAWIDGET_H
+
+#include "SessionItemWidget.h"
+
+class SessionItem;
+class IntensityDataItem;
+class ColorMapCanvas;
+class QAction;
+
+//! The IntensityDataWidget class represents IntensityDataItem as color map,
+//! provides standard actions (reset view, save as) for external toolbars and context menus.
+
+class BA_CORE_API_ IntensityDataWidget : public SessionItemWidget
+{
+ Q_OBJECT
+public:
+ explicit IntensityDataWidget(QWidget *parent = 0);
+
+ void setItem(SessionItem *item);
+ void setIntensityData(IntensityDataItem *intensityItem);
+
+ QSize sizeHint() const { return QSize(500, 400); }
+ QSize minimumSizeHint() const { return QSize(128, 128); }
+
+ QList<QAction *> actionList();
+
+public slots:
+ void onResetViewAction();
+ void onSavePlotAction();
+
+private:
+ void initActions();
+
+ ColorMapCanvas *m_colorMap;
+ IntensityDataItem *m_currentItem;
+ QAction *m_resetViewAction;
+ QAction *m_savePlotAction;
+};
+
+#endif
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
index 64d89d39f27ca4ccc1ef9c1206e4f7083055910c..2ccdb76b5594eccb92ccc2eca1771928c606af18 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataPlotWidget.cpp
@@ -188,7 +188,7 @@ void ObsoleteIntensityDataPlotWidget::savePlot(const QString &dirname)
m_centralPlot->showLinesOverTheMap(false);
SavePlotAssistant saveAssistant;
- saveAssistant.savePlot(dirname, m_centralPlot, m_item);
+ saveAssistant.savePlot(dirname, m_centralPlot->getCustomPlot(), m_item);
m_centralPlot->showLinesOverTheMap(projections_flag);
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
index c05ab0bcf41a5606724207f03df2bb1e27ce711e..3158e4bad874f9bc1df47af6d639b04186aacb87 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/ObsoleteIntensityDataWidgetActions.cpp
@@ -28,7 +28,7 @@ ObsoleteIntensityDataWidgetActions::ObsoleteIntensityDataWidgetActions(QObject *
// projections button
m_toggleProjectionsAction = new QAction(this);
m_toggleProjectionsAction->setText("Projections");
- m_toggleProjectionsAction->setIcon(QIcon(":/images/toolbar_projections.png"));
+ m_toggleProjectionsAction->setIcon(QIcon(":/images/toolbar16light_projections.svg"));
m_toggleProjectionsAction->setToolTip("Toggle Projections, Ctrl+P");
m_toggleProjectionsAction->setShortcut(Qt::CTRL + Qt::Key_P);
connect(m_toggleProjectionsAction, SIGNAL(triggered()), this, SIGNAL(toggleProjections()));
@@ -36,21 +36,21 @@ ObsoleteIntensityDataWidgetActions::ObsoleteIntensityDataWidgetActions(QObject *
// plot properties button
m_togglePropertyPanelAction = new QAction(this);
m_togglePropertyPanelAction->setText("Plot Properties");
- m_togglePropertyPanelAction->setIcon(QIcon(":/images/toolbar_propertypanel.png"));
+ m_togglePropertyPanelAction->setIcon(QIcon(":/images/toolbar16light_propertypanel.svg"));
m_togglePropertyPanelAction->setToolTip("Toggle Property Panel");
connect(m_togglePropertyPanelAction, SIGNAL(triggered()), this, SIGNAL(togglePropertyPanel()));
// reset view button
m_resetViewAction = new QAction(this);
m_resetViewAction->setText("Reset View");
- m_resetViewAction->setIcon(QIcon(":/images/toolbar_refresh.png"));
+ m_resetViewAction->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
m_resetViewAction->setToolTip("Reset View");
connect(m_resetViewAction, SIGNAL(triggered()), this, SIGNAL(resetView()));
// save plot button
m_savePlotAction = new QAction(this);
m_savePlotAction->setText("Save Plot");
- m_savePlotAction->setIcon(QIcon(":/images/toolbar_save.png"));
+ m_savePlotAction->setIcon(QIcon(":/images/toolbar16light_save.svg"));
m_savePlotAction->setToolTip("Save Plot");
connect(m_savePlotAction, SIGNAL(triggered()), this, SIGNAL(savePlot()));
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index decd5ed9c3a07bc24fac890a56c050a239a6f8c0..37586c538c75cec301e1b82ca9d297925a476975 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -54,7 +54,7 @@ SavePlotAssistant::Format::Format(const QString &file_extention, const QString &
}
-void SavePlotAssistant::savePlot(const QString &dirname, ColorMapPlot *plot,
+void SavePlotAssistant::savePlot(const QString &dirname, QCustomPlot *plot,
IntensityDataItem *item)
{
@@ -79,18 +79,18 @@ void SavePlotAssistant::savePlot(const QString &dirname, ColorMapPlot *plot,
}
-void SavePlotAssistant::saveToFile(const QString &fileName, ColorMapPlot *plot, IntensityDataItem *item)
+void SavePlotAssistant::saveToFile(const QString &fileName, QCustomPlot *plot, IntensityDataItem *item)
{
if(isPngFile(fileName)) {
- plot->getCustomPlot()->savePng(fileName);
+ plot->savePng(fileName);
}
else if(isJpgFile(fileName)) {
- plot->getCustomPlot()->saveJpg(fileName);
+ plot->saveJpg(fileName);
}
else if(isPdfFile(fileName)) {
- plot->getCustomPlot()->savePdf(fileName, true, plot->width(), plot->height());
+ plot->savePdf(fileName, true, plot->width(), plot->height());
}
else {
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
index d5b4ff532de96941c4a364ba7082b4e6410b926e..cd51badce9f6e1ee79fbdcbc6ecde7c5cede5a93 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.h
@@ -21,7 +21,7 @@
#include <QString>
#include <QVector>
-class ColorMapPlot;
+class QCustomPlot;
class IntensityDataItem;
//! Assistant class which contains all logic for saving IntensityData to various formats
@@ -38,10 +38,10 @@ public:
QString m_filter;
};
- void savePlot(const QString &dirname, ColorMapPlot *plot, IntensityDataItem *item);
+ void savePlot(const QString &dirname, QCustomPlot *plot, IntensityDataItem *item);
private:
- void saveToFile(const QString &dirname, ColorMapPlot *plot, IntensityDataItem *item);
+ void saveToFile(const QString &dirname, QCustomPlot *plot, IntensityDataItem *item);
QString getFilterString() const;
QString composeFileName(const QString &fileName, const QString &filterName) const;
bool isValidExtension(const QString &fileName) const;
diff --git a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
index ed77a03224a995d97a28652fad001b63896ace3e..ad63aebaa1664660f7e1c93db2876283fc8b5f18 100644
--- a/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
+++ b/GUI/coregui/Views/JobWidgets/JobRealTimeToolBar.cpp
@@ -24,7 +24,7 @@ JobRealTimeToolBar::JobRealTimeToolBar(QWidget *parent)
{
m_resetParametersButton = new QToolButton;
m_resetParametersButton->setText("Reset Values");
- m_resetParametersButton->setIcon(QIcon(":/images/toolbar_refresh.png"));
+ m_resetParametersButton->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
m_resetParametersButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
m_resetParametersButton->setToolTip("Reset parameter tree to initial values");
connect(m_resetParametersButton, SIGNAL(clicked()), this, SIGNAL(resetParameters()));
diff --git a/GUI/coregui/coregui.qrc b/GUI/coregui/coregui.qrc
index 918bc19915c46b7d87e631e99b57019268764175..a09ce702a9e1b9707e0d23d2aa2f260a650becd5 100644
--- a/GUI/coregui/coregui.qrc
+++ b/GUI/coregui/coregui.qrc
@@ -14,10 +14,6 @@
<file>images/treeview-vline.png</file>
<file>images/toolbar_newitem.png</file>
<file>images/toolbar_newitem_dark.png</file>
- <file>images/toolbar_propertypanel.png</file>
- <file>images/toolbar_projections.png</file>
- <file>images/toolbar_save.png</file>
- <file>images/toolbar_refresh.png</file>
<file>images/BornAgain.ico</file>
<file>images/collapse_arrow.png</file>
<file>images/expand_arrow.png</file>
@@ -46,5 +42,9 @@
<file>images/main_sampleview.svg</file>
<file>images/main_simulationview.svg</file>
<file>images/main_welcomeview.svg</file>
+ <file>images/toolbar16light_refresh.svg</file>
+ <file>images/toolbar16light_save.svg</file>
+ <file>images/toolbar16light_projections.svg</file>
+ <file>images/toolbar16light_propertypanel.svg</file>
</qresource>
</RCC>
diff --git a/GUI/coregui/images/toolbar16light_projections.svg b/GUI/coregui/images/toolbar16light_projections.svg
new file mode 100644
index 0000000000000000000000000000000000000000..69228689d8837baa03ea19914c2cfe90b24bbe7d
--- /dev/null
+++ b/GUI/coregui/images/toolbar16light_projections.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="toolbar16light_projections.svg">
+ <defs
+ id="defs2987">
+ <linearGradient
+ id="linearGradient4619">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4621" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop4623" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4592">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4594" />
+ <stop
+ style="stop-color:#fafafa;stop-opacity:0.98039216;"
+ offset="1"
+ id="stop4596" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4708"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.90913729,12.020815)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4724"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.3671751,0,0,0.36023659,-29.207084,18.152322)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3048"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,1,-8.55667,-29.093836)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient3842"
+ x1="15.25"
+ y1="45.42857"
+ x2="-1.8214296"
+ y2="31.214285"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.180851,0,-7.2519001)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3865"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.62755996,0,0,-0.47506245,26.451121,61.449025)"
+ x1="10.561905"
+ y1="40.022835"
+ x2="72.974625"
+ y2="40.232647" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3877"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.5182754,0.47506245,0,-14.41469,55.234524)"
+ x1="49.54509"
+ y1="30.625572"
+ x2="7.64222"
+ y2="54.892372" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.8994949"
+ inkscape:cx="-8.8446327"
+ inkscape:cy="13.567461"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="2466"
+ inkscape:window-height="1365"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3012"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-32)">
+ <rect
+ style="fill:none;stroke:url(#linearGradient3842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect3066"
+ width="14.071428"
+ height="11.892857"
+ x="0.96428573"
+ y="34.035717" />
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3865);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="m 14.056812,43.040356 0,-0.237531 0,-0.593829 0,-0.237531 -0.313782,0 -11.47258,0 -0.3137789,0 0,0.237531 0,0.593829 0,0.237531 0.3137789,0 11.47258,0 z"
+ id="path3863"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:transform-center-x="1.9282711"
+ inkscape:transform-center-y="-1.3571429" />
+ <path
+ inkscape:transform-center-y="-1.592478"
+ inkscape:transform-center-x="-1.3571434"
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3875"
+ d="m 3.9939791,44.998584 0.237531,0 0.593829,0 0.237531,0 0,-0.25914 0,-9.474722 0,-0.259136 -0.237531,0 -0.593829,0 -0.237531,0 0,0.259136 0,9.474722 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3877);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ </g>
+</svg>
diff --git a/GUI/coregui/images/toolbar16light_propertypanel.svg b/GUI/coregui/images/toolbar16light_propertypanel.svg
new file mode 100644
index 0000000000000000000000000000000000000000..feef1d2b93414979b4ad5682cbcf76f8dcf10508
--- /dev/null
+++ b/GUI/coregui/images/toolbar16light_propertypanel.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="toolbar16light_propertypanel.svg">
+ <defs
+ id="defs2987">
+ <linearGradient
+ id="linearGradient4619">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4621" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop4623" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4592">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4594" />
+ <stop
+ style="stop-color:#fafafa;stop-opacity:0.98039216;"
+ offset="1"
+ id="stop4596" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4708"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.90913729,12.020815)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4724"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.3671751,0,0,0.36023659,-29.207084,18.152322)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3048"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,1,-8.55667,-29.093836)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3045"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.57754839,-0.47506245,0,29.449857,23.442116)"
+ x1="40.269428"
+ y1="37.76749"
+ x2="7.64222"
+ y2="54.892372" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient3842"
+ x1="15.25"
+ y1="45.42857"
+ x2="-1.8214296"
+ y2="31.214285"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.180851,0,-7.2519001)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="28"
+ inkscape:cx="9.8913153"
+ inkscape:cy="20.070975"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="2466"
+ inkscape:window-height="1365"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3012"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-32)">
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path3043"
+ d="m 11.041187,34.848697 -0.237531,0 -0.593829,0 -0.2375313,0 0,0.288775 0,10.558306 0,0.288774 0.2375313,0 0.593829,0 0.237531,0 0,-0.288774 0,-10.558306 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3045);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ <rect
+ style="fill:none;stroke:url(#linearGradient3842);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="rect3066"
+ width="14.071428"
+ height="11.892857"
+ x="0.96428573"
+ y="34.035717" />
+ </g>
+</svg>
diff --git a/GUI/coregui/images/toolbar16light_refresh.svg b/GUI/coregui/images/toolbar16light_refresh.svg
new file mode 100644
index 0000000000000000000000000000000000000000..83381ddb45a50366033f8f9bdb7595287cdf241d
--- /dev/null
+++ b/GUI/coregui/images/toolbar16light_refresh.svg
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="toolbar_refresh.svg">
+ <defs
+ id="defs2987">
+ <linearGradient
+ id="linearGradient4619">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4621" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop4623" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4592">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4594" />
+ <stop
+ style="stop-color:#fafafa;stop-opacity:0.98039216;"
+ offset="1"
+ id="stop4596" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient4598"
+ x1="45"
+ y1="48"
+ x2="2"
+ y2="-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(10.909648,55.154329)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4625"
+ x1="29"
+ y1="43"
+ x2="29"
+ y2="35"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9869024,0,0,0.88776083,14.858206,-1.0006961)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4668"
+ gradientUnits="userSpaceOnUse"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26"
+ gradientTransform="matrix(1,0,0,1.4537913,18.3876,-22.652505)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4672"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.79979796,22.377703,2.0874223)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0164907,0,0,0.3860471,26.03748,17.720659)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4680"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.1601616,30.256893,-11.572613)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4700"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="translate(15.508666,0.29673785)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4704"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(15.508666,4.2449983)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4708"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.90913729,12.020815)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4712"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="matrix(4.6365492,0,0,0.66328254,-16.517836,-0.93725566)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4716"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6702208,0,0,0.66328257,-16.95234,3.0023381)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4720"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6702208,0,0,0.71090166,-16.851325,6.6321668)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4724"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.3671751,0,0,0.36023659,-29.207084,18.152322)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4726"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="translate(15.508666,-3.5505077)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4759"
+ x1="-12"
+ y1="130"
+ x2="-53"
+ y2="80"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99471384,0,0,1,69.141448,-85.657091)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4765"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(15.437237,8.3570368)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4767"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6365491,0,0,0.7347112,-16.517838,10.410751)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3048"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,1,-8.55667,-29.093836)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3849"
+ x1="6.7053576"
+ y1="2.4417202"
+ x2="16.750076"
+ y2="16.584578"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0646916,0,0,1.0646916,5.7075434,16.103804)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3857"
+ x1="8.1339283"
+ y1="39.205357"
+ x2="9.6383924"
+ y2="41.88393"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2897384,0,0,1.2897384,3.7451135,-27.058853)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3907"
+ x1="10.138392"
+ y1="3.9216595"
+ x2="16.049644"
+ y2="11.671659"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3942"
+ gradientUnits="userSpaceOnUse"
+ x1="10.138392"
+ y1="3.9216595"
+ x2="16.049644"
+ y2="11.671659"
+ gradientTransform="matrix(0,-1,-1,0,-0.26768743,35.589456)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient5357"
+ x1="15.697366"
+ y1="8.7413301"
+ x2="-1.7544643"
+ y2="-0.75867051"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient5361"
+ gradientUnits="userSpaceOnUse"
+ x1="2.0187941"
+ y1="1.2770442"
+ x2="16.459822"
+ y2="9.9199009"
+ gradientTransform="matrix(-1,0,0,-1,16.121472,48.018373)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7"
+ inkscape:cx="1.0212593"
+ inkscape:cy="-7.4038592"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1866"
+ inkscape:window-height="1129"
+ inkscape:window-x="-2"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3012"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-32)">
+ <path
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient5357);fill-opacity:1;stroke:none;stroke-width:2.39316606999999992;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+ d="M 6,0.84375 C 5.844669,0.86053995 5.6934609,0.91454283 5.5625,1 l -1.9375,1.125 -2,1.15625 c -0.6177992,0.3453388 -0.6177992,1.4046612 0,1.75 l 2,1.15625 1.96875,1.15625 C 5.9157492,7.5338605 6.3459071,7.5212088 6.65625,7.3125 6.9286777,7.1269396 7.0986982,6.7990429 7.09375,6.46875 L 7.09375,5 10.25,5 c 1.560157,0 2.78125,1.221093 2.78125,2.78125 l 0,0.21875 2,0 0,-0.21875 C 15.03125,5.147687 12.883563,3 10.25,3 l -3.15625,0 0,-1.125 C 7.1130789,1.3073696 6.5635651,0.78925657 6,0.84375 z"
+ transform="translate(0,32)"
+ id="path5296"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccssccssccc" />
+ <path
+ sodipodi:nodetypes="ccccccccccssccssccc"
+ inkscape:connector-curvature="0"
+ id="path5359"
+ d="m 10.121472,47.174623 c 0.155331,-0.01679 0.306539,-0.07079 0.4375,-0.15625 l 1.9375,-1.125 2,-1.15625 c 0.617799,-0.345339 0.617799,-1.404661 0,-1.75 l -2,-1.15625 -1.96875,-1.15625 c -0.322,-0.190111 -0.7521575,-0.177459 -1.0625004,0.03125 -0.2724277,0.18556 -0.4424482,0.513457 -0.4375,0.84375 l 0,1.46875 -3.1562496,0 c -1.560157,0 -2.78125,-1.221093 -2.78125,-2.78125 l 0,-0.21875 -2,0 0,0.21875 c 0,2.633563 2.147687,4.78125 4.78125,4.78125 l 3.1562496,0 0,1.125 c -0.019329,0.56763 0.5301849,1.085743 1.0937504,1.03125 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient5361);fill-opacity:1;stroke:none;stroke-width:2.39316606999999992;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ </g>
+</svg>
diff --git a/GUI/coregui/images/toolbar16light_save.svg b/GUI/coregui/images/toolbar16light_save.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0d975d0d89427ec86c658fd5b900241262f28181
--- /dev/null
+++ b/GUI/coregui/images/toolbar16light_save.svg
@@ -0,0 +1,482 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="16"
+ height="16"
+ id="svg2985"
+ version="1.1"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="toolbar_save.svg">
+ <defs
+ id="defs2987">
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4051"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3926"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect3922"
+ is_visible="true" />
+ <linearGradient
+ id="linearGradient4619">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4621" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop4623" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4592">
+ <stop
+ style="stop-color:#c3c3c3;stop-opacity:1;"
+ offset="0"
+ id="stop4594" />
+ <stop
+ style="stop-color:#fafafa;stop-opacity:0.98039216;"
+ offset="1"
+ id="stop4596" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient4598"
+ x1="45"
+ y1="48"
+ x2="2"
+ y2="-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(10.909648,55.154329)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4625"
+ x1="29"
+ y1="43"
+ x2="29"
+ y2="35"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.9869024,0,0,0.88776083,14.858206,-1.0006961)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4656"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,0.94809312,-15.163812,-6.4833842)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4668"
+ gradientUnits="userSpaceOnUse"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26"
+ gradientTransform="matrix(1,0,0,1.4537913,18.3876,-22.652505)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4672"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1.2915176,0.80407114,0,-15.408859,55.27986)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4676"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0164907,0,0,0.3860471,26.03748,17.720659)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4680"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.1601616,30.256893,-11.572613)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4700"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="translate(15.508666,0.29673785)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4704"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(15.508666,4.2449983)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4708"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.90913729,12.020815)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4712"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="matrix(4.6365492,0,0,0.66328254,-16.517836,-0.93725566)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4716"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6702208,0,0,0.66328257,-16.95234,3.0023381)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4720"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6702208,0,0,0.71090166,-16.851325,6.6321668)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4724"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.3671751,0,0,0.36023659,-29.207084,18.152322)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4726"
+ gradientUnits="userSpaceOnUse"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6"
+ gradientTransform="translate(15.508666,-3.5505077)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4759"
+ x1="-12"
+ y1="130"
+ x2="-53"
+ y2="80"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99471384,0,0,1,69.141448,-85.657091)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4765"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.66328237,0,0,1.1394731,-17.730579,23.913574)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4767"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(4.6365491,0,0,0.7347112,-16.517838,10.410751)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3048"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,1,-8.55667,-29.093836)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3052"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.65017886,0,0,1.1934711,-9.7381059,-18.749028)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3056"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.66183957,0,0,1.1887523,-6.9359667,-18.60587)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3060"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.65017887,0,0,1.8399477,4.3333226,-36.504531)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3063"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.66208822,0,0,1.1934971,-12.940946,-18.75003)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3067"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.62685746,-0.61777663,0,21.093199,14.975927)"
+ x1="21.943026"
+ y1="41.468658"
+ x2="21.886053"
+ y2="19.814222" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3071"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.62685746,0,0,0.4762124,-12.163812,13.403845)"
+ x1="21.886053"
+ y1="34.025185"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3041"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-1.2915176,1.2004509,0,-28.219842,51.672718)"
+ x1="22"
+ y1="38"
+ x2="22"
+ y2="26" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3045"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.25907572,0.25907572,-0.31584538,-0.31584538,14.14782,40.46799)"
+ x1="71.532593"
+ y1="40.067352"
+ x2="10.606053"
+ y2="40.475281" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3049"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.21079682,-4.0147447,0,176.39826,21.006889)"
+ x1="16.462538"
+ y1="40.980659"
+ x2="45.942516"
+ y2="40.977962" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3053"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.21079682,-2.6972844,0,120.23954,16.042603)"
+ x1="20.528742"
+ y1="40.974152"
+ x2="75.761345"
+ y2="41.011337" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient3842"
+ x1="15.25"
+ y1="45.42857"
+ x2="-1.8214296"
+ y2="31.214285"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.180851,-16.821429,-22.180472)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3865"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.62755996,0,0,-0.47506245,9.3082639,54.806168)"
+ x1="10.561905"
+ y1="40.022835"
+ x2="72.974625"
+ y2="40.232647" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3869"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.25907572,0.25907572,-0.31584538,-0.31584538,41.719249,52.21799)"
+ x1="46.09877"
+ y1="38.31469"
+ x2="-59.354187"
+ y2="44.150227" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3873"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.23799509,-0.23475192,0.29014549,-0.28619166,-9.2963524,65.495879)"
+ x1="1.419955"
+ y1="39.402046"
+ x2="71.868683"
+ y2="38.274639" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient3877"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,-0.5182754,0.47506245,0,-29.343261,50.841667)"
+ x1="49.54509"
+ y1="30.625572"
+ x2="7.64222"
+ y2="54.892372" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient3946"
+ x1="13.212693"
+ y1="13.353808"
+ x2="0.23667158"
+ y2="-2.303556"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.1696428,0,0,1.1666666,-20.589286,30.70238)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4619"
+ id="linearGradient4047"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99661579,0,0,1.3418541,-1.8533621,23.186357)"
+ x1="11"
+ y1="12"
+ x2="11"
+ y2="6" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4592"
+ id="linearGradient4070"
+ x1="14.897322"
+ y1="14.979911"
+ x2="-2.3214285"
+ y2="-2.4486606"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="19.79899"
+ inkscape:cx="4.4844367"
+ inkscape:cy="13.725908"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1866"
+ inkscape:window-height="1129"
+ inkscape:window-x="-2"
+ inkscape:window-y="-3"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3012"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata2990">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ transform="translate(0,-32)">
+ <path
+ style="fill:url(#linearGradient4070);fill-opacity:1;fill-rule:evenodd;stroke:none"
+ d="M 3.6875 1.03125 C 2.1837858 1.03125 0.96875 2.2462858 0.96875 3.75 L 0.96875 12.28125 C 0.96875 13.784964 2.1837858 15 3.6875 15 L 12.28125 15 C 13.784964 15 15 13.784964 15 12.28125 L 15 3.75 L 13 1.03125 L 11.96875 1.03125 L 11.96875 5.0625 C 11.96875 5.6000619 11.835808 6.0867263 11.625 6.4375 C 11.414192 6.7882737 11.135565 7 10.8125 7 L 5.25 7 C 4.9269354 7 4.6170584 6.7882737 4.40625 6.4375 C 4.1954416 6.0867263 4.0625 5.6000619 4.0625 5.0625 L 4.0625 1.03125 L 3.6875 1.03125 z M 3.375 9.4375 A 0.50005 0.50005 0 0 1 3.53125 9.4375 L 13.09375 9.4375 A 0.50005 0.50005 0 1 1 13.09375 10.4375 L 4.03125 10.4375 L 4.03125 12.53125 A 0.50005 0.50005 0 1 1 3.03125 12.53125 L 3.03125 9.9375 A 0.50005 0.50005 0 0 1 3.375 9.4375 z "
+ transform="translate(0,32)"
+ id="path4043" />
+ <path
+ sodipodi:nodetypes="ccccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path4045"
+ d="m 8.0171814,33.927999 0,0.670927 0,2.683708 0,0.670926 0.4983091,0 1.9932295,0 0.498308,0 0,-0.670926 0,-2.683708 0,-0.670927 -0.498308,0 -1.9932295,0 z"
+ style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4047);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+ </g>
+</svg>
diff --git a/GUI/coregui/images/toolbar_projections.png b/GUI/coregui/images/toolbar_projections.png
deleted file mode 100644
index 4e290759becd7890582607650acc295a45ca351c..0000000000000000000000000000000000000000
Binary files a/GUI/coregui/images/toolbar_projections.png and /dev/null differ
diff --git a/GUI/coregui/images/toolbar_propertypanel.png b/GUI/coregui/images/toolbar_propertypanel.png
deleted file mode 100644
index 72a3f458fd65961b854b62ed80cf36e52dfc300a..0000000000000000000000000000000000000000
Binary files a/GUI/coregui/images/toolbar_propertypanel.png and /dev/null differ
diff --git a/GUI/coregui/images/toolbar_refresh.png b/GUI/coregui/images/toolbar_refresh.png
deleted file mode 100644
index d19290a040b3086a9634853229bb766255d1b9f0..0000000000000000000000000000000000000000
Binary files a/GUI/coregui/images/toolbar_refresh.png and /dev/null differ
diff --git a/GUI/coregui/images/toolbar_save.png b/GUI/coregui/images/toolbar_save.png
deleted file mode 100644
index caa0e78128e139e8b087f2fdcb522df78ffe1ea4..0000000000000000000000000000000000000000
Binary files a/GUI/coregui/images/toolbar_save.png and /dev/null differ