Merge lp:~jus/mixxx/skins into lp:mixxx/1.9

Proposed by jus
Status: Merged
Merged at revision: 2678
Proposed branch: lp:~jus/mixxx/skins
Merge into: lp:mixxx/1.9
Diff against target: 2300 lines (+792/-192)
19 files modified
mixxx/res/images/templates/skin_template_outline.svg (+154/-62)
mixxx/res/skins/Deere1280x1024-SXGA/skin.xml (+22/-2)
mixxx/res/skins/Deere1280x800-WXGA/skin.xml (+22/-2)
mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml (+22/-2)
mixxx/res/skins/LateNight1280x800-WXGA/skin.xml (+22/-2)
mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml (+22/-2)
mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml (+22/-2)
mixxx/res/skins/Outline1024x600-Netbook/skin.xml (+97/-22)
mixxx/res/skins/Outline1024x768-XGA/skin.xml (+97/-22)
mixxx/res/skins/Outline800x480-WVGA/skin.xml (+99/-24)
mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml (+22/-2)
mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml (+22/-2)
mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml (+22/-2)
mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml (+22/-2)
mixxx/res/skins/Shade1024x600-Netbook/skin.xml (+37/-16)
mixxx/res/skins/Shade1024x768-XGA/skin.xml (+37/-16)
mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml (+24/-4)
mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml (+24/-4)
mixxx/src/skin/legacyskinparser.cpp (+3/-2)
To merge this branch: bzr merge lp:~jus/mixxx/skins
Reviewer Review Type Date Requested Status
Albert Santoni Approve
Review via email: mp+45508@code.launchpad.net

Description of the change

Minimal CSS changes to solve cross-platform issues have been made since the last merge to the 1.9 branch (for 1.9beta1). Nonetheless i propose this branch for merging into lp:mixxx/1.9 to be included in the final 1.9 release.
New feature is the visual feedback when searchbox has focus (available for all skins).
Also the open/close triangles for treeview and the splitter between the left/right pane in the library looks now identical on all supported platforms.

Changes tested extensively on MacOS 10.5/10.6 and (K)Ubuntu 10.10.

To post a comment you must log in.
Revision history for this message
Albert Santoni (gamegod) wrote :

Looks great, thanks Jus!

Merged into 1.9 in r2678.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mixxx/res/images/templates/skin_template_outline.svg'
2--- mixxx/res/images/templates/skin_template_outline.svg 2010-11-24 17:13:07 +0000
3+++ mixxx/res/images/templates/skin_template_outline.svg 2011-01-07 12:24:27 +0000
4@@ -18,7 +18,7 @@
5 height="570"
6 id="svg4779"
7 version="1.1"
8- inkscape:version="0.48.0 r9654">
9+ inkscape:version="0.48+devel r9889">
10 <title
11 id="title3730">Outline</title>
12 <sodipodi:namedview
13@@ -29,7 +29,7 @@
14 inkscape:pageopacity="1"
15 inkscape:pageshadow="2"
16 inkscape:zoom="1"
17- inkscape:cx="427.10953"
18+ inkscape:cx="424.55292"
19 inkscape:cy="1550.1875"
20 inkscape:document-units="px"
21 inkscape:current-layer="layer8"
22@@ -68,23 +68,19 @@
23 <defs
24 id="defs4781">
25 <linearGradient
26- id="linearGradient19119">
27+ id="linearGradient12570">
28 <stop
29- style="stop-color:#dc0000;stop-opacity:1"
30+ id="stop12572"
31 offset="0"
32- id="stop19121" />
33- <stop
34- id="stop19123"
35- offset="0.41935483"
36- style="stop-color:#eded00;stop-opacity:1;" />
37- <stop
38- id="stop19125"
39- offset="0.51612902"
40- style="stop-color:#ffff00;stop-opacity:1" />
41- <stop
42- id="stop19127"
43+ style="stop-color:#dc0000;stop-opacity:1" />
44+ <stop
45+ style="stop-color:#eded00;stop-opacity:1;"
46+ offset="0.24390224"
47+ id="stop12574" />
48+ <stop
49+ style="stop-color:#00ff00;stop-opacity:1;"
50 offset="1"
51- style="stop-color:#00cc00;stop-opacity:1" />
52+ id="stop12576" />
53 </linearGradient>
54 <filter
55 id="filter3526-1-5-6-8-0"
56@@ -97,14 +93,14 @@
57 </filter>
58 <linearGradient
59 inkscape:collect="always"
60- xlink:href="#linearGradient19119"
61- id="linearGradient8726"
62+ xlink:href="#linearGradient12570"
63+ id="linearGradient12568"
64 gradientUnits="userSpaceOnUse"
65 gradientTransform="translate(-1888.8571,928.68188)"
66- x1="867"
67- y1="-463.98721"
68- x2="929"
69- y2="-463.98721" />
70+ x1="869.85712"
71+ y1="-462.69467"
72+ x2="951.85712"
73+ y2="-462.69467" />
74 </defs>
75 <metadata
76 id="metadata4784">
77@@ -2732,7 +2728,7 @@
78 height="14.012817"
79 width="152.01282"
80 id="rect4711"
81- style="color:#000000;fill:url(#linearGradient8726);fill-opacity:1;stroke:#d3d3d3;stroke-width:1.98718262;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
82+ style="color:#000000;fill:url(#linearGradient12568);fill-opacity:1;stroke:#d3d3d3;stroke-width:1.98699999;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
83 inkscape:tile-cx="296.19562"
84 inkscape:tile-cy="-465.35458"
85 inkscape:tile-w="152"
86@@ -2744,20 +2740,20 @@
87 sodipodi:linespacing="100%"
88 id="text4723"
89 y="-265.8942"
90- x="936.29822"
91+ x="987.41492"
92 style="font-size:8px;font-style:normal;font-weight:normal;line-height:100%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
93 xml:space="preserve"
94 inkscape:export-xdpi="90"
95 inkscape:export-ydpi="90"><tspan
96 style="font-size:14px;fill:#ff0000;fill-opacity:1"
97 y="-265.8942"
98- x="936.29822"
99+ x="987.41492"
100 id="tspan4725"
101- sodipodi:role="line">TEXT1</tspan></text>
102+ sodipodi:role="line">TEXT2</tspan></text>
103 <text
104 xml:space="preserve"
105 style="font-size:8px;font-style:normal;font-weight:normal;line-height:100%;letter-spacing:0px;word-spacing:0px;fill:#19acfc;fill-opacity:0.99608053;stroke:none;display:inline;font-family:Sans"
106- x="987.4696"
107+ x="936.35291"
108 y="-265.80191"
109 id="text4727"
110 sodipodi:linespacing="100%"
111@@ -2765,9 +2761,9 @@
112 inkscape:export-ydpi="90"><tspan
113 sodipodi:role="line"
114 id="tspan4729"
115- x="987.4696"
116+ x="936.35291"
117 y="-265.80191"
118- style="font-size:14px;fill:#19acfc;fill-opacity:0.99608053">TEXT2</tspan></text>
119+ style="font-size:14px;fill:#19acfc;fill-opacity:0.99608053">TEXT1</tspan></text>
120 <text
121 xml:space="preserve"
122 style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#d3d3d3;fill-opacity:1;stroke:none;display:inline;font-family:Sans;-inkscape-font-specification:Sans Bold"
123@@ -2843,7 +2839,7 @@
124 inkscape:export-ydpi="90" />
125 <path
126 sodipodi:type="arc"
127- style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
128+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
129 id="path4486"
130 sodipodi:cx="148"
131 sodipodi:cy="-462"
132@@ -2867,7 +2863,7 @@
133 sodipodi:cy="-462"
134 sodipodi:cx="148"
135 id="path4488"
136- style="color:#000000;fill:#19acfc;fill-opacity:0.99607843;fill-rule:nonzero;stroke:#dcdcdc;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
137+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#19abfb;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
138 sodipodi:type="arc"
139 inkscape:export-xdpi="90"
140 inkscape:export-ydpi="90" />
141@@ -3824,7 +3820,7 @@
142 </g>
143 <g
144 style="display:inline"
145- transform="matrix(0.12389513,0,0,0.04335027,492.05211,131.7975)"
146+ transform="matrix(0.09883656,0,0,0.04335027,506.10995,131.7975)"
147 id="dummy_bpm1"
148 inkscape:tile-cx="1044.6921"
149 inkscape:tile-cy="-264.1518"
150@@ -3837,19 +3833,19 @@
151 inkscape:connector-curvature="0"
152 id="path8440"
153 d="M 561.52454,225.97404 1359.1411,568.56729"
154- style="fill:none;stroke:#d76cff;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
155+ style="fill:none;stroke:#d76cff;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
156 <path
157 inkscape:connector-curvature="0"
158 id="path8442"
159 d="M 1358.577,226.21665 561.31417,568.80989"
160- style="fill:none;stroke:#d76cff;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
161+ style="fill:none;stroke:#d76cff;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
162 <rect
163 y="225.4323"
164 x="561"
165 height="343"
166 width="798"
167 id="rect8444"
168- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
169+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
170 </g>
171 <g
172 inkscape:tile-y0="-278.1515"
173@@ -3882,7 +3878,7 @@
174 </g>
175 <g
176 style="display:inline"
177- transform="matrix(0.34566723,0,0,0.05237544,367.579,147.72277)"
178+ transform="matrix(0.29325611,0,0,0.05237544,438.98168,147.72277)"
179 id="dummy_woverview1"
180 inkscape:tile-cx="1044.6921"
181 inkscape:tile-cy="-264.1518"
182@@ -3895,19 +3891,19 @@
183 inkscape:connector-curvature="0"
184 id="path8456"
185 d="M 561.52454,225.97404 1359.1411,568.56729"
186- style="fill:none;stroke:#d76cff;stroke-width:7.40762854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
187+ style="fill:none;stroke:#d76cff;stroke-width:8.04238415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
188 <path
189 inkscape:connector-curvature="0"
190 id="path8458"
191 d="M 1358.577,226.21665 561.31417,568.80989"
192- style="fill:none;stroke:#d76cff;stroke-width:7.40762854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
193+ style="fill:none;stroke:#d76cff;stroke-width:8.04238415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
194 <rect
195 y="205.97951"
196 x="561"
197 height="362.45279"
198 width="801.35852"
199 id="rect8460"
200- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:7.40762901;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
201+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:8.04238415;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
202 </g>
203 <g
204 inkscape:tile-y0="-278.1515"
205@@ -3917,21 +3913,21 @@
206 inkscape:tile-cy="-264.1518"
207 inkscape:tile-cx="1044.6921"
208 id="dummy_pitch1"
209- transform="matrix(0.07391967,0,0,0.04367916,620.0319,131.66686)"
210+ transform="matrix(0.08644939,0,0,0.04367916,598.00252,131.66686)"
211 style="display:inline"
212 inkscape:label="#g8462">
213 <path
214- style="fill:none;stroke:#d76cff;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
215+ style="fill:none;stroke:#d76cff;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
216 d="M 561.52454,225.97404 1359.1411,568.56729"
217 id="path8464"
218 inkscape:connector-curvature="0" />
219 <path
220- style="fill:none;stroke:#d76cff;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
221+ style="fill:none;stroke:#d76cff;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
222 d="M 1358.577,226.21665 561.31417,568.80989"
223 id="path8466"
224 inkscape:connector-curvature="0" />
225 <rect
226- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
227+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
228 id="rect8468"
229 width="798"
230 height="343"
231@@ -3993,7 +3989,7 @@
232 inkscape:tile-w="42.000259"
233 inkscape:tile-cy="-155.54899"
234 inkscape:tile-cx="24.281105"
235- style="color:#000000;fill:#ff0000;fill-opacity:1;stroke:#d3d3d3;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
236+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
237 id="rect4359"
238 width="42.000259"
239 height="24.000187"
240@@ -4011,7 +4007,7 @@
241 height="24"
242 width="18"
243 id="rect4361"
244- style="color:#000000;fill:#ff0000;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
245+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
246 inkscape:tile-cx="74.281128"
247 inkscape:tile-cy="-455.54909"
248 inkscape:tile-w="18"
249@@ -4023,7 +4019,7 @@
250 inkscape:tile-w="18"
251 inkscape:tile-cy="-452.53629"
252 inkscape:tile-cx="505.28098"
253- style="color:#000000;fill:#ff0000;fill-opacity:1;stroke:#d3d3d3;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
254+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
255 id="rect4363"
256 width="18"
257 height="18"
258@@ -4039,7 +4035,7 @@
259 height="24.000187"
260 width="42.000259"
261 id="rect4365"
262- style="color:#000000;fill:#19acfc;fill-opacity:0.99607843;stroke:#d3d3d3;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
263+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#19abfb;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
264 inkscape:tile-cx="24.281105"
265 inkscape:tile-cy="-155.54899"
266 inkscape:tile-w="42.000259"
267@@ -4051,7 +4047,7 @@
268 inkscape:tile-w="18"
269 inkscape:tile-cy="-455.54909"
270 inkscape:tile-cx="74.281128"
271- style="color:#000000;fill:#19acfc;fill-opacity:0.99608053;stroke:#d3d3d3;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
272+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#19abfb;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
273 id="rect4367"
274 width="18"
275 height="24"
276@@ -4069,7 +4065,7 @@
277 height="18"
278 width="18"
279 id="rect4369"
280- style="color:#000000;fill:#19acfc;fill-opacity:0.99607843;stroke:#d3d3d3;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
281+ style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#19abfb;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
282 inkscape:tile-cx="505.28098"
283 inkscape:tile-cy="-452.53629"
284 inkscape:tile-w="18"
285@@ -4930,20 +4926,20 @@
286 inkscape:tile-cy="-264.1518"
287 inkscape:tile-cx="1044.6921"
288 id="dummy_bpm2"
289- transform="matrix(0.12389513,0,0,0.04335027,971.05285,131.7975)"
290+ transform="matrix(0.09883656,0,0,0.04335027,985.10995,131.7975)"
291 style="display:inline">
292 <path
293- style="fill:none;stroke:#d76cff;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
294+ style="fill:none;stroke:#d76cff;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
295 d="M 561.52454,225.97404 1359.1411,568.56729"
296 id="path28654"
297 inkscape:connector-curvature="0" />
298 <path
299- style="fill:none;stroke:#d76cff;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
300+ style="fill:none;stroke:#d76cff;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
301 d="M 1358.577,226.21665 561.31417,568.80989"
302 id="path28656"
303 inkscape:connector-curvature="0" />
304 <rect
305- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:15.20775604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
306+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:17.02681732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
307 id="rect28658"
308 width="798"
309 height="343"
310@@ -4988,20 +4984,20 @@
311 inkscape:tile-cy="-264.1518"
312 inkscape:tile-cx="1044.6921"
313 id="dummy_woverview2"
314- transform="matrix(0.34566723,0,0,0.05237544,888.57964,147.72277)"
315+ transform="matrix(0.29325611,0,0,0.05237544,917.90666,147.72277)"
316 style="display:inline">
317 <path
318- style="fill:none;stroke:#d76cff;stroke-width:7.40762854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
319+ style="fill:none;stroke:#d76cff;stroke-width:8.04238319;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
320 d="M 561.52454,225.97404 1359.1411,568.56729"
321 id="path28670"
322 inkscape:connector-curvature="0" />
323 <path
324- style="fill:none;stroke:#d76cff;stroke-width:7.40762854;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
325+ style="fill:none;stroke:#d76cff;stroke-width:8.04238319;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
326 d="M 1358.577,226.21665 561.31417,568.80989"
327 id="path28672"
328 inkscape:connector-curvature="0" />
329 <rect
330- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:7.40762901;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
331+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:8.04238319;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
332 id="rect28674"
333 width="801.35852"
334 height="362.45279"
335@@ -5011,7 +5007,7 @@
336 <g
337 inkscape:label="#g8462"
338 style="display:inline"
339- transform="matrix(0.07391967,0,0,0.04367916,1099.0326,131.66686)"
340+ transform="matrix(0.08644939,0,0,0.04367916,1077.0029,131.66686)"
341 id="dummy_pitch2"
342 inkscape:tile-cx="1044.6921"
343 inkscape:tile-cy="-264.1518"
344@@ -5023,24 +5019,24 @@
345 inkscape:connector-curvature="0"
346 id="path28678"
347 d="M 561.52454,225.97404 1359.1411,568.56729"
348- style="fill:none;stroke:#d76cff;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
349+ style="fill:none;stroke:#d76cff;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
350 <path
351 inkscape:connector-curvature="0"
352 id="path28680"
353 d="M 1358.577,226.21665 561.31417,568.80989"
354- style="fill:none;stroke:#d76cff;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
355+ style="fill:none;stroke:#d76cff;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
356 <rect
357 y="225.4323"
358 x="561"
359 height="343"
360 width="798"
361 id="rect28682"
362- style="color:#000000;fill:none;stroke:#cccccc;stroke-width:17.62747002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
363+ style="color:#000000;fill:none;stroke:#cccccc;stroke-width:16.30005455;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
364 </g>
365 <g
366 inkscape:export-ydpi="90"
367 inkscape:export-xdpi="90"
368- transform="translate(196.78858,3.0900555)"
369+ transform="translate(476.78852,3.0900555)"
370 id="btn_repeat2"
371 inkscape:label="#g28466">
372 <rect
373@@ -5129,6 +5125,102 @@
374 x="0"
375 inkscape:export-xdpi="90"
376 inkscape:export-ydpi="90" />
377+ <g
378+ inkscape:export-ydpi="90"
379+ inkscape:export-xdpi="90"
380+ transform="translate(-282.21216,3.0900555)"
381+ id="btn_tap1"
382+ inkscape:label="#g28466">
383+ <rect
384+ inkscape:export-ydpi="90"
385+ inkscape:export-xdpi="90"
386+ inkscape:tile-h="18"
387+ inkscape:tile-w="18"
388+ inkscape:tile-cy="-452.53629"
389+ inkscape:tile-cx="505.28098"
390+ style="color:#000000;fill:#ffffff;stroke:#d3d3d3;stroke-width:2.07576942;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
391+ id="rect8532"
392+ width="37.924232"
393+ height="17.924231"
394+ x="844.25006"
395+ y="155.96074"
396+ inkscape:tile-x0="496.28098"
397+ inkscape:tile-y0="-461.53629" />
398+ <g
399+ id="g8534"
400+ inkscape:label="#g9503"
401+ inkscape:export-xdpi="90"
402+ inkscape:export-ydpi="90"
403+ transform="translate(-25.768658,6.8855654)">
404+ <text
405+ xml:space="preserve"
406+ style="font-size:8px;font-style:normal;font-weight:normal;line-height:100%;letter-spacing:0px;word-spacing:0px;fill:#d3d3d3;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
407+ x="888.82068"
408+ y="161.03719"
409+ id="text8536"
410+ sodipodi:linespacing="100%"
411+ inkscape:tile-x0="674.00421"
412+ inkscape:tile-y0="-347.32138"><tspan
413+ sodipodi:role="line"
414+ x="888.82068"
415+ y="161.03719"
416+ style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d3d3d3;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
417+ id="tspan8538">TAP</tspan><tspan
418+ id="tspan8540"
419+ sodipodi:role="line"
420+ x="888.82068"
421+ y="169.03719"
422+ style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d3d3d3;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans Bold" /></text>
423+ </g>
424+ </g>
425+ <g
426+ inkscape:label="#g28466"
427+ id="btn_tap2"
428+ transform="translate(196.78858,3.0900555)"
429+ inkscape:export-xdpi="90"
430+ inkscape:export-ydpi="90">
431+ <rect
432+ inkscape:tile-y0="-461.53629"
433+ inkscape:tile-x0="496.28098"
434+ y="155.96074"
435+ x="844.25006"
436+ height="17.924231"
437+ width="37.924232"
438+ id="rect8544"
439+ style="color:#000000;fill:#ffffff;stroke:#d3d3d3;stroke-width:2.07576942;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
440+ inkscape:tile-cx="505.28098"
441+ inkscape:tile-cy="-452.53629"
442+ inkscape:tile-w="18"
443+ inkscape:tile-h="18"
444+ inkscape:export-xdpi="90"
445+ inkscape:export-ydpi="90" />
446+ <g
447+ transform="translate(-25.768658,6.8855654)"
448+ inkscape:export-ydpi="90"
449+ inkscape:export-xdpi="90"
450+ inkscape:label="#g9503"
451+ id="g8546">
452+ <text
453+ inkscape:tile-y0="-347.32138"
454+ inkscape:tile-x0="674.00421"
455+ sodipodi:linespacing="100%"
456+ id="text8548"
457+ y="161.03719"
458+ x="888.82068"
459+ style="font-size:8px;font-style:normal;font-weight:normal;line-height:100%;letter-spacing:0px;word-spacing:0px;fill:#d3d3d3;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
460+ xml:space="preserve"><tspan
461+ id="tspan8550"
462+ style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d3d3d3;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans"
463+ y="161.03719"
464+ x="888.82068"
465+ sodipodi:role="line">TAP</tspan><tspan
466+ style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d3d3d3;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Sans Bold"
467+ y="169.03719"
468+ x="888.82068"
469+ sodipodi:role="line"
470+ id="tspan8552" /></text>
471+ </g>
472+ </g>
473 </g>
474 <g
475 transform="translate(-453,-1820.375)"
476
477=== modified file 'mixxx/res/skins/Deere1280x1024-SXGA/skin.xml'
478--- mixxx/res/skins/Deere1280x1024-SXGA/skin.xml 2010-12-03 14:22:21 +0000
479+++ mixxx/res/skins/Deere1280x1024-SXGA/skin.xml 2011-01-07 12:24:27 +0000
480@@ -20,6 +20,11 @@
481
482 <!--
483 CHANGELOG
484+ v1.08 (14/12/2010)
485+ * Added custom images for splitter in library
486+ * Added custom images for branch triangle in treeview
487+ * Added visual feedback when searchbox has focus
488+
489 v1.07 (02/12/2010)
490 * Added custom images for checkboxes in library
491 * Updated styles
492@@ -102,7 +107,7 @@
493 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
494 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
495
496- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
497+ QTableView, QTextBrowser, QTreeView { border: 1px solid #656565; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
498 background: #151515; alternate-background-color: #111111; color: #CCCCCC; }
499 QTableView::indicator { width: 12px; height: 12px;}
500 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
501@@ -110,8 +115,23 @@
502
503 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
504
505+ WSearchLineEdit { padding: 2px; border: 1px solid #656565; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #151515; color: #CCCCCC; }
506+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #151515; color: #CCCCCC; }
507+
508+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
509+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
510+ QSplitter::handle:horizontal { width: 6px; }
511+ QSplitter::handle:vertical { height: 6px; }
512+
513 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
514- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #CCCCCC; }
515+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
516+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
517+
518+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
519+ QTreeView::branch:has-children:!has-siblings:closed,
520+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
521+ QTreeView::branch:open:has-children:!has-siblings,
522+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
523 </Style>
524 <Pos>6,376</Pos>
525 <Size>1252,540</Size>
526
527=== added file 'mixxx/res/skins/Deere1280x1024-SXGA/style_branch_closed.png'
528Binary files mixxx/res/skins/Deere1280x1024-SXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x1024-SXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
529=== added file 'mixxx/res/skins/Deere1280x1024-SXGA/style_branch_open.png'
530Binary files mixxx/res/skins/Deere1280x1024-SXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x1024-SXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
531=== added file 'mixxx/res/skins/Deere1280x1024-SXGA/style_handle_checked.png'
532Binary files mixxx/res/skins/Deere1280x1024-SXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x1024-SXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
533=== added file 'mixxx/res/skins/Deere1280x1024-SXGA/style_handle_unchecked.png'
534Binary files mixxx/res/skins/Deere1280x1024-SXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x1024-SXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
535=== modified file 'mixxx/res/skins/Deere1280x800-WXGA/skin.xml'
536--- mixxx/res/skins/Deere1280x800-WXGA/skin.xml 2010-12-03 14:22:21 +0000
537+++ mixxx/res/skins/Deere1280x800-WXGA/skin.xml 2011-01-07 12:24:27 +0000
538@@ -20,6 +20,11 @@
539
540 <!--
541 CHANGELOG
542+ v1.08 (14/12/2010)
543+ * Added custom images for splitter in library
544+ * Added custom images for branch triangle in treeview
545+ * Added visual feedback when searchbox has focus
546+
547 v1.07 (02/12/2010)
548 * Added custom images for checkboxes in library
549 * Updated styles
550@@ -102,7 +107,7 @@
551 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
552 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
553
554- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
555+ QTableView, QTextBrowser, QTreeView { border: 1px solid #656565; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
556 background: #151515; alternate-background-color: #111111; color: #CCCCCC; }
557 QTableView::indicator { width: 12px; height: 12px;}
558 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
559@@ -110,8 +115,23 @@
560
561 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
562
563+ WSearchLineEdit { padding: 2px; border: 1px solid #656565; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #151515; color: #CCCCCC; }
564+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #151515; color: #CCCCCC; }
565+
566+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
567+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
568+ QSplitter::handle:horizontal { width: 6px; }
569+ QSplitter::handle:vertical { height: 6px; }
570+
571 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
572- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #CCCCCC; }
573+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
574+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
575+
576+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
577+ QTreeView::branch:has-children:!has-siblings:closed,
578+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
579+ QTreeView::branch:open:has-children:!has-siblings,
580+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
581 </Style>
582 <Pos>6,376</Pos>
583 <Size>1252,318</Size>
584
585=== added file 'mixxx/res/skins/Deere1280x800-WXGA/style_branch_closed.png'
586Binary files mixxx/res/skins/Deere1280x800-WXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x800-WXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
587=== added file 'mixxx/res/skins/Deere1280x800-WXGA/style_branch_open.png'
588Binary files mixxx/res/skins/Deere1280x800-WXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x800-WXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
589=== added file 'mixxx/res/skins/Deere1280x800-WXGA/style_handle_checked.png'
590Binary files mixxx/res/skins/Deere1280x800-WXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x800-WXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
591=== added file 'mixxx/res/skins/Deere1280x800-WXGA/style_handle_unchecked.png'
592Binary files mixxx/res/skins/Deere1280x800-WXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Deere1280x800-WXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
593=== modified file 'mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml'
594--- mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml 2010-12-03 14:22:21 +0000
595+++ mixxx/res/skins/LateNight1280x1024-SXGA/skin.xml 2011-01-07 12:24:27 +0000
596@@ -20,6 +20,11 @@
597
598 <!--
599 CHANGELOG
600+ v1.08 (14/12/2010)
601+ * Added custom images for splitter in library
602+ * Added custom images for branch triangle in treeview
603+ * Added visual feedback when searchbox has focus
604+
605 v1.07 (02/12/2010)
606 * Added Mixxx 1.9 feature: BPM tap buttons
607 * Added custom images for checkboxes in library
608@@ -119,7 +124,7 @@
609 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
610 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
611
612- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
613+ QTableView, QTextBrowser, QTreeView { border: 1px solid #474747; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
614 background: #121212; alternate-background-color: #121212; color: #DFDFDF; }
615 QTableView::indicator { width: 12px; height: 12px;}
616 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
617@@ -127,8 +132,23 @@
618
619 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
620
621+ WSearchLineEdit { padding: 2px; border: 1px solid #474747; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #121212; color: #DFDFDF; }
622+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #121212; color: #DFDFDF; }
623+
624+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
625+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
626+ QSplitter::handle:horizontal { width: 6px; }
627+ QSplitter::handle:vertical { height: 6px; }
628+
629 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
630- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #DFDFDF; }
631+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
632+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
633+
634+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
635+ QTreeView::branch:has-children:!has-siblings:closed,
636+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
637+ QTreeView::branch:open:has-children:!has-siblings,
638+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
639 </Style>
640 <Pos>6,346</Pos>
641 <Size>1251,570</Size>
642
643=== added file 'mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_closed.png'
644Binary files mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
645=== added file 'mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_open.png'
646Binary files mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x1024-SXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
647=== added file 'mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_checked.png'
648Binary files mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
649=== added file 'mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_unchecked.png'
650Binary files mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x1024-SXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
651=== modified file 'mixxx/res/skins/LateNight1280x800-WXGA/skin.xml'
652--- mixxx/res/skins/LateNight1280x800-WXGA/skin.xml 2010-12-03 14:22:21 +0000
653+++ mixxx/res/skins/LateNight1280x800-WXGA/skin.xml 2011-01-07 12:24:27 +0000
654@@ -20,6 +20,11 @@
655
656 <!--
657 CHANGELOG
658+ v1.08 (14/12/2010)
659+ * Added custom images for splitter in library
660+ * Added custom images for branch triangle in treeview
661+ * Added visual feedback when searchbox has focus
662+
663 v1.07 (02/12/2010)
664 * Added Mixxx 1.9 feature: BPM tap buttons
665 * Added custom images for checkboxes in library
666@@ -119,7 +124,7 @@
667 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
668 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
669
670- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
671+ QTableView, QTextBrowser, QTreeView { border: 1px solid #474747; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
672 background: #121212; alternate-background-color: #121212; color: #DFDFDF; }
673 QTableView::indicator { width: 12px; height: 12px;}
674 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
675@@ -127,8 +132,23 @@
676
677 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
678
679+ WSearchLineEdit { padding: 2px; border: 1px solid #474747; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #121212; color: #DFDFDF; }
680+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #121212; color: #DFDFDF; }
681+
682+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
683+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
684+ QSplitter::handle:horizontal { width: 6px; }
685+ QSplitter::handle:vertical { height: 6px; }
686+
687 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
688- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #DFDFDF; }
689+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
690+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
691+
692+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
693+ QTreeView::branch:has-children:!has-siblings:closed,
694+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
695+ QTreeView::branch:open:has-children:!has-siblings,
696+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
697 </Style>
698 <Pos>6,346</Pos>
699 <Size>1251,347</Size>
700
701=== added file 'mixxx/res/skins/LateNight1280x800-WXGA/style_branch_closed.png'
702Binary files mixxx/res/skins/LateNight1280x800-WXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x800-WXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
703=== added file 'mixxx/res/skins/LateNight1280x800-WXGA/style_branch_open.png'
704Binary files mixxx/res/skins/LateNight1280x800-WXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x800-WXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
705=== added file 'mixxx/res/skins/LateNight1280x800-WXGA/style_handle_checked.png'
706Binary files mixxx/res/skins/LateNight1280x800-WXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x800-WXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
707=== added file 'mixxx/res/skins/LateNight1280x800-WXGA/style_handle_unchecked.png'
708Binary files mixxx/res/skins/LateNight1280x800-WXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNight1280x800-WXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
709=== modified file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml'
710--- mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml 2010-12-03 14:22:21 +0000
711+++ mixxx/res/skins/LateNightBlues1280x1024-SXGA/skin.xml 2011-01-07 12:24:27 +0000
712@@ -20,6 +20,11 @@
713
714 <!--
715 CHANGELOG
716+ v1.08 (14/12/2010)
717+ * Added custom images for splitter in library
718+ * Added custom images for branch triangle in treeview
719+ * Added visual feedback when searchbox has focus
720+
721 v1.07 (02/12/2010)
722 * Added Mixxx 1.9 feature: BPM tap buttons
723 * Added custom images for checkboxes in library
724@@ -120,7 +125,7 @@
725 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
726 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
727
728- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
729+ QTableView, QTextBrowser, QTreeView { border: 1px solid #484D50; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
730 background: #22272B; alternate-background-color: #22272B; color: #CDCDCD; }
731 QTableView::indicator { width: 12px; height: 12px;}
732 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
733@@ -128,8 +133,23 @@
734
735 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
736
737+ WSearchLineEdit { padding: 2px; border: 1px solid #484D50; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #22272B; color: #CDCDCD; }
738+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #22272B; color: #CDCDCD; }
739+
740+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
741+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
742+ QSplitter::handle:horizontal { width: 6px; }
743+ QSplitter::handle:vertical { height: 6px; }
744+
745 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
746- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #CDCDCD; }
747+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
748+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
749+
750+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
751+ QTreeView::branch:has-children:!has-siblings:closed,
752+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
753+ QTreeView::branch:open:has-children:!has-siblings,
754+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
755 </Style>
756 <Pos>6,346</Pos>
757 <Size>1251,571</Size>
758
759=== added file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_closed.png'
760Binary files mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
761=== added file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_open.png'
762Binary files mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
763=== added file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_checked.png'
764Binary files mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
765=== added file 'mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_unchecked.png'
766Binary files mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x1024-SXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
767=== modified file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml'
768--- mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml 2010-12-03 14:22:21 +0000
769+++ mixxx/res/skins/LateNightBlues1280x800-WXGA/skin.xml 2011-01-07 12:24:27 +0000
770@@ -20,6 +20,11 @@
771
772 <!--
773 CHANGELOG
774+ v1.08 (14/12/2010)
775+ * Added custom images for splitter in library
776+ * Added custom images for branch triangle in treeview
777+ * Added visual feedback when searchbox has focus
778+
779 v1.07 (02/12/2010)
780 * Added Mixxx 1.9 feature: BPM tap buttons
781 * Added custom images for checkboxes in library
782@@ -120,7 +125,7 @@
783 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
784 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
785
786- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
787+ QTableView, QTextBrowser, QTreeView { border: 1px solid #484D50; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
788 background: #22272B; alternate-background-color: #22272B; color: #CDCDCD; }
789 QTableView::indicator { width: 12px; height: 12px;}
790 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
791@@ -128,8 +133,23 @@
792
793 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
794
795+ WSearchLineEdit { padding: 2px; border: 1px solid #484D50; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #22272B; color: #CDCDCD; }
796+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #22272B; color: #CDCDCD; }
797+
798+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
799+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
800+ QSplitter::handle:horizontal { width: 6px; }
801+ QSplitter::handle:vertical { height: 6px; }
802+
803 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
804- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #CDCDCD; }
805+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
806+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
807+
808+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
809+ QTreeView::branch:has-children:!has-siblings:closed,
810+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
811+ QTreeView::branch:open:has-children:!has-siblings,
812+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
813 </Style>
814 <Pos>6,346</Pos>
815 <Size>1251,347</Size>
816
817=== added file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_closed.png'
818Binary files mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
819=== added file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_open.png'
820Binary files mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x800-WXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
821=== added file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_checked.png'
822Binary files mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
823=== added file 'mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_unchecked.png'
824Binary files mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/LateNightBlues1280x800-WXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
825=== added file 'mixxx/res/skins/Outline1024x600-Netbook/btn_tap1.png'
826Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_tap1.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_tap1.png 2011-01-07 12:24:27 +0000 differ
827=== added file 'mixxx/res/skins/Outline1024x600-Netbook/btn_tap1_over.png'
828Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_tap1_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_tap1_over.png 2011-01-07 12:24:27 +0000 differ
829=== added file 'mixxx/res/skins/Outline1024x600-Netbook/btn_tap2.png'
830Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_tap2.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_tap2.png 2011-01-07 12:24:27 +0000 differ
831=== added file 'mixxx/res/skins/Outline1024x600-Netbook/btn_tap2_over.png'
832Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_tap2_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_tap2_over.png 2011-01-07 12:24:27 +0000 differ
833=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display1_over.png'
834Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display1_over.png 2011-01-07 12:24:27 +0000 differ
835=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display2_over.png'
836Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display2_over.png 2011-01-07 12:24:27 +0000 differ
837=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master1_over.png'
838Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master1_over.png 2011-01-07 12:24:27 +0000 differ
839=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master2_over.png'
840Binary files mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x600-Netbook/btn_volume_display_master2_over.png 2011-01-07 12:24:27 +0000 differ
841=== modified file 'mixxx/res/skins/Outline1024x600-Netbook/skin.xml'
842--- mixxx/res/skins/Outline1024x600-Netbook/skin.xml 2011-01-02 12:30:07 +0000
843+++ mixxx/res/skins/Outline1024x600-Netbook/skin.xml 2011-01-07 12:24:27 +0000
844@@ -19,6 +19,15 @@
845
846 <!--
847 CHANGELOG
848+ v1.4 (14/12/2010)
849+ * Added custom images for splitter in library
850+ * Added custom images for branch triangle in treeview
851+
852+ v1.3 (12/12/2010)
853+ * Added BPM Tap button
854+ * Added visual feedback when searchbox has focus
855+ * Updated text alignments
856+
857 v1.2 (02/12/2010)
858 * Added custom images for checkboxes in library
859 * Updated styles
860@@ -124,15 +133,30 @@
861
862 <!-- No use of colour CSS colour propertys here, this breaks the colour schemes as of QT 4.7.1-->
863
864- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
865+ QTableView, QTextBrowser, QTreeView { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
866 QTableView::indicator { width: 12px; height: 12px;}
867 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
868 QTableView::indicator:unchecked { background: url(skin:/style_checkbox_unchecked.png);}
869
870 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
871
872+ WSearchLineEdit { padding: 2px; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
873+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
874+
875+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
876+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
877+ QSplitter::handle:horizontal { width: 6px; }
878+ QSplitter::handle:vertical { height: 6px; }
879+
880 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
881- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
882+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
883+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
884+
885+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
886+ QTreeView::branch:has-children:!has-siblings:closed,
887+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
888+ QTreeView::branch:open:has-children:!has-siblings,
889+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
890 </Style>
891 <Pos>107,225</Pos>
892 <Size>800,345</Size>
893@@ -719,8 +743,8 @@
894 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
895 </Style>
896 <Channel>1</Channel>
897- <Pos>108,158</Pos>
898- <Size>278,20</Size>
899+ <Pos>150,158</Pos>
900+ <Size>236,20</Size>
901 <BgColor>#FFFFFF</BgColor>
902 <SignalColor>#00ff00</SignalColor>
903 <MarkerColor>#0032FF</MarkerColor>
904@@ -736,7 +760,7 @@
905 </Style>
906 <Channel>2</Channel>
907 <Pos>629,158</Pos>
908- <Size>278,20</Size>
909+ <Size>236,20</Size>
910 <BgColor>#FFFFFF</BgColor>
911 <SignalColor>#00ff00</SignalColor>
912 <MarkerColor>#ff0000</MarkerColor>
913@@ -892,7 +916,7 @@
914 <Text>
915 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
916 <Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
917- background-color: transparent; text-align: left; padding-left: 1%; }
918+ background-color: transparent; text-align: left; }
919 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
920 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
921 </Style>
922@@ -903,7 +927,7 @@
923 <Text>
924 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
925 <Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
926- background-color: transparent; text-align: left; padding-left: 1%; }
927+ background-color: transparent; text-align: left; }
928 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
929 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
930 </Style>
931@@ -920,16 +944,16 @@
932 <NumberBpm>
933 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
934 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
935- background-color: transparent; text-align: left;padding-left: 1%; }
936+ background-color: transparent; text-align: left; }
937 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
938- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
939+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
940 </Style>
941 <Channel>1</Channel>
942 <Pos>108,141</Pos>
943- <Size>100,16</Size>
944+ <Size>80,16</Size>
945+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
946+ <Alignment>left</Alignment>
947 <NumberOfDigits>6</NumberOfDigits>
948- <!--<FgColor>Key for text to make colour schemes work, CSS declaration only is not enough -->
949- <FgColor>#606060</FgColor>
950 <Connection>
951 <ConfigKey>[Channel1],bpm</ConfigKey>
952 </Connection>
953@@ -937,13 +961,15 @@
954 <NumberBpm>
955 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
956 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
957- background-color: transparent; text-align: left;padding-left: 1%; }
958+ background-color: transparent; text-align: left; }
959 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
960- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
961+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
962 </Style>
963 <Channel>2</Channel>
964 <Pos>587,141</Pos>
965- <Size>100,16</Size>
966+ <Size>80,16</Size>
967+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
968+ <Alignment>left</Alignment>
969 <NumberOfDigits>6</NumberOfDigits>
970 <Connection>
971 <ConfigKey>[Channel2],bpm</ConfigKey>
972@@ -958,7 +984,7 @@
973 <NumberPos>
974 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
975 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
976- background-color: transparent; text-align: right;padding-right: 1%; }
977+ background-color: transparent; text-align: right; }
978 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
979 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
980 </Style>
981@@ -975,7 +1001,7 @@
982 <NumberPos>
983 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
984 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
985- background-color: transparent; text-align: right;padding-right: 1%; }
986+ background-color: transparent; text-align: right; }
987 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
988 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
989 </Style>
990@@ -998,12 +1024,12 @@
991 <NumberRate>
992 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
993 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
994- background-color: transparent; text-align: right; padding-right: 1%; }
995+ background-color: transparent; text-align: right; }
996 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
997 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
998 </Style>
999 <Channel>1</Channel>
1000- <Pos>218,141</Pos>
1001+ <Pos>205,141</Pos>
1002 <Size>60,16</Size>
1003 <NumberOfDigits>4</NumberOfDigits>
1004 <Connection>
1005@@ -1013,12 +1039,12 @@
1006 <NumberRate>
1007 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1008 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1009- background-color: transparent; text-align: right; padding-right: 1%; }
1010+ background-color: transparent; text-align: right; }
1011 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1012 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1013 </Style>
1014 <Channel>2</Channel>
1015- <Pos>697,141</Pos>
1016+ <Pos>685,141</Pos>
1017 <Size>60,16</Size>
1018 <NumberOfDigits>4</NumberOfDigits>
1019 <Connection>
1020@@ -2070,6 +2096,55 @@
1021
1022 <!--
1023 **********************************************
1024+ Button- BPM Tap
1025+ **********************************************
1026+ -->
1027+
1028+ <PushButton>
1029+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1030+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1031+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1032+ </Style>
1033+ <NumberStates>1</NumberStates>
1034+ <State>
1035+ <Number>0</Number>
1036+ <Pressed>btn_tap1_over.png</Pressed>
1037+ <Unpressed>btn_tap1.png</Unpressed>
1038+ </State>
1039+ <Pos>108,158</Pos>
1040+ <Connection>
1041+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1042+ <EmitOnDownPress>true</EmitOnDownPress>
1043+ </Connection>
1044+ <Connection>
1045+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1046+ <EmitOnDownPress>false</EmitOnDownPress>
1047+ </Connection>
1048+ </PushButton>
1049+ <PushButton>
1050+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1051+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1052+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1053+ </Style>
1054+ <NumberStates>1</NumberStates>
1055+ <State>
1056+ <Number>0</Number>
1057+ <Pressed>btn_tap2_over.png</Pressed>
1058+ <Unpressed>btn_tap2.png</Unpressed>
1059+ </State>
1060+ <Pos>587,158</Pos>
1061+ <Connection>
1062+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1063+ <EmitOnDownPress>true</EmitOnDownPress>
1064+ </Connection>
1065+ <Connection>
1066+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1067+ <EmitOnDownPress>false</EmitOnDownPress>
1068+ </Connection>
1069+ </PushButton>
1070+
1071+ <!--
1072+ **********************************************
1073 Button- Key lock
1074 **********************************************
1075 -->
1076@@ -2463,7 +2538,7 @@
1077 <Pressed>btn_repeat2_over.png</Pressed>
1078 <Unpressed>btn_repeat2_over.png</Unpressed>
1079 </State>
1080- <Pos>587,158</Pos>
1081+ <Pos>867,158</Pos>
1082 <Connection>
1083 <ConfigKey>[Channel2],repeat</ConfigKey>
1084 </Connection>
1085
1086=== added file 'mixxx/res/skins/Outline1024x600-Netbook/style_branch_closed.png'
1087Binary files mixxx/res/skins/Outline1024x600-Netbook/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1088=== added file 'mixxx/res/skins/Outline1024x600-Netbook/style_branch_open.png'
1089Binary files mixxx/res/skins/Outline1024x600-Netbook/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1090=== added file 'mixxx/res/skins/Outline1024x600-Netbook/style_handle_checked.png'
1091Binary files mixxx/res/skins/Outline1024x600-Netbook/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1092=== added file 'mixxx/res/skins/Outline1024x600-Netbook/style_handle_unchecked.png'
1093Binary files mixxx/res/skins/Outline1024x600-Netbook/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x600-Netbook/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1094=== added file 'mixxx/res/skins/Outline1024x768-XGA/btn_tap1.png'
1095Binary files mixxx/res/skins/Outline1024x768-XGA/btn_tap1.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_tap1.png 2011-01-07 12:24:27 +0000 differ
1096=== added file 'mixxx/res/skins/Outline1024x768-XGA/btn_tap1_over.png'
1097Binary files mixxx/res/skins/Outline1024x768-XGA/btn_tap1_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_tap1_over.png 2011-01-07 12:24:27 +0000 differ
1098=== added file 'mixxx/res/skins/Outline1024x768-XGA/btn_tap2.png'
1099Binary files mixxx/res/skins/Outline1024x768-XGA/btn_tap2.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_tap2.png 2011-01-07 12:24:27 +0000 differ
1100=== added file 'mixxx/res/skins/Outline1024x768-XGA/btn_tap2_over.png'
1101Binary files mixxx/res/skins/Outline1024x768-XGA/btn_tap2_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_tap2_over.png 2011-01-07 12:24:27 +0000 differ
1102=== modified file 'mixxx/res/skins/Outline1024x768-XGA/btn_volume_display1_over.png'
1103Binary files mixxx/res/skins/Outline1024x768-XGA/btn_volume_display1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_volume_display1_over.png 2011-01-07 12:24:27 +0000 differ
1104=== modified file 'mixxx/res/skins/Outline1024x768-XGA/btn_volume_display2_over.png'
1105Binary files mixxx/res/skins/Outline1024x768-XGA/btn_volume_display2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_volume_display2_over.png 2011-01-07 12:24:27 +0000 differ
1106=== modified file 'mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master1_over.png'
1107Binary files mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master1_over.png 2011-01-07 12:24:27 +0000 differ
1108=== modified file 'mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master2_over.png'
1109Binary files mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline1024x768-XGA/btn_volume_display_master2_over.png 2011-01-07 12:24:27 +0000 differ
1110=== modified file 'mixxx/res/skins/Outline1024x768-XGA/skin.xml'
1111--- mixxx/res/skins/Outline1024x768-XGA/skin.xml 2011-01-02 12:35:16 +0000
1112+++ mixxx/res/skins/Outline1024x768-XGA/skin.xml 2011-01-07 12:24:27 +0000
1113@@ -19,6 +19,15 @@
1114
1115 <!--
1116 CHANGELOG
1117+ v1.4 (14/12/2010)
1118+ * Added custom images for splitter in library
1119+ * Added custom images for branch triangle in treeview
1120+
1121+ v1.3 (12/12/2010)
1122+ * Added BPM Tap button
1123+ * Added visual feedback when searchbox has focus
1124+ * Updated text alignments
1125+
1126 v1.2 (02/12/2010)
1127 * Added custom images for checkboxes in library
1128 * Updated styles
1129@@ -124,15 +133,30 @@
1130
1131 <!-- No use of colour CSS colour propertys here, this breaks the colour schemes as of QT 4.7.1-->
1132
1133- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1134+ QTableView, QTextBrowser, QTreeView { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1135 QTableView::indicator { width: 12px; height: 12px;}
1136 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1137 QTableView::indicator:unchecked { background: url(skin:/style_checkbox_unchecked.png);}
1138
1139 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1140
1141+ WSearchLineEdit { padding: 2px; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1142+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
1143+
1144+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1145+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1146+ QSplitter::handle:horizontal { width: 6px; }
1147+ QSplitter::handle:vertical { height: 6px; }
1148+
1149 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1150- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
1151+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1152+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1153+
1154+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1155+ QTreeView::branch:has-children:!has-siblings:closed,
1156+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1157+ QTreeView::branch:open:has-children:!has-siblings,
1158+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1159 </Style>
1160 <Pos>107,225</Pos>
1161 <Size>800,513</Size>
1162@@ -719,8 +743,8 @@
1163 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1164 </Style>
1165 <Channel>1</Channel>
1166- <Pos>108,158</Pos>
1167- <Size>278,20</Size>
1168+ <Pos>150,158</Pos>
1169+ <Size>236,20</Size>
1170 <BgColor>#FFFFFF</BgColor>
1171 <SignalColor>#00ff00</SignalColor>
1172 <MarkerColor>#0032FF</MarkerColor>
1173@@ -736,7 +760,7 @@
1174 </Style>
1175 <Channel>2</Channel>
1176 <Pos>629,158</Pos>
1177- <Size>278,20</Size>
1178+ <Size>236,20</Size>
1179 <BgColor>#FFFFFF</BgColor>
1180 <SignalColor>#00ff00</SignalColor>
1181 <MarkerColor>#ff0000</MarkerColor>
1182@@ -892,7 +916,7 @@
1183 <Text>
1184 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1185 <Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1186- background-color: transparent; text-align: left; padding-left: 1%; }
1187+ background-color: transparent; text-align: left; }
1188 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1189 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1190 </Style>
1191@@ -903,7 +927,7 @@
1192 <Text>
1193 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1194 <Style>QLabel { font: bold 14px/16px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1195- background-color: transparent; text-align: left; padding-left: 1%; }
1196+ background-color: transparent; text-align: left; }
1197 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1198 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1199 </Style>
1200@@ -920,16 +944,16 @@
1201 <NumberBpm>
1202 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1203 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1204- background-color: transparent; text-align: left;padding-left: 1%; }
1205+ background-color: transparent; text-align: left; }
1206 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1207- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1208+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
1209 </Style>
1210 <Channel>1</Channel>
1211 <Pos>108,141</Pos>
1212- <Size>100,16</Size>
1213+ <Size>80,16</Size>
1214+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
1215+ <Alignment>left</Alignment>
1216 <NumberOfDigits>6</NumberOfDigits>
1217- <!--<FgColor>Key for text to make colour schemes work, CSS declaration only is not enough -->
1218- <FgColor>#606060</FgColor>
1219 <Connection>
1220 <ConfigKey>[Channel1],bpm</ConfigKey>
1221 </Connection>
1222@@ -937,13 +961,15 @@
1223 <NumberBpm>
1224 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1225 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1226- background-color: transparent; text-align: left;padding-left: 1%; }
1227+ background-color: transparent; text-align: left; }
1228 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1229- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1230+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
1231 </Style>
1232 <Channel>2</Channel>
1233 <Pos>587,141</Pos>
1234- <Size>100,16</Size>
1235+ <Size>80,16</Size>
1236+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
1237+ <Alignment>left</Alignment>
1238 <NumberOfDigits>6</NumberOfDigits>
1239 <Connection>
1240 <ConfigKey>[Channel2],bpm</ConfigKey>
1241@@ -958,7 +984,7 @@
1242 <NumberPos>
1243 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1244 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1245- background-color: transparent; text-align: right;padding-right: 1%; }
1246+ background-color: transparent; text-align: right; }
1247 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1248 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1249 </Style>
1250@@ -975,7 +1001,7 @@
1251 <NumberPos>
1252 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1253 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1254- background-color: transparent; text-align: right;padding-right: 1%; }
1255+ background-color: transparent; text-align: right; }
1256 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1257 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1258 </Style>
1259@@ -998,12 +1024,12 @@
1260 <NumberRate>
1261 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1262 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1263- background-color: transparent; text-align: right; padding-right: 1%; }
1264+ background-color: transparent; text-align: right; }
1265 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1266 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1267 </Style>
1268 <Channel>1</Channel>
1269- <Pos>218,141</Pos>
1270+ <Pos>205,141</Pos>
1271 <Size>60,16</Size>
1272 <NumberOfDigits>4</NumberOfDigits>
1273 <Connection>
1274@@ -1013,12 +1039,12 @@
1275 <NumberRate>
1276 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1277 <Style>QLabel { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1278- background-color: transparent; text-align: right; padding-right: 1%; }
1279+ background-color: transparent; text-align: right; }
1280 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1281 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1282 </Style>
1283 <Channel>2</Channel>
1284- <Pos>697,141</Pos>
1285+ <Pos>685,141</Pos>
1286 <Size>60,16</Size>
1287 <NumberOfDigits>4</NumberOfDigits>
1288 <Connection>
1289@@ -2070,6 +2096,55 @@
1290
1291 <!--
1292 **********************************************
1293+ Button- BPM Tap
1294+ **********************************************
1295+ -->
1296+
1297+ <PushButton>
1298+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1299+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1300+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1301+ </Style>
1302+ <NumberStates>1</NumberStates>
1303+ <State>
1304+ <Number>0</Number>
1305+ <Pressed>btn_tap1_over.png</Pressed>
1306+ <Unpressed>btn_tap1.png</Unpressed>
1307+ </State>
1308+ <Pos>108,158</Pos>
1309+ <Connection>
1310+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1311+ <EmitOnDownPress>true</EmitOnDownPress>
1312+ </Connection>
1313+ <Connection>
1314+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1315+ <EmitOnDownPress>false</EmitOnDownPress>
1316+ </Connection>
1317+ </PushButton>
1318+ <PushButton>
1319+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1320+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1321+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1322+ </Style>
1323+ <NumberStates>1</NumberStates>
1324+ <State>
1325+ <Number>0</Number>
1326+ <Pressed>btn_tap2_over.png</Pressed>
1327+ <Unpressed>btn_tap2.png</Unpressed>
1328+ </State>
1329+ <Pos>587,158</Pos>
1330+ <Connection>
1331+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1332+ <EmitOnDownPress>true</EmitOnDownPress>
1333+ </Connection>
1334+ <Connection>
1335+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1336+ <EmitOnDownPress>false</EmitOnDownPress>
1337+ </Connection>
1338+ </PushButton>
1339+
1340+ <!--
1341+ **********************************************
1342 Button- Key lock
1343 **********************************************
1344 -->
1345@@ -2463,7 +2538,7 @@
1346 <Pressed>btn_repeat2_over.png</Pressed>
1347 <Unpressed>btn_repeat2_over.png</Unpressed>
1348 </State>
1349- <Pos>587,158</Pos>
1350+ <Pos>867,158</Pos>
1351 <Connection>
1352 <ConfigKey>[Channel2],repeat</ConfigKey>
1353 </Connection>
1354
1355=== added file 'mixxx/res/skins/Outline1024x768-XGA/style_branch_closed.png'
1356Binary files mixxx/res/skins/Outline1024x768-XGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1357=== added file 'mixxx/res/skins/Outline1024x768-XGA/style_branch_open.png'
1358Binary files mixxx/res/skins/Outline1024x768-XGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1359=== added file 'mixxx/res/skins/Outline1024x768-XGA/style_handle_checked.png'
1360Binary files mixxx/res/skins/Outline1024x768-XGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1361=== added file 'mixxx/res/skins/Outline1024x768-XGA/style_handle_unchecked.png'
1362Binary files mixxx/res/skins/Outline1024x768-XGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline1024x768-XGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1363=== added file 'mixxx/res/skins/Outline800x480-WVGA/btn_tap1.png'
1364Binary files mixxx/res/skins/Outline800x480-WVGA/btn_tap1.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_tap1.png 2011-01-07 12:24:27 +0000 differ
1365=== added file 'mixxx/res/skins/Outline800x480-WVGA/btn_tap1_over.png'
1366Binary files mixxx/res/skins/Outline800x480-WVGA/btn_tap1_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_tap1_over.png 2011-01-07 12:24:27 +0000 differ
1367=== added file 'mixxx/res/skins/Outline800x480-WVGA/btn_tap2.png'
1368Binary files mixxx/res/skins/Outline800x480-WVGA/btn_tap2.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_tap2.png 2011-01-07 12:24:27 +0000 differ
1369=== added file 'mixxx/res/skins/Outline800x480-WVGA/btn_tap2_over.png'
1370Binary files mixxx/res/skins/Outline800x480-WVGA/btn_tap2_over.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_tap2_over.png 2011-01-07 12:24:27 +0000 differ
1371=== modified file 'mixxx/res/skins/Outline800x480-WVGA/btn_volume_display1_over.png'
1372Binary files mixxx/res/skins/Outline800x480-WVGA/btn_volume_display1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_volume_display1_over.png 2011-01-07 12:24:27 +0000 differ
1373=== modified file 'mixxx/res/skins/Outline800x480-WVGA/btn_volume_display2_over.png'
1374Binary files mixxx/res/skins/Outline800x480-WVGA/btn_volume_display2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_volume_display2_over.png 2011-01-07 12:24:27 +0000 differ
1375=== modified file 'mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master1_over.png'
1376Binary files mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master1_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master1_over.png 2011-01-07 12:24:27 +0000 differ
1377=== modified file 'mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master2_over.png'
1378Binary files mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master2_over.png 2010-11-23 17:05:47 +0000 and mixxx/res/skins/Outline800x480-WVGA/btn_volume_display_master2_over.png 2011-01-07 12:24:27 +0000 differ
1379=== modified file 'mixxx/res/skins/Outline800x480-WVGA/skin.xml'
1380--- mixxx/res/skins/Outline800x480-WVGA/skin.xml 2011-01-02 12:35:16 +0000
1381+++ mixxx/res/skins/Outline800x480-WVGA/skin.xml 2011-01-07 12:24:27 +0000
1382@@ -19,6 +19,15 @@
1383
1384 <!--
1385 CHANGELOG
1386+ v1.4 (14/12/2010)
1387+ * Added custom images for splitter in library
1388+ * Added custom images for branch triangle in treeview
1389+
1390+ v1.3 (12/12/2010)
1391+ * Added BPM Tap button
1392+ * Added visual feedback when searchbox has focus
1393+ * Updated text alignments
1394+
1395 v1.2 (02/12/2010)
1396 * Added custom images for checkboxes in library
1397 * Updated styles
1398@@ -124,15 +133,30 @@
1399
1400 <!-- No use of colour CSS colour propertys here, this breaks the colour schemes as of QT 4.7.1-->
1401
1402- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1403+ QTableView, QTextBrowser, QTreeView { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1404 QTableView::indicator { width: 12px; height: 12px;}
1405 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1406 QTableView::indicator:unchecked { background: url(skin:/style_checkbox_unchecked.png);}
1407
1408 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1409
1410+ WSearchLineEdit { padding: 1px; font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1411+ WSearchLineEdit:focus {padding: 1px; border: 2px solid #FF6600; font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
1412+
1413+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1414+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1415+ QSplitter::handle:horizontal { width: 6px; }
1416+ QSplitter::handle:vertical { height: 6px; }
1417+
1418 QLabel, QPushButton { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1419- QRadioButton { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;}
1420+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1421+ QRadioButton { font: 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1422+
1423+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1424+ QTreeView::branch:has-children:!has-siblings:closed,
1425+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1426+ QTreeView::branch:open:has-children:!has-siblings,
1427+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1428 </Style>
1429 <Pos>80,178</Pos>
1430 <Size>630,272</Size>
1431@@ -719,8 +743,8 @@
1432 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1433 </Style>
1434 <Channel>1</Channel>
1435- <Pos>80,125</Pos>
1436- <Size>219,16</Size>
1437+ <Pos>114,125</Pos>
1438+ <Size>185,16</Size>
1439 <BgColor>#FFFFFF</BgColor>
1440 <SignalColor>#00ff00</SignalColor>
1441 <MarkerColor>#0032FF</MarkerColor>
1442@@ -736,7 +760,7 @@
1443 </Style>
1444 <Channel>2</Channel>
1445 <Pos>491,125</Pos>
1446- <Size>219,16</Size>
1447+ <Size>185,16</Size>
1448 <BgColor>#FFFFFF</BgColor>
1449 <SignalColor>#00ff00</SignalColor>
1450 <MarkerColor>#ff0000</MarkerColor>
1451@@ -892,7 +916,7 @@
1452 <Text>
1453 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1454 <Style>QLabel { font: bold 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1455- background-color: transparent; text-align: left; padding-left: 1%; }
1456+ background-color: transparent; text-align: left; }
1457 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1458 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1459 </Style>
1460@@ -903,7 +927,7 @@
1461 <Text>
1462 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1463 <Style>QLabel { font: bold 12px/14px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1464- background-color: transparent; text-align: left; padding-left: 1%; }
1465+ background-color: transparent; text-align: left; }
1466 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1467 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1468 </Style>
1469@@ -920,16 +944,16 @@
1470 <NumberBpm>
1471 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1472 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1473- background-color: transparent; text-align: left;padding-left: 1%; }
1474+ background-color: transparent; text-align: left; }
1475 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1476- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1477+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
1478 </Style>
1479 <Channel>1</Channel>
1480 <Pos>80,111</Pos>
1481- <Size>79,13</Size>
1482+ <Size>75,13</Size>
1483+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
1484+ <Alignment>left</Alignment>
1485 <NumberOfDigits>6</NumberOfDigits>
1486- <!--<FgColor>Key for text to make colour schemes work, CSS declaration only is not enough -->
1487- <FgColor>#606060</FgColor>
1488 <Connection>
1489 <ConfigKey>[Channel1],bpm</ConfigKey>
1490 </Connection>
1491@@ -937,13 +961,15 @@
1492 <NumberBpm>
1493 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1494 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1495- background-color: transparent; text-align: left;padding-left: 1%; }
1496+ background-color: transparent; text-align: left; }
1497 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1498- background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1499+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; }
1500 </Style>
1501 <Channel>2</Channel>
1502 <Pos>458,111</Pos>
1503- <Size>79,13</Size>
1504+ <Size>75,13</Size>
1505+ <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
1506+ <Alignment>left</Alignment>
1507 <NumberOfDigits>6</NumberOfDigits>
1508 <Connection>
1509 <ConfigKey>[Channel2],bpm</ConfigKey>
1510@@ -958,7 +984,7 @@
1511 <NumberPos>
1512 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1513 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1514- background-color: transparent; text-align: right;padding-right: 1%; }
1515+ background-color: transparent; text-align: right; }
1516 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1517 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1518 </Style>
1519@@ -975,7 +1001,7 @@
1520 <NumberPos>
1521 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1522 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1523- background-color: transparent; text-align: right;padding-right: 1%; }
1524+ background-color: transparent; text-align: right; }
1525 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1526 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1527 </Style>
1528@@ -998,13 +1024,13 @@
1529 <NumberRate>
1530 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1531 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1532- background-color: transparent; text-align: right; padding-right: 1%; }
1533+ background-color: transparent; text-align: right; }
1534 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1535 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1536 </Style>
1537 <Channel>1</Channel>
1538- <Pos>158,111</Pos>
1539- <Size>47,13</Size>
1540+ <Pos>153,111</Pos>
1541+ <Size>45,13</Size>
1542 <NumberOfDigits>4</NumberOfDigits>
1543 <Connection>
1544 <ConfigKey>[Channel1],rate</ConfigKey>
1545@@ -1013,13 +1039,13 @@
1546 <NumberRate>
1547 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1548 <Style>QLabel { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1549- background-color: transparent; text-align: right; padding-right: 1%; }
1550+ background-color: transparent; text-align: right; }
1551 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1552 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1553 </Style>
1554 <Channel>2</Channel>
1555- <Pos>536,111</Pos>
1556- <Size>47,13</Size>
1557+ <Pos>531,111</Pos>
1558+ <Size>50,13</Size>
1559 <NumberOfDigits>4</NumberOfDigits>
1560 <Connection>
1561 <ConfigKey>[Channel2],rate</ConfigKey>
1562@@ -2070,6 +2096,55 @@
1563
1564 <!--
1565 **********************************************
1566+ Button- BPM Tap
1567+ **********************************************
1568+ -->
1569+
1570+ <PushButton>
1571+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1572+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1573+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1574+ </Style>
1575+ <NumberStates>1</NumberStates>
1576+ <State>
1577+ <Number>0</Number>
1578+ <Pressed>btn_tap1_over.png</Pressed>
1579+ <Unpressed>btn_tap1.png</Unpressed>
1580+ </State>
1581+ <Pos>80,125</Pos>
1582+ <Connection>
1583+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1584+ <EmitOnDownPress>true</EmitOnDownPress>
1585+ </Connection>
1586+ <Connection>
1587+ <ConfigKey>[Channel1],bpm_tap</ConfigKey>
1588+ <EmitOnDownPress>false</EmitOnDownPress>
1589+ </Connection>
1590+ </PushButton>
1591+ <PushButton>
1592+ <Tooltip>BPM Tap&#10;It takes the progressive average of the last 4 taps &#10;and sets the bpm of the deck to that value, &#10;assuming the pitch range is large enough to reach it.&#10;</Tooltip>
1593+ <Style>QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1594+ background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1595+ </Style>
1596+ <NumberStates>1</NumberStates>
1597+ <State>
1598+ <Number>0</Number>
1599+ <Pressed>btn_tap2_over.png</Pressed>
1600+ <Unpressed>btn_tap2.png</Unpressed>
1601+ </State>
1602+ <Pos>458,125</Pos>
1603+ <Connection>
1604+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1605+ <EmitOnDownPress>true</EmitOnDownPress>
1606+ </Connection>
1607+ <Connection>
1608+ <ConfigKey>[Channel2],bpm_tap</ConfigKey>
1609+ <EmitOnDownPress>false</EmitOnDownPress>
1610+ </Connection>
1611+ </PushButton>
1612+
1613+ <!--
1614+ **********************************************
1615 Button- Key lock
1616 **********************************************
1617 -->
1618@@ -2463,7 +2538,7 @@
1619 <Pressed>btn_repeat2_over.png</Pressed>
1620 <Unpressed>btn_repeat2_over.png</Unpressed>
1621 </State>
1622- <Pos>458,125</Pos>
1623+ <Pos>678,125</Pos>
1624 <Connection>
1625 <ConfigKey>[Channel2],repeat</ConfigKey>
1626 </Connection>
1627
1628=== added file 'mixxx/res/skins/Outline800x480-WVGA/style_branch_closed.png'
1629Binary files mixxx/res/skins/Outline800x480-WVGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1630=== added file 'mixxx/res/skins/Outline800x480-WVGA/style_branch_open.png'
1631Binary files mixxx/res/skins/Outline800x480-WVGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1632=== added file 'mixxx/res/skins/Outline800x480-WVGA/style_handle_checked.png'
1633Binary files mixxx/res/skins/Outline800x480-WVGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1634=== added file 'mixxx/res/skins/Outline800x480-WVGA/style_handle_unchecked.png'
1635Binary files mixxx/res/skins/Outline800x480-WVGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Outline800x480-WVGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1636=== modified file 'mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml'
1637--- mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml 2010-12-03 16:55:03 +0000
1638+++ mixxx/res/skins/Phoney1600x1200-UXGA/skin.xml 2011-01-07 12:24:27 +0000
1639@@ -20,6 +20,11 @@
1640
1641 <!--
1642 CHANGELOG
1643+ v1.08 (14/12/2010)
1644+ * Added custom images for splitter in library
1645+ * Added custom images for branch triangle in treeview
1646+ * Added visual feedback when searchbox has focus
1647+
1648 v1.07 (02/12/2010)
1649 * Added Mixxx 1.9 feature: BPM tap buttons
1650 * Added custom images for checkboxes in library
1651@@ -103,7 +108,7 @@
1652 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1653 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1654
1655- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1656+ QTableView, QTextBrowser, QTreeView { border: 1px solid #BBBBBB; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1657 background: #F7F7F7; alternate-background-color: #F7F7F7; color: #333333; }
1658 QTableView::indicator { width: 12px; height: 12px;}
1659 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1660@@ -111,8 +116,23 @@
1661
1662 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1663
1664+ WSearchLineEdit { padding: 2px; border: 1px solid #BBBBBB; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #F7F7F7; color: #333333; }
1665+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #F7F7F7; color: #333333; }
1666+
1667+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1668+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1669+ QSplitter::handle:horizontal { width: 6px; }
1670+ QSplitter::handle:vertical { height: 6px; }
1671+
1672 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1673- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #333333; }
1674+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1675+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1676+
1677+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1678+ QTreeView::branch:has-children:!has-siblings:closed,
1679+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1680+ QTreeView::branch:open:has-children:!has-siblings,
1681+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1682 </Style>
1683 <Pos>11,431</Pos>
1684 <Size>1562,658</Size>
1685
1686=== added file 'mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_closed.png'
1687Binary files mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1688=== added file 'mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_open.png'
1689Binary files mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1600x1200-UXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1690=== added file 'mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_checked.png'
1691Binary files mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1692=== added file 'mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_unchecked.png'
1693Binary files mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1600x1200-UXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1694=== modified file 'mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml'
1695--- mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml 2010-12-03 16:55:03 +0000
1696+++ mixxx/res/skins/Phoney1680x1050-WSXGA/skin.xml 2011-01-07 12:24:27 +0000
1697@@ -20,6 +20,11 @@
1698
1699 <!--
1700 CHANGELOG
1701+ v1.08 (14/12/2010)
1702+ * Added custom images for splitter in library
1703+ * Added custom images for branch triangle in treeview
1704+ * Added visual feedback when searchbox has focus
1705+
1706 v1.07 (02/12/2010)
1707 * Added Mixxx 1.9 feature: BPM tap buttons
1708 * Added custom images for checkboxes in library
1709@@ -103,7 +108,7 @@
1710 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1711 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1712
1713- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1714+ QTableView, QTextBrowser, QTreeView { border: 1px solid #BBBBBB; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1715 background: #F7F7F7; alternate-background-color: #F7F7F7; color: #333333; }
1716 QTableView::indicator { width: 12px; height: 12px;}
1717 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1718@@ -111,8 +116,23 @@
1719
1720 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1721
1722+ WSearchLineEdit { padding: 2px; border: 1px solid #BBBBBB; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #F7F7F7; color: #333333; }
1723+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #F7F7F7; color: #333333; }
1724+
1725+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1726+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1727+ QSplitter::handle:horizontal { width: 6px; }
1728+ QSplitter::handle:vertical { height: 6px; }
1729+
1730 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1731- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #333333; }
1732+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1733+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1734+
1735+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1736+ QTreeView::branch:has-children:!has-siblings:closed,
1737+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1738+ QTreeView::branch:open:has-children:!has-siblings,
1739+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1740 </Style>
1741 <Pos>11,431</Pos>
1742 <Size>1642,508</Size>
1743
1744=== added file 'mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_closed.png'
1745Binary files mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1746=== added file 'mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_open.png'
1747Binary files mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1680x1050-WSXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1748=== added file 'mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_checked.png'
1749Binary files mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1750=== added file 'mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_unchecked.png'
1751Binary files mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Phoney1680x1050-WSXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1752=== modified file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml'
1753--- mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml 2010-12-03 16:55:03 +0000
1754+++ mixxx/res/skins/PhoneyDark1600x1200-UXGA/skin.xml 2011-01-07 12:24:27 +0000
1755@@ -20,6 +20,11 @@
1756
1757 <!--
1758 CHANGELOG
1759+ v1.08 (14/12/2010)
1760+ * Added custom images for splitter in library
1761+ * Added custom images for branch triangle in treeview
1762+ * Added visual feedback when searchbox has focus
1763+
1764 v1.07 (02/12/2010)
1765 * Added Mixxx 1.9 feature: BPM tap buttons
1766 * Added custom images for checkboxes in library
1767@@ -103,7 +108,7 @@
1768 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1769 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1770
1771- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1772+ QTableView, QTextBrowser, QTreeView { border: 1px solid #525252; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1773 background: #333333; alternate-background-color: #333333; color: #F6F6F6; }
1774 QTableView::indicator { width: 12px; height: 12px;}
1775 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1776@@ -111,8 +116,23 @@
1777
1778 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1779
1780+ WSearchLineEdit { padding: 2px; border: 1px solid #525252; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #333333; color: #F6F6F6; }
1781+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #333333; color: #F6F6F6; }
1782+
1783+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1784+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1785+ QSplitter::handle:horizontal { width: 6px; }
1786+ QSplitter::handle:vertical { height: 6px; }
1787+
1788 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1789- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #F6F6F6; }
1790+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1791+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1792+
1793+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1794+ QTreeView::branch:has-children:!has-siblings:closed,
1795+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1796+ QTreeView::branch:open:has-children:!has-siblings,
1797+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1798 </Style>
1799 <Pos>10,430</Pos>
1800 <Size>1563,659</Size>
1801
1802=== added file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_closed.png'
1803Binary files mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1804=== added file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_open.png'
1805Binary files mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1806=== added file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_checked.png'
1807Binary files mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1808=== added file 'mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_unchecked.png'
1809Binary files mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1600x1200-UXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1810=== modified file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml'
1811--- mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml 2010-12-03 16:55:03 +0000
1812+++ mixxx/res/skins/PhoneyDark1680x1050-WSXGA/skin.xml 2011-01-07 12:24:27 +0000
1813@@ -20,6 +20,11 @@
1814
1815 <!--
1816 CHANGELOG
1817+ v1.08 (14/12/2010)
1818+ * Added custom images for splitter in library
1819+ * Added custom images for branch triangle in treeview
1820+ * Added visual feedback when searchbox has focus
1821+
1822 v1.07 (02/12/2010)
1823 * Added Mixxx 1.9 feature: BPM tap buttons
1824 * Added custom images for checkboxes in library
1825@@ -103,7 +108,7 @@
1826 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1827 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1828
1829- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1830+ QTableView, QTextBrowser, QTreeView { border: 1px solid #525252; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1831 background: #333333; alternate-background-color: #333333; color: #F6F6F6; }
1832 QTableView::indicator { width: 12px; height: 12px;}
1833 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1834@@ -111,8 +116,23 @@
1835
1836 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1837
1838+ WSearchLineEdit { padding: 2px; border: 1px solid #525252; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #333333; color: #F6F6F6; }
1839+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #333333; color: #F6F6F6; }
1840+
1841+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1842+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1843+ QSplitter::handle:horizontal { width: 6px; }
1844+ QSplitter::handle:vertical { height: 6px; }
1845+
1846 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1847- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #F6F6F6; }
1848+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1849+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1850+
1851+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1852+ QTreeView::branch:has-children:!has-siblings:closed,
1853+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1854+ QTreeView::branch:open:has-children:!has-siblings,
1855+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1856 </Style>
1857 <Pos>10,430</Pos>
1858 <Size>1643,509</Size>
1859
1860=== added file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_closed.png'
1861Binary files mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
1862=== added file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_open.png'
1863Binary files mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
1864=== added file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_checked.png'
1865Binary files mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
1866=== added file 'mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_unchecked.png'
1867Binary files mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
1868=== modified file 'mixxx/res/skins/Shade1024x600-Netbook/background1024x600.png'
1869Binary files mixxx/res/skins/Shade1024x600-Netbook/background1024x600.png 2010-11-21 20:35:10 +0000 and mixxx/res/skins/Shade1024x600-Netbook/background1024x600.png 2011-01-07 12:24:27 +0000 differ
1870=== modified file 'mixxx/res/skins/Shade1024x600-Netbook/skin.xml'
1871--- mixxx/res/skins/Shade1024x600-Netbook/skin.xml 2010-12-03 14:22:21 +0000
1872+++ mixxx/res/skins/Shade1024x600-Netbook/skin.xml 2011-01-07 12:24:27 +0000
1873@@ -20,6 +20,12 @@
1874
1875 <!--
1876 CHANGELOG
1877+ v1.08 (14/12/2010)
1878+ * Added custom images for splitter in library
1879+ * Added custom images for branch triangle in treeview
1880+ * Added visual feedback when searchbox has focus
1881+ * Small colour adjustments for library
1882+
1883 v1.07 (02/12/2010)
1884 * Added custom images for checkboxes in library
1885 * Updated styles
1886@@ -105,23 +111,38 @@
1887 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1888 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1889
1890- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1891- background: #191F24; alternate-background-color: #191F24; color: #E4E4E4; }
1892+ QTableView, QTextBrowser, QTreeView { border: 1px solid #636F87; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1893+ background: #191919; alternate-background-color: #191919; color: #E4E4E4; }
1894 QTableView::indicator { width: 12px; height: 12px;}
1895 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
1896 QTableView::indicator:unchecked { background: url(skin:/style_checkbox_unchecked.png);}
1897
1898 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1899
1900+ WSearchLineEdit { padding: 2px; border: 1px solid #636F87; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #191919; color: #E4E4E4; }
1901+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #191919; color: #E4E4E4; }
1902+
1903+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
1904+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
1905+ QSplitter::handle:horizontal { width: 6px; }
1906+ QSplitter::handle:vertical { height: 6px; }
1907+
1908 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
1909- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #E4E4E4; }
1910+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
1911+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
1912+
1913+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
1914+ QTreeView::branch:has-children:!has-siblings:closed,
1915+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
1916+ QTreeView::branch:open:has-children:!has-siblings,
1917+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
1918 </Style>
1919- <Pos>11,267</Pos>
1920- <Size>986,222</Size>
1921- <BgColor>#191F24</BgColor>
1922+ <Pos>10,265</Pos>
1923+ <Size>988,225</Size>
1924+ <BgColor>#191919</BgColor>
1925 <FgColor>#E4E4E4</FgColor>
1926- <BgColorRowEven>#191F24</BgColorRowEven>
1927- <BgColorRowUneven>#191F24</BgColorRowUneven>
1928+ <BgColorRowEven>#191919</BgColorRowEven>
1929+ <BgColorRowUneven>#191919</BgColorRowUneven>
1930 </TableView>
1931
1932 <!--
1933@@ -859,7 +880,7 @@
1934 <Text>
1935 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1936 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1937- background-color: transparent; color: #191F24; text-align: left; padding-left: 1%; }
1938+ background-color: transparent; color: #191919; text-align: left; padding-left: 1%; }
1939 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1940 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1941 </Style>
1942@@ -870,7 +891,7 @@
1943 <Text>
1944 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
1945 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1946- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
1947+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
1948 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1949 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1950 </Style>
1951@@ -887,7 +908,7 @@
1952 <NumberBpm>
1953 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1954 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1955- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
1956+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
1957 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1958 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1959 </Style>
1960@@ -902,7 +923,7 @@
1961 <NumberBpm>
1962 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
1963 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1964- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
1965+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
1966 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1967 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1968 </Style>
1969@@ -923,7 +944,7 @@
1970 <NumberPos>
1971 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1972 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1973- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
1974+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
1975 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1976 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1977 </Style>
1978@@ -938,7 +959,7 @@
1979 <NumberPos>
1980 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
1981 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1982- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
1983+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
1984 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1985 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1986 </Style>
1987@@ -959,7 +980,7 @@
1988 <NumberRate>
1989 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1990 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1991- background-color: transparent; color: #191F24; text-align: right; padding-right: 1%; }
1992+ background-color: transparent; color: #191919; text-align: right; padding-right: 1%; }
1993 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
1994 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
1995 </Style>
1996@@ -974,7 +995,7 @@
1997 <NumberRate>
1998 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
1999 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2000- background-color: transparent; color: #191F24; text-align: right; padding-right: 1%; }
2001+ background-color: transparent; color: #191919; text-align: right; padding-right: 1%; }
2002 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2003 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2004 </Style>
2005
2006=== added file 'mixxx/res/skins/Shade1024x600-Netbook/style_branch_closed.png'
2007Binary files mixxx/res/skins/Shade1024x600-Netbook/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x600-Netbook/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
2008=== added file 'mixxx/res/skins/Shade1024x600-Netbook/style_branch_open.png'
2009Binary files mixxx/res/skins/Shade1024x600-Netbook/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x600-Netbook/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
2010=== added file 'mixxx/res/skins/Shade1024x600-Netbook/style_handle_checked.png'
2011Binary files mixxx/res/skins/Shade1024x600-Netbook/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x600-Netbook/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
2012=== added file 'mixxx/res/skins/Shade1024x600-Netbook/style_handle_unchecked.png'
2013Binary files mixxx/res/skins/Shade1024x600-Netbook/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x600-Netbook/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
2014=== modified file 'mixxx/res/skins/Shade1024x768-XGA/background1024x768.png'
2015Binary files mixxx/res/skins/Shade1024x768-XGA/background1024x768.png 2010-11-21 20:35:10 +0000 and mixxx/res/skins/Shade1024x768-XGA/background1024x768.png 2011-01-07 12:24:27 +0000 differ
2016=== modified file 'mixxx/res/skins/Shade1024x768-XGA/skin.xml'
2017--- mixxx/res/skins/Shade1024x768-XGA/skin.xml 2010-12-03 14:22:21 +0000
2018+++ mixxx/res/skins/Shade1024x768-XGA/skin.xml 2011-01-07 12:24:27 +0000
2019@@ -20,6 +20,12 @@
2020
2021 <!--
2022 CHANGELOG
2023+ v1.08 (14/12/2010)
2024+ * Added custom images for splitter in library
2025+ * Added custom images for branch triangle in treeview
2026+ * Added visual feedback when searchbox has focus
2027+ * Small colour adjustments for library
2028+
2029 v1.07 (02/12/2010)
2030 * Added custom images for checkboxes in library
2031 * Updated styles
2032@@ -105,23 +111,38 @@
2033 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2034 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2035
2036- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2037- background: #191F24; alternate-background-color: #191F24; color: #E4E4E4; }
2038+ QTableView, QTextBrowser, QTreeView { border: 1px solid #636F87; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2039+ background: #191919; alternate-background-color: #191919; color: #E4E4E4; }
2040 QTableView::indicator { width: 12px; height: 12px;}
2041 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
2042 QTableView::indicator:unchecked { background: url(skin:/style_checkbox_unchecked.png);}
2043
2044 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2045
2046+ WSearchLineEdit { padding: 2px; border: 1px solid #636F87; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #191919; color: #E4E4E4; }
2047+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #191919; color: #E4E4E4; }
2048+
2049+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
2050+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
2051+ QSplitter::handle:horizontal { width: 6px; }
2052+ QSplitter::handle:vertical { height: 6px; }
2053+
2054 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2055- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #E4E4E4; }
2056+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
2057+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
2058+
2059+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
2060+ QTreeView::branch:has-children:!has-siblings:closed,
2061+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
2062+ QTreeView::branch:open:has-children:!has-siblings,
2063+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
2064 </Style>
2065- <Pos>11,267</Pos>
2066- <Size>986,390</Size>
2067- <BgColor>#191F24</BgColor>
2068+ <Pos>10,265</Pos>
2069+ <Size>988,393</Size>
2070+ <BgColor>#191919</BgColor>
2071 <FgColor>#E4E4E4</FgColor>
2072- <BgColorRowEven>#191F24</BgColorRowEven>
2073- <BgColorRowUneven>#191F24</BgColorRowUneven>
2074+ <BgColorRowEven>#191919</BgColorRowEven>
2075+ <BgColorRowUneven>#191919</BgColorRowUneven>
2076 </TableView>
2077
2078 <!--
2079@@ -859,7 +880,7 @@
2080 <Text>
2081 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
2082 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2083- background-color: transparent; color: #191F24; text-align: left; padding-left: 1%; }
2084+ background-color: transparent; color: #191919; text-align: left; padding-left: 1%; }
2085 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2086 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2087 </Style>
2088@@ -870,7 +891,7 @@
2089 <Text>
2090 <Tooltip>Track information&#10;Displays the Name and Title of the loaded track.&#10;Informations are extracted from the tracks tags.&#10;</Tooltip>
2091 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2092- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
2093+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
2094 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2095 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2096 </Style>
2097@@ -887,7 +908,7 @@
2098 <NumberBpm>
2099 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
2100 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2101- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
2102+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
2103 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2104 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2105 </Style>
2106@@ -902,7 +923,7 @@
2107 <NumberBpm>
2108 <Tooltip>Tempo information&#10;Displays the tempo of the loaded track in BPM (beats per minute)&#10;</Tooltip>
2109 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2110- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
2111+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
2112 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2113 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2114 </Style>
2115@@ -923,7 +944,7 @@
2116 <NumberPos>
2117 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
2118 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2119- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
2120+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
2121 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2122 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2123 </Style>
2124@@ -938,7 +959,7 @@
2125 <NumberPos>
2126 <Tooltip>Time information&#10;Displays the current playback position (or remaining time) and the duration of the loaded track.&#10;Depends on your settings in Preferences→Interface→Position display.&#10;</Tooltip>
2127 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2128- background-color: transparent; color: #191F24; text-align: left;padding-left: 1%; }
2129+ background-color: transparent; color: #191919; text-align: left;padding-left: 1%; }
2130 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2131 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2132 </Style>
2133@@ -959,7 +980,7 @@
2134 <NumberRate>
2135 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
2136 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2137- background-color: transparent; color: #191F24; text-align: right; padding-right: 1%; }
2138+ background-color: transparent; color: #191919; text-align: right; padding-right: 1%; }
2139 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2140 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2141 </Style>
2142@@ -974,7 +995,7 @@
2143 <NumberRate>
2144 <Tooltip>Pitch rate information&#10;Displays the current pitch of the track based on the original tempo.&#10;</Tooltip>
2145 <Style>QLabel { font: bold 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2146- background-color: transparent; color: #191F24; text-align: right; padding-right: 1%; }
2147+ background-color: transparent; color: #191919; text-align: right; padding-right: 1%; }
2148 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2149 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2150 </Style>
2151
2152=== added file 'mixxx/res/skins/Shade1024x768-XGA/style_branch_closed.png'
2153Binary files mixxx/res/skins/Shade1024x768-XGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x768-XGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
2154=== added file 'mixxx/res/skins/Shade1024x768-XGA/style_branch_open.png'
2155Binary files mixxx/res/skins/Shade1024x768-XGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x768-XGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
2156=== added file 'mixxx/res/skins/Shade1024x768-XGA/style_handle_checked.png'
2157Binary files mixxx/res/skins/Shade1024x768-XGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x768-XGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
2158=== added file 'mixxx/res/skins/Shade1024x768-XGA/style_handle_unchecked.png'
2159Binary files mixxx/res/skins/Shade1024x768-XGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/Shade1024x768-XGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
2160=== modified file 'mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml'
2161--- mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml 2010-12-03 14:22:21 +0000
2162+++ mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml 2011-01-07 12:24:27 +0000
2163@@ -20,6 +20,11 @@
2164
2165 <!--
2166 CHANGELOG
2167+ v1.08 (14/12/2010)
2168+ * Added custom images for splitter in library
2169+ * Added custom images for branch triangle in treeview
2170+ * Added visual feedback when searchbox has focus
2171+
2172 v1.07 (02/12/2010)
2173 * Added custom images for checkboxes in library
2174 * Updated styles
2175@@ -105,7 +110,7 @@
2176 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2177 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2178
2179- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2180+ QTableView, QTextBrowser, QTreeView { border: 1px solid #565D6B; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2181 background: #3F4249; alternate-background-color: #3F4249; color: #E4E4E4; }
2182 QTableView::indicator { width: 12px; height: 12px;}
2183 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
2184@@ -113,11 +118,26 @@
2185
2186 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2187
2188+ WSearchLineEdit { padding: 2px; border: 1px solid #565D6B; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #3F4249; color: #E4E4E4; }
2189+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #3F4249; color: #E4E4E4; }
2190+
2191+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
2192+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
2193+ QSplitter::handle:horizontal { width: 6px; }
2194+ QSplitter::handle:vertical { height: 6px; }
2195+
2196 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2197- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #E4E4E4; }
2198+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
2199+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
2200+
2201+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
2202+ QTreeView::branch:has-children:!has-siblings:closed,
2203+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
2204+ QTreeView::branch:open:has-children:!has-siblings,
2205+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
2206 </Style>
2207- <Pos>11,267</Pos>
2208- <Size>986,222</Size>
2209+ <Pos>10,265</Pos>
2210+ <Size>988,225</Size>
2211 <BgColor>#3F4249</BgColor>
2212 <FgColor>#E4E4E4</FgColor>
2213 <BgColorRowEven>#3F4249</BgColorRowEven>
2214
2215=== added file 'mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_closed.png'
2216Binary files mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
2217=== added file 'mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_open.png'
2218Binary files mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x600-Netbook/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
2219=== added file 'mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_checked.png'
2220Binary files mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
2221=== added file 'mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_unchecked.png'
2222Binary files mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x600-Netbook/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
2223=== modified file 'mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml'
2224--- mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml 2010-12-03 14:22:21 +0000
2225+++ mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml 2011-01-07 12:24:27 +0000
2226@@ -20,6 +20,11 @@
2227
2228 <!--
2229 CHANGELOG
2230+ v1.08 (14/12/2010)
2231+ * Added custom images for splitter in library
2232+ * Added custom images for branch triangle in treeview
2233+ * Added visual feedback when searchbox has focus
2234+
2235 v1.07 (02/12/2010)
2236 * Added custom images for checkboxes in library
2237 * Updated styles
2238@@ -105,7 +110,7 @@
2239 QToolTip { font: 11px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2240 background-color: #191919; color: #CCCCCC; border: 1px solid #CCCCCC; padding: 4px; }
2241
2242- QTableView, QTextBrowser, QTreeView , QLineEdit { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2243+ QTableView, QTextBrowser, QTreeView { border: 1px solid #565D6B; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
2244 background: #3F4249; alternate-background-color: #3F4249; color: #E4E4E4; }
2245 QTableView::indicator { width: 12px; height: 12px;}
2246 QTableView::indicator:checked { background: url(skin:/style_checkbox_checked.png);}
2247@@ -113,11 +118,26 @@
2248
2249 QHeaderView { font: 11px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2250
2251+ WSearchLineEdit { padding: 2px; border: 1px solid #565D6B; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #3F4249; color: #E4E4E4; }
2252+ WSearchLineEdit:focus {padding: 2px; border: 2px solid #FF6600; font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: #3F4249; color: #E4E4E4; }
2253+
2254+ QSplitter::handle { image: url(skin:/style_handle_unchecked.png); background: none; }
2255+ QSplitter::handle:pressed { image: url(skin:/style_handle_checked.png); background: none; }
2256+ QSplitter::handle:horizontal { width: 6px; }
2257+ QSplitter::handle:vertical { height: 6px; }
2258+
2259 QLabel, QPushButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; }
2260- QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; color: #E4E4E4; }
2261+ <!--Extra declaration for QRadionButton otherwise it shows up with wrong colors in Linux with Gnome -->
2262+ QRadioButton { font: 13px/15px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif; background: transparent; }
2263+
2264+ <!--Workaround for QT4.7.0 background color bug in Linux with Gnome https://bugs.launchpad.net/mixxx/+bug/690280-->
2265+ QTreeView::branch:has-children:!has-siblings:closed,
2266+ QTreeView::branch:closed:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_closed.png);}
2267+ QTreeView::branch:open:has-children:!has-siblings,
2268+ QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(skin:/style_branch_open.png);}
2269 </Style>
2270- <Pos>11,267</Pos>
2271- <Size>986,390</Size>
2272+ <Pos>10,265</Pos>
2273+ <Size>988,393</Size>
2274 <BgColor>#3F4249</BgColor>
2275 <FgColor>#E4E4E4</FgColor>
2276 <BgColorRowEven>#3F4249</BgColorRowEven>
2277
2278=== added file 'mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_closed.png'
2279Binary files mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_closed.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_closed.png 2011-01-07 12:24:27 +0000 differ
2280=== added file 'mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_open.png'
2281Binary files mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_open.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x768-XGA/style_branch_open.png 2011-01-07 12:24:27 +0000 differ
2282=== added file 'mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_checked.png'
2283Binary files mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_checked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_checked.png 2011-01-07 12:24:27 +0000 differ
2284=== added file 'mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_unchecked.png'
2285Binary files mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_unchecked.png 1970-01-01 00:00:00 +0000 and mixxx/res/skins/ShadeDark1024x768-XGA/style_handle_unchecked.png 2011-01-07 12:24:27 +0000 differ
2286=== modified file 'mixxx/src/skin/legacyskinparser.cpp'
2287--- mixxx/src/skin/legacyskinparser.cpp 2011-01-06 19:05:52 +0000
2288+++ mixxx/src/skin/legacyskinparser.cpp 2011-01-07 12:24:27 +0000
2289@@ -743,8 +743,9 @@
2290 // disappears when we do background-color. I suspect they use
2291 // background-image instead of border-image, against their own
2292 // documentation's recommendation.
2293-
2294- // styleHack.append(QString("QTreeView::branch:has-children { background-color: %1; }\n ").arg(color.name()));
2295+ // EDIT: Un-commented next line cause it works if we use custom images as triangle,
2296+ // see https://bugs.launchpad.net/mixxx/+bug/690280 --jus 12/2010
2297+ styleHack.append(QString("QTreeView::branch:has-children { background-color: %1; }\n ").arg(color.name()));
2298 } else {
2299 styleHack.append(QString("WLibraryTableView { background-color: %1; }\n ").arg(color.name()));
2300 styleHack.append(QString("WLibrarySidebar { background-color: %1; }\n ").arg(color.name()));

Subscribers

People subscribed via source and target branches