wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add misc support

Browse Source
wilder
Laurent Montel 7 years ago
parent dd0fa8f0e8
commit 1b440a6156
3 changed files with 34 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      CMakeLists.txt
  2. 45
      src/configuredialog/configureplugins/configurepluginslistwidget.cpp
  3. 1
      src/configuredialog/configureplugins/configurepluginslistwidget.h

4
CMakeLists.txt
Unescape View File

@ -66,9 +66,9 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.10.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.10.42")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.10.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.10.48")
set(MESSAGELIB_LIB_VERSION_LIB "5.10.51")
set(LIBKLEO_LIB_VERSION_LIB "5.10.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.10.42")
set(PIMCOMMON_LIB_VERSION_LIB "5.10.44")
set(LIBKDEPIM_LIB_VERSION_LIB "5.10.41")
set(LIBKSIEVE_LIB_VERSION_LIB "5.10.40")

45
src/configuredialog/configureplugins/configurepluginslistwidget.cpp
Unescape View File

@ -41,12 +41,14 @@
#include <MessageComposer/PluginEditorInit>
#include <WebEngineViewer/NetworkPluginUrlInterceptor>
#include <MessageComposer/PluginEditorCheckBeforeSend>
#include <MessageViewer/MessageViewerConfigureSettingsPluginManager>
#include <MessageViewer/ViewerPlugin>
#include <PimCommon/GenericPlugin>
#include <MessageComposer/PluginEditor>
#include <MessageViewer/HeaderStylePlugin>
#include <AkonadiCore/AgentManager>
#include <AkonadiCore/AgentInstance>
#include <MessageViewer/MessageViewerConfigureSettingsPlugin>
namespace {
QString pluginEditorGroupName()
@ -98,6 +100,10 @@ QString agentAkonadiGroupName()
{
return QStringLiteral("agentakonadigroupname");
}
QString configurePluginGroupName()
{
return QStringLiteral("configuregroupname");
}
}
ConfigurePluginsListWidget::ConfigurePluginsListWidget(QWidget *parent)
@ -171,6 +177,7 @@ void ConfigurePluginsListWidget::doResetToDefaultsOther()
changeState(mPluginEditorInitItems);
changeState(mPluginConvertTextItems);
changeState(mPluginEditorGrammarItems);
}
void ConfigurePluginsListWidget::initialize()
@ -238,7 +245,7 @@ void ConfigurePluginsListWidget::initialize()
MessageViewer::HeaderStylePluginManager::self()->configPrefixSettingKey(),
mPluginHeaderStyleItems,
headerStyleGroupName());
// //Load headerstyle
//Load Converter plugin
PimCommon::ConfigurePluginsListWidget::fillTopItems(MessageComposer::PluginEditorConvertTextManager::self()->pluginsDataList(),
i18n("Convertor Text Plugins"),
MessageComposer::PluginEditorConvertTextManager::self()->configGroupName(),
@ -246,6 +253,13 @@ void ConfigurePluginsListWidget::initialize()
mPluginConvertTextItems,
pluginEditorConvertTextGroupName());
PimCommon::ConfigurePluginsListWidget::fillTopItems(MessageViewer::MessageViewerConfigureSettingsPluginManager::self()->pluginsDataList(),
i18n("Misc"),
MessageViewer::MessageViewerConfigureSettingsPluginManager::self()->configGroupName(),
MessageViewer::MessageViewerConfigureSettingsPluginManager::self()->configPrefixSettingKey(),
mPluginConfigureItems,
configurePluginGroupName(), false);
//Load Agent Plugin
initializeAgentPlugins();
mListWidget->expandAll();
@ -323,37 +337,40 @@ void ConfigurePluginsListWidget::changeAgentActiveState(const QString &agentIden
}
}
void ConfigurePluginsListWidget::slotConfigureClicked(const QString &configureGroupName, const QString &identifier)
void ConfigurePluginsListWidget::slotConfigureClicked(const QString &groupName, const QString &identifier)
{
if (!configureGroupName.isEmpty() && !identifier.isEmpty()) {
if (configureGroupName == headerStyleGroupName()) {
if (!groupName.isEmpty() && !identifier.isEmpty()) {
if (groupName == headerStyleGroupName()) {
MessageViewer::HeaderStylePlugin *plugin = MessageViewer::HeaderStylePluginManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == networkUrlInterceptorGroupName()) {
} else if (groupName == networkUrlInterceptorGroupName()) {
WebEngineViewer::NetworkPluginUrlInterceptor *plugin = WebEngineViewer::NetworkUrlInterceptorPluginManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == viewerPluginGroupName()) {
} else if (groupName == viewerPluginGroupName()) {
MessageViewer::ViewerPlugin *plugin = MessageViewer::ViewerPluginManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == pluginEditorGroupName()) {
} else if (groupName == pluginEditorGroupName()) {
MessageComposer::PluginEditor *plugin = MessageComposer::PluginEditorManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == kmailPluginToolsGroupName()) {
} else if (groupName == kmailPluginToolsGroupName()) {
PimCommon::GenericPlugin *plugin = KMailPluginInterface::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == pluginEditorInitGroupName()) {
} else if (groupName == pluginEditorInitGroupName()) {
MessageComposer::PluginEditorInit *plugin = MessageComposer::PluginEditorInitManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == pluginEditorCheckBeforeGroupName()) {
} else if (groupName == pluginEditorCheckBeforeGroupName()) {
MessageComposer::PluginEditorCheckBeforeSend *plugin = MessageComposer::PluginEditorCheckBeforeSendManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == pluginEditorConvertTextGroupName()) {
} else if (groupName == pluginEditorConvertTextGroupName()) {
MessageComposer::PluginEditorConvertText *plugin = MessageComposer::PluginEditorConvertTextManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == pluginEditorGrammarGroupName()) {
} else if (groupName == pluginEditorGrammarGroupName()) {
PimCommon::CustomToolsPlugin *plugin = MessageComposer::PluginEditorGrammarManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (configureGroupName == agentAkonadiGroupName()) {
} else if (groupName == configurePluginGroupName()) {
MessageViewer::MessageViewerConfigureSettingsPlugin *plugin = MessageViewer::MessageViewerConfigureSettingsPluginManager::self()->pluginFromIdentifier(identifier);
plugin->showConfigureDialog(this);
} else if (groupName == agentAkonadiGroupName()) {
for (const PimCommon::PluginUtilData &data : qAsConst(mPluginUtilDataList)) {
if (data.mIdentifier == identifier) {
auto instance = Akonadi::AgentManager::self()->instance(identifier);
@ -364,7 +381,7 @@ void ConfigurePluginsListWidget::slotConfigureClicked(const QString &configureGr
}
}
} else {
qCWarning(KMAIL_LOG) << "Unknown configureGroupName" << configureGroupName;
qCWarning(KMAIL_LOG) << "Unknown configureGroupName" << groupName;
}
}
}

1
src/configuredialog/configureplugins/configurepluginslistwidget.h
Unescape View File

@ -51,6 +51,7 @@ private:
QList<PluginItem *> mPluginHeaderStyleItems;
QList<PluginItem *> mAgentPluginsItems;
QList<PluginItem *> mPluginConvertTextItems;
QList<PluginItem *> mPluginConfigureItems;
QVector<PimCommon::PluginUtilData> mPluginUtilDataList;
};

Write Preview
Loading…
Cancel
Save