From e45c1fc3222b2fe173360f54b02550152cb2cf90 Mon Sep 17 00:00:00 2001 From: ArkadiuszMichalski <2730894+ArkadiuszMichalski@users.noreply.github.com> Date: Tue, 13 Dec 2022 18:24:13 +0100 Subject: [PATCH] [xml] Fix disabled options activated in themes issue Don't use non-working attributes for WidgetStyle in themes. Fix #12508, close #12635 --- PowerEditor/installer/themes/Bespin.xml | 40 ++++++------- PowerEditor/installer/themes/Black board.xml | 30 +++++----- PowerEditor/installer/themes/Choco.xml | 40 ++++++------- .../installer/themes/DansLeRuSH-Dark.xml | 47 ++++++++------- .../installer/themes/DarkModeDefault.xml | 3 +- PowerEditor/installer/themes/Deep Black.xml | 29 ++++----- PowerEditor/installer/themes/Hello Kitty.xml | 30 +++++----- .../installer/themes/HotFudgeSundae.xml | 46 +++++++------- .../installer/themes/Mono Industrial.xml | 20 +++---- PowerEditor/installer/themes/Monokai.xml | 20 +++---- PowerEditor/installer/themes/MossyLawn.xml | 46 +++++++------- PowerEditor/installer/themes/Navajo.xml | 8 ++- PowerEditor/installer/themes/Obsidian.xml | 40 +++++++------ .../installer/themes/Plastic Code Wrap.xml | 20 +++---- PowerEditor/installer/themes/Ruby Blue.xml | 30 +++++----- .../installer/themes/Solarized-light.xml | 6 +- PowerEditor/installer/themes/Solarized.xml | 6 +- PowerEditor/installer/themes/Twilight.xml | 34 +++++------ PowerEditor/installer/themes/Vibrant Ink.xml | 30 +++++----- PowerEditor/installer/themes/Zenburn.xml | 3 +- PowerEditor/installer/themes/khaki.xml | 60 ++++++++++--------- .../installer/themes/vim Dark Blue.xml | 11 ++-- PowerEditor/src/stylers.model.xml | 7 ++- 23 files changed, 313 insertions(+), 293 deletions(-) diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml index 4a0374707..0d1746e08 100644 --- a/PowerEditor/installer/themes/Bespin.xml +++ b/PowerEditor/installer/themes/Bespin.xml @@ -777,34 +777,34 @@ Credits: - - - - - - + + + + + - + - - - + + + - - - - - - - - - - + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml index 9f1291a94..28b61cc62 100644 --- a/PowerEditor/installer/themes/Black board.xml +++ b/PowerEditor/installer/themes/Black board.xml @@ -775,34 +775,34 @@ Credits: - - - - - - + + + + + - - - + + + - - - - - + + + + + - + + diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml index 2b3b25933..10f86f9f5 100644 --- a/PowerEditor/installer/themes/Choco.xml +++ b/PowerEditor/installer/themes/Choco.xml @@ -775,34 +775,34 @@ Credits: - - - - - - + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml index d1d008abb..c2c629f93 100644 --- a/PowerEditor/installer/themes/DansLeRuSH-Dark.xml +++ b/PowerEditor/installer/themes/DansLeRuSH-Dark.xml @@ -893,33 +893,34 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable - - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/DarkModeDefault.xml b/PowerEditor/installer/themes/DarkModeDefault.xml index d1ee5c689..14d64fbf1 100644 --- a/PowerEditor/installer/themes/DarkModeDefault.xml +++ b/PowerEditor/installer/themes/DarkModeDefault.xml @@ -1427,7 +1427,8 @@ License: GPL2 - + + diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml index 683cf16ba..9c105ccf2 100644 --- a/PowerEditor/installer/themes/Deep Black.xml +++ b/PowerEditor/installer/themes/Deep Black.xml @@ -781,33 +781,34 @@ https://notepad-plus-plus.org/donate/ - + + - - + + - + - - - - + + + + - - + + - - - + + + - + diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml index 7abd64227..da69aab23 100644 --- a/PowerEditor/installer/themes/Hello Kitty.xml +++ b/PowerEditor/installer/themes/Hello Kitty.xml @@ -752,32 +752,34 @@ so your enhanced file can be included in Notepad++ future release. - + + - - + + - + - - - - + + + + - - - - - - + + + + + + + diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml index 7b6947b95..42e0d977c 100644 --- a/PowerEditor/installer/themes/HotFudgeSundae.xml +++ b/PowerEditor/installer/themes/HotFudgeSundae.xml @@ -921,32 +921,34 @@ Installation: - - - - + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml index e42b4b3cc..097b5a34d 100644 --- a/PowerEditor/installer/themes/Mono Industrial.xml +++ b/PowerEditor/installer/themes/Mono Industrial.xml @@ -780,10 +780,9 @@ Credits: - - + + - @@ -792,21 +791,22 @@ Credits: - - + + - - - - - + + + + + + diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml index ec6bb98e3..b569a8e78 100644 --- a/PowerEditor/installer/themes/Monokai.xml +++ b/PowerEditor/installer/themes/Monokai.xml @@ -796,10 +796,9 @@ Credits: - - + + - @@ -808,21 +807,22 @@ Credits: - - + + - - - - - + + + + + + diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml index d0609db98..f542603e2 100644 --- a/PowerEditor/installer/themes/MossyLawn.xml +++ b/PowerEditor/installer/themes/MossyLawn.xml @@ -917,37 +917,39 @@ Installation: - - + + - - + + - - + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml index d76c32bc7..5f00a5049 100644 --- a/PowerEditor/installer/themes/Navajo.xml +++ b/PowerEditor/installer/themes/Navajo.xml @@ -920,7 +920,8 @@ Installation: - + + @@ -930,8 +931,8 @@ Installation: - - + + @@ -945,6 +946,7 @@ Installation: + \ No newline at end of file diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml index 662c82c66..a0fed66ec 100644 --- a/PowerEditor/installer/themes/Obsidian.xml +++ b/PowerEditor/installer/themes/Obsidian.xml @@ -782,32 +782,34 @@ Notepad++ Custom Style - + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml index 0bfd24dce..5c7f91072 100644 --- a/PowerEditor/installer/themes/Plastic Code Wrap.xml +++ b/PowerEditor/installer/themes/Plastic Code Wrap.xml @@ -792,10 +792,9 @@ Credits: - - + + - @@ -804,21 +803,22 @@ Credits: - - + + - - - - - + + + + + + diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml index 39d409b36..f14dc883e 100644 --- a/PowerEditor/installer/themes/Ruby Blue.xml +++ b/PowerEditor/installer/themes/Ruby Blue.xml @@ -628,34 +628,34 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - + + + + + - + - - - + + + - - - - - + + + + + + diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml index 807ed8079..4ee34f104 100644 --- a/PowerEditor/installer/themes/Solarized-light.xml +++ b/PowerEditor/installer/themes/Solarized-light.xml @@ -931,7 +931,8 @@ Installation: - + + @@ -941,7 +942,7 @@ Installation: - + @@ -956,6 +957,7 @@ Installation: + \ No newline at end of file diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml index a2dd45f23..6e258e8b2 100644 --- a/PowerEditor/installer/themes/Solarized.xml +++ b/PowerEditor/installer/themes/Solarized.xml @@ -1296,7 +1296,8 @@ Installation: - + + @@ -1306,7 +1307,7 @@ Installation: - + @@ -1321,6 +1322,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml index 41c026a80..b0811a123 100644 --- a/PowerEditor/installer/themes/Twilight.xml +++ b/PowerEditor/installer/themes/Twilight.xml @@ -781,33 +781,33 @@ Credits: - - + + - - + - - - - - - + + + + + + - - - - - - - + + + + + + + + diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml index 29b568823..31bf41115 100644 --- a/PowerEditor/installer/themes/Vibrant Ink.xml +++ b/PowerEditor/installer/themes/Vibrant Ink.xml @@ -751,34 +751,34 @@ http://sourceforge.net/donate/index.php?group_id=95717 - - - - - - + + + + + - + - - - + + + - - - - - + + + + + + diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index c42466711..8d19bc9a1 100644 --- a/PowerEditor/installer/themes/Zenburn.xml +++ b/PowerEditor/installer/themes/Zenburn.xml @@ -1424,7 +1424,8 @@ License: GPL2 - + + diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml index a18f70780..04305d8df 100644 --- a/PowerEditor/installer/themes/khaki.xml +++ b/PowerEditor/installer/themes/khaki.xml @@ -914,37 +914,39 @@ Installation: - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + \ No newline at end of file diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml index 04818150d..8d262a3be 100644 --- a/PowerEditor/installer/themes/vim Dark Blue.xml +++ b/PowerEditor/installer/themes/vim Dark Blue.xml @@ -745,8 +745,8 @@ - - + + @@ -756,8 +756,8 @@ - - + + @@ -770,9 +770,8 @@ - - + diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 0fbd73bee..89b032573 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -1285,7 +1285,7 @@ - + @@ -1346,7 +1346,7 @@ - + @@ -1406,7 +1406,7 @@ - + @@ -1416,6 +1416,7 @@ +