diff options
| -rw-r--r-- | bin/.gitignore | 1 | ||||
| -rw-r--r-- | bin/sugar | 9 | ||||
| -rw-r--r-- | bin/sugar-emulator | 17 | ||||
| -rw-r--r-- | bin/sugar-shell | 9 | ||||
| -rw-r--r-- | bin/sugar.in | 14 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 16 | ||||
| -rw-r--r-- | data/gtkrc.em | 4 |
9 files changed, 34 insertions, 38 deletions
diff --git a/bin/.gitignore b/bin/.gitignore index 9e78b64..b86c1c9 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,2 @@ +sugar sugar-shell-service diff --git a/bin/sugar b/bin/sugar deleted file mode 100644 index 88e478a..0000000 --- a/bin/sugar +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -export SUGAR_THEME=sugar-xo - -if [ -f /etc/olpc-security ] ; then - exec dbus-launch --exit-with-session --config-file=/etc/dbus-1/session-olpc.conf sugar-shell -else - exec dbus-launch --exit-with-session sugar-shell -fi diff --git a/bin/sugar-emulator b/bin/sugar-emulator index 36958db..f6cafd6 100644 --- a/bin/sugar-emulator +++ b/bin/sugar-emulator @@ -88,27 +88,24 @@ def main(): """Script-level operations""" parser = OptionParser() - parser.add_option('-x', '--xo-style', dest='xo_style', - action='store_true', help='use the XO style') + parser.add_option('-d', '--dpi', dest='dpi', help='Emulator dpi') + parser.add_option('-s', '--scaling', dest='scaling', help='Sugar scaling') (options, args) = parser.parse_args() _setup_env() - if options.xo_style: - _start_xephyr(dpi=201) + if options.dpi: + _start_xephyr(dpi=options.dpi) else: _start_xephyr() - if options.xo_style: - os.environ['SUGAR_THEME'] = 'sugar-xo' - os.environ['SUGAR_XO_STYLE'] = 'yes' - else: - os.environ['SUGAR_XO_STYLE'] = 'no' + if options.scaling: + os.environ['SUGAR_SCALING'] = options.scaling command = ['dbus-launch', 'dbus-launch', '--exit-with-session'] if not args: - command.append('sugar-shell') + command.append('sugar') else: _start_matchbox() diff --git a/bin/sugar-shell b/bin/sugar-shell index a47b556..6a8d112 100644 --- a/bin/sugar-shell +++ b/bin/sugar-shell @@ -18,15 +18,6 @@ import os import gettext -from jarabe import config - -if os.environ.has_key('SUGAR_THEME'): - theme = os.environ['SUGAR_THEME'] -else: - theme = 'sugar' - -os.environ['GTK2_RC_FILES'] = os.path.join(config.data_path, '%s.gtkrc' % theme) - import gtk import gobject import dbus.glib diff --git a/bin/sugar.in b/bin/sugar.in new file mode 100644 index 0000000..26f7cba --- /dev/null +++ b/bin/sugar.in @@ -0,0 +1,14 @@ +#!/bin/sh + +if test -z "$SUGAR_SCALING"; then + export SUGAR_SCALING=100 +fi + +export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc" + +if ! test -f "$GTK2_RC_FILES"; then + echo "sugar: ERROR: Gtk theme for scaling $SUGAR_SCALING not available." + exit 1 +fi + +sugar-shell diff --git a/configure.ac b/configure.ac index ea5060c..260ecb2 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AC_ARG_ENABLE(update-mimedb, AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) AC_CONFIG_FILES([ +bin/sugar bin/sugar-shell-service service/config.py src/jarabe/config.py diff --git a/data/.gitignore b/data/.gitignore new file mode 100644 index 0000000..6fa4af3 --- /dev/null +++ b/data/.gitignore @@ -0,0 +1 @@ +*.gtkrc diff --git a/data/Makefile.am b/data/Makefile.am index cdf9dc5..8a31c67 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = icons -sugar.gtkrc: gtkrc.em - $(srcdir)/em.py -D theme=\'sugar\' $(srcdir)/gtkrc.em > \ - $(top_builddir)/data/sugar.gtkrc +sugar-72.gtkrc: gtkrc.em + $(srcdir)/em.py -D scaling=\'72\' $(srcdir)/gtkrc.em > \ + $(top_builddir)/data/sugar-72.gtkrc -sugar-xo.gtkrc: gtkrc.em - $(srcdir)/em.py -D theme=\'sugar-xo\' $(srcdir)/gtkrc.em > \ - $(top_builddir)/data/sugar-xo.gtkrc +sugar-100.gtkrc: gtkrc.em + $(srcdir)/em.py -D scaling=\'100\' $(srcdir)/gtkrc.em > \ + $(top_builddir)/data/sugar-100.gtkrc sugardir = $(pkgdatadir)/data sugar_DATA = \ @@ -16,8 +16,8 @@ sugar_DATA = \ $(GTKRC_FILES) GTKRC_FILES = \ - sugar.gtkrc \ - sugar-xo.gtkrc + sugar-72.gtkrc \ + sugar-100.gtkrc xsessionsdir = $(datadir)/xsessions xsessions_DATA = sugar.desktop diff --git a/data/gtkrc.em b/data/gtkrc.em index cf68650..f355141 100644 --- a/data/gtkrc.em +++ b/data/gtkrc.em @@ -1,12 +1,12 @@ @{ -if theme == 'sugar': +if scaling == '72': font_name = 'Sans Serif 10' icon_sizes = 'gtk-large-toolbar=40,40' else: font_name = 'Sans Serif 7' icon_sizes = 'gtk-large-toolbar=55,55' }@ -gtk-theme-name = "@theme" +gtk-theme-name = "sugar-@scaling" gtk-icon-theme-name = "sugar" gtk-font-name = "@font_name" gtk-cursor-theme-name = "sugar" |