Plugins: Remove option to disable loading extensions

It can now only be globally disabled with --no-extensions switch.
It is still possible to manually disable all extensions, only the
global option to disable all extensions were removed.
remotes/origin/Falkon/3.0
David Rosca 8 years ago
parent d5608d823b
commit fdeb350746
  1. 5
      src/lib/plugins/plugins.cpp
  2. 1
      src/lib/plugins/plugins.h
  3. 7
      src/lib/preferences/pluginslist.ui
  4. 24
      src/lib/preferences/pluginsmanager.cpp
  5. 3
      src/lib/preferences/pluginsmanager.h

@ -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());

@ -90,7 +90,6 @@ private:
QList<Plugin> m_availablePlugins;
QStringList m_allowedPlugins;
bool m_pluginsEnabled;
bool m_pluginsLoaded;
SpeedDial* m_speedDial;

@ -23,13 +23,6 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="allowAppPlugins">
<property name="text">
<string>Allow Application Extensions to be loaded</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="list">
<property name="alternatingRowColors">

@ -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*)));

@ -1,6 +1,6 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2018 David Rosca <nowrep@gmail.com>
*
* 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();

Loading…
Cancel
Save