From 504db3f702625c63cb304430e60ab21b9411cb96 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 5 Jan 2019 17:29:34 +0100 Subject: [PATCH 1/3] Fix title update when changing active split view Summary: The DolphinTabPage::activeViewUrlChanged signal triggers the title update in DolphinMainWindow, which sets the new title from the `m_activeViewContainer` instance. This means we need to notify the main window that the active view changed before telling it that the current url changed. BUG: 402641 FIXED-IN: 18.12.1 Reviewers: #dolphin, rizzitello, ngraham Reviewed By: #dolphin, rizzitello, ngraham Subscribers: rizzitello, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D17881 --- src/dolphintabpage.cpp | 2 +- src/tests/dolphinmainwindowtest.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index b2bb5c896d..91fc7cfd88 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -331,8 +331,8 @@ void DolphinTabPage::slotViewActivated() this, &DolphinTabPage::slotViewUrlRedirection); } - emit activeViewUrlChanged(activeViewContainer()->url()); emit activeViewChanged(activeViewContainer()); + emit activeViewUrlChanged(activeViewContainer()->url()); } void DolphinTabPage::slotViewUrlRedirection(const QUrl& oldUrl, const QUrl& newUrl) diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp index d7ff1fb542..9cc6b84e8d 100644 --- a/src/tests/dolphinmainwindowtest.cpp +++ b/src/tests/dolphinmainwindowtest.cpp @@ -203,7 +203,6 @@ void DolphinMainWindowTest::testUpdateWindowTitleAfterChangingSplitView() // 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); } From 5d9ad8d24fd495e861d5c9c88d5a5cb292365b22 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Jan 2019 08:35:14 +0100 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/dolphinpart.desktop | 6 +++--- src/settings/kcm/kcmdolphingeneral.desktop | 2 +- src/settings/kcm/kcmdolphinnavigation.desktop | 2 +- src/settings/kcm/kcmdolphinservices.desktop | 2 +- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index f0cda29da5..a217e34c5b 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -101,7 +101,7 @@ Name[sv]=Ikoner Name[tr]=Simgeler Name[uk]=Піктограми Name[x-test]=xxIconsxx -Name[zh_CN]=图标视图 +Name[zh_CN]=图标 Name[zh_TW]=圖示 Icon=view-list-icons # Dummy @@ -150,7 +150,7 @@ Name[sv]=Kompakt Name[tr]=Sıkışık Name[uk]=Компактний Name[x-test]=xxCompactxx -Name[zh_CN]=简洁视图 +Name[zh_CN]=精简视图 Name[zh_TW]=簡潔模式 Icon=view-list-details # Dummy @@ -199,7 +199,7 @@ Name[sv]=Detaljinformation Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[x-test]=xxDetailsxx -Name[zh_CN]=细节视图 +Name[zh_CN]=详细信息 Name[zh_TW]=詳細模式 Icon=view-list-tree # Dummy diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 5f569237cc..c0faa31a24 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 974ebc3d2a..35f0fc7239 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -227,5 +227,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index a2421a8483..024c44a5de 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -181,5 +181,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 286320eaab..14f3e530e2 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 From 8f051a391db543a05c00bc1323634a48d7e6444d Mon Sep 17 00:00:00 2001 From: Alexander Stippich Date: Mon, 7 Jan 2019 21:44:50 +0100 Subject: [PATCH 3/3] fix display of image orientation Summary: The name of the orientation property for baloo/kfilemetadata was false, leading to an always empty image orientation field. Test Plan: Look at an image in Dolphin details view which has the exiv orientation tag set. Orientation column is not empty. Reviewers: #dolphin, ngraham Reviewed By: #dolphin, ngraham Subscribers: ngraham, kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D18008 --- src/kitemviews/private/kbaloorolesprovider.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index 0e9aef71e7..41184e119c 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -129,7 +129,7 @@ KBalooRolesProvider::KBalooRolesProvider() : { "width", "width" }, { "height", "height" }, { "imageDateTime", "imageDateTime"}, - { "nexif.orientation", "orientation", }, + { "imageOrientation", "orientation", }, { "artist", "artist" }, { "genre", "genre" }, { "album", "album" },