X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bd47eb2e6d80315115bb3f58987162fcb4911b10..5bee1889e1682f1e7ffe55e49beaf4544eaf7157:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index cd232577d..c35de766c 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -100,7 +100,9 @@ DolphinMainWindow::DolphinMainWindow() : m_controlButton(0), m_updateToolBarTimer(0), m_lastHandleUrlStatJob(0), +#ifndef Q_OS_WIN m_terminalPanel(0), +#endif m_placesPanel(0), m_tearDownFromPlacesRequested(false) { @@ -1004,6 +1006,7 @@ void DolphinMainWindow::setUrlAsCaption(const QUrl& url) void DolphinMainWindow::slotStorageTearDownFromPlacesRequested(const QString& mountPath) { +#ifndef Q_OS_WIN if (m_terminalPanel->currentWorkingDirectory().startsWith(mountPath)) { m_tearDownFromPlacesRequested = true; m_terminalPanel->goHome(); @@ -1011,14 +1014,17 @@ 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() @@ -1090,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);