Merge lp:~unity-team/light-themes/light-themes.dialog_v4 into lp:~ubuntu-art-pkg/light-themes/trunk

[Sam Spilsbury]

Add dialog style

[Andrea Cimitan (cimi)]

good work, just remove the whitespace in draw_title_text_normal_dialog for both themes. thanks!

review: Approve

[Paul Sladen (sladen)]

Please that this be tied back to the original bug # or design-change request before it's applied so that the rationale is clear.

[Paul Sladen (sladen)]

Bug #767253 ("Finish the implementation of sheet style dialogues"), per mockup 'sheet_style_dialogue.png' (see bug report for attachment).

=== added file 'Ambiance/metacity-1/close_dialog.png'
Binary files Ambiance/metacity-1/close_dialog.png	1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Ambiance/metacity-1/close_focused_normal_dialog.png'
Binary files Ambiance/metacity-1/close_focused_normal_dialog.png	1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_normal_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Ambiance/metacity-1/close_focused_prelight_dialog.png'
Binary files Ambiance/metacity-1/close_focused_prelight_dialog.png	1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_prelight_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Ambiance/metacity-1/close_focused_pressed_dialog.png'
Binary files Ambiance/metacity-1/close_focused_pressed_dialog.png	1970-01-01 00:00:00 +0000 and Ambiance/metacity-1/close_focused_pressed_dialog.png	2011-06-27 10:52:53 +0000 differ
=== modified file 'Ambiance/metacity-1/metacity-theme-1.xml'
--- Ambiance/metacity-1/metacity-theme-1.xml	2011-04-11 15:40:01 +0000
+++ Ambiance/metacity-1/metacity-theme-1.xml	2011-06-27 10:52:53 +0000
@@ -5,7 +5,7 @@
   	<name>Ambiance</name>
   	<author>Kenneth Wimer, James Schriver, Andrea Cimitan</author>
   	<copyright>Canonical Ltd.</copyright>
-  	<date>April, 2011</date>
+  	<date>June, 2011</date>
   	<description>Metacity theme</description>
 </info>
 
@@ -23,6 +23,19 @@
 	<border name="button_border" left="0" right="0" top="1" bottom="1"/>
 </frame_geometry>
 
+<frame_geometry name="frame_geometry_dialog" title_scale="xx-large" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="true" rounded_bottom_right="true">
+ 	<distance name="left_width" value="22"/>
+	<distance name="right_width" value="22"/>
+	<distance name="bottom_height" value="22"/>
+	<distance name="left_titlebar_edge" value="3"/>
+	<distance name="right_titlebar_edge" value="3"/>
+	<distance name="button_width" value="18"/>
+	<distance name="button_height" value="20"/>
+	<distance name="title_vertical_pad" value="0"/>
+	<border name="title_border" left="0" right="0" top="29" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="31"/>
+</frame_geometry>
+
 <frame_geometry name="frame_geometry_abnormal" title_scale="medium" rounded_top_left="false" rounded_top_right="false">
   	<distance name="left_width" value="0"/>
   	<distance name="right_width" value="0"/>
@@ -195,6 +208,41 @@
 	<include name="draw_title_maximized_unfocused" />
 </draw_ops>
 
+<draw_ops name="draw_title_text_normal_dialog">
+  <title color="#4a4a4a"
+         x="10"
+         y="(((height - title_height) / 2) `max` 0)"/>
+
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive_dialog">
+  <title color="#4a4a4a"
+         x="10"
+         y="(((height - title_height) / 2) `max` 0)"/>
+</draw_ops>
+
+<draw_ops name="draw_title_dialog">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width" height="top_height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+	<color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
+<draw_ops name="draw_title_unfocused_dialog">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+	<color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
+<draw_ops name="draw_title_inactive_dialog">
+	<include name="draw_title_unfocused" />
+</draw_ops>
+
 <!-- Window Frames -->
 
 <draw_ops name="draw_frame">
@@ -205,6 +253,13 @@
     </gradient>
 </draw_ops>
 
+<draw_ops name="draw_frame_dialog">
+    <gradient type="vertical" x="0" y="0" width="width" height="height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
 <!-- bottom border -->
 <draw_ops name="bottom_edge">
 	<line color="shade/#3c3b37/0.7" x1="0" x2="width" y1="height-1" y2="height-1"/>
@@ -385,6 +440,24 @@
 	<draw_ops name="close_unfocused_pressed">
 		<image filename="close.png" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
+	<draw_ops name="close_focused_normal_dialog">
+		<image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_focused_prelight_dialog">
+		<image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_focused_pressed_dialog">
+		<image filename="close_focused_pressed_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_normal_dialog">
+		<image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_prelight_dialog">
+		<image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_pressed_dialog">
+		<image filename="close_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
 
 <!-- FRAME STYLE -->
 <frame_style name="normal_focused" geometry="frame_geometry_normal">
@@ -464,7 +537,32 @@
 	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
 	<shadow radius="8.0" opacity="0.5" color="#abde4f" x_offset="1" y_offset="4"/>
-	<padding left="7" right="7" bottom="7"/>
+	<padding left="5" right="5" bottom="5"/>
+</frame_style>
+
+<frame_style name="dialog_focused" geometry="frame_geometry_dialog" parent="normal_focused">
+	<piece position="title" draw_ops="draw_title_text_normal_dialog"/>
+   	<piece position="titlebar" draw_ops="draw_title_dialog"/>
+   	<piece position="left_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="right_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="bottom_edge" draw_ops="draw_frame_dialog"/>
+	<button function="close" state="normal" draw_ops="close_focused_normal_dialog"/>
+	<button function="close" state="prelight" draw_ops="close_focused_prelight_dialog"/>
+	<button function="close" state="pressed" draw_ops="close_focused_pressed_dialog"/>
+	<shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="0" right="0" bottom="0"/>
+</frame_style>
+
+<frame_style name="dialog_unfocused" geometry="frame_geometry_dialog" parent="normal_focused">
+	<piece position="title" draw_ops="draw_title_text_normal_dialog"/>
+   	<piece position="titlebar" draw_ops="draw_title_dialog"/>
+   	<piece position="left_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="right_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="bottom_edge" draw_ops="draw_frame_dialog"/>
+	<button function="close" state="normal" draw_ops="close_unfocused_normal_dialog"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight_dialog"/>
+	<shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="0" right="0" bottom="0"/>
 </frame_style>
 
 <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused">
@@ -473,8 +571,8 @@
 	<button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/>
-	<shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
-	<padding left="2" right="2" bottom="2"/>
+	<shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+	<padding left="0" right="0" bottom="0"/>
 </frame_style>
 
 <frame_style name="maximized_unfocused" geometry="geometry_maximized" parent="normal_unfocused">
@@ -483,8 +581,8 @@
 	<button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
-	<!--shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/-->
-	<!--padding left="2" right="2" bottom="2"/-->
+	<shadow radius="0.0" opacity="0.0" color="#000000" x_offset="0" y_offset="0"/>
+	<padding left="0" right="0" bottom="0"/>
 </frame_style>
 
 <frame_style name="utility_focused" parent="normal_focused">
@@ -496,8 +594,8 @@
 	<button function="close" state="normal" draw_ops="close_focused_normal"/>
 	<button function="close" state="prelight" draw_ops="close_focused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_focused_pressed"/>
-	<shadow radius="8.0" opacity="0.3" color="#abde4f" x_offset="1" y_offset="1"/>
-	<padding left="2" right="2" bottom="2"/>
+	<shadow radius="60.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="7" right="7" bottom="7"/>
 </frame_style>
 
 <frame_style name="utility_unfocused" parent="normal_unfocused">
@@ -530,6 +628,17 @@
 	<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo -->
 </frame_style_set>
 
+<frame_style_set name="dialog">
+	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="maximized_focused"/>
+	<frame focus="no" state="maximized" style="normal_focused"/>
+	<frame focus="yes" state="shaded" style="dialog_focused"/><!-- todo -->
+	<frame focus="no" state="shaded" style="dialog_unfocused"/><!-- todo -->
+	<frame focus="yes" state="maximized_and_shaded" style="dialog_focused"/><!-- todo -->
+	<frame focus="no" state="maximized_and_shaded" style="dialog_unfocused"/><!-- todo -->
+</frame_style_set>
+
 <frame_style_set name="utility">
 	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
 	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
@@ -554,8 +663,8 @@
 
 <!-- WINDOW -->
 <window type="normal" style_set="normal"/>
-<window type="dialog" style_set="utility"/>
-<window type="modal_dialog" style_set="utility"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="dialog"/>
 <window type="menu" style_set="utility"/>
 <window type="utility" style_set="utility"/>
 <window type="border" style_set="border"/>

=== added file 'Radiance/metacity-1/close_dialog.png'
Binary files Radiance/metacity-1/close_dialog.png	1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Radiance/metacity-1/close_focused_normal_dialog.png'
Binary files Radiance/metacity-1/close_focused_normal_dialog.png	1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_normal_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Radiance/metacity-1/close_focused_prelight_dialog.png'
Binary files Radiance/metacity-1/close_focused_prelight_dialog.png	1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_prelight_dialog.png	2011-06-27 10:52:53 +0000 differ
=== added file 'Radiance/metacity-1/close_focused_pressed_dialog.png'
Binary files Radiance/metacity-1/close_focused_pressed_dialog.png	1970-01-01 00:00:00 +0000 and Radiance/metacity-1/close_focused_pressed_dialog.png	2011-06-27 10:52:53 +0000 differ
=== modified file 'Radiance/metacity-1/metacity-theme-1.xml'
--- Radiance/metacity-1/metacity-theme-1.xml	2011-04-11 15:40:01 +0000
+++ Radiance/metacity-1/metacity-theme-1.xml	2011-06-27 10:52:53 +0000
@@ -5,7 +5,7 @@
   	<name>Radiance</name>
   	<author>Kenneth Wimer, James Schriver, Andrea Cimitan</author>
   	<copyright>Canonical Ltd.</copyright>
-  	<date>March, 2011</date>
+  	<date>June, 2011</date>
   	<description>Metacity theme</description>
 </info>
 
@@ -36,6 +36,19 @@
 	<border name="button_border" left="0" right="0" top="1" bottom="1"/>
 </frame_geometry>
 
+<frame_geometry name="frame_geometry_dialog" title_scale="xx-large" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="true" rounded_bottom_right="true">
+ 	<distance name="left_width" value="22"/>
+	<distance name="right_width" value="22"/>
+	<distance name="bottom_height" value="22"/>
+	<distance name="left_titlebar_edge" value="3"/>
+	<distance name="right_titlebar_edge" value="3"/>
+	<distance name="button_width" value="18"/>
+	<distance name="button_height" value="20"/>
+	<distance name="title_vertical_pad" value="0"/>
+	<border name="title_border" left="0" right="0" top="29" bottom="0"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="31"/>
+</frame_geometry>
+
 <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
 	<distance name="left_width" value="0"/>
 	<distance name="right_width" value="0"/>
@@ -163,6 +176,41 @@
 	<include name="draw_title_unfocused" />
 </draw_ops>
 
+<draw_ops name="draw_title_text_normal_dialog">
+  <title color="#4a4a4a"
+         x="10"
+         y="(((height - title_height) / 2) `max` 0)"/>
+
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive_dialog">
+  <title color="#4a4a4a"
+         x="10"
+         y="(((height - title_height) / 2) `max` 0)"/>
+</draw_ops>
+
+<draw_ops name="draw_title_dialog">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width" height="top_height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+	<color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
+<draw_ops name="draw_title_unfocused_dialog">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+	<color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
+<draw_ops name="draw_title_inactive_dialog">
+	<include name="draw_title_unfocused" />
+</draw_ops>
+
 <draw_ops name="draw_title_maximized">
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="1" width="width" height="top_height-1">
@@ -207,6 +255,13 @@
     </gradient>
 </draw_ops>
 
+<draw_ops name="draw_frame_dialog">
+    <gradient type="vertical" x="0" y="0" width="width" height="height">
+        <color value="#f2f1f0" />
+        <color value="#f2f1f0" />
+    </gradient>
+</draw_ops>
+
 <!-- bottom border -->
 <draw_ops name="bottom_edge">
 	<line color="shade/gtk:bg[NORMAL]/0.9" x1="0" x2="width" y1="height-1" y2="height-1"/>
@@ -387,6 +442,24 @@
 	<draw_ops name="close_unfocused_pressed">
 		<image filename="close.png" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
+	<draw_ops name="close_focused_normal_dialog">
+		<image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_focused_prelight_dialog">
+		<image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_focused_pressed_dialog">
+		<image filename="close_focused_pressed_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_normal_dialog">
+		<image filename="close_focused_normal_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_prelight_dialog">
+		<image filename="close_focused_prelight_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
+	<draw_ops name="close_unfocused_pressed_dialog">
+		<image filename="close_dialog.png" x="0" y="1" width="object_width" height="object_height"/>
+	</draw_ops>
 
 <!-- FRAME STYLE -->
 <frame_style name="normal_focused" geometry="frame_geometry_normal">
@@ -469,6 +542,31 @@
 	<padding left="7" right="7" bottom="7"/>
 </frame_style>
 
+<frame_style name="dialog_focused" geometry="frame_geometry_dialog" parent="normal_focused">
+	<piece position="title" draw_ops="draw_title_text_normal_dialog"/>
+   	<piece position="titlebar" draw_ops="draw_title_dialog"/>
+   	<piece position="left_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="right_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="bottom_edge" draw_ops="draw_frame_dialog"/>
+	<button function="close" state="normal" draw_ops="close_focused_normal_dialog"/>
+	<button function="close" state="prelight" draw_ops="close_focused_prelight_dialog"/>
+	<button function="close" state="pressed" draw_ops="close_focused_pressed_dialog"/>
+	<shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="0" right="0" bottom="0"/>
+</frame_style>
+
+<frame_style name="dialog_unfocused" geometry="frame_geometry_dialog" parent="normal_focused">
+	<piece position="title" draw_ops="draw_title_text_normal_dialog"/>
+   	<piece position="titlebar" draw_ops="draw_title_dialog"/>
+   	<piece position="left_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="right_edge" draw_ops="draw_frame_dialog"/>
+   	<piece position="bottom_edge" draw_ops="draw_frame_dialog"/>
+	<button function="close" state="normal" draw_ops="close_unfocused_normal_dialog"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight_dialog"/>
+	<shadow radius="8.0" opacity="1.3" color="#abde4f" x_offset="1" y_offset="4"/>
+	<padding left="0" right="0" bottom="0"/>
+</frame_style>
+
 <frame_style name="maximized_focused" geometry="geometry_maximized" parent="normal_focused">
 	<piece position="title" draw_ops="draw_title_text_normal"/>
    	<piece position="titlebar" draw_ops="draw_title_maximized"/>
@@ -532,6 +630,17 @@
 	<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/><!-- todo -->
 </frame_style_set>
 
+<frame_style_set name="dialog">
+	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="maximized_focused"/>
+	<frame focus="no" state="maximized" style="normal_focused"/>
+	<frame focus="yes" state="shaded" style="dialog_focused"/><!-- todo -->
+	<frame focus="no" state="shaded" style="dialog_unfocused"/><!-- todo -->
+	<frame focus="yes" state="maximized_and_shaded" style="dialog_focused"/><!-- todo -->
+	<frame focus="no" state="maximized_and_shaded" style="dialog_unfocused"/><!-- todo -->
+</frame_style_set>
+
 <frame_style_set name="utility">
 	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
 	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
@@ -556,8 +665,8 @@
 
 <!-- WINDOW -->
 <window type="normal" style_set="normal"/>
-<window type="dialog" style_set="utility"/>
-<window type="modal_dialog" style_set="utility"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="dialog"/>
 <window type="menu" style_set="utility"/>
 <window type="utility" style_set="utility"/>
 <window type="border" style_set="border"/>