From 8684f99d5e22e36f3135bf4c542fc3c877e2037d Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 12 Apr 2022 23:09:27 +0200 Subject: [PATCH 1/4] GIT_SILENT Upgrade release service version to 22.04.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96b3f4264..9803e52d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "22") -set (RELEASE_SERVICE_VERSION_MINOR "03") -set (RELEASE_SERVICE_VERSION_MICRO "90") +set (RELEASE_SERVICE_VERSION_MINOR "04") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) From 06bd5b2ee9324e268da2e5c0cf54bc8d8d725ae9 Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Tue, 12 Apr 2022 23:17:49 +0200 Subject: [PATCH 2/4] GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index e158fd5c1..5bc9ba858 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -423,10 +423,10 @@ dolphin + - From 4012ea30c9061a5259c96de64aca114cec5014aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Apr 2022 02:45:08 +0000 Subject: [PATCH 3/4] 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/settings/kcm/kcmdolphingeneral.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index b428367e8..c43d2c633 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -57,7 +57,7 @@ Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين ا Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. Comment[az]=Bu xidmət əsas Dolphin parametrlərini ayarlamağa imkan verir. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. -Comment[ca@valencia]=Este servei permet la configuració de la configuració general de Dolphin. +Comment[ca@valencia]=Este servei permet la configuració general de Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. Comment[da]=Denne tjeneste muliggør konfiguration af generelle Dolphin-indstillinger. Comment[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. From e70e12e3bdf3ce4e9cca4c8f003655ea10b21d7e Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Wed, 27 Apr 2022 10:40:40 +0000 Subject: [PATCH 4/4] Fix terminal panel not keeping up with dir changes The terminal panel is supposed to show the same location as the currently active Dolphin view at all times. However there was an issue when the terminal is supposed to quickly switch to a new location and then back again to the old one. The terminal ignored the switch to the old location unless it had already fully switched to the new location. Because it isn't particularly fast at fully switching to the new location, it would never do the expected thing of switching back to the old location. This commit makes it so the switch to the old location is only ignored if there are no in-progress switches to a different location. BUG: 391380 BUG: 416690 FIXED-IN: 22.04.2 Not totally sure if this fixes everything but it seems like an improvement. --- src/panels/terminal/terminalpanel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 75bfe93d0..d87ae3b1e 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -234,7 +234,9 @@ void TerminalPanel::changeDir(const QUrl& url) void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory) { - if (dir == m_konsolePartCurrentDirectory) { + if (dir == m_konsolePartCurrentDirectory // We are already there + && m_sendCdToTerminalHistory.isEmpty() // …and that is not because the terminal couldn't keep up + ) { m_clearTerminal = false; return; } @@ -252,8 +254,6 @@ void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHist } #endif - m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n'); - // We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after // the directory change, because this directory change is not caused by a "cd" command that the // user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be @@ -261,6 +261,8 @@ void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHist if (addToHistory == HistoryPolicy::AddToHistory) m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath()); + m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n'); + if (m_clearTerminal) { m_terminal->sendInput(QStringLiteral(" clear\n")); m_clearTerminal = false;