Move subsurface-core to core and qt-mobile to mobile-widgets

Having subsurface-core as a directory name really messes with
autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an
autocomplete conflict and also was inconsistent with the desktop-widget
name for the directory containing the "other" UI.

And while cleaning up the resulting change in the path name for include
files, I decided to clean up those even more to make them consistent
overall.

This could have been handled in more commits, but since this requires a
make clean before the build, it seemed more sensible to do it all in one.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 48 insertions, 0 deletions

diff --git a/core/qt-init.cpp b/core/qt-init.cpp
new file mode 100644
index 000000000..b52dfd970
--- /dev/null
+++ b/core/qt-init.cpp
@@ -0,0 +1,48 @@
+#include <QApplication>
+#include <QNetworkProxy>
+#include <QLibraryInfo>
+#include <QTextCodec>
+#include "helpers.h"
+
+void init_qt_late()
+{
+	QApplication *application = qApp;
+	// tell Qt to use system proxies
+	// note: on Linux, "system" == "environment variables"
+	QNetworkProxyFactory::setUseSystemConfiguration(true);
+
+	// for Win32 and Qt5 we try to set the locale codec to UTF-8.
+	// this makes QFile::encodeName() work.
+#ifdef Q_OS_WIN
+	QTextCodec::setCodecForLocale(QTextCodec::codecForMib(106));
+#endif
+
+	QCoreApplication::setOrganizationName("Subsurface");
+	QCoreApplication::setOrganizationDomain("subsurface.hohndel.org");
+	QCoreApplication::setApplicationName("Subsurface");
+	// find plugins installed in the application directory (without this SVGs don't work on Windows)
+	QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
+	QLocale loc;
+	QString uiLang = uiLanguage(&loc);
+	QLocale::setDefault(loc);
+
+	// we don't have translations for English - if we don't check for this
+	// Qt will proceed to load the second language in preference order - not what we want
+	// on Linux this tends to be en-US, but on the Mac it's just en
+	if (!uiLang.startsWith("en") || uiLang.startsWith("en-GB")) {
+		qtTranslator = new QTranslator;
+		if (qtTranslator->load(loc, "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+			application->installTranslator(qtTranslator);
+		} else {
+			qDebug() << "can't find Qt localization for locale" << uiLang << "searching in" << QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+		}
+		ssrfTranslator = new QTranslator;
+		if (ssrfTranslator->load(loc, "subsurface", "_") ||
+		    ssrfTranslator->load(loc, "subsurface", "_", getSubsurfaceDataPath("translations")) ||
+		    ssrfTranslator->load(loc, "subsurface", "_", getSubsurfaceDataPath("../translations"))) {
+			application->installTranslator(ssrfTranslator);
+		} else {
+			qDebug() << "can't find Subsurface localization for locale" << uiLang;
+		}
+	}
+}