From 44b668e9fbaa86046315b292b2233ca998b24d89 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 7 Jan 2017 19:47:57 +0100 Subject: GIT_SILENT Upgrade KDE Applications version to 16.12.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37ff86ec5..cdf2b1b79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") set (KDE_APPLICATIONS_VERSION_MINOR "12") -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}") set(QT_MIN_VERSION "5.4.0") -- cgit v1.3 From 85121a8115c5a8b6b7c0a01073663d51bd64e6ae Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sat, 14 Jan 2017 12:52:58 +0100 Subject: Don't overwrite custom icons for the show_hidden_files action BUG: 374508 FIXED-IN: 16.12.2 REVIEW: 129789 --- src/views/dolphinviewactionhandler.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 5c0b49cd2..273bcdd76 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -482,6 +482,12 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown) QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files")); showHiddenFilesAction->setChecked(shown); + // #374508: don't overwrite custom icons. + const QString iconName = showHiddenFilesAction->icon().name(); + if (!iconName.isEmpty() && iconName != QLatin1String("visibility") && iconName != QLatin1String("hint")) { + return; + } + showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint"))); } -- cgit v1.3