diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp index ae3ea7f68..335e41491 100644 --- a/src/lib/plugins/plugins.cpp +++ b/src/lib/plugins/plugins.cpp @@ -84,7 +84,6 @@ void Plugins::loadSettings() { Settings settings; settings.beginGroup("Plugin-Settings"); - m_pluginsEnabled = settings.value("EnablePlugins", true).toBool(); m_allowedPlugins = settings.value("AllowedPlugins", QStringList()).toStringList(); settings.endGroup(); @@ -109,10 +108,6 @@ void Plugins::shutdown() void Plugins::loadPlugins() { - if (!m_pluginsEnabled) { - return; - } - QDir settingsDir(DataPaths::currentProfilePath() + "/extensions/"); if (!settingsDir.exists()) { settingsDir.mkdir(settingsDir.absolutePath()); diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h index d4ad50252..4e20d6374 100644 --- a/src/lib/plugins/plugins.h +++ b/src/lib/plugins/plugins.h @@ -90,7 +90,6 @@ private: QList m_availablePlugins; QStringList m_allowedPlugins; - bool m_pluginsEnabled; bool m_pluginsLoaded; SpeedDial* m_speedDial; diff --git a/src/lib/preferences/pluginslist.ui b/src/lib/preferences/pluginslist.ui index bc23e2921..b9e0e4413 100644 --- a/src/lib/preferences/pluginslist.ui +++ b/src/lib/preferences/pluginslist.ui @@ -23,13 +23,6 @@ 0 - - - - Allow Application Extensions to be loaded - - - diff --git a/src/lib/preferences/pluginsmanager.cpp b/src/lib/preferences/pluginsmanager.cpp index 8b11aac50..b03c0a710 100644 --- a/src/lib/preferences/pluginsmanager.cpp +++ b/src/lib/preferences/pluginsmanager.cpp @@ -44,13 +44,11 @@ PluginsManager::PluginsManager(QWidget* parent) bool appPluginsEnabled = settings.value("EnablePlugins", true).toBool(); settings.endGroup(); - ui->allowAppPlugins->setChecked(appPluginsEnabled); ui->list->setEnabled(appPluginsEnabled); connect(ui->butSettings, SIGNAL(clicked()), this, SLOT(settingsClicked())); connect(ui->list, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(currentChanged(QListWidgetItem*))); connect(ui->list, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); - connect(ui->allowAppPlugins, SIGNAL(clicked(bool)), this, SLOT(allowAppPluginsChanged(bool))); ui->list->setItemDelegate(new PluginListDelegate(ui->list)); } @@ -90,34 +88,12 @@ void PluginsManager::save() Settings settings; settings.beginGroup("Plugin-Settings"); - settings.setValue("EnablePlugins", ui->allowAppPlugins->isChecked()); settings.setValue("AllowedPlugins", allowedPlugins); settings.endGroup(); } -void PluginsManager::allowAppPluginsChanged(bool state) -{ - ui->list->setEnabled(state); - - if (!state) { - for (int i = 0; i < ui->list->count(); i++) { - QListWidgetItem* item = ui->list->item(i); - - if (item->checkState() == Qt::Checked) { - item->setCheckState(Qt::Unchecked); - } - } - } - - refresh(); -} - void PluginsManager::refresh() { - if (!ui->allowAppPlugins->isChecked()) { - return; - } - ui->list->clear(); ui->butSettings->setEnabled(false); disconnect(ui->list, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); diff --git a/src/lib/preferences/pluginsmanager.h b/src/lib/preferences/pluginsmanager.h index 904f6ed33..2a9a37eee 100644 --- a/src/lib/preferences/pluginsmanager.h +++ b/src/lib/preferences/pluginsmanager.h @@ -1,6 +1,6 @@ /* ============================================================ * Falkon - Qt web browser -* Copyright (C) 2010-2014 David Rosca +* Copyright (C) 2010-2018 David Rosca * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,7 +44,6 @@ private slots: void settingsClicked(); void currentChanged(QListWidgetItem* item); void itemChanged(QListWidgetItem* item); - void allowAppPluginsChanged(bool state); void refresh();