Merge with branch1.1

1 files changed, 105 insertions, 7 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 39b6dba7..d9a7e799 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -87,11 +87,34 @@ void Settings::clearPlugins()
 {
   m_Plugins.clear();
   m_PluginSettings.clear();
+
+  m_PluginBlacklist.clear();
+  int count = m_Settings.beginReadArray("pluginBlacklist");
+  for (int i = 0; i < count; ++i) {
+    m_Settings.setArrayIndex(i);
+    m_PluginBlacklist.insert(m_Settings.value("name").toString());
+  }
+  m_Settings.endArray();
+}
+
+bool Settings::pluginBlacklisted(const QString &fileName) const
+{
+  return m_PluginBlacklist.contains(fileName);
+}
+
+void Settings::registerAsNXMHandler(bool force)
+{
+  std::wstring nxmPath = ToWString(QCoreApplication::applicationDirPath() + "/nxmhandler.exe");
+  std::wstring executable = ToWString(QCoreApplication::applicationFilePath());
+  std::wstring mode = force ? L"forcereg" : L"reg";
+  ::ShellExecuteW(NULL, L"open", nxmPath.c_str(),
+                  (mode + L" " + GameInfo::instance().getGameShortName() + L" \"" + executable + L"\"").c_str(), NULL, SW_SHOWNORMAL);
 }
 
 void Settings::registerPlugin(IPlugin *plugin)
 {
   m_Plugins.push_back(plugin);
+  m_PluginSettings.insert(plugin->name(), QMap<QString, QVariant>());
   foreach (const PluginSetting &setting, plugin->settings()) {
     QVariant temp = m_Settings.value("Plugins/" + plugin->name() + "/" + setting.key, setting.defaultValue);
     if (!temp.convert(setting.defaultValue.type())) {
@@ -145,7 +168,7 @@ bool Settings::automaticLoginEnabled() const
 
 QString Settings::getSteamAppID() const
 {
-  return m_Settings.value("Settings/app_id", ToQString(GameInfo::instance().getSteamAPPId())).toString();
+  return m_Settings.value("Settings/app_id", ToQString(GameInfo::instance().getSteamAPPId(m_Settings.value("game_edition", 0).toInt()))).toString();
 }
 
 QString Settings::getDownloadDirectory() const
@@ -200,7 +223,12 @@ QString Settings::getModDirectory() const
 
 QString Settings::getNMMVersion() const
 {
-  return m_Settings.value("Settings/nmm_version", "0.34.0").toString();
+  static const QString MIN_NMM_VERSION = "0.47.0";
+  QString result = m_Settings.value("Settings/nmm_version", MIN_NMM_VERSION).toString();
+  if (VersionInfo(result) < VersionInfo(MIN_NMM_VERSION)) {
+    result = MIN_NMM_VERSION;
+  }
+  return result;
 }
 
 bool Settings::getNexusLogin(QString &username, QString &password) const
@@ -275,16 +303,47 @@ QVariant Settings::pluginSetting(const QString &pluginName, const QString &key)
 {
   auto iterPlugin = m_PluginSettings.find(pluginName);
   if (iterPlugin == m_PluginSettings.end()) {
-    throw MyException(tr("setting for invalid plugin \"%1\" requested").arg(key));
+    return QVariant();
   }
   auto iterSetting = iterPlugin->find(key);
   if (iterSetting == iterPlugin->end()) {
-    throw MyException(tr("invalid setting \"%1\" requested for plugin \"%2\"").arg(key).arg(pluginName));
+    return QVariant();
   }
 
   return *iterSetting;
 }
 
+void Settings::setPluginSetting(const QString &pluginName, const QString &key, const QVariant &value)
+{
+  auto iterPlugin = m_PluginSettings.find(pluginName);
+  if (iterPlugin == m_PluginSettings.end()) {
+    throw MyException(tr("attempt to store setting for unknown plugin \"%1\"").arg(pluginName));
+  }
+
+  // store the new setting both in memory and in the ini
+  m_PluginSettings[pluginName][key] = value;
+  m_Settings.setValue("Plugins/" + pluginName + "/" + key, value);
+}
+
+QVariant Settings::pluginPersistent(const QString &pluginName, const QString &key, const QVariant &def) const
+{
+  if (!m_PluginSettings.contains(pluginName)) {
+    return def;
+  }
+  return m_Settings.value("PluginPersistance/" + pluginName + "/" + key, def);
+}
+
+void Settings::setPluginPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync)
+{
+  if (!m_PluginSettings.contains(pluginName)) {
+    throw MyException(tr("attempt to store setting for unknown plugin \"%1\"").arg(pluginName));
+  }
+  m_Settings.setValue("PluginPersistance/" + pluginName + "/" + key, value);
+  if (sync) {
+    m_Settings.sync();
+  }
+}
+
 QString Settings::language()
 {
   QString result = m_Settings.value("Settings/language", "").toString();
@@ -330,6 +389,23 @@ void Settings::updateServers(const QList<ServerInfo> &servers)
   m_Settings.sync();
 }
 
+void Settings::addBlacklistPlugin(const QString &fileName)
+{
+  m_PluginBlacklist.insert(fileName);
+  writePluginBlacklist();
+}
+
+void Settings::writePluginBlacklist()
+{
+  m_Settings.beginWriteArray("pluginBlacklist");
+  int idx = 0;
+  foreach (const QString &plugin, m_PluginBlacklist) {
+    m_Settings.setArrayIndex(idx++);
+    m_Settings.setValue("name", plugin);
+  }
+
+  m_Settings.endArray();
+}
 
 void Settings::addLanguages(QComboBox *languageBox)
 {
@@ -360,6 +436,13 @@ void Settings::addLanguages(QComboBox *languageBox)
 void Settings::addStyles(QComboBox *styleBox)
 {
   styleBox->addItem("None", "");
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+  styleBox->addItem("Fusion", "Fusion");
+#else
+  styleBox->addItem("Plastique", "Plastique");
+  styleBox->addItem("Cleanlooks", "Cleanlooks");
+#endif
+
   QDirIterator langIter(QCoreApplication::applicationDirPath() + "/" + ToQString(AppConfig::stylesheetsPath()), QStringList("*.qss"), QDir::Files);
   while (langIter.hasNext()) {
     langIter.next();
@@ -443,6 +526,7 @@ void Settings::query(QWidget *parent)
 
   // plugis page
   QListWidget *pluginsList = dialog.findChild<QListWidget*>("pluginsList");
+  QListWidget *pluginBlacklistList = dialog.findChild<QListWidget*>("pluginBlacklist");
 
   // workarounds page
   QCheckBox *forceEnableBox = dialog.findChild<QCheckBox*>("forceEnableBox");
@@ -517,11 +601,12 @@ void Settings::query(QWidget *parent)
   downloadDirEdit->setText(getDownloadDirectory());
   modDirEdit->setText(getModDirectory());
   cacheDirEdit->setText(getCacheDirectory());
-  offlineBox->setChecked(m_Settings.value("Settings/offline_mode", false).toBool());
-  proxyBox->setChecked(m_Settings.value("Settings/use_proxy", false).toBool());
-  nmmVersionEdit->setText(m_Settings.value("Settings/nmm_version", "0.33.1").toString());
+  offlineBox->setChecked(offlineMode());
+  proxyBox->setChecked(useProxy());
+  nmmVersionEdit->setText(getNMMVersion());
   logLevelBox->setCurrentIndex(logLevel());
 
+  // display plugin settings
   foreach (IPlugin *plugin, m_Plugins) {
     QListWidgetItem *listItem = new QListWidgetItem(plugin->name(), pluginsList);
     listItem->setData(Qt::UserRole, QVariant::fromValue((void*)plugin));
@@ -529,6 +614,12 @@ void Settings::query(QWidget *parent)
     pluginsList->addItem(listItem);
   }
 
+  // display plugin blacklist
+  foreach (const QString &pluginName, m_PluginBlacklist) {
+    pluginBlacklistList->addItem(pluginName);
+  }
+
+  // display server preferences
   m_Settings.beginGroup("Servers");
   foreach (const QString &key, m_Settings.childKeys()) {
     QVariantMap val = m_Settings.value(key).toMap();
@@ -624,6 +715,13 @@ void Settings::query(QWidget *parent)
       }
     }
 
+    // store plugin blacklist
+    m_PluginBlacklist.clear();
+    foreach (QListWidgetItem *item, pluginBlacklistList->findItems("*", Qt::MatchWildcard)) {
+      m_PluginBlacklist.insert(item->text());
+    }
+    writePluginBlacklist();
+
     // store server preference
     m_Settings.beginGroup("Servers");
     for (int i = 0; i < knownServersList->count(); ++i) {