diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
index 26fb372281..8a06fa3f3b 100644
--- a/src/Mod/Drawing/Gui/Command.cpp
+++ b/src/Mod/Drawing/Gui/Command.cpp
@@ -160,12 +160,10 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
lastPaper = paper;
lastId = id;
- QFile file(QString::fromLatin1(":/icons/actions/drawing-landscape-A0.svg"));
+ QFile file(QString::fromLatin1(":/icons/actions/drawing-%1-%2%3.svg").arg(orientation.toLower()).arg(paper).arg(id));
QAction* a = pcAction->addAction(QString());
if (file.open(QFile::ReadOnly)) {
- QString s = QString::fromLatin1("style=\"font-size:22px\">%1%2").arg(paper).arg(id);
QByteArray data = file.readAll();
- data.replace("style=\"font-size:22px\">A0", s.toLatin1());
a->setIcon(Gui::BitmapFactory().pixmapFromSvg(data, QSize(64,64)));
}
diff --git a/src/Mod/Drawing/Gui/Resources/Drawing.qrc b/src/Mod/Drawing/Gui/Resources/Drawing.qrc
index 47a8beb322..299a816f02 100644
--- a/src/Mod/Drawing/Gui/Resources/Drawing.qrc
+++ b/src/Mod/Drawing/Gui/Resources/Drawing.qrc
@@ -12,7 +12,11 @@
icons/actions/drawing-landscape-A4.svg
icons/actions/drawing-landscape-new.svg
icons/actions/drawing-landscape.svg
- icons/actions/drawing-portrait-A4.svg
+ icons/actions/drawing-portrait-A0.svg
+ icons/actions/drawing-portrait-A1.svg
+ icons/actions/drawing-portrait-A2.svg
+ icons/actions/drawing-portrait-A3.svg
+ icons/actions/drawing-portrait-A4.svg
icons/actions/drawing-view.svg
icons/actions/drawing-orthoviews.svg
icons/actions/drawing-openbrowser.svg
diff --git a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg
index 2cc6b67059..495ed189f9 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg
@@ -1,284 +1,64 @@
-
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-new.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-new.svg
index 84a2364d62..d46042a301 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-new.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-new.svg
@@ -1,450 +1,105 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
image/svg+xml
-
- New Document
+
+
- Jakub Steiner
+ [agryson] Alexander Gryson
- http://jimmac.musichall.cz
-
+ http://agryson.net
+
+ drawing-landscape-new
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-new.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape.svg
index 2cc6b67059..edb12d8671 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape.svg
@@ -1,436 +1,104 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
image/svg+xml
-
- New Document
+
+
- Jakub Steiner
+ [agryson] Alexander Gryson
- http://jimmac.musichall.cz
-
+ http://agryson.net
+
+ drawing-landscape
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-openbrowser.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-openbrowser.svg
index fa26b7eacb..15b2c910aa 100755
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-openbrowser.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-openbrowser.svg
@@ -1,727 +1,541 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
image/svg+xml
-
-
+
+
+
+
+ [Yorik van Havre]
+
+
+ drawing-openbrowser
+ 2012-01-19
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-openbrowser.svg
+
+
+ FreeCAD LGPL2+
+
+
+ https://www.gnu.org/copyleft/lesser.html
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-orthoviews.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-orthoviews.svg
index 909a65964e..be940d5042 100755
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-orthoviews.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-orthoviews.svg
@@ -1,171 +1,86 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
image/svg+xml
-
-
+
+
+
+
+ [wmayer]
+
+
+ drawing-orthoviews
+ 2011-12-11
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-orthoviews.svg
+
+
+ FreeCAD LGPL2+
+
+
+ https://www.gnu.org/copyleft/lesser.html
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A0.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A0.svg
new file mode 100644
index 0000000000..cb3b2625bb
--- /dev/null
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A0.svg
@@ -0,0 +1,332 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+ http://agryson.net
+
+ drawing-landscape-A0
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-A0.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A1.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A1.svg
new file mode 100644
index 0000000000..43c0ecd9b5
--- /dev/null
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A1.svg
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+ http://agryson.net
+
+ drawing-landscape-A1
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-A1.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A2.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A2.svg
new file mode 100644
index 0000000000..3e0768e8b3
--- /dev/null
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A2.svg
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+ http://agryson.net
+
+ drawing-landscape-A2
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-A2.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A3.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A3.svg
new file mode 100644
index 0000000000..deb3175212
--- /dev/null
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A3.svg
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+ http://agryson.net
+
+ drawing-landscape-A3
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-A3.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A4.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A4.svg
index 002c6b926f..f0a5d98899 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A4.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-portrait-A4.svg
@@ -1,61 +1,27 @@
+
+ version="1.1">
-
-
-
-
-
-
-
@@ -102,7 +58,7 @@
fx="24.306795"
fy="42.07798"
r="15.821514"
- gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,-6.310056e-16,30.08928)"
+ gradientTransform="matrix(1,0,0,0.284916,0,30.08928)"
gradientUnits="userSpaceOnUse" />
@@ -117,11 +73,11 @@
-
-
-
-
-
+
+ id="linearGradient3775-1">
+
+
+
+ gradientTransform="matrix(1.0434782,0,0,1.0434782,-8.391304,-131.43091)" />
+
+
+
+
+
+ inkscape:window-width="1920"
+ inkscape:window-height="1137"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:showpageshadow="false"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-nodes="true">
+
+
@@ -279,15 +229,34 @@
image/svg+xml
- New Document
+
- Jakub Steiner
+ [agryson] Alexander Gryson
- http://jimmac.musichall.cz
+ http://agryson.net
+ rdf:resource="https://www.gnu.org/licenses/lgpl.html" />
+ drawing-landscape-A4
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-landscape-A4.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
@@ -306,152 +275,63 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ style="display:inline"
+ transform="translate(0,16)" />
-
-
-
-
-
-
-
-
- A4
-
+ style="display:inline"
+ transform="translate(0,16)" />
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-spreadsheet.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-spreadsheet.svg
index 67dcc956db..a33ebb3047 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-spreadsheet.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-spreadsheet.svg
@@ -1,792 +1,183 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
image/svg+xml
-
-
+
+
+
+
+ [Yorik van Havre]
+
+
+ drawing-spreadsheet
+ 2016-01-03
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-spreadsheet.svg
+
+
+ FreeCAD LGPL2+
+
+
+ https://www.gnu.org/copyleft/lesser.html
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-symbol.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-symbol.svg
index 6661551325..7d19cd4f41 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-symbol.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-symbol.svg
@@ -1,439 +1,108 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
image/svg+xml
-
-
+
+
+
+
+ [WandererFan]
+
+
+ techdraw-symbol
+ 2016-01-14
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/techdraw-symbol.svg
+
+
+ FreeCAD LGPL2+
+
+
+ https://www.gnu.org/copyleft/lesser.html
+
+
+ [agryson] Alexander Gryson, [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-view.svg b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-view.svg
index 96e45251e0..c9e8474734 100644
--- a/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-view.svg
+++ b/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-view.svg
@@ -1,564 +1,141 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
image/svg+xml
-
+
New Document
- Jakub Steiner
+ [agryson] Alexander Gryson
- http://jimmac.musichall.cz
-
+ http://agryson.net
+
+ 2011-10-10
+ http://www.freecadweb.org/wiki/index.php?title=Artwork
+
+
+ FreeCAD
+
+
+ FreeCAD/src/Mod/Drawing/Gui/Resources/icons/actions/drawing-view.svg
+
+
+ FreeCAD LGPL2+
+
+
+
+
+ [agryson] Alexander Gryson
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+