diff --git a/resources/resources.pro b/resources/resources.pro
index ea5c1e985..52bb6cf2c 100644
--- a/resources/resources.pro
+++ b/resources/resources.pro
@@ -6,12 +6,14 @@ CONFIG -= qt
OTHER_FILES += share/images/flags/*.png
OTHER_FILES += share/images/airlines/*.png
-OTHER_FILES += shared//bootstrap/*.*
+OTHER_FILES += shared/bootstrap/*.*
+OTHER_FILES += shared/html/*.*
OTHER_FILES += shared/dbdata/*.*
OTHER_FILES += shared/updateinfo/*.*
COPY_FILES += $$PWD/share/images/flags/*.png
COPY_FILES += $$PWD/share/images/airlines/*.png
+COPY_FILES += $$PWD/share/html/*.*
COPY_FILES += $$PWD/share/shared/bootstrap/*.*
COPY_FILES += $$PWD/share/shared/dbdata/*.*
COPY_FILES += $$PWD/share/shared/updateinfo/*.*
diff --git a/resources/share/html/swifttemplate.html b/resources/share/html/swifttemplate.html
new file mode 100644
index 000000000..035dc0f92
--- /dev/null
+++ b/resources/share/html/swifttemplate.html
@@ -0,0 +1,43 @@
+
+
+
+
+ swift
+
+
+
+
+
+%1
+
+
diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp
index 6b293ebcb..98348e033 100644
--- a/src/blackconfig/buildconfig.cpp
+++ b/src/blackconfig/buildconfig.cpp
@@ -10,7 +10,6 @@
//! \cond PRIVATE
#include "blackconfig/buildconfig.h"
-
#include
#include
#include
@@ -196,7 +195,7 @@ namespace BlackConfig
{
const QString d(CBuildConfig::getSwiftResourceDir());
if (d.isEmpty()) { return ""; }
- QDir dir(QDir::cleanPath(d + QDir::separator() + "shared/dbdata"));
+ const QDir dir(QDir::cleanPath(d + QDir::separator() + "shared/dbdata"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
@@ -211,7 +210,7 @@ namespace BlackConfig
{
const QString d(CBuildConfig::getSwiftResourceDir());
if (d.isEmpty()) { return ""; }
- QDir dir(QDir::cleanPath(d + QDir::separator() + "sounds"));
+ const QDir dir(QDir::cleanPath(d + QDir::separator() + "sounds"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
@@ -226,7 +225,7 @@ namespace BlackConfig
{
const QString d(CBuildConfig::getSwiftResourceDir());
if (d.isEmpty()) { return ""; }
- QDir dir(QDir::cleanPath(d + QDir::separator() + "qss"));
+ const QDir dir(QDir::cleanPath(d + QDir::separator() + "qss"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
@@ -240,7 +239,7 @@ namespace BlackConfig
QString getImagesDirImpl()
{
const QString d(CBuildConfig::getSwiftResourceDir());
- QDir dir(QDir::cleanPath(d + QDir::separator() + "images"));
+ const QDir dir(QDir::cleanPath(d + QDir::separator() + "images"));
Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
return dir.absolutePath();
}
@@ -251,6 +250,26 @@ namespace BlackConfig
return s;
}
+ QString getHtmlDirImpl()
+ {
+ const QString d(CBuildConfig::getSwiftResourceDir());
+ const QDir dir(QDir::cleanPath(d + QDir::separator() + "html"));
+ Q_ASSERT_X(dir.exists(), Q_FUNC_INFO, "missing dir");
+ return dir.absolutePath();
+ }
+
+ const QString &CBuildConfig::getHtmlDir()
+ {
+ static const QString s(getHtmlDirImpl());
+ return s;
+ }
+
+ const QString &CBuildConfig::getHtmlTemplateFileName()
+ {
+ static const QString s(getHtmlDir() + QDir::separator() + "swifttemplate.html");
+ return s;
+ }
+
bool CBuildConfig::canRunInDeveloperEnvironment()
{
if (CBuildConfig::isBetaTest()) { return true; }
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index dcf97d852..e01eff5d3 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -106,6 +106,12 @@ namespace BlackConfig
//! Where images are located
static const QString &getImagesDir();
+ //! Where HTML files are located
+ static const QString &getHtmlDir();
+
+ //! Where HTML files are located
+ static const QString &getHtmlTemplateFileName();
+
//! Directory where data can be stored
static const QString &getDocumentationDirectory();