Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

2 files changed, 46 insertions, 2 deletions

diff --git a/gtk3/theme/Makefile.am b/gtk3/theme/Makefile.am
index d2e6df7..16f5dcf 100644
--- a/gtk3/theme/Makefile.am
+++ b/gtk3/theme/Makefile.am
@@ -16,17 +16,41 @@ settings-100.ini: settings.ini.em
 	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/settings.ini.em > \
 		$(top_builddir)/gtk3/theme/settings-100.ini
 
+gtk-contrast-widgets-72.css: gtk-contrast-widgets.css.em
+	$(srcdir)/em.py -p $$ -D scaling=\'72\' $(srcdir)/gtk-contrast-widgets.css.em > \
+		$(top_builddir)/gtk3/theme/gtk-contrast-widgets-72.css
+
+gtk-contrast-widgets-100.css: gtk-contrast-widgets.css.em
+	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtk-contrast-widgets.css.em > \
+		$(top_builddir)/gtk3/theme/gtk-contrast-widgets-100.css
+
+settings-contrast-72.ini: settings.ini.em
+	$(srcdir)/em.py -p $$ -D scaling=\'72\' $(srcdir)/settings.ini.em > \
+		$(top_builddir)/gtk3/theme/settings-contrast-72.ini
+
+settings-contrast-100.ini: settings.ini.em
+	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/settings.ini.em > \
+		$(top_builddir)/gtk3/theme/settings-contrast-100.ini
+
 clean:
 	$(RM) gtk-widgets-100.css
 	$(RM) gtk-widgets-72.css
 	$(RM) settings-100.ini
 	$(RM) settings-72.ini
+	$(RM) gtk-contrast-widgets-100.css
+	$(RM) gtk-contrast-widgets-72.css
+	$(RM) settings-contrast-100.ini
+	$(RM) settings-contrast-72.ini
 
 GEN_FILES = \
        gtk-widgets-72.css \
        gtk-widgets-100.css \
        settings-72.ini \
-       settings-100.ini
+       settings-100.ini \
+       gtk-contrast-widgets-72.css \
+       gtk-contrast-widgets-100.css \
+       settings-contrast-72.ini \
+       settings-contrast-100.ini
 
 install-data-local: $(GEN_FILES)
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0
@@ -43,10 +67,26 @@ install-data-local: $(GEN_FILES)
 		$(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/settings.ini
 	$(INSTALL_DATA) $(srcdir)/gtk.css \
 		$(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0/gtk.css
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-3.0
+	$(INSTALL_DATA) $(top_builddir)/gtk3/theme/gtk-contrast-widgets-72.css \
+		$(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-3.0/gtk-contrast-widgets.css
+	$(INSTALL_DATA) $(top_builddir)/gtk3/theme/settings-contrast-72.ini \
+		$(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-3.0/settings.ini
+	$(INSTALL_DATA) $(srcdir)/gtk.css \
+		$(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-3.0/gtk.css
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-3.0
+	$(INSTALL_DATA) $(top_builddir)/gtk3/theme/gtk-contrast-widgets-100.css \
+		$(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-3.0/gtk-contrast-widgets.css
+	$(INSTALL_DATA) $(top_builddir)/gtk3/theme/settings-contrast-100.ini \
+		$(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-3.0/settings.ini
+	$(INSTALL_DATA) $(srcdir)/gtk.css \
+		$(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-3.0/gtk.css
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72/gtk-3.0
 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100/gtk-3.0
+	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-3.0
+	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-3.0
 
-EXTRA_DIST = gtk-widgets.css.em settings.ini.em em.py gtk.css
+EXTRA_DIST = gtk-widgets.css.em gtk-contrast-widgets.css.em settings.ini.em em.py gtk.css
 CLEANFILES = $(GEN_FILES)
diff --git a/gtk3/theme/assets/Makefile.am b/gtk3/theme/assets/Makefile.am
index c098cc5..a494d8f 100644
--- a/gtk3/theme/assets/Makefile.am
+++ b/gtk3/theme/assets/Makefile.am
@@ -16,6 +16,10 @@ assets =			\
 
 sugar72dir = $(datadir)/themes/sugar-72/gtk-3.0/assets
 sugar100dir = $(datadir)/themes/sugar-100/gtk-3.0/assets
+sugar72contrastdir = $(datadir)/themes/sugar-72-contrast/gtk-3.0/assets
+sugar100contrastdir = $(datadir)/themes/sugar-100-contrast/gtk-3.0/assets
 
 dist_sugar72_DATA = $(assets)
 dist_sugar100_DATA = $(assets)
+dist_sugar72contrast_DATA = $(assets)
+dist_sugar100contrast_DATA = $(assets)