mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'Applications/18.12'
This commit is contained in:
commit
89158c6b3d
|
@ -72,7 +72,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
||||||
i18nc("@title", "File Manager"),
|
i18nc("@title", "File Manager"),
|
||||||
KAboutLicense::GPL,
|
KAboutLicense::GPL,
|
||||||
i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
|
i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
|
||||||
aboutData.setHomepage(QStringLiteral("http://dolphin.kde.org"));
|
aboutData.setHomepage(QStringLiteral("https://dolphin.kde.org"));
|
||||||
aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
|
aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
|
||||||
i18nc("@info:credit", "Maintainer (since 2018) and developer"),
|
i18nc("@info:credit", "Maintainer (since 2018) and developer"),
|
||||||
QStringLiteral("elvis.angelaccio@kde.org"));
|
QStringLiteral("elvis.angelaccio@kde.org"));
|
||||||
|
|
|
@ -40,6 +40,7 @@ private slots:
|
||||||
void testActiveViewAfterClosingSplitView_data();
|
void testActiveViewAfterClosingSplitView_data();
|
||||||
void testActiveViewAfterClosingSplitView();
|
void testActiveViewAfterClosingSplitView();
|
||||||
void testUpdateWindowTitleAfterClosingSplitView();
|
void testUpdateWindowTitleAfterClosingSplitView();
|
||||||
|
void testUpdateWindowTitleAfterChangingSplitView();
|
||||||
void testOpenInNewTabTitle();
|
void testOpenInNewTabTitle();
|
||||||
void testNewFileMenuEnabled_data();
|
void testNewFileMenuEnabled_data();
|
||||||
void testNewFileMenuEnabled();
|
void testNewFileMenuEnabled();
|
||||||
|
@ -175,6 +176,37 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterClosingSplitView()
|
||||||
QCOMPARE(currentUrlChangedSpy.count(), 1);
|
QCOMPARE(currentUrlChangedSpy.count(), 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test case for bug #402641
|
||||||
|
void DolphinMainWindowTest::testUpdateWindowTitleAfterChangingSplitView()
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
||||||
|
// Open split view.
|
||||||
|
m_mainWindow->actionCollection()->action(QStringLiteral("split_view"))->trigger();
|
||||||
|
QVERIFY(tabWidget->currentTabPage()->splitViewEnabled());
|
||||||
|
|
||||||
|
auto leftViewContainer = tabWidget->currentTabPage()->primaryViewContainer();
|
||||||
|
auto rightViewContainer = tabWidget->currentTabPage()->secondaryViewContainer();
|
||||||
|
|
||||||
|
// Store old window title.
|
||||||
|
const auto oldTitle = m_mainWindow->windowTitle();
|
||||||
|
|
||||||
|
// Change URL in the right view and make sure the title gets updated.
|
||||||
|
rightViewContainer->setUrl(QUrl::fromLocalFile(QDir::rootPath()));
|
||||||
|
QVERIFY(m_mainWindow->windowTitle() != oldTitle);
|
||||||
|
|
||||||
|
// Activate back the left view and check whether the old title gets restored.
|
||||||
|
leftViewContainer->setActive(true);
|
||||||
|
QEXPECT_FAIL("", "Bug #402641", Continue);
|
||||||
|
QCOMPARE(m_mainWindow->windowTitle(), oldTitle);
|
||||||
|
}
|
||||||
|
|
||||||
// Test case for bug #397910
|
// Test case for bug #397910
|
||||||
void DolphinMainWindowTest::testOpenInNewTabTitle()
|
void DolphinMainWindowTest::testOpenInNewTabTitle()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue