Merge branch 'Applications/18.08'

diff --cc src/dolphinmainwindow.cpp
Simple merge

diff --cc src/tests/dolphinmainwindowtest.cpp
index ca492215a0b3838bb2d222262584cf71670c414e,0dc33012418f3aba196f0848c28f8fb22ae51ddb..027ab3e891c78e0ef8cd6f241b340f4db145c80e
--- 1/src/tests/dolphinmainwindowtest.cpp
--- 2/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@@ -39,8 -40,9 +40,11 @@@ private slots
      void testActiveViewAfterClosingSplitView_data();
      void testActiveViewAfterClosingSplitView();
      void testUpdateWindowTitleAfterClosingSplitView();
 +    void testOpenInNewTabTitle();
+     void testNewFileMenuEnabled_data();
+     void testNewFileMenuEnabled();
+ 
 +
  private:
      QScopedPointer<DolphinMainWindow> m_mainWindow;
  };
@@@ -171,23 -173,31 +175,48 @@@ void DolphinMainWindowTest::testUpdateW
      QCOMPARE(currentUrlChangedSpy.count(), 1);
  }
  
 +// Test case for bug #397910
 +void DolphinMainWindowTest::testOpenInNewTabTitle()
 +{
 +    m_mainWindow->openDirectories({ QUrl::fromLocalFile(QDir::homePath()) }, false);
 +    m_mainWindow->show();
 +    QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data()));
 +    QVERIFY(m_mainWindow->isVisible());
 +
 +    auto tabWidget = m_mainWindow->findChild<DolphinTabWidget*>("tabWidget");
 +    QVERIFY(tabWidget);
 +
 +    tabWidget->openNewTab(QUrl::fromLocalFile(QDir::tempPath()));
 +    QCOMPARE(tabWidget->count(), 2);
 +    QVERIFY(tabWidget->tabIcon(0).name() != tabWidget->tabIcon(1).name());
 +    QVERIFY(tabWidget->tabText(0) != tabWidget->tabText(1));
 +}
 +
+ void DolphinMainWindowTest::testNewFileMenuEnabled_data()
+ {
+     QTest::addColumn<QUrl>("activeViewUrl");
+     QTest::addColumn<bool>("expectedEnabled");
+ 
+     QTest::newRow("home") << QUrl::fromLocalFile(QDir::homePath()) << true;
+     QTest::newRow("root") << QUrl::fromLocalFile(QDir::rootPath()) << false;
+     QTest::newRow("trash") << QUrl::fromUserInput(QStringLiteral("trash:/")) << false;
+ }
+ 
+ void DolphinMainWindowTest::testNewFileMenuEnabled()
+ {
+     QFETCH(QUrl, activeViewUrl);
+     m_mainWindow->openDirectories({ activeViewUrl }, false);
+     m_mainWindow->show();
+     QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data()));
+     QVERIFY(m_mainWindow->isVisible());
+ 
+     auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("newFileMenu");
+     QVERIFY(newFileMenu);
+ 
+     QFETCH(bool, expectedEnabled);
+     QCOMPARE(newFileMenu->isEnabled(), expectedEnabled);
+ }
+ 
  QTEST_MAIN(DolphinMainWindowTest)
  
  #include "dolphinmainwindowtest.moc"