kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/18.12'

Browse source
This commit is contained in:
Friedrich W. H. Kossebau 2019-01-04 22:23:49 +01:00
parent 15f1963842 1cde03cdfe
commit 89158c6b3d
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.cpp
View file

@ -72,7 +72,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
i18nc("@title", "File Manager"),
KAboutLicense::GPL,
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"),
i18nc("@info:credit", "Maintainer (since 2018) and developer"),
QStringLiteral("elvis.angelaccio@kde.org"));

32
src/tests/dolphinmainwindowtest.cpp
View file

@ -40,6 +40,7 @@ private slots:
void testActiveViewAfterClosingSplitView_data();
void testActiveViewAfterClosingSplitView();
void testUpdateWindowTitleAfterClosingSplitView();
void testUpdateWindowTitleAfterChangingSplitView();
void testOpenInNewTabTitle();
void testNewFileMenuEnabled_data();
void testNewFileMenuEnabled();
@ -175,6 +176,37 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterClosingSplitView()
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
void DolphinMainWindowTest::testOpenInNewTabTitle()
{