From 1e2d5b069370041fea52e6dda2c224eecc5d0224 Mon Sep 17 00:00:00 2001
From: marco <marcofernandezheras@gmail.com>
Date: Sun, 23 Aug 2015 13:34:15 +0200
Subject: [PATCH] Fix translate setting + Mod oracle to portable build

---
 cockatrice/src/settingscache.cpp |  4 +--
 oracle/src/oraclewizard.cpp      | 43 ++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp
index 3645160b..651f6a12 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settingscache.cpp
@@ -17,8 +17,8 @@ QString SettingsCache::getSettingsPath()
     #else
         file = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
     #endif
-        file.append("/settings/");
 #endif
+        file.append("/settings/");
 
         return file;
 }
@@ -98,7 +98,7 @@ void SettingsCache::translateLegacySettings()
     QStringList allFilters = legacySetting.allKeys();
     for (int i = 0; i < allFilters.size(); ++i) {
         if(allFilters.at(i).startsWith("game_type")){
-            gameFilters().setGameTypeEnabled(allFilters.at(i), legacySetting.value(allFilters.at(i)).toBool());
+            gameFilters().setGameHashedTypeEnabled(allFilters.at(i), legacySetting.value(allFilters.at(i)).toBool());
         }
     }
     QStringList allKeysfilter_games = legacySetting.allKeys();
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 0924bcc7..2664ae62 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -48,13 +48,19 @@ OracleWizard::OracleWizard(QWidget *parent)
     settings = new QSettings(this);
     connect(settingsCache, SIGNAL(langChanged()), this, SLOT(updateLanguage()));
 
-    importer = new OracleImporter(
-#if QT_VERSION < 0x050000
-        QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+    QString dataDir;
+
+#ifndef PORTABLE_BUILD
+    #if QT_VERSION < 0x050000
+            QDesktopServices::storageLocation(QDesktopServices::DataLocation)
+    #else
+            QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+    #endif
 #else
-        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first()
+    dataDir.append("data/");
 #endif
-    , this);
+
+    importer = new OracleImporter(dataDir, this);
 
     addPage(new IntroPage);
     addPage(new LoadSetsPage);
@@ -485,6 +491,9 @@ void SaveSetsPage::retranslateUi()
                    "Press \"Save\" to save the imported cards to the Cockatrice database."));
 
     defaultPathCheckBox->setText(tr("Save to the default path (recommended)"));
+    #ifdef PORTABLE_BUILD
+    defaultPathCheckBox->setEnabled(false);
+    #endif
 }
 
 void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName)
@@ -500,12 +509,17 @@ void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, co
 bool SaveSetsPage::validatePage()
 {
     bool ok = false;
-    const QString dataDir = 
+    QString dataDir;
+    #ifndef PORTABLE_BUILD
 #if QT_VERSION < 0x050000
-        QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+        dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
 #else
-        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+        dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
 #endif
+#else
+    dataDir = "data/";
+#endif
+
     QSettings* settings = new QSettings(this);
     QString defaultPath = settings->value("paths/carddatabase").toString();
     QString windowName = tr("Save card database");
@@ -695,16 +709,23 @@ void SaveTokensPage::retranslateUi()
                    "Press \"Save\" to save the imported tokens to the Cockatrice tokens database."));
 
     defaultPathCheckBox->setText(tr("Save to the default path (recommended)"));
+    #ifdef PORTABLE_BUILD
+    defaultPathCheckBox->setEnabled(false);
+    #endif
 }
 
 bool SaveTokensPage::validatePage()
 {
     bool ok = false;
-    const QString dataDir = 
+    QString dataDir;
+    #ifndef PORTABLE_BUILD
 #if QT_VERSION < 0x050000
-        QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+        dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
 #else
-        QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+        dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
+#endif
+#else
+    dataDir = "data/";
 #endif
     QSettings* settings = new QSettings(this);
     QString defaultPath = settings->value("paths/tokendatabase").toString();