From 2f858c02a3f613af043929da96fc1ba59d7a9eae Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 19 Apr 2007 21:13:55 +0200 Subject: [PATCH] Split the gtkrc in sugar and sugar-xo. Make them load the respective gtk theme. --- data/Makefile.am | 3 ++- data/{gtkrc => sugar.gtkrc} | 4 +--- sugar-emulator | 7 ++++++- 3 files changed, 9 insertions(+), 5 deletions(-) rename data/{gtkrc => sugar.gtkrc} (51%) diff --git a/data/Makefile.am b/data/Makefile.am index 3ff222b9..8e99b34f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,7 @@ sugardir = $(pkgdatadir)/data sugar_DATA = \ - gtkrc \ + sugar.gtkrc \ + sugar-xo.gtkrc \ gecko-prefs.js \ mime.types diff --git a/data/gtkrc b/data/sugar.gtkrc similarity index 51% rename from data/gtkrc rename to data/sugar.gtkrc index 840b7349..d7420268 100644 --- a/data/gtkrc +++ b/data/sugar.gtkrc @@ -1,7 +1,5 @@ gtk-theme-name = "sugar" gtk-icon-theme-name = "sugar" -gtk-font-name = "Bitstream Vera Sans 7" -gtk-icon-sizes = "gtk-menu=32,32:gtk-button=32,32" +gtk-font-name = "Sans Serif 11" gtk-cursor-theme-name = "sugar" -gtk-cursor-theme-size = 48 gtk-toolbar-style = GTK_TOOLBAR_ICONS diff --git a/sugar-emulator b/sugar-emulator index c1fb6a3e..2d6b04f1 100755 --- a/sugar-emulator +++ b/sugar-emulator @@ -87,7 +87,12 @@ _start_xephyr() from sugar import env -os.environ['GTK2_RC_FILES'] = env.get_data_path('gtkrc') +if env.is_emulator(): + gtkrc_filename = 'sugar.gtkrc' +else: + gtkrc_filename = 'sugar-xo.gtkrc' + +os.environ['GTK2_RC_FILES'] = env.get_data_path(gtkrc_filename) if len(sys.argv) == 1: program = 'sugar-shell'