diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-19 19:13:55 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-19 19:13:55 (GMT) |
| commit | 2f858c02a3f613af043929da96fc1ba59d7a9eae (patch) | |
| tree | f09041ccce7d53aa254de949b6d0ee3941d8dafc | |
| parent | 23bf7d94c656804cc987a3f06d7ddd184048c6f1 (diff) | |
Split the gtkrc in sugar and sugar-xo. Make them load the
respective gtk theme.
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/gtkrc | 7 | ||||
| -rw-r--r-- | data/sugar.gtkrc | 5 | ||||
| -rwxr-xr-x | sugar-emulator | 7 |
4 files changed, 13 insertions, 9 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 3ff222b..8e99b34 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/gtkrc deleted file mode 100644 index 840b734..0000000 --- a/data/gtkrc +++ /dev/null @@ -1,7 +0,0 @@ -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-cursor-theme-name = "sugar" -gtk-cursor-theme-size = 48 -gtk-toolbar-style = GTK_TOOLBAR_ICONS diff --git a/data/sugar.gtkrc b/data/sugar.gtkrc new file mode 100644 index 0000000..d742026 --- /dev/null +++ b/data/sugar.gtkrc @@ -0,0 +1,5 @@ +gtk-theme-name = "sugar" +gtk-icon-theme-name = "sugar" +gtk-font-name = "Sans Serif 11" +gtk-cursor-theme-name = "sugar" +gtk-toolbar-style = GTK_TOOLBAR_ICONS diff --git a/sugar-emulator b/sugar-emulator index c1fb6a3..2d6b04f 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' |