Merge lp:~ubuntu-mate-dev/ubuntu-themes/mate-compatibility into lp:ubuntu-themes

[Martin Wimpress ]

The merge proposal adds MATE compatibility to Ambiance and Radiance. This merge proposal was requested by Lars Uebernickel (larsu) following our discussion on IRC.

[Dmitry Shachnev (mitya57)]

Adwaita was designed for GNOME/Unity, and I don't think we should be adding support for other applications/desktops here.

We don't have any code specific to LXDE, Xfce, etc here, and I don't see why MATE should be an exception.

That is my personal opinion, it may be different compared to one of other members of ~ubuntu-artwork-pkg.

[Sebastien Bacher (seb128)]

When discussed on #ubuntu-desktop it seemed like the consensus was that we didn't want more code in our themes to support other desktop, you should rather make your own theme variant there

review: Disapprove

Unmerged revisions

441. By Martin Wimpress  on 2015-06-18

Add MATE compatibility to Radiance.

440. By Martin Wimpress  on 2015-06-18

Add MATE compatibility to Ambiance.

=== added file 'Ambiance/gtk-2.0/apps/caja.rc'
--- Ambiance/gtk-2.0/apps/caja.rc	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/caja.rc	2015-06-18 13:31:05 +0000
@@ -0,0 +1,11 @@
+# ==============================================================================
+# CAJA SPECIFIC SETTINGS
+# ==============================================================================
+
+style "caja_info_pane" {
+	bg[NORMAL] = @bg_color
+}
+
+widget_class "*Caja*<GtkNotebook>*<GtkEventBox>" style "caja_info_pane"
+widget_class "*Caja*<GtkButton>" style "notebook_button"
+widget_class "*Caja*<GtkButton>*<GtkLabel>" style "notebook_button"

=== added file 'Ambiance/gtk-2.0/apps/mate-panel.rc'
--- Ambiance/gtk-2.0/apps/mate-panel.rc	1970-01-01 00:00:00 +0000
+++ Ambiance/gtk-2.0/apps/mate-panel.rc	2015-06-18 13:31:05 +0000
@@ -0,0 +1,30 @@
+# Panel specific settings for correct theming on MATE
+
+style "panel" = "dark"
+{
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+style "panel_default" = "dark"
+{
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+widget "*Panel*"                  style "panel"
+widget "*PanelWidget*"            style "panel"
+widget "*PanelApplet*"            style "panel"		# workaround for right click menu corrupted bg
+widget "*fast-user-switch*"       style "panel" 	# workaround for Fast User Switch applet
+widget "*CPUFreqApplet*"          style "panel" 	# workaround for CpuFreq Applet
+class "PanelApp*"                 style "panel"
+class "PanelToplevel*"            style "panel"
+widget_class "*notif*"            style "panel"
+widget_class "*PanelApplet*"      style "panel_default"	# workaround for right click menu corrupted bg
+widget_class "*Tray*"             style "panel"		# workaround for StarDict, gnubiff... tray icon bg
+class "GtkScrollbar"              style "scrollbar"

=== modified file 'Ambiance/gtk-2.0/gtkrc'
--- Ambiance/gtk-2.0/gtkrc	2014-03-04 17:08:48 +0000
+++ Ambiance/gtk-2.0/gtkrc	2015-06-18 13:31:05 +0000
@@ -340,7 +340,7 @@
 	}
 }
 
-style "menu" {
+style "menu" = "dark" {
 	xthickness = 0
 	ythickness = 0
 
@@ -528,6 +528,10 @@
 	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
 }
 
+style "caja_location" {
+	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
 style "calendar" {
 	xthickness = 0
 	ythickness = 0
@@ -566,7 +570,7 @@
 
 # Workaround style for menus where the text color is used instead of the fg color.
 style "menuitem_text_is_fg_color_workaround" {
-	text[NORMAL]        = @fg_color
+	text[NORMAL]        = @base_color
 	text[PRELIGHT]      = @selected_fg_color
 	text[SELECTED]      = @selected_fg_color
 	text[ACTIVE]        = @fg_color
@@ -693,6 +697,10 @@
 # ToDo: A more generic approach for all applications that have a widget like this.
 widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
 
+# Special case the caja-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.caja-extra-view-widget" style : highest "caja_location"
+
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
 widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
@@ -704,7 +712,7 @@
 widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
 # GtkCList also uses the fg color to draw text on top of the base colors.
 widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
+# Nautilus/Caja when renaming files, and maybe other places.
 widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 # Work around for ubuntu's lucid sound indicator
 widget "ido-offscreen-scale" style "soundfix"
@@ -720,3 +728,5 @@
 include "apps/ff.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"
+include "apps/caja.rc"
+include "apps/mate-panel.rc"

=== added file 'Radiance/gtk-2.0/apps/caja.rc'
--- Radiance/gtk-2.0/apps/caja.rc	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-2.0/apps/caja.rc	2015-06-18 13:31:05 +0000
@@ -0,0 +1,11 @@
+# ==============================================================================
+# CAJA SPECIFIC SETTINGS
+# ==============================================================================
+
+style "caja_info_pane" {
+	bg[NORMAL] = @bg_color
+}
+
+widget_class "*Caja*<GtkNotebook>*<GtkEventBox>" style "caja_info_pane"
+widget_class "*Caja*<GtkButton>" style "notebook_button"
+widget_class "*Caja*<GtkButton>*<GtkLabel>" style "notebook_button"

=== added file 'Radiance/gtk-2.0/apps/mate-panel.rc'
--- Radiance/gtk-2.0/apps/mate-panel.rc	1970-01-01 00:00:00 +0000
+++ Radiance/gtk-2.0/apps/mate-panel.rc	2015-06-18 13:31:05 +0000
@@ -0,0 +1,30 @@
+# Panel specific settings for correct theming on MATE
+
+style "panel" = "dark"
+{
+	xthickness = 0
+	ythickness = 0
+
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+style "panel_default" = "dark"
+{
+	engine "murrine" {
+		colorize_scrollbar = TRUE
+	}
+}
+
+widget "*Panel*"                  style "panel"
+widget "*PanelWidget*"            style "panel"
+widget "*PanelApplet*"            style "panel"		# workaround for right click menu corrupted bg
+widget "*fast-user-switch*"       style "panel" 	# workaround for Fast User Switch applet
+widget "*CPUFreqApplet*"          style "panel" 	# workaround for CpuFreq Applet
+class "PanelApp*"                 style "panel"
+class "PanelToplevel*"            style "panel"
+widget_class "*notif*"            style "panel"
+widget_class "*PanelApplet*"      style "panel_default"	# workaround for right click menu corrupted bg
+widget_class "*Tray*"             style "panel"		# workaround for StarDict, gnubiff... tray icon bg
+class "GtkScrollbar"		  style "scrollbar"

=== modified file 'Radiance/gtk-2.0/gtkrc'
--- Radiance/gtk-2.0/gtkrc	2014-03-04 17:08:48 +0000
+++ Radiance/gtk-2.0/gtkrc	2015-06-18 13:31:05 +0000
@@ -488,6 +488,10 @@
 	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
 }
 
+style "caja_location" {
+	bg[NORMAL]  = mix (0.60, shade (1.05, @bg_color), @selected_bg_color)
+}
+
 style "calendar" {
 	xthickness = 0
 	ythickness = 0
@@ -642,6 +646,10 @@
 # ToDo: A more generic approach for all applications that have a widget like this.
 widget "*.nautilus-extra-view-widget" style : highest "nautilus_location"
 
+# Special case the caja-extra-view-widget
+# ToDo: A more generic approach for all applications that have a widget like this.
+widget "*.caja-extra-view-widget" style : highest "caja_location"
+
 # Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
 # Note that this work around assumes that the combobox is _not_ in appears-as-list mode.
 widget_class "*.<GtkComboBox>.<GtkCellView>" style "text_is_fg_color_workaround"
@@ -653,7 +661,7 @@
 widget_class "*<GtkListItem>*" style "fg_is_text_color_workaround"
 # GtkCList also uses the fg color to draw text on top of the base colors.
 widget_class "*<GtkCList>" style "fg_is_text_color_workaround"
-# Nautilus when renaming files, and maybe other places.
+# Nautilus/Caja when renaming files, and maybe other places.
 widget_class "*<EelEditableLabel>" style "fg_is_text_color_workaround"
 # Work around for ubuntu's lucid sound indicator
 widget "ido-offscreen-scale" style "soundfix"
@@ -669,3 +677,5 @@
 include "apps/ff.rc"
 include "apps/gnome-terminal.rc"
 include "apps/nautilus.rc"
+include "apps/caja.rc"
+include "apps/mate-panel.rc"