From 36d079ec28ca4526737b292adf35ee6f7ee6c365 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Thu, 6 Jun 2019 12:01:12 +0100 Subject: [PATCH 01/10] Update version number for 5.16.0 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25934f2e..c76a207d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.15.90") +set(PROJECT_VERSION "5.16.0") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 0698750e05c438bdc556bad18ba84d1dbf16d1fb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 7 Jun 2019 08:43:06 +0200 Subject: [PATCH 02/10] 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" --- colors/BreezeDark.colors | 2 +- colors/BreezeHighContrast.colors | 1 + colors/BreezeLight.colors | 1 + cursors/Breeze/Breeze/index.theme | 1 + cursors/Breeze/src/index.theme | 1 + cursors/Breeze_Snow/Breeze_Snow/index.theme | 2 ++ cursors/Breeze_Snow/src/index.theme | 2 ++ lookandfeel.dark/metadata.desktop | 3 ++- 8 files changed, 11 insertions(+), 2 deletions(-) diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 3cfea9ee..543a4152 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -116,7 +116,7 @@ Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro Name[et]=Breeze Dark -Name[eu]=Breeze Dark +Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre Name[gl]=Breeze escuro diff --git a/colors/BreezeHighContrast.colors b/colors/BreezeHighContrast.colors index a245e2c3..951c1435 100644 --- a/colors/BreezeHighContrast.colors +++ b/colors/BreezeHighContrast.colors @@ -112,6 +112,7 @@ Name[da]=Breeze højkontrast Name[de]=Breeze Hoher Kontrast Name[en_GB]=Breeze High Contrast Name[es]=Brisa de alto contraste +Name[eu]=Breeze kontraste handikoa Name[fi]=Suurikontrastinen Breeze Name[fr]=Brise contraste élevé Name[gl]=Breeze de alto contraste diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index d1dcc93a..744fd3ad 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -112,6 +112,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index e3e0dffc..63a26635 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -50,6 +50,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe Comment[de]=Breeze von der KDE VDG Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG +Comment[eu]=Breeze, KDE VDGk egina Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Brise par KDE VDG Comment[gl]=Breeze de KDE VDG diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index e3e0dffc..63a26635 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -50,6 +50,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe Comment[de]=Breeze von der KDE VDG Comment[en_GB]=Breeze by the KDE VDG Comment[es]=Brisa por KDE VDG +Comment[eu]=Breeze, KDE VDGk egina Comment[fi]=Breeze KDE VDG:ltä Comment[fr]=Brise par KDE VDG Comment[gl]=Breeze de KDE VDG diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index a1ab918e..c3443ade 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -7,6 +7,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro @@ -32,6 +33,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe Comment[de]=Breeze-Hell von der KDE VDG Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG +Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG Comment[gl]=Breeze claro de KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index a1ab918e..c3443ade 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -7,6 +7,7 @@ Name[da]=Breeze Light Name[de]=Breeze Hell Name[en_GB]=Breeze Light Name[es]=Brisa claro +Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro @@ -32,6 +33,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe Comment[de]=Breeze-Hell von der KDE VDG Comment[en_GB]=Breeze Light by the KDE VDG Comment[es]=Brisa claro por KDE VDG +Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG Comment[gl]=Breeze claro de KDE VDG diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 93944bd7..8f6bfc5b 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -6,6 +6,7 @@ Comment[da]=Breeze Dark af KDE's visuelle designgruppe Comment[de]=Breeze-Dunkel von der KDE VDG Comment[en_GB]=Breeze Dark by the KDE VDG Comment[es]=Brisa oscuro por KDE VDG +Comment[eu]=Breeze iluna, KDE VDGk egina Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG Comment[gl]=Breeze escuro de KDE VDG @@ -36,7 +37,7 @@ Name[el]=Σκοτεινό Breeze Name[en_GB]=Breeze Dark Name[es]=Brisa oscuro Name[et]=Breeze Dark -Name[eu]=Breeze Dark +Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre Name[gl]=Breeze escuro From 9d6c7c7f3439941a6870d6537645297683501bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Fri, 7 Jun 2019 14:18:26 +0200 Subject: [PATCH 03/10] re-read color palettes when application color changes Summary: Without this patch, changing the application color scheme from system settings only affects some widgets. Notably, checkboxes highlighting colors stays the old color, leading to a hodge-podge color scheme and bad contrast on some items. The breeze QStyle caches the colors read via KSharedConfig, so it needs to re-read the configuration when the application color changes. QApplication emits a signal (originating in KGlobalSettings), which we can react to. This fixes the coloring of various widgets in breeze right after color changes. BUG:408416 FIXED-IN: 5.16 Those I haven't tested, but look quite suspicious (so please re-test): CCBUG:382505 CCBUG:355295 Test Plan: 1. open kcmshell5 colors 2. change to a theme with a different highlight color 3. apply * without patch: checkbox in color KCM (and a whole lot of other widgets all over the place) don't change colors * with patch: colors change as expected Reviewers: #plasma, broulik, sitter Reviewed By: #plasma, broulik, sitter Subscribers: sitter, cfeck, broulik, zzag, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D21646 --- kstyle/breezestyle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index ed7d29b2..078c7471 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -197,7 +197,9 @@ namespace Breeze QStringLiteral( "/BreezeDecoration" ), QStringLiteral( "org.kde.Breeze.Style" ), QStringLiteral( "reparseConfiguration" ), this, SLOT(configurationChanged()) ); - +#if !BREEZE_USE_KDE4 + connect(qApp, &QApplication::paletteChanged, this, &Style::configurationChanged); +#endif // call the slot directly; this initial call will set up things that also // need to be reset when the system palette changes loadConfiguration(); From 9832c3a5dc1171a869494b777ec571d7549d0954 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 18 Jun 2019 10:27:48 +0100 Subject: [PATCH 04/10] Update version number for 5.16.1 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c76a207d..ee48cce9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.16.0") +set(PROJECT_VERSION "5.16.1") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 2e43810764b03a0c58d9798034fd3c997bdbc5cc Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 25 Jun 2019 12:11:16 +0100 Subject: [PATCH 05/10] Update version number for 5.16.2 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee48cce9..66458e0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.16.1") +set(PROJECT_VERSION "5.16.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 995d8d1a3326e9f5e2ffe1b8e07f0e8d1c12a409 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 9 Jul 2019 15:45:17 +0100 Subject: [PATCH 06/10] Update version number for 5.16.3 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66458e0d..07ebca61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.16.2") +set(PROJECT_VERSION "5.16.3") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 6e141c18c17b4400dc3513bd57c14e25e146786e Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 30 Jul 2019 10:42:29 +0100 Subject: [PATCH 07/10] Update version number for 5.16.4 GIT_SILENT --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 07ebca61..419af45e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(breeze) -set(PROJECT_VERSION "5.16.3") +set(PROJECT_VERSION "5.16.4") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) From 7007a0d87d21078df17f1926bf87c2e2819af519 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 31 Jul 2019 09:07:03 +0200 Subject: [PATCH 08/10] 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" --- colors/BreezeDark.colors | 2 +- colors/BreezeLight.colors | 2 +- cursors/Breeze_Snow/Breeze_Snow/index.theme | 4 ++-- cursors/Breeze_Snow/src/index.theme | 4 ++-- lookandfeel.dark/metadata.desktop | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 543a4152..7e7235fa 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -123,7 +123,7 @@ Name[gl]=Breeze escuro Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure -Name[id]=Breeze Dark +Name[id]=Breeze Gelap Name[it]=Brezza scuro Name[ko]=어두운 Breeze Name[lt]=Breeze tamsi diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index 744fd3ad..495a076f 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -116,7 +116,7 @@ Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro -Name[id]=Breeze Light +Name[id]=Breeze Terang Name[it]=Brezza chiaro Name[ko]=Breeze Light Name[nl]=Breeze Light diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index c3443ade..88c77323 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -11,7 +11,7 @@ Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro -Name[id]=Breeze Light +Name[id]=Breeze Terang Name[it]=Brezza chiaro Name[ko]=Breeze Light Name[nl]=Breeze Light @@ -37,7 +37,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG Comment[gl]=Breeze claro de KDE VDG -Comment[id]=Breeze Light oleh KDE VDG +Comment[id]=Breeze Terang oleh KDE VDG Comment[it]=Brezza chiaro a cura del VDG di KDE Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[nl]=Breeze Light door de KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index c3443ade..88c77323 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -11,7 +11,7 @@ Name[eu]=Breeze argia Name[fi]=Breeze Light Name[fr]=Brise clair Name[gl]=Breeze claro -Name[id]=Breeze Light +Name[id]=Breeze Terang Name[it]=Brezza chiaro Name[ko]=Breeze Light Name[nl]=Breeze Light @@ -37,7 +37,7 @@ Comment[eu]=Breeze argia, KDE VDGk egina Comment[fi]=Breeze Light KDE VDG:ltä Comment[fr]=Brise Light par KDE VDG Comment[gl]=Breeze claro de KDE VDG -Comment[id]=Breeze Light oleh KDE VDG +Comment[id]=Breeze Terang oleh KDE VDG Comment[it]=Brezza chiaro a cura del VDG di KDE Comment[ko]=KDE 시각 디자인 그룹에서 제작한 Breeze Light Comment[nl]=Breeze Light door de KDE VDG diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 8f6bfc5b..1969f1b2 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -10,7 +10,7 @@ Comment[eu]=Breeze iluna, KDE VDGk egina Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fr]=Breeze sombre, par KDE VDG Comment[gl]=Breeze escuro de KDE VDG -Comment[id]=Breeze Dark oleh KDE VDG +Comment[id]=Breeze Gelap oleh KDE VDG Comment[it]=Brezza scuro a cura del VDG di KDE Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[nl]=Breeze Dark door de KDE VDG @@ -44,7 +44,7 @@ Name[gl]=Breeze escuro Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure -Name[id]=Breeze Dark +Name[id]=Breeze Gelap Name[it]=Brezza scuro Name[ko]=어두운 Breeze Name[lt]=Breeze tamsi From ffdd370a05c456e89fdc4f1bf605d20c146fea8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 4 Aug 2019 08:51:39 +0200 Subject: [PATCH 09/10] 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" --- colors/BreezeDark.colors | 2 +- lookandfeel.dark/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 7e7235fa..f25be5c3 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -119,7 +119,7 @@ Name[et]=Breeze Dark Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre -Name[gl]=Breeze escuro +Name[gl]=Breeze Dark Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure diff --git a/lookandfeel.dark/metadata.desktop b/lookandfeel.dark/metadata.desktop index 1969f1b2..08a2e227 100644 --- a/lookandfeel.dark/metadata.desktop +++ b/lookandfeel.dark/metadata.desktop @@ -40,7 +40,7 @@ Name[et]=Breeze Dark Name[eu]=Breeze iluna Name[fi]=Breeze Dark Name[fr]=Brise sombre -Name[gl]=Breeze escuro +Name[gl]=Breeze Dark Name[he]=Breeze Dark Name[hu]=Breeze Dark Name[ia]=Brisa obscure From f16961c3eb4ce32d4cb124674d97756eadbcb19e Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 6 Aug 2019 13:26:30 +0200 Subject: [PATCH 10/10] [SplitterProxy] Don't manually mapToGlobal The constructor of QMouseEvent actually expects windowPos and/or screenPos but never globalPos. By only supplying a localPos we have Qt figure it out correctly on its own. Differential Revision: https://phabricator.kde.org/D22851 --- kstyle/breezesplitterproxy.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/kstyle/breezesplitterproxy.cpp b/kstyle/breezesplitterproxy.cpp index effd74c5..0d34a91c 100644 --- a/kstyle/breezesplitterproxy.cpp +++ b/kstyle/breezesplitterproxy.cpp @@ -258,7 +258,6 @@ namespace Breeze QMouseEvent copy( mouseEvent->type(), _hook, - _splitter.data()->mapToGlobal(_hook), mouseEvent->button(), mouseEvent->buttons(), mouseEvent->modifiers()); @@ -270,7 +269,6 @@ namespace Breeze QMouseEvent copy( mouseEvent->type(), _splitter.data()->mapFromGlobal( mouseEvent->globalPos() ), - mouseEvent->globalPos(), mouseEvent->button(), mouseEvent->buttons(), mouseEvent->modifiers());