From 184ba759a0cfb4f6da11270733bf6ec118df14be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikko=20Syrj=C3=A4?= <mikko@3d-system.fi>
Date: Thu, 28 Mar 2019 01:27:44 +0200
Subject: Some final cleanup for labs branch.

---
 README.md   | 33 ++++++++++++++++++++-------------
 main.cpp    |  2 --
 symedit.cpp |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index edcf5ca..bbef0c1 100644
--- a/README.md
+++ b/README.md
@@ -4,22 +4,29 @@ Simple symbol editor for use with 3D-Win.
 
 https://gentleface.com/free_icon_set.html
 
-krita:
-	icons:
-		48x48
-		transparent
-		line width: 6px
-		brush: basic-1
+krita icons:
+	48x48
+	transparent
+	line width: 6px
+	brush: basic-1
+
+Windows icon creation with ImageMagick:
+
+convert icon16.png icon24.png icon32.png icon48.png icon256.png icon.ico
+
+Build html help in Windows:
+
+sphinx-build -M html . _build
 
 Windows deployment:
 
 C:\Users\Mikko\Code\Qt\5.12.2\msvc2017_64\bin\windeployqt.exe
-	--release
-	--qmldir ../../symedit
-	--no-translations
-	--no-compiler-runtime
-	--no-webkit2
-	--no-angle
-	--no-opengl-sw
+	--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
+	--release --qmldir ../../symedit
+	--no-translations --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw
 	.
 
diff --git a/main.cpp b/main.cpp
index ff2a60a..3ed41d6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,4 @@
 #include <QQmlContext>
-//#include <QGuiApplication>
 #include <QtWidgets/QApplication>
 #include <QQmlApplicationEngine>
 #include <QCommandLineParser>
@@ -22,7 +21,6 @@ int main(int argc, char *argv[])
 	// set base language translators
 	QLocale locale;
 	QTranslator backuptranslator, localetranslator, currenttranslator;
-//	if ( backuptranslator.load(":/locale/symedit.fi_FI.qm") )
 	if ( backuptranslator.load(":/locale/symedit.en_GB.qm") )
 		QCoreApplication::installTranslator(&backuptranslator);
 	if ( localetranslator.load(locale, ":/locale/symedit.") )
diff --git a/symedit.cpp b/symedit.cpp
index 2cf2ad9..555a0da 100644
--- a/symedit.cpp
+++ b/symedit.cpp
@@ -502,7 +502,7 @@ void SymEditManager::help(QString topic) const
 {
 	Q_UNUSED(topic);
 	QString path = QCoreApplication::applicationDirPath();
-	path.append("/help/").append(Language).append("/index.html");
+	path.append("/help/").append(Language).append("/symedit/index.html");
 	QDesktopServices::openUrl(QUrl(path));
 }
 
-- 
cgit v1.2.3