diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/debian/changelog dolphin-19.12.3+p20.04+git20200305.1931/debian/changelog --- dolphin-19.12.2+p20.04+git20200301.0006/debian/changelog 2020-03-01 00:06:16.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/debian/changelog 2020-03-05 19:31:11.000000000 +0000 @@ -1,8 +1,14 @@ -dolphin (4:19.12.2+p20.04+git20200301.0006-0) focal; urgency=high +dolphin (4:19.12.3+p20.04+git20200305.1931-0) focal; urgency=high * Automatic Ubuntu CI Build - -- Kubuntu CI Sun, 01 Mar 2020 00:06:16 +0000 + -- Kubuntu CI Thu, 05 Mar 2020 19:31:11 +0000 + +dolphin (4:19.12.3-0ubuntu1) focal; urgency=medium + + * New upstream release (19.12.3) + + -- Rik Mills Thu, 05 Mar 2020 16:04:27 +0000 dolphin (4:19.12.2-0ubuntu1) focal; urgency=medium diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/debian/control dolphin-19.12.3+p20.04+git20200305.1931/debian/control --- dolphin-19.12.2+p20.04+git20200301.0006/debian/control 2020-03-01 00:06:16.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/debian/control 2020-03-05 19:31:11.000000000 +0000 @@ -10,7 +10,7 @@ gettext, kinit-dev (>= 5.57.0~), libkf5activities-dev (>= 5.57.0~), - libkf5baloowidgets-dev (>= 4:19.12.2~) [!hurd-any], + libkf5baloowidgets-dev (>= 4:19.12.3~) [!hurd-any], libkf5bookmarks-dev (>= 5.57.0~), libkf5completion-dev (>= 5.57.0~), libkf5config-dev (>= 5.57.0~), diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/dolphinpart.desktop dolphin-19.12.3+p20.04+git20200305.1931/src/dolphinpart.desktop --- dolphin-19.12.2+p20.04+git20200301.0006/src/dolphinpart.desktop 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/dolphinpart.desktop 2020-03-05 19:31:09.000000000 +0000 @@ -137,7 +137,7 @@ Name[ko]=축소됨 Name[lt]=Kompaktiškas Name[lv]=Kompakts -Name[ml]=തിങ്ങിയതായി +Name[ml]=തിങ്ങിയത് Name[nb]=Kompakt Name[nl]=Compact Name[nn]=Kompakt diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/dolphintabwidget.cpp dolphin-19.12.3+p20.04+git20200305.1931/src/dolphintabwidget.cpp --- dolphin-19.12.2+p20.04+git20200301.0006/src/dolphintabwidget.cpp 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/dolphintabwidget.cpp 2020-03-05 19:31:09.000000000 +0000 @@ -206,6 +206,10 @@ } else { tabPage->secondaryViewContainer()->setActive(true); } + // BUG: 417230 + // Required for updateViewState() call in openFiles() to work as expected + // If there is a selection, updateViewState() calls are effectively a no-op + tabPage->activeViewContainer()->view()->clearSelection(); continue; } if (splitView && (it != dirs.constEnd())) { @@ -239,10 +243,14 @@ // Select the files. Although the files can be split between several // tabs, there is no need to split 'files' accordingly, as // the DolphinView will just ignore invalid selections. - for (int i = oldTabCount; i < tabCount; ++i) { + for (int i = 0; i < tabCount; ++i) { DolphinTabPage* tabPage = tabPageAt(i); tabPage->markUrlsAsSelected(files); tabPage->markUrlAsCurrent(files.first()); + if (i < oldTabCount) { + // Force selection of file if directory was already open, BUG: 417230 + tabPage->activeViewContainer()->view()->updateViewState(); + } } } diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/org.kde.dolphin.appdata.xml dolphin-19.12.3+p20.04+git20200305.1931/src/org.kde.dolphin.appdata.xml --- dolphin-19.12.2+p20.04+git20200301.0006/src/org.kde.dolphin.appdata.xml 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/org.kde.dolphin.appdata.xml 2020-03-05 19:31:09.000000000 +0000 @@ -589,6 +589,8 @@ dolphin + + diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphingeneral.desktop dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphingeneral.desktop --- dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphingeneral.desktop 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphingeneral.desktop 2020-03-05 19:31:09.000000000 +0000 @@ -217,7 +217,7 @@ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinnavigation.desktop dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinnavigation.desktop --- dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinnavigation.desktop 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinnavigation.desktop 2020-03-05 19:31:09.000000000 +0000 @@ -218,7 +218,7 @@ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinservices.desktop dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinservices.desktop --- dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinservices.desktop 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinservices.desktop 2020-03-05 19:31:09.000000000 +0000 @@ -170,7 +170,7 @@ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinviewmodes.desktop dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinviewmodes.desktop --- dolphin-19.12.2+p20.04+git20200301.0006/src/settings/kcm/kcmdolphinviewmodes.desktop 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/settings/kcm/kcmdolphinviewmodes.desktop 2020-03-05 19:31:09.000000000 +0000 @@ -170,7 +170,7 @@ Comment[ko]=파일 관리자 보기 모드 구성 Comment[lt]=Konfigūruoti failų tvarkytuvės rodinio veiksenas Comment[lv]=Konfigurēt datņu pārvaldnieka skata režīmus -Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ ദശകള്‍ ക്രമീകരിയ്ക്കുക +Comment[ml]=ഫയല്‍ മാനേജറിന്റെ അവതരണ രീതികള്‍ ക്രമീകരിയ്ക്കുക Comment[nb]=Tilpass filbehandlerens visningsmåter Comment[nl]=Bestandsbeheerderweergavemodussen configureren Comment[nn]=Set opp visingsmodusane i filhandsamaren @@ -217,7 +217,7 @@ X-KDE-Keywords[ko]=파일 관리자 X-KDE-Keywords[lt]=failų tvarkytuvė X-KDE-Keywords[lv]=datņu pārvaldnieks -X-KDE-Keywords[ml]=ഫയൽ മാനേജർ +X-KDE-Keywords[ml]=ഫയൽ മാനേജർ X-KDE-Keywords[nb]=filbehandler X-KDE-Keywords[nl]=bestandsbeheerder X-KDE-Keywords[nn]=filhandsamar diff -Nru dolphin-19.12.2+p20.04+git20200301.0006/src/views/dolphinview.h dolphin-19.12.3+p20.04+git20200305.1931/src/views/dolphinview.h --- dolphin-19.12.2+p20.04+git20200301.0006/src/views/dolphinview.h 2020-03-01 00:06:14.000000000 +0000 +++ dolphin-19.12.3+p20.04+git20200305.1931/src/views/dolphinview.h 2020-03-05 19:31:09.000000000 +0000 @@ -381,6 +381,12 @@ void stopLoading(); + /** + * Applies the state that has been restored by restoreViewState() + * to the view. + */ + void updateViewState(); + /** Activates the view if the item list container gets focus. */ bool eventFilter(QObject* watched, QEvent* event) override; @@ -703,12 +709,6 @@ void slotDirectoryRedirection(const QUrl& oldUrl, const QUrl& newUrl); /** - * Applies the state that has been restored by restoreViewState() - * to the view. - */ - void updateViewState(); - - /** * Calculates the number of currently shown files into * \a fileCount and the number of folders into \a folderCount. * The size of all files is written into \a totalFileSize.