Merge with branch1.1

1 files changed, 18 insertions, 0 deletions

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 9f268455..bf1f95dc 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -21,12 +21,15 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "ui_settingsdialog.h"
 #include "categoriesdialog.h"
 #include "helper.h"
+#include "noeditdelegate.h"
 #include <gameinfo.h>
 #include <QDirIterator>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QShortcut>
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include "settings.h"
 
 
 using namespace MOBase;
@@ -37,6 +40,9 @@ SettingsDialog::SettingsDialog(QWidget *parent)
   : TutorableDialog("SettingsDialog", parent), ui(new Ui::SettingsDialog)
 {
   ui->setupUi(this);
+
+  QShortcut *delShortcut = new QShortcut(QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
+  connect(delShortcut, SIGNAL(activated()), this, SLOT(deleteBlacklistItem()));
 }
 
 SettingsDialog::~SettingsDialog()
@@ -146,6 +152,8 @@ void SettingsDialog::on_pluginsList_currentItemChanged(QListWidgetItem *current,
   for (auto iter = settings.begin(); iter != settings.end(); ++iter) {
     QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key()));
     QVariant value = *iter;
+
+    ui->pluginSettingsList->setItemDelegateForColumn(0, new NoEditDelegate());
     newItem->setData(1, Qt::DisplayRole, value);
     newItem->setData(1, Qt::EditRole, value);
 
@@ -153,3 +161,13 @@ void SettingsDialog::on_pluginsList_currentItemChanged(QListWidgetItem *current,
     ui->pluginSettingsList->addTopLevelItem(newItem);
   }
 }
+
+void SettingsDialog::deleteBlacklistItem()
+{
+  ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row());
+}
+
+void SettingsDialog::on_associateButton_clicked()
+{
+  Settings::instance().registerAsNXMHandler(true);
+}