1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172 | Description: switch kde4libs defaults from oxygen to breeze
This enables tighter integration with default Plasma 5 appearance in all cases.
The patch switches the default icon theme as well as widget style
from oxygen to breeze.
It also adjusts the hardcoded default color values in kcolorscheme from oxygen to
breeze (thanks to Kai Uwe Broulik https://git.reviewboard.kde.org/r/124872/)
Author: Harald Sitter <sitter@kde.org>
Origin: vendor
Forwarded: no
Reviewed-by: <name and email of a reviewer, optional>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: kde4libs-4.14.12/kdeui/icons/kicontheme.cpp
===================================================================
--- kde4libs-4.14.12.orig/kdeui/icons/kicontheme.cpp
+++ kde4libs-4.14.12/kdeui/icons/kicontheme.cpp
@@ -593,7 +593,7 @@ void KIconTheme::reconfigure()
// static
QString KIconTheme::defaultThemeName()
{
- return QLatin1String("oxygen");
+ return QLatin1String("breeze");
}
void KIconTheme::assignIconsToContextMenu( ContextMenus type,
Index: kde4libs-4.14.12/kdeui/kernel/kstyle.cpp
===================================================================
--- kde4libs-4.14.12.orig/kdeui/kernel/kstyle.cpp
+++ kde4libs-4.14.12/kdeui/kernel/kstyle.cpp
@@ -360,7 +360,7 @@ KStyle::SubElement KStyle::newSubElement
QString KStyle::defaultStyle()
{
#if defined(Q_WS_X11) && !defined(Q_WS_MAEMO_5) || defined(Q_WS_WIN)
- return QString("oxygen");
+ return QString("breeze");
#else
return QString(); // native style
#endif
Index: kde4libs-4.14.12/kdeui/colors/kcolorscheme.cpp
===================================================================
--- kde4libs-4.14.12.orig/kdeui/colors/kcolorscheme.cpp
+++ kde4libs-4.14.12/kdeui/colors/kcolorscheme.cpp
@@ -165,77 +165,73 @@ struct DecoDefaultColors {
};
SetDefaultColors defaultViewColors = {
- { 255, 255, 255 }, // Background
- { 248, 247, 246 }, // Alternate
- { 31, 28, 27 }, // Normal
- { 137, 136, 135 }, // Inactive
- { 146, 76, 157 }, // Active
- { 0, 87, 174 }, // Link
- { 100, 74, 155 }, // Visited
- { 191, 3, 3 }, // Negative
- { 176, 128, 0 }, // Neutral
- { 0, 110, 40 } // Positive
+ { 252, 252, 252 }, // Background
+ { 239, 240, 241 }, // Alternate
+ { 49, 54, 59 }, // Normal
+ { 127, 140, 141 }, // Inactive
+ { 61, 174, 233 }, // Active
+ { 41, 128, 185 }, // Link
+ { 127, 140, 141 }, // Visited
+ { 218, 68, 83 }, // Negative
+ { 246, 116, 0 }, // Neutral
+ { 39, 174, 96 } // Positive
};
-
SetDefaultColors defaultWindowColors = {
- { 214, 210, 208 }, // Background
- { 218, 217, 216 }, // Alternate
- { 34, 31, 30 }, // Normal
- { 137, 136, 135 }, // Inactive
- { 146, 76, 157 }, // Active
- { 0, 87, 174 }, // Link
- { 100, 74, 155 }, // Visited
- { 191, 3, 3 }, // Negative
- { 176, 128, 0 }, // Neutral
- { 0, 110, 40 } // Positive
+ { 239, 240, 241 }, // Background
+ { 189, 195, 199 }, // Alternate
+ { 49, 54, 59 }, // Normal
+ { 127, 140, 141 }, // Inactive
+ { 61, 174, 233 }, // Active
+ { 41, 128, 185 }, // Link
+ { 127, 140, 141 }, // Visited
+ { 218, 68, 83 }, // Negative
+ { 246, 116, 0 }, // Neutral
+ { 39, 174, 96 } // Positive
};
-
SetDefaultColors defaultButtonColors = {
- { 223, 220, 217 }, // Background
- { 224, 223, 222 }, // Alternate
- { 34, 31, 30 }, // Normal
- { 137, 136, 135 }, // Inactive
- { 146, 76, 157 }, // Active
- { 0, 87, 174 }, // Link
- { 100, 74, 155 }, // Visited
- { 191, 3, 3 }, // Negative
- { 176, 128, 0 }, // Neutral
- { 0, 110, 40 } // Positive
+ { 239, 240, 241 }, // Background
+ { 189, 195, 199 }, // Alternate
+ { 49, 54, 59 }, // Normal
+ { 127, 140, 141 }, // Inactive
+ { 61, 174, 233 }, // Active
+ { 41, 128, 185 }, // Link
+ { 127, 140, 141 }, // Visited
+ { 218, 68, 83 }, // Negative
+ { 246, 116, 0 }, // Neutral
+ { 39, 174, 96 } // Positive
};
-
SetDefaultColors defaultSelectionColors = {
- { 67, 172, 232 }, // Background
- { 62, 138, 204 }, // Alternate
- { 255, 255, 255 }, // Normal
- { 199, 226, 248 }, // Inactive
- { 108, 36, 119 }, // Active
- { 0, 49, 110 }, // Link
- { 69, 40, 134 }, // Visited
- { 156, 14, 14 }, // Negative
- { 255, 221, 0 }, // Neutral
- { 128, 255, 128 } // Positive
+ { 61, 174, 233 }, // Background
+ { 29, 153, 243 }, // Alternate
+ { 239, 240, 241 }, // Normal
+ { 239, 240, 241 }, // Inactive
+ { 252, 252, 252 }, // Active
+ { 253, 188, 75 }, // Link
+ { 189, 195, 199 }, // Visited
+ { 218, 68, 83 }, // Negative
+ { 246, 116, 0 }, // Neutral
+ { 39, 174, 96 } // Positive
};
-
SetDefaultColors defaultTooltipColors = {
- { 24, 21, 19 }, // Background
- { 196, 224, 255 }, // Alternate
- { 231, 253, 255 }, // Normal
- { 137, 136, 135 }, // Inactive
- { 255, 128, 224 }, // Active
- { 88, 172, 255 }, // Link
- { 150, 111, 232 }, // Visited
- { 191, 3, 3 }, // Negative
- { 176, 128, 0 }, // Neutral
- { 0, 110, 40 } // Positive
+ { 49, 54, 59 }, // Background
+ { 77, 77, 77 }, // Alternate
+ { 239, 240, 241 }, // Normal
+ { 189, 195, 199 }, // Inactive
+ { 61, 174, 233 }, // Active
+ { 41, 128, 185 }, // Link
+ { 127, 140, 141 }, // Visited
+ { 218, 68, 83 }, // Negative
+ { 246, 116, 0 }, // Neutral
+ { 39, 174, 96 } // Positive
};
DecoDefaultColors defaultDecorationColors = {
- { 110, 214, 255 }, // Hover
- { 58, 167, 221 }, // Focus
+ { 147, 206, 233 }, // Hover
+ { 61, 174, 233 }, // Focus
};
//END default colors
|