Removed &-signs from icon names to make them work in XML files.

26 files changed, 83 insertions, 71 deletions

diff --git a/README.md b/README.md
index bbef0c1..4baacaf 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,12 @@ sphinx-build -M html . _build
 
 Windows deployment:
 
-C:\Users\Mikko\Code\Qt\5.12.2\msvc2017_64\bin\windeployqt.exe
+C:\Users\Mikko\Code\Qt\5.12.4\msvc2017_64\bin\windeployqt.exe
 	--debug --qmldir ../../symedit
 	--no-translations --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw
 	.
 
-C:\Users\Mikko\Code\Qt\5.12.2\msvc2017_64\bin\windeployqt.exe
+C:\Users\Mikko\Code\Qt\5.12.4\msvc2017_64\bin\windeployqt.exe
 	--release --qmldir ../../symedit
 	--no-translations --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw
 	.
diff --git a/help/eng/menu.rst b/help/eng/menu.rst
index 6d2dbb7..233b9a3 100644
--- a/help/eng/menu.rst
+++ b/help/eng/menu.rst
@@ -6,13 +6,13 @@ Operations available in application menu.
 File
 ----
 
-.. |open image| image:: ../../image/open_icon&48.png
+.. |open image| image:: ../../image/open_icon48.png
 	:scale: 50 %
-.. |save image| image:: ../../image/save_icon&48.png
+.. |save image| image:: ../../image/save_icon48.png
 	:scale: 50 %
 .. |save as image| image:: ../../image/save_as.png
 	:scale: 50 %
-.. |exit image| image:: ../../image/exit_icon&48.png
+.. |exit image| image:: ../../image/exit_icon48.png
 	:scale: 50 %
 
 |open image| Open
@@ -38,9 +38,9 @@ Exits application. Shortcut key Alt+F4.
 Edit
 ----
 
-.. |undo image| image:: ../../image/undo_icon&48.png
+.. |undo image| image:: ../../image/undo_icon48.png
 	:scale: 50 %
-.. |redo image| image:: ../../image/redo_icon&48.png
+.. |redo image| image:: ../../image/redo_icon48.png
 	:scale: 50 %
 
 |undo image| Undo
@@ -53,11 +53,11 @@ Undoes previous operation. Shortcut key Ctrl+Z.
 
 Redoes previously undoed operation. Shortcut key Ctrl+Y or Ctrl+Shift+Z.
 
-.. |cut image| image:: ../../image/cut_icon&48.png
+.. |cut image| image:: ../../image/cut_icon48.png
 	:scale: 50 %
-.. |copy image| image:: ../../image/copy_icon&48.png
+.. |copy image| image:: ../../image/copy_icon48.png
 	:scale: 50 %
-.. |paste image| image:: ../../image/paste_icon&48.png
+.. |paste image| image:: ../../image/paste_icon48.png
 	:scale: 50 %
 
 |cut image| Cut
@@ -90,9 +90,9 @@ Rotates symbol 90 degrees clockwise. Shortcut key Alt+Right.
 
 Rotates symbol 90 degrees counterclockwise. Shortcut key Alt+Left.
 
-.. |raise image| image:: ../../image/up_icon&48.png
+.. |raise image| image:: ../../image/up_icon48.png
 	:scale: 50 %
-.. |lower image| image:: ../../image/down_icon&48.png
+.. |lower image| image:: ../../image/down_icon48.png
 	:scale: 50 %
 
 |raise image| Raise Item
@@ -116,11 +116,11 @@ Removes active item and activates previous item in drawing order. Shortcut key D
 View
 ----
 
-.. |in image| image:: ../../image/plus_icon&48.png
+.. |in image| image:: ../../image/plus_icon48.png
 	:scale: 50 %
-.. |out image| image:: ../../image/minus_icon&48.png
+.. |out image| image:: ../../image/minus_icon48.png
 	:scale: 50 %
-.. |all image| image:: ../../image/zoom_icon&48.png
+.. |all image| image:: ../../image/zoom_icon48.png
 	:scale: 50 %
 
 |in image| Zoom In
@@ -138,9 +138,9 @@ Zooms view farther. Shortcut key Ctrl+-.
 
 Zooms view to a maximum size and quits possible preview mode. Shortcut key Ctrl+0.
 
-.. |grid image| image:: ../../image/grid_icon&48.png
+.. |grid image| image:: ../../image/grid_icon48.png
 	:scale: 50 %
-.. |preview image| image:: ../../image/eye_icon&48.png
+.. |preview image| image:: ../../image/eye_icon48.png
 	:scale: 50 %
 
 |grid image| Show Grid
@@ -161,9 +161,9 @@ See :doc:`tools`.
 Help
 ----
 
-.. |help image| image:: ../../image/bubble_icon&48.png
+.. |help image| image:: ../../image/bubble_icon48.png
 	:scale: 50 %
-.. |info image| image:: ../../image/info_icon&48.png
+.. |info image| image:: ../../image/info_icon48.png
 	:scale: 50 %
 
 |help image| Help
diff --git a/help/eng/tools.rst b/help/eng/tools.rst
index 2925f03..6cfbbc5 100644
--- a/help/eng/tools.rst
+++ b/help/eng/tools.rst
@@ -10,7 +10,7 @@ All drawing methods behave same way. Pressing the mouse button defines starting
 
 Item start and end points must be different. Releasing the mouse button at start point does not create new item.
 
-.. |select image| image:: ../../image/cursor_icon&48.png
+.. |select image| image:: ../../image/cursor_icon48.png
 	:scale: 50 %
 
 |select image| Select
diff --git a/help/fin/menu.rst b/help/fin/menu.rst
index 9370c2b..71980d5 100644
--- a/help/fin/menu.rst
+++ b/help/fin/menu.rst
@@ -6,13 +6,13 @@ Sovelluksen valikossa saatavilla olevat toiminnot.
 Tiedosto
 --------
 
-.. |open image| image:: ../../image/open_icon&48.png
+.. |open image| image:: ../../image/open_icon48.png
 	:scale: 50 %
-.. |save image| image:: ../../image/save_icon&48.png
+.. |save image| image:: ../../image/save_icon48.png
 	:scale: 50 %
 .. |save as image| image:: ../../image/save_as.png
 	:scale: 50 %
-.. |exit image| image:: ../../image/exit_icon&48.png
+.. |exit image| image:: ../../image/exit_icon48.png
 	:scale: 50 %
 
 |open image| Avaa
@@ -38,9 +38,9 @@ Lopettaa ohjelman. Pikanäppäin Alt+F4.
 Muokkaa
 -------
 
-.. |undo image| image:: ../../image/undo_icon&48.png
+.. |undo image| image:: ../../image/undo_icon48.png
 	:scale: 50 %
-.. |redo image| image:: ../../image/redo_icon&48.png
+.. |redo image| image:: ../../image/redo_icon48.png
 	:scale: 50 %
 
 |undo image| Kumoa
@@ -53,11 +53,11 @@ Kumoaa edellisen operaation. Pikanäppäin Ctrl+Z.
 
 Tekee uudellen kumotun operaation. Pikanäppäin Ctrl+Y tai Ctrl+Shift+Z.
 
-.. |cut image| image:: ../../image/cut_icon&48.png
+.. |cut image| image:: ../../image/cut_icon48.png
 	:scale: 50 %
-.. |copy image| image:: ../../image/copy_icon&48.png
+.. |copy image| image:: ../../image/copy_icon48.png
 	:scale: 50 %
-.. |paste image| image:: ../../image/paste_icon&48.png
+.. |paste image| image:: ../../image/paste_icon48.png
 	:scale: 50 %
 
 |cut image| Leikkaa
@@ -90,9 +90,9 @@ Kääntää symbolia 90 astetta myötäpäivään. Pikanäppäin Alt+Right.
 
 Kääntää symbolia 90 astetta vastapäivään. Pikanäppäin Alt+Left.
 
-.. |raise image| image:: ../../image/up_icon&48.png
+.. |raise image| image:: ../../image/up_icon48.png
 	:scale: 50 %
-.. |lower image| image:: ../../image/down_icon&48.png
+.. |lower image| image:: ../../image/down_icon48.png
 	:scale: 50 %
 
 |raise image| Nosta kohdetta
@@ -116,11 +116,11 @@ Poistaa aktiivisen kohteen ja aktivoi piirtojärjestyksessä edellisen kohteen.
 Näytä
 -----
 
-.. |in image| image:: ../../image/plus_icon&48.png
+.. |in image| image:: ../../image/plus_icon48.png
 	:scale: 50 %
-.. |out image| image:: ../../image/minus_icon&48.png
+.. |out image| image:: ../../image/minus_icon48.png
 	:scale: 50 %
-.. |all image| image:: ../../image/zoom_icon&48.png
+.. |all image| image:: ../../image/zoom_icon48.png
 	:scale: 50 %
 
 |in image| Lähennä
@@ -138,9 +138,9 @@ Zoomaa näyttöä kauemmas. Pikanäppäin Ctrl+-.
 
 Zoomaa ruudukon maksimikokoon ja lopettaa mahdollisen esikatselutilan. Pikanäppäin Ctrl+0.
 
-.. |grid image| image:: ../../image/grid_icon&48.png
+.. |grid image| image:: ../../image/grid_icon48.png
 	:scale: 50 %
-.. |preview image| image:: ../../image/eye_icon&48.png
+.. |preview image| image:: ../../image/eye_icon48.png
 	:scale: 50 %
 
 |grid image| Ruudukko
@@ -161,9 +161,9 @@ Katso :doc:`tools`.
 Ohje
 ----
 
-.. |help image| image:: ../../image/bubble_icon&48.png
+.. |help image| image:: ../../image/bubble_icon48.png
 	:scale: 50 %
-.. |info image| image:: ../../image/info_icon&48.png
+.. |info image| image:: ../../image/info_icon48.png
 	:scale: 50 %
 
 |help image| Ohje
diff --git a/help/fin/tools.rst b/help/fin/tools.rst
index 0063846..4d49956 100644
--- a/help/fin/tools.rst
+++ b/help/fin/tools.rst
@@ -10,7 +10,7 @@ Kaikki piirtotavat toimivat samalla tavalla. Hiiren painikkeen painaminen määr
 
 Kohteen alku- ja loppupisteen on oltava eri paikoissa eli hiiren painikkeen vapauttaminen alkupisteessä ei luo uutta kohdetta.
 
-.. |select image| image:: ../../image/cursor_icon&48.png
+.. |select image| image:: ../../image/cursor_icon48.png
 	:scale: 50 %
 
 |select image| Valitse
diff --git a/image/bubble_icon&48.png b/image/bubble_icon48.png
index a4f8db5..a4f8db5 100644
--- a/image/bubble_icon&48.png
+++ b/image/bubble_icon48.png
diff --git a/image/copy_icon&48.png b/image/copy_icon48.png
index f1387b8..f1387b8 100644
--- a/image/copy_icon&48.png
+++ b/image/copy_icon48.png
diff --git a/image/cursor_icon&48.png b/image/cursor_icon48.png
index 83fcad8..83fcad8 100644
--- a/image/cursor_icon&48.png
+++ b/image/cursor_icon48.png
diff --git a/image/cut_icon&48.png b/image/cut_icon48.png
index 82be5f4..82be5f4 100644
--- a/image/cut_icon&48.png
+++ b/image/cut_icon48.png
diff --git a/image/down_icon&48.png b/image/down_icon48.png
index cda9e0c..cda9e0c 100644
--- a/image/down_icon&48.png
+++ b/image/down_icon48.png
diff --git a/image/exit_icon&48.png b/image/exit_icon48.png
index c380907..c380907 100644
--- a/image/exit_icon&48.png
+++ b/image/exit_icon48.png
diff --git a/image/eye_icon&48.png b/image/eye_icon48.png
index c5bcf57..c5bcf57 100644
--- a/image/eye_icon&48.png
+++ b/image/eye_icon48.png
diff --git a/image/grid_icon&48.png b/image/grid_icon48.png
index 00e0d19..00e0d19 100644
--- a/image/grid_icon&48.png
+++ b/image/grid_icon48.png
diff --git a/image/info_icon&48.png b/image/info_icon48.png
index 071cb87..071cb87 100644
--- a/image/info_icon&48.png
+++ b/image/info_icon48.png
diff --git a/image/minus_icon&48.png b/image/minus_icon48.png
index 7fe2864..7fe2864 100644
--- a/image/minus_icon&48.png
+++ b/image/minus_icon48.png
diff --git a/image/open_icon&48.png b/image/open_icon48.png
index 7cdc921..7cdc921 100644
--- a/image/open_icon&48.png
+++ b/image/open_icon48.png
diff --git a/image/paste_icon&48.png b/image/paste_icon48.png
index 4d90cc0..4d90cc0 100644
--- a/image/paste_icon&48.png
+++ b/image/paste_icon48.png
diff --git a/image/plus_icon&48.png b/image/plus_icon48.png
index ccf3031..ccf3031 100644
--- a/image/plus_icon&48.png
+++ b/image/plus_icon48.png
diff --git a/image/redo_icon&48.png b/image/redo_icon48.png
index 4486db1..4486db1 100644
--- a/image/redo_icon&48.png
+++ b/image/redo_icon48.png
diff --git a/image/save_icon&48.png b/image/save_icon48.png
index 838358e..838358e 100644
--- a/image/save_icon&48.png
+++ b/image/save_icon48.png
diff --git a/image/undo_icon&48.png b/image/undo_icon48.png
index 13bad19..13bad19 100644
--- a/image/undo_icon&48.png
+++ b/image/undo_icon48.png
diff --git a/image/up_icon&48.png b/image/up_icon48.png
index 31fecf0..31fecf0 100644
--- a/image/up_icon&48.png
+++ b/image/up_icon48.png
diff --git a/image/zoom_icon&48.png b/image/zoom_icon48.png
index 9d9e881..9d9e881 100644
--- a/image/zoom_icon&48.png
+++ b/image/zoom_icon48.png
diff --git a/main.qml b/main.qml
index 683214d..b5fac48 100644
--- a/main.qml
+++ b/main.qml
@@ -123,28 +123,28 @@ ApplicationWindow
 			{
 				height: 32
 				z: 10
-//				BarTool { image: "image/open_icon&48.png"; tooltip: qsTrId("id_tooltip_file_open"); onClicked: open() }
-//				BarTool { image: "image/save_icon&48.png"; tooltip: qsTrId("id_tooltip_file_save"); onClicked: save(false) }
+//				BarTool { image: "image/open_icon48.png"; tooltip: qsTrId("id_tooltip_file_open"); onClicked: open() }
+//				BarTool { image: "image/save_icon48.png"; tooltip: qsTrId("id_tooltip_file_save"); onClicked: save(false) }
 //				BarTool { image: "image/save_as.png"; tooltip: qsTrId("id_tooltip_file_save_as"); onClicked: save(true) }
 //				BarSeparator { }
-				BarTool { image: "image/undo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_undo"); onClicked: undo(true) }
-				BarTool { image: "image/redo_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_redo"); onClicked: undo(false) }
-				BarTool { image: "image/cut_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_cut"); onClicked: cutsymbol() }
-				BarTool { image: "image/copy_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_copy"); onClicked: copysymbol() }
-				BarTool { image: "image/paste_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_paste"); onClicked: pastesymbol() }
+                BarTool { image: "image/undo_icon48.png"; tooltip: qsTrId("id_tooltip_edit_undo"); onClicked: undo(true) }
+                BarTool { image: "image/redo_icon48.png"; tooltip: qsTrId("id_tooltip_edit_redo"); onClicked: undo(false) }
+                BarTool { image: "image/cut_icon48.png"; tooltip: qsTrId("id_tooltip_edit_cut"); onClicked: cutsymbol() }
+                BarTool { image: "image/copy_icon48.png"; tooltip: qsTrId("id_tooltip_edit_copy"); onClicked: copysymbol() }
+                BarTool { image: "image/paste_icon48.png"; tooltip: qsTrId("id_tooltip_edit_paste"); onClicked: pastesymbol() }
 				BarSeparator { }
 				BarTool { image: "image/rotate_right.png"; tooltip: qsTrId("id_tooltip_edit_rotate_right"); onClicked: rotatesymbol(1) }
 				BarTool { image: "image/rotate_left.png"; tooltip: qsTrId("id_tooltip_edit_rotate_left"); onClicked: rotatesymbol(-1) }
-				BarTool { image: "image/up_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_raise_item"); onClicked: raiseitem(1) }
-				BarTool { image: "image/down_icon&48.png"; tooltip: qsTrId("id_tooltip_edit_lower_item"); onClicked: raiseitem(-1) }
+                BarTool { image: "image/up_icon48.png"; tooltip: qsTrId("id_tooltip_edit_raise_item"); onClicked: raiseitem(1) }
+                BarTool { image: "image/down_icon48.png"; tooltip: qsTrId("id_tooltip_edit_lower_item"); onClicked: raiseitem(-1) }
 				BarTool { image: "image/delete.png"; tooltip: qsTrId("id_tooltip_delete_item"); onClicked: removeitem() }
 				BarSeparator { }
-//				BarTool { image: "image/plus_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_in"); onClicked: zoom(1) }
-//				BarTool { image: "image/minus_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_out"); onClicked: zoom(-1) }
-				BarTool { image: "image/zoom_icon&48.png"; tooltip: qsTrId("id_tooltip_zoom_all"); onClicked: zoom(0) }
+//				BarTool { image: "image/plus_icon48.png"; tooltip: qsTrId("id_tooltip_zoom_in"); onClicked: zoom(1) }
+//				BarTool { image: "image/minus_icon48.png"; tooltip: qsTrId("id_tooltip_zoom_out"); onClicked: zoom(-1) }
+                BarTool { image: "image/zoom_icon48.png"; tooltip: qsTrId("id_tooltip_zoom_all"); onClicked: zoom(0) }
 				BarTool
 				{
-					image: "image/eye_icon&48.png";
+                    image: "image/eye_icon48.png";
 					tooltip: qsTrId("id_tooltip_zoom_preview");
 					checkable: true
 					checked: preview
@@ -155,7 +155,7 @@ ApplicationWindow
 					}
 				}
 				BarSeparator { }
-				BarTool { image: "image/cursor_icon&48.png"; tooltip: qsTrId("id_tooltip_tool_select"); tool: Editor.Tool.Select }
+                BarTool { image: "image/cursor_icon48.png"; tooltip: qsTrId("id_tooltip_tool_select"); tool: Editor.Tool.Select }
 				BarSeparator { }
 				BarTool { image: "image/polyline.png"; tooltip: qsTrId("id_tooltip_tool_line"); tool: Editor.Tool.Line }
 				BarSeparator { }
diff --git a/qml.qrc b/qml.qrc
index 7ce6fa1..81d24bf 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -12,26 +12,26 @@
         <file>image/circle_center.png</file>
         <file>image/rotate_left.png</file>
         <file>image/rotate_right.png</file>
-        <file>image/save_icon&amp;48.png</file>
+        <file>image/save_icon48.png</file>
         <file>image/text.png</file>
         <file>image/delete.png</file>
-        <file>image/redo_icon&amp;48.png</file>
-        <file>image/undo_icon&amp;48.png</file>
-        <file>image/copy_icon&amp;48.png</file>
-        <file>image/cursor_icon&amp;48.png</file>
-        <file>image/cut_icon&amp;48.png</file>
-        <file>image/paste_icon&amp;48.png</file>
-        <file>image/open_icon&amp;48.png</file>
-        <file>image/down_icon&amp;48.png</file>
-        <file>image/up_icon&amp;48.png</file>
-        <file>image/minus_icon&amp;48.png</file>
-        <file>image/plus_icon&amp;48.png</file>
-        <file>image/eye_icon&amp;48.png</file>
-        <file>image/exit_icon&amp;48.png</file>
-        <file>image/grid_icon&amp;48.png</file>
-        <file>image/info_icon&amp;48.png</file>
-        <file>image/zoom_icon&amp;48.png</file>
-        <file>image/bubble_icon&amp;48.png</file>
+        <file>image/redo_icon48.png</file>
+        <file>image/undo_icon48.png</file>
+        <file>image/copy_icon48.png</file>
+        <file>image/cursor_icon48.png</file>
+        <file>image/cut_icon48.png</file>
+        <file>image/paste_icon48.png</file>
+        <file>image/open_icon48.png</file>
+        <file>image/down_icon48.png</file>
+        <file>image/up_icon48.png</file>
+        <file>image/minus_icon48.png</file>
+        <file>image/plus_icon48.png</file>
+        <file>image/eye_icon48.png</file>
+        <file>image/exit_icon48.png</file>
+        <file>image/grid_icon48.png</file>
+        <file>image/info_icon48.png</file>
+        <file>image/zoom_icon48.png</file>
+        <file>image/bubble_icon48.png</file>
         <file>image/quarter_radius.png</file>
         <file>image/circle_diameter.png</file>
         <file>image/semi_diameter.png</file>
diff --git a/symedit.cpp b/symedit.cpp
index b78ef07..3a35027 100644
--- a/symedit.cpp
+++ b/symedit.cpp
@@ -3,6 +3,7 @@
 #include <QSettings>
 #include <QDesktopServices>
 #include <QTextStream>
+#include <QFileInfo>
 #include <QFile>
 
 #include "symedit.h"
@@ -512,7 +513,18 @@ void SymEditManager::help(QString topic) const
 	Q_UNUSED(topic);
 	QString path = QCoreApplication::applicationDirPath();
 	path.append("/help/").append(Language).append("/symedit/index.html");
-	QDesktopServices::openUrl(QUrl(path));
+
+	QFileInfo info(path);
+	if ( info.exists() )
+		QDesktopServices::openUrl(QUrl(path));
+	else	// development version
+	{
+		path = QCoreApplication::applicationDirPath();
+		path.append("/../threedee/help/").append(Language).append("/symedit/index.html");
+		QFileInfo info(path);
+		if ( info.exists() )
+			QDesktopServices::openUrl(QUrl(path));
+	}
 }
 
 //! Open symbol file.