kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-07 10:51:45 +00:00
Code Issues Projects Releases Wiki Activity

terminalpanel: Improve Konsole missing message

Browse Source 
It now forces the pane to fit its height, and will animate on every appearance.
This commit is contained in:
Oliver Beard 2023-08-23 01:44:21 +01:00 committed by Méven Car
parent 99541a77fa
commit 38342ae820
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/panels/terminal/terminalpanel.cpp
View File

@ -77,18 +77,22 @@ 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)));
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("/")));
// 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 = '/';
// 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 = '/';
}
}
}
@ -168,25 +172,26 @@ void TerminalPanel::showEvent(QShowEvent *event)
});
}
} 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();
}
}