Revert to using circular button states + new metacity themes

5 files changed, 33 insertions, 96 deletions

diff --git a/Shiki-Colors-Classic-EZ/metacity-1/metacity-theme-1.xml b/Shiki-Colors-Classic-EZ/metacity-1/metacity-theme-1.xml
index d50586d..97bbc50 100644
--- a/Shiki-Colors-Classic-EZ/metacity-1/metacity-theme-1.xml
+++ b/Shiki-Colors-Classic-EZ/metacity-1/metacity-theme-1.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Shiki-Colors Easy Metacity</name>
-	<author>Victor C. &lt;perfectska04@gmail.com&gt;</author>
-	<copyright>&#194; 2009 perfectska04</copyright>
-	<date>Apr, 2009</date>
-	<description>Unity-based Metacity Theme for Shiki-Colors</description>
+	<name>Shiki-Colors-Classic Easy</name>
+	<author>Kylie McClain &lt;somasis@exherbo.org&gt;, Victor C. &lt;perfectska04@gmail.com&gt;</author>
+	<copyright>&#194; 2015 Kylie McClain, &#194; 2009 perfectska04</copyright>
+	<date>Jun, 2015</date>
+	<description>Unity-based Metacity Theme for Shiki-Colors-Classic</description>
 </info>
 
 <!-- ::: GEOMETRY ::: -->
-<frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
+<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
 	<distance name="left_width" value="3"/>
 	<distance name="right_width" value="3"/>
 	<distance name="bottom_height" value="3"/>
@@ -22,7 +22,7 @@
 	<border name="button_border" left="1" right="1" top="3" bottom="2"/>
 </frame_geometry>
 
-<frame_geometry name="shaded" parent="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true"/>
+<frame_geometry name="shaded" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"/>
 
 <frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
 	<!-- strip frame spacing off the normal geometry when maximised -->
@@ -66,34 +66,34 @@
 <!-- ::: CORNERS ::: -->
 <draw_ops name="corners_outline_selected_top">
 	<!-- top left -->
-	<line color="#3C3C3C" x1="1" y1="3" x2="1" y2="3"/>
-	<line color="#3C3C3C" x1="1" y1="4" x2="1" y2="4"/>
-	<line color="#3C3C3C" x1="2" y1="2" x2="2" y2="2"/>
-	<line color="#3C3C3C" x1="3" y1="1" x2="3" y2="1"/>
-	<line color="#3C3C3C" x1="4" y1="1" x2="4" y2="1"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
 
 	<!-- top right -->
-	<line color="#3C3C3C" x1="width-2" y1="3" x2="width-2" y2="3"/>
-	<line color="#3C3C3C" x1="width-2" y1="4" x2="width-2" y2="4"/>
-	<line color="#3C3C3C" x1="width-3" y1="2" x2="width-3" y2="2"/>
-	<line color="#3C3C3C" x1="width-4" y1="1" x2="width-4" y2="1"/>
-	<line color="#3C3C3C" x1="width-5" y1="1" x2="width-5" y2="1"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
 </draw_ops>
 
 <draw_ops name="corners_outline_top">
 	<!-- top left -->
-	<line color="#3C3C3C" x1="1" y1="3" x2="1" y2="3"/>
-	<line color="#3C3C3C" x1="1" y1="4" x2="1" y2="4"/>
-	<line color="#3C3C3C" x1="2" y1="2" x2="2" y2="2"/>
-	<line color="#3C3C3C" x1="3" y1="1" x2="3" y2="1"/>
-	<line color="#3C3C3C" x1="4" y1="1" x2="4" y2="1"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#3C3C3C" x1="0" y1="0" x2="0" y2="0"/>
 
 	<!-- top right -->
-	<line color="#3C3C3C" x1="width-2" y1="3" x2="width-2" y2="3"/>
-	<line color="#3C3C3C" x1="width-2" y1="4" x2="width-2" y2="4"/>
-	<line color="#3C3C3C" x1="width-3" y1="2" x2="width-3" y2="2"/>
-	<line color="#3C3C3C" x1="width-4" y1="1" x2="width-4" y2="1"/>
-	<line color="#3C3C3C" x1="width-5" y1="1" x2="width-5" y2="1"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#3C3C3C" x1="width" y1="0" x2="width" y2="0"/>
 </draw_ops>
 
 <draw_ops name="corners_outline_selected_bottom">
@@ -121,75 +121,19 @@
 </draw_ops>
 
 <draw_ops name="corners_highlight">
-	<!-- ** corner highlight for left top ** -->
-	<line color="#5C5C5C" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="#666666" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="#5C5C5C" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="#666666" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<!--<line color="shade/gtk:bg[NORMAL]/1.14" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/gtk:bg[NORMAL]/0.9" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
-
-	<!-- ** corner highlight for right bottom ** -->
-	<!--<line color="shade/gtk:bg[NORMAL]/0.9" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/gtk:bg[NORMAL]/0.9" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
+	
 </draw_ops>
 
 <draw_ops name="corners_highlight_unfocused">
-	<!-- ** corner highlight for left top ** -->
-	<line color="#575757" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="#616161" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="#575757" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="#616161" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<!--<line color="shade/gtk:bg[NORMAL]/1.14" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="shade/gtk:bg[NORMAL]/0.9" x1="3" y1="height-3" x2="4" y2="height-3"/>-->
-
-	<!-- ** corner highlight for right bottom ** -->
-	<!--<line color="shade/gtk:bg[NORMAL]/0.9" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="shade/gtk:bg[NORMAL]/0.9" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>-->
+	
 </draw_ops>
 
 <draw_ops name="corners_highlight_shaded">
-	<!-- ** corner highlight for left top ** -->
-	<line color="#5C5C5C" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="#666666" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="#5C5C5C" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="#666666" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<line color="#3C3C3C" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="#3C3C3C" x1="3" y1="height-3" x2="4" y2="height-3"/>
-
-	<!-- ** corner highlight for right bottom ** -->
-	<line color="#3C3C3C" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="#3C3C3C" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
+	
 </draw_ops>
 
 <draw_ops name="corners_highlight_shaded_unfocused">
-	<!-- ** corner highlight for left top ** -->
-	<line color="#575757" x1="2" y1="3" x2="2" y2="4"/>
-	<line color="#616161" x1="3" y1="2" x2="4" y2="2"/>
-
-	<!-- ** corner highlight for right top ** -->
-	<line color="#575757" x1="width-3" y1="3" x2="width-3" y2="4"/>
-	<line color="#616161" x1="width-5" y1="2" x2="width-4" y2="2"/>
-
-	<!-- ** corner highlight for left bottom ** -->
-	<line color="#3C3C3C" x1="2" y1="height-4" x2="2" y2="height-5"/>
-	<line color="#3C3C3C" x1="3" y1="height-3" x2="4" y2="height-3"/>
-
-	<!-- ** corner highlight for right bottom ** -->
-	<line color="#3C3C3C" x1="width-3" y1="height-4" x2="width-3" y2="height-5"/>
-	<line color="#3C3C3C" x1="width-4" y1="height-3" x2="width-5" y2="height-3"/>
+	
 </draw_ops>
 
 <draw_ops name="window_bg">
diff --git a/Shiki-Colors-Classic-EZ/metacity-1/prelight.png b/Shiki-Colors-Classic-EZ/metacity-1/prelight.png
index 38a0bd0..f5209c0 100644
--- a/Shiki-Colors-Classic-EZ/metacity-1/prelight.png
+++ b/Shiki-Colors-Classic-EZ/metacity-1/prelight.png
diff --git a/Shiki-Colors-Classic-EZ/metacity-1/prelight_unfocused.png b/Shiki-Colors-Classic-EZ/metacity-1/prelight_unfocused.png
index 48fc47c..9f4f6bb 100644
--- a/Shiki-Colors-Classic-EZ/metacity-1/prelight_unfocused.png
+++ b/Shiki-Colors-Classic-EZ/metacity-1/prelight_unfocused.png
diff --git a/Shiki-Colors-Classic-EZ/metacity-1/pressed.png b/Shiki-Colors-Classic-EZ/metacity-1/pressed.png
index 1c985d5..fcb0665 100644
--- a/Shiki-Colors-Classic-EZ/metacity-1/pressed.png
+++ b/Shiki-Colors-Classic-EZ/metacity-1/pressed.png
diff --git a/Shiki-Colors-Classic-EZ/xfwm4/themerc b/Shiki-Colors-Classic-EZ/xfwm4/themerc
index b33643f..398859f 100644
--- a/Shiki-Colors-Classic-EZ/xfwm4/themerc
+++ b/Shiki-Colors-Classic-EZ/xfwm4/themerc
@@ -5,10 +5,8 @@ title_horizontal_offset=0
 title_vertical_offset_active=1
 title_vertical_offset_inactive=1
 title_shadow_active=false
-title_alignment=center
-button_layout=O|HMC
-active_text_color=#E6E6E6
-inactive_text_color=#9B9B9B
+active_text_color=#e6e6e6
+inactive_text_color=#9b9b9b
 
 show_app_icon=true
 
@@ -17,8 +15,3 @@ shadow_delta_width=0
 shadow_delta_x=0
 shadow_delta_y=0
 
-resize_opacity=100
-move_opacity=80
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=true