From 7384f39c7d9cc23ce64495f419e2f4342ca61b08 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Tue, 29 Mar 2016 14:29:15 +0200
Subject: [PATCH] resources changes

---
 PictureDialog.cpp                    |   1 -
 gta5sync.pro                         |   8 +++++++-
 main.cpp                             |   8 ++++++++
 5sync.png => res/5sync-48.png        | Bin
 app.qrc => res/app.qrc               |   2 +-
 gta5sync_de.qm => res/gta5sync_de.qm | Bin
 gta5sync_de.ts => res/gta5sync_de.ts |   0
 qt_de.qm => res/qt_de.qm             | Bin
 qtbase_de.qm => res/qtbase_de.qm     | Bin
 savegame.png => res/savegame.png     | Bin
 10 files changed, 16 insertions(+), 3 deletions(-)
 rename 5sync.png => res/5sync-48.png (100%)
 rename app.qrc => res/app.qrc (85%)
 rename gta5sync_de.qm => res/gta5sync_de.qm (100%)
 rename gta5sync_de.ts => res/gta5sync_de.ts (100%)
 rename qt_de.qm => res/qt_de.qm (100%)
 rename qtbase_de.qm => res/qtbase_de.qm (100%)
 rename savegame.png => res/savegame.png (100%)

diff --git a/PictureDialog.cpp b/PictureDialog.cpp
index abf54d2..8966b03 100755
--- a/PictureDialog.cpp
+++ b/PictureDialog.cpp
@@ -37,7 +37,6 @@ PictureDialog::PictureDialog(ProfileDatabase *profileDB, QWidget *parent) :
     ui(new Ui::PictureDialog)
 {
     ui->setupUi(this);
-    this->setWindowIcon(QIcon(":/img/5sync.png"));
     windowTitleStr = this->windowTitle();
     jsonDrawString = ui->labJSON->text();
     ui->cmdExport->setEnabled(0);
diff --git a/gta5sync.pro b/gta5sync.pro
index 01d0e24..7b43aea 100755
--- a/gta5sync.pro
+++ b/gta5sync.pro
@@ -69,7 +69,7 @@ TRANSLATIONS += \
     gta5sync_de.ts
 
 RESOURCES += \
-    app.qrc
+    res/app.qrc
 
 OTHER_FILES += \
     app.rc
@@ -97,3 +97,9 @@ isEqual(QT_MAJOR_VERSION, 4): SOURCES += qjson4/QJsonArray.cpp \
     qjson4/QJsonValueRef.cpp \
     qjson4/QJsonParser.cpp
 
+# UNIX SYSTEM STUFF
+
+unix: !macx: appfiles.path = $$(INSTALL_PATH)/share/applications
+unix: !macx: appfiles.files = $$PWD/res/5sync.desktop
+unix: !macx: target.path = $$(INSTALL_PATH)/bin
+unix: !macx: INSTALLS += target appfiles
diff --git a/main.cpp b/main.cpp
index ea28021..775b9c9 100755
--- a/main.cpp
+++ b/main.cpp
@@ -32,6 +32,7 @@
 #include <QString>
 #include <QDebug>
 #include <QFile>
+#include <QDir>
 
 int main(int argc, char *argv[])
 {
@@ -39,6 +40,10 @@ int main(int argc, char *argv[])
     a.setApplicationName("gta5sync");
     a.setApplicationVersion("1.0.0");
 
+    QDir pluginsDir = QFileInfo(a.applicationFilePath()).absoluteDir();
+    pluginsDir.cd("plugins");
+    a.addLibraryPath(pluginsDir.path());
+
     // Loading translation settings
     QSettings settings("Syping", "gta5sync");
     settings.beginGroup("Interface");
@@ -238,6 +243,7 @@ int main(int argc, char *argv[])
 
         bool readOk = picture.readingPictureFromFile(arg1);
         picDialog->setWindowFlags(picDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
+        picDialog->setWindowIcon(QIcon(":/img/5sync-48.png"));
         picDialog->setSnapmaticPicture(&picture, readOk);
 
         int crewID = picture.getCrewNumber();
@@ -259,6 +265,7 @@ int main(int argc, char *argv[])
 
         bool readOk = savegame.readingSavegameFromFile(arg1);
         savegameDialog->setWindowFlags(savegameDialog->windowFlags()^Qt::WindowContextHelpButtonHint);
+        savegameDialog->setWindowIcon(QIcon(":/img/5sync-48.png"));
         savegameDialog->setSavegameData(&savegame, readOk);
 
         if (!readOk) { return 1; }
@@ -276,6 +283,7 @@ int main(int argc, char *argv[])
     threadDB->start();
 
     UserInterface *uiWindow = new UserInterface(profileDB, crewDB, threadDB);
+    uiWindow->setWindowIcon(QIcon(":/img/5sync-48.png"));
     uiWindow->show();
 
     return a.exec();
diff --git a/5sync.png b/res/5sync-48.png
similarity index 100%
rename from 5sync.png
rename to res/5sync-48.png
diff --git a/app.qrc b/res/app.qrc
similarity index 85%
rename from app.qrc
rename to res/app.qrc
index 92d0d0c..67a1099 100755
--- a/app.qrc
+++ b/res/app.qrc
@@ -7,6 +7,6 @@
     <qresource prefix="/img">
         <file>savegame.png</file>
         <file>5sync.ico</file>
-        <file>5sync.png</file>
+        <file>5sync-48.png</file>
     </qresource>
 </RCC>
diff --git a/gta5sync_de.qm b/res/gta5sync_de.qm
similarity index 100%
rename from gta5sync_de.qm
rename to res/gta5sync_de.qm
diff --git a/gta5sync_de.ts b/res/gta5sync_de.ts
similarity index 100%
rename from gta5sync_de.ts
rename to res/gta5sync_de.ts
diff --git a/qt_de.qm b/res/qt_de.qm
similarity index 100%
rename from qt_de.qm
rename to res/qt_de.qm
diff --git a/qtbase_de.qm b/res/qtbase_de.qm
similarity index 100%
rename from qtbase_de.qm
rename to res/qtbase_de.qm
diff --git a/savegame.png b/res/savegame.png
similarity index 100%
rename from savegame.png
rename to res/savegame.png