Merge branch '452292-fix-service-menu-installer-run-script-in-konsole-on-install---uninstall' into 'master'

fix: service-menu-installer-run-script-in-konsole-on-install---uninstall See merge request system/dolphin!372
fix information panel icon
2024-06-28 14:35:36 +00:00 · 2024-06-23 20:56:20 +00:00 · 2024-06-23 16:45:58 +00:00 · 2022-12-31 14:03:16 +00:00
2 changed files with 2 additions and 2 deletions
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@ -2191,7 +2191,7 @@ void DolphinMainWindow::setupDockWidgets()
    connect(infoPanel, &InformationPanel::urlActivated, this, &DolphinMainWindow::handleUrl);
    infoDock->setWidget(infoPanel);

-    createPanelAction(QIcon::fromTheme(QStringLiteral("dialog-information")), Qt::Key_F11, infoDock, QStringLiteral("show_information_panel"));
+    createPanelAction(QIcon::fromTheme(QStringLiteral("documentinfo")), Qt::Key_F11, infoDock, QStringLiteral("show_information_panel"));

    addDockWidget(Qt::RightDockWidgetArea, infoDock);
    connect(this, &DolphinMainWindow::urlChanged, infoPanel, &InformationPanel::setUrl);
--- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
@ -261,7 +261,7 @@ bool runScriptVariants(const QString &path, bool hasArgVariants, const QStringLi
    qInfo() << "[servicemenuinstaller]: Trying to run installer/uninstaller" << path;
    if (hasArgVariants) {
        for (const auto &arg : argVariants) {
-            if (runScriptOnce(path, {arg}, ScriptExecution::Process)) {
+            if (runScriptOnce(path, {arg}, ScriptExecution::Konsole)) {
                return true;
            }
        }