diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/icons/Makefile.am (renamed from src/controlpanel/icons/Makefile.am) | 4 | ||||
| -rw-r--r-- | data/icons/module-about_me.svg (renamed from src/controlpanel/icons/module-about_me.svg) | 0 | ||||
| -rw-r--r-- | data/icons/module-about_my_xo.svg (renamed from src/controlpanel/icons/module-about_my_xo.svg) | 0 | ||||
| -rw-r--r-- | data/icons/module-date_and_time.svg (renamed from src/controlpanel/icons/module-date_and_time.svg) | 0 | ||||
| -rw-r--r-- | data/icons/module-language.svg (renamed from src/controlpanel/icons/module-language.svg) | 0 | ||||
| -rw-r--r-- | data/icons/module-network.svg (renamed from src/controlpanel/icons/module-network.svg) | 0 | ||||
| -rw-r--r-- | src/controlpanel/Makefile.am | 2 | ||||
| -rw-r--r-- | src/controlpanel/gui.py | 11 |
10 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 1981fbc..9e5f9a4 100644 --- a/configure.ac +++ b/configure.ac @@ -40,10 +40,10 @@ AC_OUTPUT([ Makefile bin/Makefile data/Makefile +data/icons/Makefile service/Makefile src/Makefile src/controlpanel/Makefile -src/controlpanel/icons/Makefile src/controlpanel/model/Makefile src/controlpanel/view/Makefile src/intro/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 7771ce9..bf9242f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = icons + sugar.gtkrc: gtkrc.em $(srcdir)/em.py -D theme=\'sugar\' $(srcdir)/gtkrc.em > \ $(top_builddir)/data/sugar.gtkrc diff --git a/src/controlpanel/icons/Makefile.am b/data/icons/Makefile.am index 1d5d478..5b7c8e6 100644 --- a/src/controlpanel/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,4 +1,4 @@ -sugardir = $(pkgdatadir)/shell/controlpanel/icons +sugardir = $(pkgdatadir)/data/icons sugar_DATA = \ module-about_me.svg \ @@ -7,4 +7,4 @@ sugar_DATA = \ module-language.svg \ module-network.svg -EXTRA_DIST = $(sugar_DATA)
\ No newline at end of file +EXTRA_DIST = $(sugar_DATA) diff --git a/src/controlpanel/icons/module-about_me.svg b/data/icons/module-about_me.svg index 7abe926..7abe926 100644 --- a/src/controlpanel/icons/module-about_me.svg +++ b/data/icons/module-about_me.svg diff --git a/src/controlpanel/icons/module-about_my_xo.svg b/data/icons/module-about_my_xo.svg index cf3528e..cf3528e 100644 --- a/src/controlpanel/icons/module-about_my_xo.svg +++ b/data/icons/module-about_my_xo.svg diff --git a/src/controlpanel/icons/module-date_and_time.svg b/data/icons/module-date_and_time.svg index 605dbeb..605dbeb 100644 --- a/src/controlpanel/icons/module-date_and_time.svg +++ b/data/icons/module-date_and_time.svg diff --git a/src/controlpanel/icons/module-language.svg b/data/icons/module-language.svg index ce04cb4..ce04cb4 100644 --- a/src/controlpanel/icons/module-language.svg +++ b/data/icons/module-language.svg diff --git a/src/controlpanel/icons/module-network.svg b/data/icons/module-network.svg index a750a38..a750a38 100644 --- a/src/controlpanel/icons/module-network.svg +++ b/data/icons/module-network.svg diff --git a/src/controlpanel/Makefile.am b/src/controlpanel/Makefile.am index e626af4..41141aa 100644 --- a/src/controlpanel/Makefile.am +++ b/src/controlpanel/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = model view icons +SUBDIRS = model view sugardir = $(pkgdatadir)/shell/controlpanel sugar_PYTHON = \ diff --git a/src/controlpanel/gui.py b/src/controlpanel/gui.py index 98f93b6..413d560 100644 --- a/src/controlpanel/gui.py +++ b/src/controlpanel/gui.py @@ -37,10 +37,6 @@ class ControlPanel(gtk.Window): def __init__(self): gtk.Window.__init__(self) - icons_path = os.path.join(config.prefix, - 'share/sugar/shell/controlpanel/icons') - gtk.icon_theme_get_default().append_search_path(icons_path) - self.set_border_width(style.LINE_WIDTH) offset = style.GRID_CELL_SIZE width = gtk.gdk.screen_width() - offset * 2 @@ -200,10 +196,9 @@ class ControlPanel(gtk.Window): structure: {'optionname': {'view', 'model', 'button', 'keywords', 'icon'} } ''' - path = os.path.join(config.prefix, 'share/sugar/shell') - + subpath = ['controlpanel', 'view'] - names = os.listdir(os.path.join(path, '/'.join(subpath))) + names = os.listdir(os.path.join(config.shell_path, '/'.join(subpath))) for name in names: if name.endswith('.py') and name != '__init__.py': tmp = name.strip('.py') @@ -220,7 +215,7 @@ class ControlPanel(gtk.Window): self._options[tmp]['color'] = getattr(mod, 'COLOR', None) subpath = ['controlpanel', 'model'] - names = os.listdir(os.path.join(path, '/'.join(subpath))) + names = os.listdir(os.path.join(config.shell_path, '/'.join(subpath))) for name in names: if name.endswith('.py') and name != '__init__.py': tmp = name.strip('.py') |
