Merge pull request #1883 from nicolasfella/contexticon

[dolphin] Add icon to context menu

shell_integration/dolphin/ownclouddolphinactionplugin.cpp

@@ -93,6 +93,7 @@ public:
 
         auto menuaction = new QAction(parentWidget);
         menuaction->setText(helper->contextMenuTitle());
+        menuaction->setIcon(QIcon::fromTheme(helper->contextMenuIconName()));
         menuaction->setMenu(menu);
         return { menuaction };
     }

shell_integration/dolphin/ownclouddolphinpluginhelper.h

@@ -41,6 +41,10 @@ public:
     {
         return _strings.value("SHARE_MENU_TITLE", "Share …");
     }
+    QString contextMenuIconName() const
+    {
+        return _strings.value("CONTEXT_MENU_ICON", "Nextcloud");
+    }
 
     QString copyPrivateLinkTitle() const { return _strings["COPY_PRIVATE_LINK_MENU_TITLE"]; }
     QString emailPrivateLinkTitle() const { return _strings["EMAIL_PRIVATE_LINK_MENU_TITLE"]; }

src/gui/socketapi.cpp

@@ -707,6 +707,7 @@ void SocketApi::command_GET_STRINGS(const QString &argument, SocketListener *lis
         { "CONTEXT_MENU_TITLE", Theme::instance()->appNameGUI() },
         { "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") },
         { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email …") },
+        { "CONTEXT_MENU_ICON", APPLICATION_ICON_NAME},
     } };
     listener->sendMessage(QString("GET_STRINGS:BEGIN"));
     for (const auto& key_value : strings) {