Merge pull request #1458 from marcofernandezheras/Fix-Portable

fix Decks, Pics replays & sounds paths on Portable build

cockatrice/src/settingscache.cpp

 #include "settingscache.h"
 #include <QSettings>
 #include <QFile>
+#include <QApplication>
 
 #if QT_VERSION >= 0x050000
     #include <QStandardPaths>
@@ -10,7 +11,7 @@
 
 QString SettingsCache::getSettingsPath()
 {
-    QString file = "settings/";
+    QString file = qApp->applicationDirPath() + "settings/";
 
 #ifndef PORTABLE_BUILD
     #if QT_VERSION >= 0x050000
@@ -26,7 +27,9 @@ QString SettingsCache::getSettingsPath()
 
 void SettingsCache::translateLegacySettings()
 {
-    //NOTE Please remove this legacy setting translation after 2016-9-1 (+1 year after creation)
+#ifdef PORTABLE_BUILD
+    return;
+#endif
 
     //Layouts
     QFile layoutFile(getSettingsPath()+"layouts/deckLayout.ini");
@@ -130,6 +133,13 @@ SettingsCache::SettingsCache()
     if(!QFile(settingsPath+"global.ini").exists())
         translateLegacySettings();
 
+#ifdef PORTABLE_BUILD
+    setDeckPath(qApp->applicationDirPath() + "data/decks");
+    setReplaysPath(qApp->applicationDirPath() +"data/replays");
+    setPicsPath(qApp->applicationDirPath() +  "data/pics");
+    setSoundPath(qApp->applicationDirPath() +"data/sounds");
+#endif
+
     notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
     lang = settings->value("personal/lang").toString();
     keepalive = settings->value("personal/keepalive", 5).toInt();
@@ -627,4 +637,4 @@ void SettingsCache::setNotifyAboutUpdate(int _notifyaboutupdate)
 {
     notifyAboutUpdates = _notifyaboutupdate;
     settings->setValue("personal/updatenotification", notifyAboutUpdates);
-}
\ No newline at end of file
+}

oracle/src/oraclewizard.cpp

@@ -516,7 +516,7 @@ bool SaveSetsPage::validatePage()
         dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
 #endif
 #else
-    dataDir = "data";
+    dataDir =  qApp->applicationDirPath() + "/data";
 #endif
 
 #ifdef PORTABLE_BUILD
@@ -731,7 +731,7 @@ bool SaveTokensPage::validatePage()
         dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
 #endif
 #else
-    dataDir = "data";
+    dataDir = qApp->applicationDirPath() + "/data";
 #endif
 
 #ifdef PORTABLE_BUILD