#include <KActionCollection>
#include <KIO/DesktopExecParser>
#include <KIO/Job>
-#include <KIO/JobUiDelegate>
#include <KJobWidgets>
#include <KLocalizedString>
#include <KMessageWidget>
#include <QAction>
#include <QDesktopServices>
#include <QDir>
-#include <QLabel>
#include <QShowEvent>
#include <QTimer>
#include <QVBoxLayout>
-TerminalPanel::TerminalPanel(QWidget* parent) :
- Panel(parent),
- m_clearTerminal(true),
- m_mostLocalUrlJob(nullptr),
- m_layout(nullptr),
- m_terminal(nullptr),
- m_terminalWidget(nullptr),
- m_konsolePartMissingMessage(nullptr),
- m_konsolePart(nullptr),
- m_konsolePartCurrentDirectory(),
- m_sendCdToTerminalHistory(),
- m_kiofuseInterface(QStringLiteral("org.kde.KIOFuse"),
- QStringLiteral("/org/kde/KIOFuse"),
- QDBusConnection::sessionBus())
+TerminalPanel::TerminalPanel(QWidget *parent)
+ : Panel(parent)
+ , m_clearTerminal(true)
+ , m_mostLocalUrlJob(nullptr)
+ , m_layout(nullptr)
+ , m_terminal(nullptr)
+ , m_terminalWidget(nullptr)
+ , m_konsolePartMissingMessage(nullptr)
+ , m_konsolePart(nullptr)
+ , m_konsolePartCurrentDirectory()
+ , m_sendCdToTerminalHistory()
+ , m_kiofuseInterface(QStringLiteral("org.kde.KIOFuse"), QStringLiteral("/org/kde/KIOFuse"), QDBusConnection::sessionBus())
{
m_layout = new QVBoxLayout(this);
m_layout->setContentsMargins(0, 0, 0, 0);
TerminalPanel::~TerminalPanel()
{
+ if (m_konsolePart) {
+ // Avoid when QObject cleanup, which comes after our destructor, deletes the konsolePart
+ // and subsequently calls back into our slot when the destructor has already run.
+ disconnect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
+ }
}
void TerminalPanel::goHome()
sendCdToTerminal(QDir::homePath(), HistoryPolicy::SkipHistory);
}
-QString TerminalPanel::currentWorkingDirectory()
+bool TerminalPanel::currentWorkingDirectoryIsChildOf(const QString &path) const
{
if (m_terminal) {
- return m_terminal->currentWorkingDirectory();
+ return m_terminal->currentWorkingDirectory().startsWith(path);
}
- return QString();
+ return false;
}
void TerminalPanel::terminalExited()
bool TerminalPanel::isHiddenInVisibleWindow() const
{
- return parentWidget()
- && parentWidget()->isHidden();
+ return parentWidget() && parentWidget()->isHidden();
}
void TerminalPanel::dockVisibilityChanged()
{
// Only react when the DockWidget itself (not some parent) is hidden. This way we don't
// respond when e.g. Dolphin is minimized.
- if (isHiddenInVisibleWindow() && m_terminal && !hasProgramRunning()) {
- // Make sure that the following "cd /" command will not affect the view.
- disconnect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
- this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
-
- // Make sure this terminal does not prevent unmounting any removable drives
- changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
-
- // Because we have disconnected from the part's currentDirectoryChanged()
- // signal, we have to update m_konsolePartCurrentDirectory manually. If this
- // was not done, showing the panel again might not set the part's working
- // directory correctly.
- m_konsolePartCurrentDirectory = '/';
+ if (isHiddenInVisibleWindow()) {
+ if (m_konsolePartMissingMessage) {
+ m_konsolePartMissingMessage->hide();
+ } else if (m_terminal && !hasProgramRunning()) {
+ // Make sure that the following "cd /" command will not affect the view.
+ disconnect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)), this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
+
+ // Make sure this terminal does not prevent unmounting any removable drives
+ changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
+
+ // Because we have disconnected from the part's currentDirectoryChanged()
+ // signal, we have to update m_konsolePartCurrentDirectory manually. If this
+ // was not done, showing the panel again might not set the part's working
+ // directory correctly.
+ m_konsolePartCurrentDirectory = '/';
+ }
}
}
return true;
}
-void TerminalPanel::showEvent(QShowEvent* event)
+void TerminalPanel::showEvent(QShowEvent *event)
{
if (event->spontaneous()) {
Panel::showEvent(event);
if (!m_terminal) {
m_clearTerminal = true;
- KPluginFactory *factory = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("konsolepart"))).plugin;
+ KPluginFactory *factory = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("kf6/parts/konsolepart"))).plugin;
m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : nullptr;
if (m_konsolePart) {
connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
if (m_konsolePartMissingMessage) {
m_layout->removeWidget(m_konsolePartMissingMessage);
}
- m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);
+ m_terminal = qobject_cast<TerminalInterface *>(m_konsolePart);
// needed to collect the correct KonsolePart actionCollection
// namely the one of the single inner terminal and not the outer 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 {
+ 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->setSizeConstraint(QLayout::SetMaximumSize);
+ }
+
m_konsolePartMissingMessage->animatedShow();
}
}
if (m_terminal) {
m_terminal->showShellInDir(url().toLocalFile());
- if(!hasProgramRunning()) {
+ if (!hasProgramRunning()) {
changeDir(url());
}
m_terminalWidget->setFocus();
- connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
- this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
+ connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)), this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
}
Panel::showEvent(event);
}
-void TerminalPanel::changeDir(const QUrl& url)
+void TerminalPanel::changeDir(const QUrl &url)
{
delete m_mostLocalUrlJob;
m_mostLocalUrlJob = nullptr;
sendCdToTerminalKIOFuse(url);
}
-void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)
+void TerminalPanel::sendCdToTerminal(const QString &dir, HistoryPolicy addToHistory)
{
- if (dir == m_konsolePartCurrentDirectory // We are already there
+ if (dir == m_konsolePartCurrentDirectory // We are already there
&& m_sendCdToTerminalHistory.isEmpty() // …and that is not because the terminal couldn't keep up
) {
m_clearTerminal = false;
return;
}
-#ifndef Q_OS_WIN
- if (!m_clearTerminal) {
- // The TerminalV2 interface does not provide a way to delete the
- // current line before sending a new input. This is mandatory,
- // otherwise sending a 'cd x' to a existing 'rm -rf *' might
- // result in data loss. As workaround SIGINT is sent.
- const int processId = m_terminal->terminalProcessId();
- if (processId > 0) {
- kill(processId, SIGINT);
- }
- }
-#endif
+ // Send prior Ctrl-E, Ctrl-U to ensure the line is empty. This is
+ // mandatory, otherwise sending a 'cd x\n' to a prompt with 'rm -rf *'
+ // would result in data loss.
+ m_terminal->sendInput(QStringLiteral("\x05\x15"));
// We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after
// the directory change, because this directory change is not caused by a "cd" command that the
if (addToHistory == HistoryPolicy::AddToHistory)
m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());
- m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
+ m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\r');
if (m_clearTerminal) {
- m_terminal->sendInput(QStringLiteral(" clear\n"));
+ m_terminal->sendInput(QStringLiteral(" clear\r"));
m_clearTerminal = false;
}
}
-void TerminalPanel::sendCdToTerminalKIOFuse(const QUrl &url) {
+void TerminalPanel::sendCdToTerminalKIOFuse(const QUrl &url)
+{
// URL isn't local, only hope for the terminal to be in sync with the
// DolphinView is to mount the remote URL in KIOFuse and point to it.
// If we can't do that for any reason, silently fail.
auto reply = m_kiofuseInterface.mountUrl(url.toString());
- QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher(reply, this);
- QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] (QDBusPendingCallWatcher* watcher) {
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+ QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) {
watcher->deleteLater();
if (!reply.isError()) {
// Successfully mounted, point to the KIOFuse equivalent path.
});
}
-void TerminalPanel::slotMostLocalUrlResult(KJob* job)
+void TerminalPanel::slotMostLocalUrlResult(KJob *job)
{
- KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
+ KIO::StatJob *statJob = static_cast<KIO::StatJob *>(job);
const QUrl url = statJob->mostLocalUrl();
if (url.isLocalFile()) {
sendCdToTerminal(url.toLocalFile());
m_mostLocalUrlJob = nullptr;
}
-void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
+void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString &dir)
{
m_konsolePartCurrentDirectory = QDir(dir).canonicalPath();
}
auto reply = m_kiofuseInterface.remoteUrl(m_konsolePartCurrentDirectory);
- QDBusPendingCallWatcher * watcher = new QDBusPendingCallWatcher(reply, this);
- QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=] (QDBusPendingCallWatcher* watcher) {
+ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
+ QObject::connect(watcher, &QDBusPendingCallWatcher::finished, this, [=](QDBusPendingCallWatcher *watcher) {
watcher->deleteLater();
if (reply.isError()) {
// KIOFuse errored out... just show the normal URL
return hasFocus();
}
+
+#include "moc_terminalpanel.cpp"
projects / dolphin.git / blobdiff