Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpgritti@gmail.com>2008-10-03 00:16:17 (GMT)
committer Marco Pesenti Gritti <mpgritti@gmail.com>2008-10-03 00:16:17 (GMT)
commita0c2037277d70a29c5014b7845052e9cf0a8e345 (patch)
tree7e300433d497405827fd0d5f756095a169684794
parentab134e3612c9cc32e9cc8bfbcd7ce6ac6e7025bf (diff)
Generate two themes based on SUGAR_SCALING.
-rw-r--r--gtk/theme/Makefile.am36
-rw-r--r--gtk/theme/gtkrc.em2
2 files changed, 19 insertions, 19 deletions
diff --git a/gtk/theme/Makefile.am b/gtk/theme/Makefile.am
index f6b1229..a6b0bd8 100644
--- a/gtk/theme/Makefile.am
+++ b/gtk/theme/Makefile.am
@@ -1,30 +1,30 @@
-sugar.gtkrc: gtkrc.em
- $(srcdir)/em.py -p $$ -D theme=\'sugar\' $(srcdir)/gtkrc.em > \
- $(top_builddir)/gtk/theme/sugar.gtkrc
+sugar-72.gtkrc: gtkrc.em
+ $(srcdir)/em.py -p $$ -D scaling=\'72\' $(srcdir)/gtkrc.em > \
+ $(top_builddir)/gtk/theme/sugar-72.gtkrc
-sugar-xo.gtkrc: gtkrc.em
- $(srcdir)/em.py -p $$ -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \
- $(top_builddir)/gtk/theme/sugar-xo.gtkrc
+sugar-100.gtkrc: gtkrc.em
+ $(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtkrc.em > \
+ $(top_builddir)/gtk/theme/sugar-100.gtkrc
clean:
- $(RM) sugar.gtkrc
- $(RM) sugar-xo.gtkrc
+ $(RM) sugar-72.gtkrc
+ $(RM) sugar-100.gtkrc
GTKRC_FILES = \
- sugar.gtkrc \
- sugar-xo.gtkrc
+ sugar-72.gtkrc \
+ sugar-100.gtkrc
install-data-local: $(GTKRC_FILES)
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar/gtk-2.0
- $(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar.gtkrc \
- $(DESTDIR)$(datadir)/themes/sugar/gtk-2.0/gtkrc
- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-xo/gtk-2.0
- $(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-xo.gtkrc \
- $(DESTDIR)$(datadir)/themes/sugar-xo/gtk-2.0/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
+ $(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-72.gtkrc \
+ $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0/gtkrc
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
+ $(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-100.gtkrc \
+ $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0/gtkrc
uninstall-local:
- rm -rf $(DESTDIR)$(datadir)/themes/sugar/gtk-2.0
- rm -rf $(DESTDIR)$(datadir)/themes/sugar-xo/gtk-2.0
+ rm -rf $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
+ rm -rf $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
EXTRA_DIST = em.py gtkrc.em
CLEANFILES = $(GTKRC_FILES)
diff --git a/gtk/theme/gtkrc.em b/gtk/theme/gtkrc.em
index 6fa1b05..5a4078f 100644
--- a/gtk/theme/gtkrc.em
+++ b/gtk/theme/gtkrc.em
@@ -12,7 +12,7 @@ def my_ceil(num):
# Are these already the correct sizes for the XO?
# These sizes need to be sanity checked ...
-if theme == "sugar-xo":
+if scaling == "100":
xo = True
line_width = 2.0 # 2.25px, rounded down
thick_line_width = 3.5 # 3.5