From 68a924af05e7adf1c36b8139ee33a739298fe36d Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Wed, 7 Mar 2018 14:35:17 +0300 Subject: [PATCH] Show a message if Konsole part is not installed Summary: Show a message if Konsole part is not installed BUG: 371822 FIXED-IN: 18.04.0 {F5749731} Reviewers: ngraham, progwolff, elvisangelaccio Reviewed By: ngraham, progwolff, elvisangelaccio Subscribers: rkflx, ngraham, elvisangelaccio, broulik, progwolff, #dolphin Differential Revision: https://phabricator.kde.org/D11118 --- src/panels/terminal/terminalpanel.cpp | 29 +++++++++++++++++++++++++++ src/panels/terminal/terminalpanel.h | 2 ++ 2 files changed, 31 insertions(+) diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 4f77f6136c..d2d569c9ff 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -19,9 +19,12 @@ #include "terminalpanel.h" +#include #include #include #include +#include +#include #include #include #include @@ -29,8 +32,12 @@ #include #include +#include +#include #include +#include #include +#include #include TerminalPanel::TerminalPanel(QWidget* parent) : @@ -132,7 +139,29 @@ void TerminalPanel::showEvent(QShowEvent* event) connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited); m_terminalWidget = m_konsolePart->widget(); m_layout->addWidget(m_terminalWidget); + if (m_konsolePartMissingMessage) { + m_layout->removeWidget(m_konsolePartMissingMessage); + } m_terminal = qobject_cast(m_konsolePart); + } else if (!m_konsolePartMissingMessage) { + const auto konsoleInstallUrl = QUrl("appstream://org.kde.konsole.desktop"); + const auto konsoleNotInstalledText = i18n("Terminal cannot be shown because Konsole is not installed. " + "Please install it and then reopen the panel."); + m_konsolePartMissingMessage = new KMessageWidget(konsoleNotInstalledText, this); + m_konsolePartMissingMessage->setCloseButtonVisible(false); + m_konsolePartMissingMessage->hide(); + if (KIO::DesktopExecParser::hasSchemeHandler(konsoleInstallUrl)) { + auto installKonsoleAction = new QAction(i18n("Install Konsole"), this); + connect(installKonsoleAction, &QAction::triggered, [konsoleInstallUrl]() { + QDesktopServices::openUrl(konsoleInstallUrl); + }); + m_konsolePartMissingMessage->addAction(installKonsoleAction); + } + m_layout->addWidget(m_konsolePartMissingMessage); + m_layout->addStretch(); + QTimer::singleShot(0, m_konsolePartMissingMessage, &KMessageWidget::animatedShow); + } else { + m_konsolePartMissingMessage->animatedShow(); } } if (m_terminal) { diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index b36f24142f..a6f93d7672 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -25,6 +25,7 @@ #include class TerminalInterface; +class KMessageWidget; class QVBoxLayout; class QWidget; @@ -93,6 +94,7 @@ private: QVBoxLayout* m_layout; TerminalInterface* m_terminal; QWidget* m_terminalWidget; + KMessageWidget* m_konsolePartMissingMessage; KParts::ReadOnlyPart* m_konsolePart; QString m_konsolePartCurrentDirectory; QQueue m_sendCdToTerminalHistory;