Merge branch 'release/21.12'

diff --combined src/dolphinmainwindow.cpp
index 11338ec1f7fe719f72611ad683898838347fdb8d,fa105b15a62674b0ac710b98d4361932e55960c6..c03095c3c0c824b0ecb976e419789f44f4d5b857
--- 1/src/dolphinmainwindow.cpp
--- 2/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@@ -133,7 -133,7 +133,7 @@@ DolphinMainWindow::DolphinMainWindow() 
      KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
      undoManager->setUiInterface(new UndoUiInterface());
  
 -    connect(undoManager, QOverload<bool>::of(&KIO::FileUndoManager::undoAvailable),
 +    connect(undoManager, &KIO::FileUndoManager::undoAvailable,
              this, &DolphinMainWindow::slotUndoAvailable);
      connect(undoManager, &KIO::FileUndoManager::undoTextChanged,
              this, &DolphinMainWindow::slotUndoTextChanged);
@@@ -211,7 -211,7 +211,7 @@@
  
      setupWhatsThis();
  
 -    connect(KSycoca::self(), QOverload<>::of(&KSycoca::databaseChanged), this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
 +    connect(KSycoca::self(), &KSycoca::databaseChanged, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
  
      QTimer::singleShot(0, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
  
@@@ -445,16 -445,6 +445,16 @@@ void DolphinMainWindow::openNewTab(cons
      m_tabWidget->openNewTab(url, QUrl());
  }
  
 +void DolphinMainWindow::openNewTabAndActivate(const QUrl &url)
 +{
 +    m_tabWidget->openNewActivatedTab(url, QUrl());
 +}
 +
 +void DolphinMainWindow::openNewWindow(const QUrl &url)
 +{
 +    Dolphin::openNewWindow({url}, this);
 +}
 +
  void DolphinMainWindow::slotSplitViewChanged()
  {
      m_tabWidget->currentTabPage()->setSplitViewEnabled(GeneralSettings::splitView(), WithAnimation);
@@@ -657,12 -647,14 +657,12 @@@ void DolphinMainWindow::readProperties(
  
  void DolphinMainWindow::updateNewMenu()
  {
 -    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());
      m_newFileMenu->checkUpToDate();
      m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());
  }
  
  void DolphinMainWindow::createDirectory()
  {
 -    m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->hiddenFilesShown());
      m_newFileMenu->setPopupFiles(QList<QUrl>() << activeViewContainer()->url());
      m_newFileMenu->createDirectory();
  }
@@@ -758,7 -750,7 +758,7 @@@ void DolphinMainWindow::slotAboutToShow
      int entries = 0;
      m_backAction->menu()->clear();
      for (int i = urlNavigator->historyIndex() + 1; i < urlNavigator->historySize() && entries < MaxNumberOfNavigationentries; ++i, ++entries) {
-         QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_backAction->menu());
+         QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_backAction->menu());
          action->setData(i);
          m_backAction->menu()->addAction(action);
      }
@@@ -787,7 -779,7 +787,7 @@@ void DolphinMainWindow::slotAboutToShow
      int entries = 0;
      m_forwardAction->menu()->clear();
      for (int i = urlNavigator->historyIndex() - 1; i >= 0 && entries < MaxNumberOfNavigationentries; --i, ++entries) {
-         QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_forwardAction->menu());
+         QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_forwardAction->menu());
          action->setData(i);
          m_forwardAction->menu()->addAction(action);
      }
@@@ -1488,7 -1480,7 +1488,7 @@@ void DolphinMainWindow::setupActions(
  
      QAction* showFilterBar = actionCollection()->addAction(QStringLiteral("show_filter_bar"));
      showFilterBar->setText(i18nc("@action:inmenu Tools", "Filter..."));
 -    showFilterBar->setToolTip(i18nc("@info:tooltip", "Toggle Filter Bar"));
 +    showFilterBar->setToolTip(i18nc("@info:tooltip", "Show Filter Bar"));
      showFilterBar->setWhatsThis(xi18nc("@info:whatsthis", "This opens the "
          "<emphasis>Filter Bar</emphasis> at the bottom of the window.<nl/> "
          "There you can enter a text to filter the files and folders currently displayed. "
@@@ -1869,10 -1861,8 +1869,10 @@@ void DolphinMainWindow::setupDockWidget
              foldersPanel, &FoldersPanel::setUrl);
      connect(foldersPanel, &FoldersPanel::folderActivated,
              this, &DolphinMainWindow::changeUrl);
 -    connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
 +    connect(foldersPanel, &FoldersPanel::folderInNewTab,
              this, &DolphinMainWindow::openNewTab);
 +    connect(foldersPanel, &FoldersPanel::folderInNewActiveTab,
 +            this, &DolphinMainWindow::openNewTabAndActivate);
      connect(foldersPanel, &FoldersPanel::errorMessage,
              this, &DolphinMainWindow::showErrorMessage);
  
@@@ -1954,10 -1944,8 +1954,10 @@@
      addDockWidget(Qt::LeftDockWidgetArea, placesDock);
      connect(m_placesPanel, &PlacesPanel::placeActivated,
              this, &DolphinMainWindow::slotPlaceActivated);
 -    connect(m_placesPanel, &PlacesPanel::placeMiddleClicked,
 +    connect(m_placesPanel, &PlacesPanel::placeActivatedInNewTab,
              this, &DolphinMainWindow::openNewTab);
 +    connect(m_placesPanel, &PlacesPanel::placeActivatedInNewActiveTab,
 +            this, &DolphinMainWindow::openNewTabAndActivate);
      connect(m_placesPanel, &PlacesPanel::errorMessage,
              this, &DolphinMainWindow::showErrorMessage);
      connect(this, &DolphinMainWindow::urlChanged,
@@@ -2148,10 -2136,6 +2148,10 @@@ void DolphinMainWindow::connectViewSign
              this, &DolphinMainWindow::updateSearchAction);
      connect(container, &DolphinViewContainer::captionChanged,
              this, &DolphinMainWindow::updateWindowTitle);
 +    connect(container, &DolphinViewContainer::tabRequested,
 +            this, &DolphinMainWindow::openNewTab);
 +    connect(container, &DolphinViewContainer::activeTabRequested,
 +            this, &DolphinMainWindow::openNewTabAndActivate);
  
      const QAction* toggleSearchAction = actionCollection()->action(QStringLiteral("toggle_search"));
      connect(toggleSearchAction, &QAction::triggered, container, &DolphinViewContainer::setSearchModeEnabled);
@@@ -2165,10 -2149,6 +2165,10 @@@
              this, &DolphinMainWindow::fileItemsChanged);
      connect(view, &DolphinView::tabRequested,
              this, &DolphinMainWindow::openNewTab);
 +    connect(view, &DolphinView::activeTabRequested,
 +            this, &DolphinMainWindow::openNewTabAndActivate);
 +    connect(view, &DolphinView::windowRequested,
 +            this, &DolphinMainWindow::openNewWindow);
      connect(view, &DolphinView::requestContextMenu,
              this, &DolphinMainWindow::openContextMenu);
      connect(view, &DolphinView::directoryLoadingStarted,
@@@ -2203,10 -2183,6 +2203,10 @@@
              this, &DolphinMainWindow::slotEditableStateChanged);
      connect(navigator, &KUrlNavigator::tabRequested,
              this, &DolphinMainWindow::openNewTab);
 +    connect(navigator, &KUrlNavigator::activeTabRequested,
 +            this, &DolphinMainWindow::openNewTabAndActivate);
 +    connect(navigator, &KUrlNavigator::newWindowRequested,
 +            this, &DolphinMainWindow::openNewWindow);
  
  }