Commit f30ec7d8 authored by Bruno Coudoin's avatar Bruno Coudoin

many little fix around

svn path=/branches/gcomprixogoo/; revision=3583
parent 82c84627
......@@ -722,6 +722,8 @@ src/searace-activity/resources/Makefile
src/searace-activity/resources/searace/Makefile
src/administration-activity/admin/Makefile
src/administration-activity/Makefile
src/administration-activity/resources/Makefile
src/administration-activity/resources/administration/Makefile
src/ballcatch-activity/Makefile
src/ballcatch-activity/resources/Makefile
src/ballcatch-activity/resources/ballcatch/Makefile
......
......@@ -21,6 +21,7 @@ SUBDIRS = goocanvas gcompris boards \
colors-activity \
crane-activity \
doubleentry-activity \
doubleclick-activity \
enumerate-activity \
erase-activity \
erase_clic-activity \
......
SUBDIRS = admin
SUBDIRS = admin resources
pythondir = $(PYTHON_PLUGIN_DIR)
......
......@@ -229,7 +229,7 @@ class Board_list:
if board_cell[0] == None:
row_dict[''] = \
model.append(None,
[self.pixbuf_skin_at_height('tuxplane.png', height),
[self.pixbuf_admin_at_height('administration/tuxplane.png', height),
_('Main menu') + '\n' + '/',
not board_cell[1].board_id in self.out_dict[self.active_profile.profile_id],
'%s/%s' % (board_cell[1].section,board_cell[1].name), self.pixbuf_configurable(board_cell[1])])
......@@ -243,12 +243,11 @@ class Board_list:
'%s/%s' % (board_cell[1].section,board_cell[1].name), self.pixbuf_configurable(board_cell[1])])
def pixbuf_skin_at_height(self, file, height):
pixbuf = gcompris.skin.load_pixmap(file)
def pixbuf_admin_at_height(self, file, height):
pixbuf = gcompris.utils.load_pixmap(file)
width = pixbuf.get_width()* height / pixbuf.get_height()
del pixbuf
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(gcompris.DATA_DIR + '/' +
gcompris.skin.image_to_skin(file),
pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(gcompris.DATA_DIR + '/' + file,
width, height)
return pixbuf
......@@ -386,6 +385,8 @@ class Board_list:
pass
def row_selected(self, treeview, model):
if treeview.get_selection().get_selected()[1] == None:
return
path = model.get_path(treeview.get_selection().get_selected()[1])
self.selected_board = self.board_dict[model[path][3]]
......
imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/administration
img_DATA = \
tuxplane.png
EXTRA_DIST = $(img_DATA) ${xml_in_files}
CLEANFILES = $(xml_DATA)
SUBDIRS =
SUBDIRS =resources
pythondir = $(PYTHON_PLUGIN_DIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment