Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: not send plugin incompatible notify

Browse Source
This commit is contained in:
listenerri 2019-04-09 13:44:14 +08:00
parent b9679f6c3d
commit d03b29a7bc
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/util/abstractpluginscontroller.cpp
View File

@ -21,6 +21,7 @@
#include "abstractpluginscontroller.h"
#include "pluginsiteminterface.h"
#include "DNotifySender"
#include <QDebug>
#include <QDir>
@ -160,6 +161,9 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
const QString &pluginApi = meta.value("api").toString();
if (pluginApi.isEmpty() || !CompatiblePluginApiList.contains(pluginApi))
{
QString notifyMessage(tr("The plugin %1 is not compatible with the system."));
Dtk::Core::DUtil::DNotifySender(notifyMessage.arg(QFileInfo(pluginFile).fileName())).appIcon("dialog-warning").call();
qWarning() << objectName()
<< "plugin api version not matched! expect versions:" << CompatiblePluginApiList
<< ", got version:" << pluginApi
@ -183,6 +187,7 @@ void AbstractPluginsController::loadPlugin(const QString &pluginFile)
qDebug() << objectName() << dbusService << "daemon has not started, waiting for signal";
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this,
[=](const QString &name, const QString &oldOwner, const QString &newOwner) {
Q_UNUSED(oldOwner);
if (name == dbusService && !newOwner.isEmpty()) {
qDebug() << objectName() << dbusService << "daemon started, init plugin and disconnect";
initPlugin(interface);

44
translations/dde-dock.ts
View File

@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>AbstractPluginsController</name>
<message>
<location filename="../frame/util/abstractpluginscontroller.cpp" line="163"/>
<source>The plugin %1 is not compatible with the system.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ContainerItem</name>
<message>
@ -25,17 +33,17 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="146"/>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="143"/>
<source>12 Hour Time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="148"/>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="145"/>
<source>24 Hour Time</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="154"/>
<location filename="../plugins/datetime/datetimeplugin.cpp" line="151"/>
<source>Time Settings</source>
<translation type="unfinished"></translation>
</message>
@ -112,14 +120,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DockPluginsController</name>
<message>
<location filename="../frame/controller/dockpluginscontroller.cpp" line="160"/>
<source>The plugin %1 is not compatible with the system.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DockSettings</name>
<message>
@ -233,7 +233,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/onboard/onboardplugin.cpp" line="106"/>
<location filename="../plugins/onboard/onboardplugin.cpp" line="97"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
@ -261,7 +261,7 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/power/powerplugin.cpp" line="132"/>
<location filename="../plugins/power/powerplugin.cpp" line="124"/>
<source>Power settings</source>
<translation type="unfinished"></translation>
</message>
@ -269,32 +269,32 @@
<context>
<name>ShutdownPlugin</name>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="117"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="108"/>
<source>Shut down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="123"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="114"/>
<source>Restart</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="137"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="128"/>
<source>Hibernate</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="145"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="136"/>
<source>Lock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="151"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="142"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="130"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="121"/>
<source>Suspend</source>
<translation type="unfinished"></translation>
</message>
@ -305,12 +305,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="159"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="150"/>
<source>Switch account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="167"/>
<location filename="../plugins/shutdown/shutdownplugin.cpp" line="158"/>
<source>Power settings</source>
<translation type="unfinished"></translation>
</message>
@ -393,7 +393,7 @@
<context>
<name>TrayPlugin</name>
<message>
<location filename="../plugins/tray/trayplugin.cpp" line="59"/>
<location filename="../plugins/tray/trayplugin.cpp" line="60"/>
<source>System Tray</source>
<translation type="unfinished"></translation>
</message>