X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7787f080678ffd428b269acd8db370a8c0026b37..5bee1889e1682f1e7ffe55e49beaf4544eaf7157:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 07e80d586..c35de766c 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1004,9 +1004,9 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url) setWindowTitle(schemePrefix + fileName); } -#ifndef Q_OS_WIN void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath) { +#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = true; m_terminalPanel->goHome(); @@ -1014,16 +1014,18 @@ void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mo } else { m_placesPanel->proceedWithTearDown(); } +#endif } void DolphinMainWindow::slotStorageTearDownExternallyRequested(const QString& mountPath) { +#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = false; m_terminalPanel->goHome(); } -} #endif +} void DolphinMainWindow::setupActions() { @@ -1094,7 +1096,7 @@ void DolphinMainWindow::setupActions() actionCollection()->setDefaultShortcut(stashSplit, Qt::CTRL | Qt::Key_S); stashSplit->setText(i18nc("@action:intoolbar Stash", "Stash")); stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window")); - stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-visiting"))); + stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-stash"))); stashSplit->setCheckable(false); stashSplit->setVisible(KProtocolInfo::isKnownProtocol("stash")); connect(stashSplit, &QAction::triggered, this, &DolphinMainWindow::toggleSplitStash);