diff --git a/lolautoaccept.pro b/lolautoaccept.pro
index 319f77e..bf70ad2 100644
--- a/lolautoaccept.pro
+++ b/lolautoaccept.pro
@@ -99,8 +99,8 @@ INCLUDEPATH += $$PWD/include/ \
LANGUAGES = de_DE en
-TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/ts/, .ts)
-TRANSLATIONSQM = $$prependAll(LANGUAGES, $$PWD/ts/, .qm)
+TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/resources/ts/, .ts)
+TRANSLATIONSQM = $$prependAll(LANGUAGES, $$PWD/resources/ts/, .qm)
makelang.commands = lrelease $$_PRO_FILE_
updatelang.commands = lupdate $$_PRO_FILE_
@@ -113,18 +113,18 @@ QMAKE_CLEAN += $$TRANSLATIONSQM
unix {
linuxdeploy-x86_64.AppImage.commands = wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod u+x linuxdeploy-x86_64.AppImage
- lolautoaccept.png.depends = lolautoaccept.svg
- lolautoaccept.png.commands = rsvg-convert -w 512 -h 512 lolautoaccept.svg -o lolautoaccept.png
+ lolautoaccept.png.depends = resources/lolautoaccept.svg
+ lolautoaccept.png.commands = rsvg-convert -w 512 -h 512 resources/lolautoaccept.svg -o resources/lolautoaccept.png
- appimg.depends = linuxdeploy-x86_64.AppImage $${TARGET} lolautoaccept.png
+ appimg.depends = linuxdeploy-x86_64.AppImage $${TARGET} resources/lolautoaccept.png
appimg.commands = rm -rf AppDir ; \
mkdir -p AppDir/ts ; \
- cp ./ts/*.qm ./AppDir/ts ; \
- ./linuxdeploy-x86_64.AppImage --appdir=AppDir -e lolautoaccept -i lolautoaccept.png -d lolautoaccept.desktop --output appimage
+ cp ./resources/ts/*.qm ./AppDir/ts ; \
+ ./linuxdeploy-x86_64.AppImage --appdir=AppDir -e lolautoaccept -i resources/lolautoaccept.png -d resources/lolautoaccept.desktop --output appimage
- QMAKE_EXTRA_TARGETS += appimg linuxdeploy-x86_64.AppImage lolautoaccept.png
+ QMAKE_EXTRA_TARGETS += appimg linuxdeploy-x86_64.AppImage resources/lolautoaccept.png
- QMAKE_CLEAN += linuxdeploy-x86_64.AppImage lolautoaccept.png
+ QMAKE_CLEAN += linuxdeploy-x86_64.AppImage resources/lolautoaccept.png
}
win32 {
@@ -139,3 +139,6 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
# https://wiki.qt.io/Automating_generation_of_qm_files
+
+RESOURCES += \
+ resources/res.qrc
diff --git a/lolautoaccept.desktop b/resources/lolautoaccept.desktop
similarity index 100%
rename from lolautoaccept.desktop
rename to resources/lolautoaccept.desktop
diff --git a/lolautoaccept.svg b/resources/lolautoaccept.svg
similarity index 100%
rename from lolautoaccept.svg
rename to resources/lolautoaccept.svg
diff --git a/resources/res.qrc b/resources/res.qrc
new file mode 100644
index 0000000..f1c25dd
--- /dev/null
+++ b/resources/res.qrc
@@ -0,0 +1,8 @@
+
+
+ ts/de_DE.qm
+ ts/de_DE.ts
+ lolautoaccept.png
+ lolautoaccept.svg
+
+
diff --git a/ts/de_DE.ts b/resources/ts/de_DE.ts
similarity index 99%
rename from ts/de_DE.ts
rename to resources/ts/de_DE.ts
index 5a0f2cc..8f5888c 100644
--- a/ts/de_DE.ts
+++ b/resources/ts/de_DE.ts
@@ -138,7 +138,7 @@ ID: %4
- Runnen Anwenden
+ Runen Anwenden
diff --git a/ts/en.ts b/resources/ts/en.ts
similarity index 100%
rename from ts/en.ts
rename to resources/ts/en.ts
diff --git a/src/main.cpp b/src/main.cpp
index d4d12a3..83eb20e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,28 +14,6 @@
#include "clientaccess.h"
#include "clientapi.h"
-#ifdef WIN32
-static std::string getBaseString(char** argv) {
- // TODO
- (void) argv;
- return "./";
-}
-#else
-static std::string getBaseString(char** argv) {
- std::string base;
-
- char* appbase = getenv("APPDIR");
- if(appbase) {
- return std::string(appbase) + '/';
- }
-
- char* cresolved = realpath(argv[0], NULL);
- std::string resolved(cresolved);
- free(cresolved);
- return resolved.substr(0, resolved.rfind('/')+1);
-}
-#endif
-
int main(int argc, char** argv) {
Log::init();
Log::setConsoleLogLevel(Log::Level::INFO);
@@ -58,18 +36,15 @@ int main(int argc, char** argv) {
Log::info << "Hello, World!";
Log::note << "Using Locale: " << QLocale().name().toStdString();
- std::string base = getBaseString(argv);
- Log::info << "appbase: " << base;
-
QApplication app(argc, argv);
QTranslator translator;
- if(translator.load(QLocale().name(), QString::fromStdString(base + "ts"))) {
+ if(translator.load(QLocale().name(), ":/ts")) {
app.installTranslator(&translator);
} else {
Log::warn << "translation not found";
}
MainWindow win;
- QIcon icon(QString::fromStdString(base + "lolautoaccept.png"));
+ QIcon icon(":/lolautoaccept.png");
win.setWindowIcon(icon);
win.show();