Merge pull request #37 from NiceandGently/master

update Menta GTK-2/3 to latest Zukwito update from 2013.03.29 to support GTK3-3.8

10 files changed, 179 insertions, 35 deletions

diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
index 74355a23..75239e33 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
@@ -12,9 +12,11 @@ EXTRA_DIST = $(theme_DATA)
 SUBDIRS = \
 	Panel \
 	Null \
-	Others
+	Others \
+	Scale
 
 DIST_SUBDIRS = \
 	Panel \
 	Null \
-	Others
+	Others \
+	Scale
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am
new file mode 100644
index 00000000..5032ef78
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/Makefile.am
@@ -0,0 +1,12 @@
+
+themedir = $(datadir)/themes/Menta/gtk-2.0/widgets/Scale
+
+theme_DATA = \
+	slider.png \
+	slider-hover.png \
+	slider-ins.png \
+	trough-horizontal.png \
+	trough-vertical.png
+
+EXTRA_DIST = $(theme_DATA)
+
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png
new file mode 100644
index 00000000..72c5437b
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-hover.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png
new file mode 100644
index 00000000..f31f5c90
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider-ins.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png
new file mode 100644
index 00000000..3fdda2c9
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/slider.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png
new file mode 100644
index 00000000..2de30503
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-horizontal.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png
new file mode 100644
index 00000000..333de7cc
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Scale/trough-vertical.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
index ffe8155c..aed20d83 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
@@ -6,12 +6,34 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-black.png"
 
-	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#2C5C31"
-	fg[ACTIVE]	= "#F7F7F7"
-	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#2C5C31"
-	text[ACTIVE]	= "#F7F7F7"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= @bg_color_dark
+	bg[PRELIGHT]		= shade (1.20, @bg_color_dark)
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= @bg_color_dark
+	bg[ACTIVE]			= shade (0.8, @bg_color_dark)
+	fg[NORMAL]			= "#F7F7F7"
+	fg[PRELIGHT]		= "#2C5C31"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#F7F7F7"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#F7F7F7"
+	text[PRELIGHT]		= "#2C5C31"
+	text[ACTIVE]		= "#F7F7F7"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+ 	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-black.png"
+
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +127,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +146,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +194,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
index 5d0ccad2..e614c21b 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
@@ -6,12 +6,33 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-dark-grey.png"
 
-	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#2C5C31"
-	fg[ACTIVE]	= "#F7F7F7"
-	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#2C5C31"
-	text[ACTIVE]	= "#F7F7F7"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= "#80867A"
+	bg[PRELIGHT]		= shade (1.20, "#80867A")
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= "#80867A"
+	bg[ACTIVE]			= shade (0.8, "#80867A")
+	fg[NORMAL]			= "#F7F7F7"
+	fg[PRELIGHT]		= "#2C5C31"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#F7F7F7"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#F7F7F7"
+	text[PRELIGHT]		= "#2C5C31"
+	text[ACTIVE]		= "#F7F7F7"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg-dark-grey.png"
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +126,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +145,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +193,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
index a199a171..08a0b9a1 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
@@ -6,12 +6,33 @@ style "theme-panel"
 # Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
 
-	fg[NORMAL]	= "#000000"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#000000"
-	text[NORMAL]	= "#000000"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#000000"
+	base[NORMAL]		= @bg_color
+	base[PRELIGHT]		= shade (1.06, @bg_color)
+	base[INSENSITIVE]	= @bg_color
+	bg[NORMAL]			= @bg_color
+	bg[PRELIGHT]		= shade (1.20, @bg_color)
+	bg[SELECTED]		= shade (0.90, @selected_bg_color)
+	bg[INSENSITIVE]		= @bg_color_dark
+	bg[ACTIVE]			= shade (0.8, @bg_color)
+	fg[NORMAL]			= "#000000"
+	fg[PRELIGHT]		= "#000000"
+	fg[SELECTED]		= @selected_fg_color
+	fg[ACTIVE]			= "#ffffff"
+	fg[INSENSITIVE]		= "#f0f0f0"
+	text[NORMAL]		= "#000000"
+	text[PRELIGHT]		= "#000000"
+	text[ACTIVE]		= "#ffffff"
+	text[SELECTED]		= @selected_fg_color
+	text[INSENSITIVE]	= "#f0f0f0"
+ 	
+	engine "murrine" {
+	}
+}
+
+style "theme-panel-buttons"
+{
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
 	
 	engine "pixmap" {
 		image {
@@ -105,8 +126,11 @@ widget "*indicator-applet*"		style "theme-panel"
 class "PanelApp*"			style "theme-panel"
 class "PanelToplevel*"			style "theme-panel"
 widget_class "*PanelToplevel*"		style "theme-panel"
-widget_class "*notif*"			style "theme-panel"
-widget_class "*Notif*"			style "theme-panel"
+widget_class "*PanelFrame*" 		style "theme-panel"
+widget_class "*PanelAppletFrame*" 	style "theme-panel"
+widget_class "*PanelWidget*.*"		style "theme-panel"
+#widget_class "*notif*"			style "theme-panel"
+#widget_class "*Notif*"			style "theme-panel"
 widget_class "*Tray*"			style "theme-panel" 
 widget_class "*tray*"			style "theme-panel"
 widget_class "*computertemp*"		style "theme-panel"
@@ -121,10 +145,20 @@ widget_class "*Notif*Brasero*"	style "theme-panel-light"
 widget "*Xfce*Panel*"	style "theme-panel"
 class "*Xfce*Panel*"	style "theme-panel"
 
+# Panel buttons
+widget_class "*Panel*GtkToggleButton"	style:highest "theme-panel-buttons"
+#widget_class "*Panel*GtkButton"	style:highest "theme-panel-buttons"
+
+# XFCE panel buttons
+widget "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+class "*Xfce*Panel*Button*"	style:highest "theme-panel-buttons"
+widget_class "*LauncherPlugin*"	style:highest "theme-panel-buttons"
+widget_class "*ActionsPlugin*"	style:highest "theme-panel-buttons"
+
 # lxpanel and fbpanel
-widget "*.tclock.*"		style "theme-panel"
-widget "*.taskbar.*"		style "theme-panel"
-widget_class "*GtkBgbox*"	style "theme-panel"
+widget "*.tclock.*"		style "theme-panel-buttons"
+widget "*.taskbar.*"		style "theme-panel-buttons"
+widget_class "*GtkBgbox*"	style "theme-panel-buttons"
 
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
@@ -159,3 +193,12 @@ engine "pixmap" {
 }
 
 widget_class "*PanelToplevel*" style "panel-arrow-remove"
+
+# Fix xfce-notifyd button
+style "xfce-notifyd-button" {
+	fg[NORMAL]	= @text_color
+	fg[PRELIGHT]	= @text_color
+	fg[ACTIVE]	= @text_color
+}
+
+widget_class "XfceNotifyWindow.*.GtkButton*" style "xfce-notifyd-button"