aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Syrjä <mikko@3d-system.fi>2019-03-28 01:27:44 +0200
committerMikko Syrjä <mikko@3d-system.fi>2019-03-28 01:27:44 +0200
commit184ba759a0cfb4f6da11270733bf6ec118df14be (patch)
tree1b7b76cb41c52afe3aae7fda3f9b7702da8c077f
parent0264982f440e0c0d0121556440b40e8b5ba6d750 (diff)
downloadsymedit-184ba759a0cfb4f6da11270733bf6ec118df14be.tar.gz
symedit-184ba759a0cfb4f6da11270733bf6ec118df14be.zip
Some final cleanup for labs branch.
-rw-r--r--README.md33
-rw-r--r--main.cpp2
-rw-r--r--symedit.cpp2
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));
}