bringing mate panel to a working level

2 files changed, 171 insertions, 102 deletions

diff --git a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
index 01c2f66..98a0b55 100644
--- a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
@@ -1,18 +1,17 @@
-style "xfce-panel"
+style "pixmap-panel"
 {
 	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
 	ythickness = 2
 
-	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]		= shade (0.70, @window_active_color)
-
 	fg[NORMAL]		= @bg_color
 	fg[PRELIGHT]	= lighter (@selected_bg_color)
 	fg[ACTIVE]		= @bg_color
 
-	text[NORMAL]   	= @fg_color
-	text[PRELIGHT] 	= @text_color
-#	text[ACTIVE]	= @test1
+#	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]			= shade (0.70, @window_active_color)
+#	bg[ACTIVE]			= @selected_bg_color
+#	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
+#	bg[SELECTED]      	= @selected_bg_color
 	
 	engine "pixmap" {
 		image {
@@ -56,20 +55,59 @@ style "xfce-panel"
 	}
 }
 
-style "other-panel"
+style "panel-buttons" = "default"
 {
-	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]		= shade (0.70, @window_active_color)
+	xthickness = 2
+	ythickness = 0
 
 	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= shade (0.9, @bg_color)
+	fg[PRELIGHT]	= shade (1.45, @selected_bg_color)
 	fg[ACTIVE]		= @bg_color
 
-	text[NORMAL]   	= @fg_color
-	text[PRELIGHT] 	= @text_color
-	text[ACTIVE]	= @fg_color
+	bg[NORMAL]       	=  shade (0.90, @window_active_color)
+#	bg[ACTIVE]			=  @selected_bg_color
+#	bg[PRELIGHT]      	=  shade(1.75, @selected_bg_color)
+#	bg[SELECTED]      	=  @selected_bg_color
 
-	engine "murrine" {
+	engine "pixmap" {
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= NORMAL
+			file		= "Panel/panel-button-inactive.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= PRELIGHT
+			file		= "Panel/panel-button-hover.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= ACTIVE
+			file		= "Panel/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= SELECTED
+			file		= "Panel/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= INSENSITIVE
+
+		}
 	}
 }
 
@@ -86,21 +124,7 @@ style "theme-panel-light"
 	}
 }
 
-style "theme-panel-text"
-{
-	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= shade (0.9, @bg_color)
-	fg[ACTIVE]		= @bg_color
-	text[NORMAL]	= "#f5f5f5"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#f5f5f5"
-
-	bg[NORMAL]	= @test2
-
-	engine "murrine" { }
-}
-
-style "theme-main-menu-text" = "theme-panel-text"
+style "theme-main-menu-text" = "panel-buttons"
 {
 	fg[PRELIGHT]	= "#ffffff"
 	text[PRELIGHT]	= "#ffffff"
@@ -118,40 +142,43 @@ style "theme-panel-handle"
 	}
 }
 
-widget "*PanelWidget*"			style "other-panel"
-widget "*PanelApplet*"			style "other-panel"
-widget "*fast-user-switch*"		style "other-panel"
-widget "*CPUFreq*Applet*"		style "other-panel"
-widget "*indicator-applet*"		style "other-panel"
-class "PanelApp*"			style "other-panel"
-class "PanelToplevel*"			style "other-panel"
-widget_class "*PanelToplevel*"		style "other-panel"
-widget_class "*notif*"			style "other-panel"
-widget_class "*Notif*"			style "other-panel"
-widget_class "*Tray*"			style "other-panel" 
-widget_class "*tray*"			style "other-panel"
-widget_class "*computertemp*"		style "other-panel"
-widget_class "*Applet*Tomboy*"		style "other-panel"
-widget_class "*Applet*Netstatus*"	style "other-panel"
+# XFCE panel theming.
+widget "*Xfce*Panel*"	style "pixmap-panel"
+class "*Xfce*Panel*"	style "pixmap-panel"
+
+# Other (MATE) panel
+
+widget "*PanelWidget*"			style "panel-buttons"
+#widget "*PanelApplet*"			style "test"
+widget "*fast-user-switch*"		style "panel-buttons"
+widget "*CPUFreq*Applet*"		style "panel-buttons"
+widget "*indicator-applet*"		style "panel-buttons"
+class "PanelApp*"				style "panel-buttons"
+class "PanelToplevel*"			style "panel-buttons"
+widget_class "*PanelToplevel*"		style "panel-buttons" # pimp here
+
+# widget_class "*notif*"			style "panel-buttons"
+# widget_class "*Notif*"			style "panel-buttons"
+# widget_class "*Tray*"			style "panel-buttons" 
+# widget_class "*tray*"			style "panel-buttons"
+# widget_class "*computertemp*"		style "panel-buttons"
+# widget_class "*Applet*Tomboy*"		style "panel-buttons"
+# widget_class "*Applet*Netstatus*"	style "panel-buttons"
 
 # Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "xfce-panel"
-class "*Xfce*Panel*"	style "xfce-panel"
+# widget_class "*Notif*Beagle*"	style "theme-panel-light"
+# widget_class "*Notif*Brasero*"	style "theme-panel-light"
 
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "other-panel"
-widget "*.taskbar.*"		style "other-panel"
-widget_class "*GtkBgbox*"	style "other-panel"
+# widget "*.tclock.*"		style "panel-buttons"
+# widget "*.taskbar.*"		style "panel-buttons"
+# widget_class "*GtkBgbox*"	style "panel-buttons"
 
 # Make sure panel text color doesn't change
-widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
-widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
+widget_class "*Panel*MenuBar*"		style "theme-main-menu-text" # pimp here
+widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text" # pimp here
+widget "*.clock-applet-button.*"	style "panel-buttons"
+widget "*PanelApplet*"			style "panel-buttons" # check here, why doubled, looks ok for bottom
 
 # Hide ugly handle
 class "PanelAppletFrame" style:highest "theme-panel-handle"
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
index 030a873..6a784ec 100644
--- a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
@@ -1,18 +1,17 @@
-style "xfce-panel"
+style "pixmap-panel"
 {
 	xthickness = 2 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
 	ythickness = 2
 
-	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]		= @selected_bg_color
-
 	fg[NORMAL]		= lighter (@fg_color)
 	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
 	fg[ACTIVE]		= lighter (@fg_color)
 
-	text[NORMAL]	= @fg_color
-	text[PRELIGHT]	= @text_color
-#	text[ACTIVE]	= @test1
+#	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
+	bg[NORMAL]			= @selected_bg_color
+#	bg[ACTIVE]			= @selected_bg_color
+#	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
+#	bg[SELECTED]      	= @selected_bg_color
 	
 	engine "pixmap" {
 		image {
@@ -56,20 +55,59 @@ style "xfce-panel"
 	}
 }
 
-style "other-panel"
+style "panel-buttons" = "default"
 {
-	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]		= shade (0.70, @window_active_color)
+	xthickness = 2
+	ythickness = 0
 
-	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= shade (0.9, @bg_color)
-	fg[ACTIVE]		= @bg_color
+	fg[NORMAL]		= lighter (@fg_color)
+	fg[PRELIGHT]	= shade (1.75, @selected_bg_color)
+	fg[ACTIVE]		= lighter (@fg_color)
 
-	text[NORMAL]   	= @fg_color
-	text[PRELIGHT] 	= @text_color
-	text[ACTIVE]	= @fg_color
+	bg[NORMAL]       	=  shade (1.0, @window_active_color)
+#	bg[ACTIVE]			=  @selected_bg_color
+#	bg[PRELIGHT]      	=  shade(1.75, @selected_bg_color)
+#	bg[SELECTED]      	=  @selected_bg_color
 
-	engine "murrine" {
+	engine "pixmap" {
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= NORMAL
+			file		= "Panel/panel-button-inactive.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= PRELIGHT
+			file		= "Panel/panel-button-hover.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= ACTIVE
+			file		= "Panel/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= SELECTED
+			file		= "Panel/panel-button-active.png"
+			border		= { 4, 4, 1, 1 }
+			stretch		= TRUE
+		}
+		image {
+			function	= BOX
+			recolorable	= TRUE
+			state		= INSENSITIVE
+
+		}
 	}
 }
 
@@ -91,11 +129,12 @@ style "theme-panel-text"
 	fg[NORMAL]		= @fg_color
 	fg[PRELIGHT]	= "#ffffff"
 	fg[ACTIVE]		= "#f5f5f5"
+
 	text[NORMAL]	= "#f5f5f5"
 	text[PRELIGHT]	= "#ffffff"
 	text[ACTIVE]	= "#f5f5f5"
 	
-	bg[NORMAL]	= @test2
+#	bg[NORMAL]	= @test2
 
 	engine "murrine" { }
 }
@@ -118,40 +157,43 @@ style "theme-panel-handle"
 	}
 }
 
-widget "*PanelWidget*"			style "other-panel"
-widget "*PanelApplet*"			style "other-panel"
-widget "*fast-user-switch*"		style "other-panel"
-widget "*CPUFreq*Applet*"		style "other-panel"
-widget "*indicator-applet*"		style "other-panel"
-class "PanelApp*"			style "other-panel"
-class "PanelToplevel*"			style "other-panel"
-widget_class "*PanelToplevel*"		style "other-panel"
-widget_class "*notif*"			style "other-panel"
-widget_class "*Notif*"			style "other-panel"
-widget_class "*Tray*"			style "other-panel" 
-widget_class "*tray*"			style "other-panel"
-widget_class "*computertemp*"		style "other-panel"
-widget_class "*Applet*Tomboy*"		style "other-panel"
-widget_class "*Applet*Netstatus*"	style "other-panel"
+# XFCE panel theming.
+widget "*Xfce*Panel*"	style "pixmap-panel"
+class "*Xfce*Panel*"	style "pixmap-panel"
+
+# Other (MATE) panel
+
+widget "*PanelWidget*"			style "panel-buttons"
+# widget "*PanelApplet*"			style "panel-buttons"
+widget "*fast-user-switch*"		style "panel-buttons"
+widget "*CPUFreq*Applet*"		style "panel-buttons"
+widget "*indicator-applet*"		style "panel-buttons"
+class "PanelApp*"			style "panel-buttons"
+class "PanelToplevel*"			style "panel-buttons"
+widget_class "*PanelToplevel*"		style "panel-buttons"
+
+# widget_class "*notif*"			style "panel-buttons"
+# widget_class "*Notif*"			style "panel-buttons"
+# widget_class "*Tray*"			style "panel-buttons" 
+# widget_class "*tray*"			style "panel-buttons"
+# widget_class "*computertemp*"		style "panel-buttons"
+# widget_class "*Applet*Tomboy*"		style "panel-buttons"
+# widget_class "*Applet*Netstatus*"	style "panel-buttons"
 
 # Fixes for tooltip text in some apps.
-widget_class "*Notif*Beagle*"	style "theme-panel-light"
-widget_class "*Notif*Brasero*"	style "theme-panel-light"
-
-# XFCE panel theming.
-widget "*Xfce*Panel*"	style "xfce-panel"
-class "*Xfce*Panel*"	style "xfce-panel"
+# widget_class "*Notif*Beagle*"	style "theme-panel-light"
+# widget_class "*Notif*Brasero*"	style "theme-panel-light"
 
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "other-panel"
-widget "*.taskbar.*"		style "other-panel"
-widget_class "*GtkBgbox*"	style "other-panel"
+# widget "*.tclock.*"		style "panel-buttons"
+# widget "*.taskbar.*"		style "panel-buttons"
+# widget_class "*GtkBgbox*"	style "panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
 widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "theme-panel-text"
-widget "*PanelApplet*"			style "theme-panel-text"
+widget "*.clock-applet-button.*"	style "panel-buttons"
+widget "*PanelApplet*"			style "panel-buttons"
 
 # Hide ugly handle
 class "PanelAppletFrame" style:highest "theme-panel-handle"