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

Proposed by Sam Spilsbury on 2012-02-02
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 2012-02-02 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.
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

Please merge trunk

review: Needs Fixing

Unmerged revisions

183. By Sam Spilsbury on 2012-02-02

Locally integrated menus assets

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
2--- Ambiance/metacity-1/metacity-theme-1.xml 2011-08-24 09:12:05 +0000
3+++ Ambiance/metacity-1/metacity-theme-1.xml 2012-02-02 12:21:18 +0000
4@@ -234,6 +234,12 @@
5 <draw_ops name="left_right_background_focused_pressed">
6 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
7 </draw_ops>
8+<draw_ops name="no_background_focused_normal">
9+ <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
10+</draw_ops>
11+<draw_ops name="no_background_focused_pressed">
12+ <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
13+</draw_ops>
14 <draw_ops name="left_left_background_unfocused_normal">
15 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
16 </draw_ops>
17@@ -250,9 +256,15 @@
18 <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
19 </draw_ops>
20 <draw_ops name="left_right_background_unfocused_pressed">
21- <image filename="trough_right.png" x="0" y="1" width="object_width" height="object_height"/>
22-</draw_ops>
23-
24+ <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
25+</draw_ops>
26+<draw_ops name="no_background_unfocused_normal">
27+ <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
28+</draw_ops>
29+<draw_ops name="no_background_unfocused_pressed">
30+ <image filename="no_background.png" x="0" y="1" width="object_width" height="object_height"/>
31+</draw_ops>
32+
33 <!-- button trough right -->
34 <draw_ops name="right_left_background_focused_normal">
35 <image filename="trough_left.png" x="0" y="1" width="object_width" height="object_height"/>
36@@ -322,6 +334,24 @@
37 <draw_ops name="minimize_unfocused_pressed">
38 <image filename="minimize.png" x="0" y="1" width="object_width" height="object_height"/>
39 </draw_ops>
40+<draw_ops name="window_menu_focused_normal">
41+ <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
42+</draw_ops>
43+<draw_ops name="window_menu_focused_prelight">
44+ <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
45+</draw_ops>
46+<draw_ops name="window_menu_focused_pressed">
47+ <image filename="window_menu.png" x="0" y="1" width="object_width" height="object_height"/>
48+</draw_ops>
49+<draw_ops name="window_menu_unfocused_normal">
50+ <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
51+</draw_ops>
52+<draw_ops name="window_menu_unfocused_prelight">
53+ <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
54+</draw_ops>
55+<draw_ops name="window_menu_unfocused_pressed">
56+ <image filename="window_menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
57+</draw_ops>
58 <draw_ops name="maximize_focused_normal">
59 <image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
60 </draw_ops>
61@@ -402,12 +432,18 @@
62 <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
63 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
64 <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
65+ <button function="no_background" state="pressed" draw_ops="no_background_focused_pressed"/>
66+ <button function="no_background" state="normal" draw_ops="no_background_focused_normal"/>
67+ <button function="no_background" state="prelight" draw_ops="no_background_focused_normal"/>
68 <button function="menu" state="normal" draw_ops="menu_focused_normal"/>
69 <button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>
70 <button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
71 <button function="minimize" state="normal" draw_ops="minimize_focused_normal"/>
72 <button function="minimize" state="prelight" draw_ops="minimize_focused_prelight"/>
73 <button function="minimize" state="pressed" draw_ops="minimize_focused_pressed"/>
74+ <button function="window_menu" state="normal" draw_ops="window_menu_focused_normal"/>
75+ <button function="window_menu" state="prelight" draw_ops="window_menu_focused_prelight"/>
76+ <button function="window_menu" state="pressed" draw_ops="window_menu_focused_pressed"/>
77 <button function="maximize" state="normal" draw_ops="maximize_focused_normal"/>
78 <button function="maximize" state="prelight" draw_ops="maximize_focused_prelight"/>
79 <button function="maximize" state="pressed" draw_ops="maximize_focused_pressed"/>
80@@ -442,12 +478,18 @@
81 <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
82 <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
83 <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
84+ <button function="no_background" state="pressed" draw_ops="no_background_unfocused_pressed"/>
85+ <button function="no_background" state="normal" draw_ops="no_background_unfocused_normal"/>
86+ <button function="no_background" state="prelight" draw_ops="no_background_unfocused_normal"/>
87 <button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>
88 <button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>
89 <button function="menu" state="pressed" draw_ops="menu_unfocused_normal"/>
90 <button function="minimize" state="normal" draw_ops="minimize_unfocused_normal"/>
91 <button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
92 <button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
93+ <button function="window_menu" state="normal" draw_ops="window_menu_unfocused_normal"/>
94+ <button function="window_menu" state="prelight" draw_ops="window_menu_unfocused_prelight"/>
95+ <button function="window_menu" state="pressed" draw_ops="window_menu_unfocused_pressed"/>
96 <button function="maximize" state="normal" draw_ops="maximize_unfocused_normal"/>
97 <button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
98 <button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
99
100=== added file 'Ambiance/metacity-1/no_background.png'
101Binary 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
102=== added file 'Ambiance/metacity-1/window_menu.png'
103Binary 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
104=== added file 'Ambiance/metacity-1/window_menu_unfocused.png'
105Binary 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

Subscribers

People subscribed via source and target branches