From 246a525fdad9ea1aa90b59880b8317e5f3af77c9 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sun, 1 Sep 2019 05:28:07 +0200 Subject: GIT_SILENT Upgrade KDE Applications version to 19.08.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3237a03a2..ee37f38b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) -- cgit v1.3 From ada16756d69c012c089733f6ce4e9271f84ccca6 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Mon, 2 Sep 2019 09:12:48 +0200 Subject: Reset progress bar text when directory loading starts Dolphin shows a different text for whether it is loading the directory or currently sorting its contents. However, when entering a folder that causes sort criteria to change (e.g. because of different view properties in that folder), the status bar text is changed to "Sorting..." while it is still actually loading the folder. When loading a directory starts, reset any status bar text to ensure "Loading..." is displayed in this case. Differential Revision: >https://phabricator.kde.org/D23459 --- src/dolphinviewcontainer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 5d1d257e5..585610550 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -566,6 +566,7 @@ void DolphinViewContainer::slotDirectoryLoadingStarted() // Trigger an undetermined progress indication. The progress // information in percent will be triggered by the percent() signal // of the directory lister later. + m_statusBar->setProgressText(QString()); updateDirectoryLoadingProgress(-1); } } -- cgit v1.3