gcompris r3583 - in branches/gcomprixogoo: . src src/administration-activity src/administration-activity/admin src/administration-activity/resources src/administration-activity/resources/administration src/doubleclick-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Mon Oct 27 19:07:59 2008
New Revision: 3583
URL: http://svn.gnome.org/viewvc/gcompris?rev=3583&view=rev

Log:
many little fix around


Added:
   branches/gcomprixogoo/src/administration-activity/resources/Makefile.am
   branches/gcomprixogoo/src/administration-activity/resources/administration/
   branches/gcomprixogoo/src/administration-activity/resources/administration/Makefile.am
   branches/gcomprixogoo/src/administration-activity/resources/administration/tuxplane.png   (contents, props changed)
Modified:
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/Makefile.am
   branches/gcomprixogoo/src/administration-activity/Makefile.am
   branches/gcomprixogoo/src/administration-activity/admin/board_list.py
   branches/gcomprixogoo/src/doubleclick-activity/Makefile.am

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Mon Oct 27 19:07:59 2008
@@ -722,6 +722,8 @@
 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

Modified: branches/gcomprixogoo/src/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/Makefile.am	(original)
+++ branches/gcomprixogoo/src/Makefile.am	Mon Oct 27 19:07:59 2008
@@ -21,6 +21,7 @@
 	colors-activity \
 	crane-activity \
 	doubleentry-activity \
+	doubleclick-activity \
 	enumerate-activity \
 	erase-activity \
 	erase_clic-activity \

Modified: branches/gcomprixogoo/src/administration-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/administration-activity/Makefile.am	Mon Oct 27 19:07:59 2008
@@ -1,4 +1,4 @@
-SUBDIRS = admin
+SUBDIRS = admin resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)
 

Modified: branches/gcomprixogoo/src/administration-activity/admin/board_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/board_list.py	(original)
+++ branches/gcomprixogoo/src/administration-activity/admin/board_list.py	Mon Oct 27 19:07:59 2008
@@ -229,7 +229,7 @@
       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 @@
                                        '%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 @@
     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]]

Added: branches/gcomprixogoo/src/administration-activity/resources/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/administration-activity/resources/Makefile.am	Mon Oct 27 19:07:59 2008
@@ -0,0 +1 @@
+SUBDIRS=administration

Added: branches/gcomprixogoo/src/administration-activity/resources/administration/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/administration-activity/resources/administration/Makefile.am	Mon Oct 27 19:07:59 2008
@@ -0,0 +1,6 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/administration
+img_DATA = \
+	tuxplane.png
+
+EXTRA_DIST = $(img_DATA) ${xml_in_files}
+CLEANFILES = $(xml_DATA)

Added: branches/gcomprixogoo/src/administration-activity/resources/administration/tuxplane.png
==============================================================================
Binary file. No diff available.

Modified: branches/gcomprixogoo/src/doubleclick-activity/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/doubleclick-activity/Makefile.am	(original)
+++ branches/gcomprixogoo/src/doubleclick-activity/Makefile.am	Mon Oct 27 19:07:59 2008
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS =resources
 
 pythondir = $(PYTHON_PLUGIN_DIR)