From 6de7aae20ad5110fb0615857328bd26ceee55ccc Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 23 Dec 2018 06:55:00 +0100
Subject: GIT_SILENT made messages (after extraction)

---
 src/org.kde.dolphin.appdata.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml
index 1d293fa27..2c0177815 100644
--- a/src/org.kde.dolphin.appdata.xml
+++ b/src/org.kde.dolphin.appdata.xml
@@ -536,6 +536,7 @@
       <caption xml:lang="en-GB">File management in Dolphin</caption>
       <caption xml:lang="es">Gestión de archivos en Dolphin</caption>
       <caption xml:lang="fi">Tiedostonhallinta Dolphinissa</caption>
+      <caption xml:lang="fr">Gestion de fichiers dans Dophin</caption>
       <caption xml:lang="gl">Xestión de ficheiros en Dolphin</caption>
       <caption xml:lang="it">Gestione dei file in Dolphin</caption>
       <caption xml:lang="nl">Bestandsbeheer in Dolphin</caption>
-- 
cgit v1.3


From f0e66d34655d5e1eecaed2cab7fd07432aecb714 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Mon, 31 Dec 2018 00:21:25 +0100
Subject: Add failing test case for bug #402641

CCBUG: 402641
---
 src/tests/dolphinmainwindowtest.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src')

diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp
index 673bccd44..d7ff1fb54 100644
--- a/src/tests/dolphinmainwindowtest.cpp
+++ b/src/tests/dolphinmainwindowtest.cpp
@@ -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()
 {
-- 
cgit v1.3


From 1cde03cdfe66f455e115a373878524b227fadc4e Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Fri, 4 Jan 2019 22:22:07 +0100
Subject: Use https over http for homepage url

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main.cpp b/src/main.cpp
index 09d3fe753..08405d007 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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"));
-- 
cgit v1.3