light-themes

Merge lp:~smspillaz/light-themes/light-themes.lim3 into lp:~ubuntu-art-pkg/light-themes/trunk

  1. light-themes.lim3
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Work in progress
Proposed branch: lp:~smspillaz/light-themes/light-themes.lim3
Merge into: lp:~ubuntu-art-pkg/light-themes/trunk
Diff against target: 105 lines (+45/-3)
1 file modified
Ambiance/metacity-1/metacity-theme-1.xml (+45/-3)
To merge this branch: bzr merge lp:~smspillaz/light-themes/light-themes.lim3
Reviewer Review Type Date Requested Status
Andrea Cimitan Pending
Review via email: mp+91252@code.launchpad.net

This proposal supersedes a proposal from 2012-02-02.

Description of the change

Added locally integrated menus support

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

Please merge trunk

review: Needs Fixing

Unmerged revisions

183. By Sam Spilsbury

Locally integrated menus assets

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
--- Ambiance/metacity-1/metacity-theme-1.xml 2011-08-24 09:12:05 +0000
+++ Ambiance/metacity-1/metacity-theme-1.xml 2012-02-02 12:21:18 +0000
@@ -234,6 +234,12 @@
234<draw_ops name="left_right_background_focused_pressed">234<draw_ops name="left_right_background_focused_pressed">
235 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>235 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
236</draw_ops>236</draw_ops>
237<draw_ops name="no_background_focused_normal">
238 <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
239</draw_ops>
240<draw_ops name="no_background_focused_pressed">
241 <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
242</draw_ops>
237<draw_ops name="left_left_background_unfocused_normal">243<draw_ops name="left_left_background_unfocused_normal">
238 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>244 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
239</draw_ops>245</draw_ops>
@@ -250,9 +256,15 @@
250 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>256 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
251</draw_ops>257</draw_ops>
252<draw_ops name="left_right_background_unfocused_pressed">258<draw_ops name="left_right_background_unfocused_pressed">
253 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>259 <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
254</draw_ops>260</draw_ops>
255 261<draw_ops name="no_background_unfocused_normal">
262 <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
263</draw_ops>
264<draw_ops name="no_background_unfocused_pressed">
265 <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
266</draw_ops>
267
256<!-- button trough right -->268<!-- button trough right -->
257<draw_ops name="right_left_background_focused_normal">269<draw_ops name="right_left_background_focused_normal">
258 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>270 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
@@ -322,6 +334,24 @@
322<draw_ops name="minimize_unfocused_pressed">334<draw_ops name="minimize_unfocused_pressed">
323 <image filename="minimize.png" x="0" y="1" width="object_width" height="object_height"/>335 <image filename="minimize.png" x="0" y="1" width="object_width" height="object_height"/>
324</draw_ops>336</draw_ops>
337<draw_ops name="window_menu_focused_normal">
338 <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
339</draw_ops>
340<draw_ops name="window_menu_focused_prelight">
341 <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
342</draw_ops>
343<draw_ops name="window_menu_focused_pressed">
344 <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
345</draw_ops>
346<draw_ops name="window_menu_unfocused_normal">
347 <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
348</draw_ops>
349<draw_ops name="window_menu_unfocused_prelight">
350 <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
351</draw_ops>
352<draw_ops name="window_menu_unfocused_pressed">
353 <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
354</draw_ops>
325<draw_ops name="maximize_focused_normal">355<draw_ops name="maximize_focused_normal">
326 <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>356 <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
327</draw_ops>357</draw_ops>
@@ -402,12 +432,18 @@
402 <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>432 <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
403 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>433 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
404 <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>434 <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
435 <button function="no_background" state="pressed" draw_ops="no_background_focused_pressed"/>
436 <button function="no_background" state="normal" draw_ops="no_background_focused_normal"/>
437 <button function="no_background" state="prelight" draw_ops="no_background_focused_normal"/>
405 <button function="menu" state="normal" draw_ops="menu_focused_normal"/>438 <button function="menu" state="normal" draw_ops="menu_focused_normal"/>
406 <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>439 <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>
407 <button function="menu" state="pressed" draw_ops="menu_focused_normal"/> 440 <button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
408 <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/>441 <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/>
409 <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/>442 <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/>
410 <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>443 <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>
444 <button function="window_menu" state="normal" draw_ops="window_menu_focused_normal"/>
445 <button function="window_menu" state="prelight" draw_ops="window_menu_focused_prelight"/>
446 <button function="window_menu" state="pressed" draw_ops="window_menu_focused_pressed"/>
411 <button function="maximize" state="normal" draw_ops="maximize_focused_normal"/>447 <button function="maximize" state="normal" draw_ops="maximize_focused_normal"/>
412 <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight"/>448 <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight"/>
413 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed"/>449 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed"/>
@@ -442,12 +478,18 @@
442 <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>478 <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
443 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>479 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
444 <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>480 <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
481 <button function="no_background" state="pressed" draw_ops="no_background_unfocused_pressed"/>
482 <button function="no_background" state="normal" draw_ops="no_background_unfocused_normal"/>
483 <button function="no_background" state="prelight" draw_ops="no_background_unfocused_normal"/>
445 <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>484 <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>
446 <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>485 <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>
447 <button function="menu" state="pressed" draw_ops="menu_unfocused_normal"/> 486 <button function="menu" state="pressed" draw_ops="menu_unfocused_normal"/>
448 <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/>487 <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/>
449 <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>488 <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
450 <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>489 <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
490 <button function="window_menu" state="normal" draw_ops="window_menu_unfocused_normal"/>
491 <button function="window_menu" state="prelight" draw_ops="window_menu_unfocused_prelight"/>
492 <button function="window_menu" state="pressed" draw_ops="window_menu_unfocused_pressed"/>
451 <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/>493 <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/>
452 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>494 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
453 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>495 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
454496
=== added file 'Ambiance/metacity-1/no_background.png'
455Binary files Ambiance/metacity-1/no_background.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/no_background.png 2012-02-02 12:21:18 +0000 differ497Binary files Ambiance/metacity-1/no_background.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/no_background.png 2012-02-02 12:21:18 +0000 differ
=== added file 'Ambiance/metacity-1/window_menu.png'
456Binary files Ambiance/metacity-1/window_menu.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/window_menu.png 2012-02-02 12:21:18 +0000 differ498Binary files Ambiance/metacity-1/window_menu.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/window_menu.png 2012-02-02 12:21:18 +0000 differ
=== added file 'Ambiance/metacity-1/window_menu_unfocused.png'
457Binary files Ambiance/metacity-1/window_menu_unfocused.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/window_menu_unfocused.png 2012-02-02 12:21:18 +0000 differ499Binary files Ambiance/metacity-1/window_menu_unfocused.png 1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/window_menu_unfocused.png 2012-02-02 12:21:18 +0000 differ