diff --git a/CMakeLists.txt b/CMakeLists.txt index bd5424d3f2dce8251b779a1c60452d2af58c5769..3e68905f6a35cf118150ad4800245355383f65ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -set(MESSAGELIB_LIB_VERSION "5.1.80") +set(MESSAGELIB_LIB_VERSION "5.1.81") set(KF5_VERSION "5.19.0") set(KDEPIMLIBS_LIB_VERSION "5.1.42") diff --git a/messageviewer/src/viewer/viewer_p.cpp b/messageviewer/src/viewer/viewer_p.cpp index ae0d0688fb6495bf2a889bcf24bef7de72baf959..159e4f28084dc6f380cd6d68c726ed7ae9549a57 100644 --- a/messageviewer/src/viewer/viewer_p.cpp +++ b/messageviewer/src/viewer/viewer_p.cpp @@ -2391,7 +2391,7 @@ void ViewerPrivate::slotActivatePlugin(ViewerPluginInterface *interface) if (!text.isEmpty()) { interface->setText(text); } - interface->showWidget(); + interface->execute(); } void ViewerPrivate::slotAttachmentSaveAs() diff --git a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp index b4ae2bd071876f268b2403e4a0dacfca5b726a55..8180c0567913f5a9a3d27388025ddb42c6e1e140 100644 --- a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp +++ b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp @@ -88,7 +88,7 @@ ViewerPluginTest::~ViewerPluginTest() void ViewerPluginTest::slotActivatePlugin(MessageViewer::ViewerPluginInterface *interface) { - interface->showWidget(); + interface->execute(); } int main(int argc, char **argv) diff --git a/messageviewer/src/viewerplugins/viewerplugininterface.cpp b/messageviewer/src/viewerplugins/viewerplugininterface.cpp index 5321809cbbfe87dac67fdcd3b264c79f145ab483..fa2115551b9eedbfa154d625f681663f9aa19c63 100644 --- a/messageviewer/src/viewerplugins/viewerplugininterface.cpp +++ b/messageviewer/src/viewerplugins/viewerplugininterface.cpp @@ -40,6 +40,11 @@ ViewerPluginInterface::~ViewerPluginInterface() delete d; } +void ViewerPluginInterface::execute() +{ + showWidget(); +} + void ViewerPluginInterface::setText(const QString &text) { Q_UNUSED(text); @@ -75,6 +80,11 @@ void ViewerPluginInterface::closePlugin() // Reimplement in subclass } +void ViewerPluginInterface::showWidget() +{ + // Reimplement in subclass +} + void ViewerPluginInterface::updateAction(const Akonadi::Item &item) { Q_UNUSED(item); diff --git a/messageviewer/src/viewerplugins/viewerplugininterface.h b/messageviewer/src/viewerplugins/viewerplugininterface.h index eedb66e5a8484042f5e66c315716bd8803d1c983..a0d01d73438dbf7347c197e79daee7f1298fc3ca 100644 --- a/messageviewer/src/viewerplugins/viewerplugininterface.h +++ b/messageviewer/src/viewerplugins/viewerplugininterface.h @@ -43,17 +43,19 @@ public: Q_FLAGS(SpecificFeatureTypes) Q_DECLARE_FLAGS(SpecificFeatureTypes, SpecificFeatureType) + virtual void execute(); + virtual void setText(const QString &text); virtual QAction *action() const; virtual void setUrl(const QUrl &url); virtual void setMessage(const KMime::Message::Ptr &value); virtual void setMessageItem(const Akonadi::Item &item); virtual void closePlugin(); - virtual void showWidget() = 0; virtual ViewerPluginInterface::SpecificFeatureTypes featureTypes() const = 0; virtual void updateAction(const Akonadi::Item &item); protected: + virtual void showWidget(); void addHelpTextAction(QAction *act, const QString &text); protected Q_SLOTS: