Added missing files for the edit mode (editing class)

	Re-Added gcompris-edit menu

	* Makefile.am:
	* gcompris-edit.desktop.in:
	* gcompris-edit.png:
	* src/boards/python/admin/.cvsignore:
	* src/boards/python/admin/Makefile.am:
	* src/boards/python/admin/class_list.py:
	* src/boards/python/admin/user_list.py:
	* src/boards/python/tuxpaint.py: bad return value

9 files changed, 692 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d268ab..6f70f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,26 @@
+2005-07-01  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	Added missing files for the edit mode (editing class)
+	Re-Added gcompris-edit menu
+	
+	* Makefile.am:
+	* gcompris-edit.desktop.in:
+	* gcompris-edit.png:
+	* src/boards/python/admin/.cvsignore:
+	* src/boards/python/admin/Makefile.am:
+	* src/boards/python/admin/class_list.py:
+	* src/boards/python/admin/user_list.py:
+	* src/boards/python/tuxpaint.py: bad return value
+
+2005-06-30  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	* INSTALL: fixed new dependancies pyxml, pysqlite sqlite-devel
+	* src/boards/python/admin/users.py: improved, started class-edit
+	* src/boards/python/admin/class_edit.py: started, no complete yet.
+	
 2005-07-01  Yves Combe  <yves@ycombe.net>
 
-	* gcompris.child_watch_add compris.spawn_async to bind g_child_watch_add and g_spawn_async, (code from pygtk 2.6)
+	* src/boards/py-mod-gcompris.c: gcompris.child_watch_add compris.spawn_async to bind g_child_watch_add and g_spawn_async, (code from pygtk 2.6)
 	* tuxpaint.py should now run with pygtk 2.4
 
 2005-06-30  Yves Combe <yves@ycombe.net>
diff --git a/Makefile.am b/Makefile.am
index 0de481b..d439c42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,11 @@ endif
 SUBDIRS = po src boards $(DOCS_SUBDIR)
 
 icondir=$(datadir)/pixmaps
-icon_DATA = gcompris.png
+icon_DATA = gcompris.png gcompris-edit.png
 
 Applicationsdir = $(datadir)/applications/
-Applications_in_files = gcompris.desktop.in
-Applications_DATA = gcompris.desktop
+Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
+Applications_DATA = gcompris.desktop gcompris-edit.desktop
 
 Menudir=$(prefix)/lib/menu
 Menu_DATA=gcompris
@@ -46,7 +46,7 @@ dist-hook:
 	fi
 
 
-CLEANFILES = core-translation-report gcompris.desktop gcompris.spec
+CLEANFILES = core-translation-report gcompris.desktop gcompris-edit.desktop gcompris.spec
 
 clean-local:
 	rm -f intltool-extract intltool-merge intltool-update
diff --git a/gcompris-edit.desktop.in b/gcompris-edit.desktop.in
new file mode 100644
index 0000000..dc06c24
--- /dev/null
+++ b/gcompris-edit.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=GCompris Editor
+_Comment=Editor for gcompris
+Exec=gcompris -e
+Icon=gcompris-edit.png
+Terminal=0
+Type=Application
+Categories=GNOME;Application;Game;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gcompris
+X-GNOME-Bugzilla-Component=
diff --git a/gcompris-edit.png b/gcompris-edit.png
new file mode 100644
index 0000000..ab7149c
--- /dev/null
+++ b/gcompris-edit.png
diff --git a/src/boards/python/admin/.cvsignore b/src/boards/python/admin/.cvsignore
new file mode 100644
index 0000000..43d8184
--- /dev/null
+++ b/src/boards/python/admin/.cvsignore
@@ -0,0 +1,8 @@
+*.la
+*.lo
+.deps
+.exrc
+.libs
+*.pyc
+Makefile
+Makefile.in
diff --git a/src/boards/python/admin/Makefile.am b/src/boards/python/admin/Makefile.am
index be66ae3..6d0247e 100644
--- a/src/boards/python/admin/Makefile.am
+++ b/src/boards/python/admin/Makefile.am
@@ -4,8 +4,11 @@ pythondir = $(PYTHON_PLUGIN_DIR)/admin
 
 dist_python_DATA= \
 	__init__.py \
-	  module.py \
-	  profiles.py \
-	  users.py
+	module.py \
+	profiles.py \
+	users.py \
+	user_list.py \
+	class_list.py \
+	class_edit.py
 
 
diff --git a/src/boards/python/admin/class_list.py b/src/boards/python/admin/class_list.py
new file mode 100644
index 0000000..71de323
--- /dev/null
+++ b/src/boards/python/admin/class_list.py
@@ -0,0 +1,271 @@
+#  gcompris - class_list.py
+# 
+# Time-stamp: <2001/08/20 00:54:45 bruno>
+# 
+# Copyright (C) 2005 Bruno Coudoin
+# 
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# 
+
+import gnome
+import gnome.canvas
+import gcompris
+import gcompris.utils
+import gcompris.skin
+import gtk
+import gtk.gdk
+import gobject
+from gettext import gettext as _
+
+# Database
+from pysqlite2 import dbapi2 as sqlite
+
+import class_edit
+
+# Class Management
+(
+  COLUMN_CLASSID,
+  COLUMN_NAME,
+  COLUMN_TEACHER,
+  COLUMN_CLASS_EDITABLE
+) = range(4)
+
+class Class_list:
+  """GCompris Class List Table"""
+
+
+  # area is the drawing area for the list
+  def __init__(self, canvas, db_connect, db_cursor, area, hgap, vgap):
+
+      self.rootitem = canvas
+      self.cur = db_cursor
+      self.con = db_connect
+      
+      # ---------------
+      # Class Management
+      # ---------------
+
+      # Grab the class data
+      self.cur.execute('select * from class')
+      self.class_data = self.cur.fetchall()
+
+      # Create the table
+      sw = gtk.ScrolledWindow()
+      sw.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+      sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+
+      # create tree model
+      model = self.__create_model_class()
+
+      # create tree view
+      treeview_class = gtk.TreeView(model)
+      treeview_class.set_rules_hint(True)
+      treeview_class.set_search_column(COLUMN_NAME)
+
+      sw.add(treeview_class)
+
+      # Some constants for the layout
+      but_height = hgap * 2
+      but_width  = hgap * 6
+            
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=sw,
+        x=area[0] + hgap,
+        y=area[1],
+        width=area[2]-area[0]-hgap*2-but_width,
+        height=area[3]-area[1],
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      sw.show()
+      treeview_class.show()
+
+      # add columns to the tree view
+      self.__add_columns_class(treeview_class)
+
+      # Add buttons
+
+      button_add = gtk.Button(_("Add class"))
+      button_add.connect("clicked", self.on_add_class_clicked, model)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_add,
+        x=area[2]-but_width,
+        y=area[1],
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_add.show()
+      
+      button_rem = gtk.Button(_("Remove class"))
+      button_rem.connect("clicked", self.on_remove_class_clicked, treeview_class)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_rem,
+        x=area[2]-but_width,
+        y=area[1] + but_height + vgap,
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_rem.show()
+
+      button_rem = gtk.Button(_("Edit class"))
+      button_rem.connect("clicked", self.on_edit_class_clicked, treeview_class)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_rem,
+        x=area[2]-but_width,
+        y=area[1] + but_height*2 + vgap*2,
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_rem.show()
+
+  # -------------------
+  # Class Management
+  # -------------------
+
+  def __create_model_class(self):
+    model = gtk.ListStore(
+      gobject.TYPE_INT,
+      gobject.TYPE_STRING,
+      gobject.TYPE_STRING,
+      gobject.TYPE_BOOLEAN)
+
+    for item in self.class_data:
+      iter = model.append()
+      model.set(iter,
+                 COLUMN_CLASSID,   item[COLUMN_CLASSID],
+                 COLUMN_NAME,      item[COLUMN_NAME],
+                 COLUMN_TEACHER,   item[COLUMN_TEACHER],
+                 COLUMN_CLASS_EDITABLE,  True)
+    return model
+
+
+  def __add_columns_class(self, treeview):
+    
+    model = treeview.get_model()
+
+    # columns for name
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_class_edited, model)
+    renderer.set_data("column", COLUMN_NAME)
+    column = gtk.TreeViewColumn(_('Name'), renderer,
+                                text=COLUMN_NAME,
+                                editable=COLUMN_CLASS_EDITABLE)
+    column.set_sort_column_id(COLUMN_NAME)
+    treeview.append_column(column)
+
+    # columns for first name
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_class_edited, model)
+    renderer.set_data("column", COLUMN_TEACHER)
+    column = gtk.TreeViewColumn(_('Teacher'), renderer,
+                                text=COLUMN_TEACHER,
+                                editable=COLUMN_CLASS_EDITABLE)
+    column.set_sort_column_id(COLUMN_TEACHER)
+    treeview.append_column(column)
+
+
+  # Return the next class id
+  def get_next_class_id(self):
+    self.cur.execute('select max(class_id) from class')
+    class_id = self.cur.fetchone()[0]
+    if(class_id == None):
+      class_id=0
+    else:
+      class_id += 1
+      
+    return class_id
+
+
+  # Add class in the model
+  def add_class_in_model(self, model, aclass):
+    iter = model.append()
+    model.set (iter,
+               COLUMN_CLASSID,    aclass[COLUMN_CLASSID],
+               COLUMN_NAME,       aclass[COLUMN_NAME],
+               COLUMN_TEACHER,    aclass[COLUMN_TEACHER],
+               COLUMN_CLASS_EDITABLE,  True
+               )
+
+    
+  #
+  def on_add_class_clicked(self, button, model):
+    class_id = self.get_next_class_id()
+
+    new_class = [class_id, "?", "?", "?", "?", 0]
+    self.add_class_in_model(model, new_class)
+
+
+  def on_remove_class_clicked(self, button, treeview):
+
+    selection = treeview.get_selection()
+    model, iter = selection.get_selected()
+
+    if iter:
+      path = model.get_path(iter)[0]
+      class_id = model.get_value(iter, COLUMN_CLASSID)
+      model.remove(iter)
+      # Remove it from the base
+      print "Deleting class_id=" + str(class_id)
+      self.cur.execute('delete from class where class_id=?', (class_id,))
+      self.con.commit()
+
+
+  def on_cell_class_edited(self, cell, path_string, new_text, model):
+
+    iter = model.get_iter_from_string(path_string)
+    path = model.get_path(iter)[0]
+    column = cell.get_data("column")
+
+    class_id = model.get_value(iter, COLUMN_CLASSID)
+    
+    if column == COLUMN_NAME:
+      model.set(iter, column, new_text)
+
+    elif column == COLUMN_TEACHER:
+      model.set(iter, column, new_text)
+
+    class_data = (class_id,
+                  model.get_value(iter, COLUMN_NAME),
+                  model.get_value(iter, COLUMN_TEACHER))
+    # Save the changes in the base
+    self.cur.execute('insert or replace into class (class_id, name, teacher) values (?, ?, ?)', class_data)
+    self.con.commit()
+
+
+  def on_edit_class_clicked(self, button, treeview):
+
+    selection = treeview.get_selection()
+    model, iter = selection.get_selected()
+
+    if iter:
+      path = model.get_path(iter)[0]
+      class_id   = model.get_value(iter, COLUMN_CLASSID)
+      class_name = model.get_value(iter, COLUMN_NAME)
+      class_edit.ClassEdit(self.con, self.cur, class_id, class_name)
+
+    else:
+      # Tell the user to select a class first
+      dialog = gtk.MessageDialog(None,
+                                 gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                                 gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+                                 _("You must first select a class in the list"))
+      dialog.run()
+      dialog.destroy()
diff --git a/src/boards/python/admin/user_list.py b/src/boards/python/admin/user_list.py
new file mode 100644
index 0000000..79bd673
--- /dev/null
+++ b/src/boards/python/admin/user_list.py
@@ -0,0 +1,366 @@
+#  gcompris - user_list.py
+# 
+# Time-stamp: <2001/08/20 00:54:45 bruno>
+# 
+# Copyright (C) 2005 Bruno Coudoin
+# 
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+# 
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+# 
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# 
+
+import gnome
+import gnome.canvas
+import gcompris
+import gcompris.utils
+import gcompris.skin
+import gtk
+import gtk.gdk
+import gobject
+from gettext import gettext as _
+
+# Database
+from pysqlite2 import dbapi2 as sqlite
+
+# User Management
+(
+  COLUMN_USERID,
+  COLUMN_LOGIN,
+  COLUMN_FIRSTNAME,
+  COLUMN_LASTNAME,
+  COLUMN_BIRTHDATE,
+  COLUMN_CLASS,
+  COLUMN_USER_EDITABLE
+) = range(7)
+
+class User_list:
+  """GCompris Users List Table"""
+
+
+  # area is the drawing area for the list
+  def __init__(self, canvas, db_connect, db_cursor, area, hgap, vgap):
+
+      self.rootitem = canvas
+      self.cur = db_cursor
+      self.con = db_connect
+      
+      # ---------------
+      # User Management
+      # ---------------
+
+      # Grab the user data
+      self.cur.execute('select * from users')
+      self.user_data = self.cur.fetchall()
+
+      # Create the table
+      sw = gtk.ScrolledWindow()
+      sw.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+      sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+
+      # create tree model
+      model = self.__create_model()
+
+      # create tree view
+      treeview = gtk.TreeView(model)
+      treeview.set_rules_hint(True)
+      treeview.set_search_column(COLUMN_FIRSTNAME)
+
+      sw.add(treeview)
+
+      # Some constants for the layout
+      but_height = hgap * 2
+      but_width  = hgap * 6
+            
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=sw,
+        x=area[0] + hgap,
+        y=area[1],
+        width=area[2]-area[0]-hgap*2-but_width,
+        height=area[3]-area[1],
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      sw.show()
+      treeview.show()
+
+      # add columns to the tree view
+      self.__add_columns(treeview)
+
+      # Add buttons
+
+      button_add = gtk.Button(_("Add user"))
+      button_add.connect("clicked", self.on_add_item_clicked, model)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_add,
+        x=area[2]-but_width,
+        y=area[1],
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_add.show()
+      
+      button_rem = gtk.Button(_("Remove user"))
+      button_rem.connect("clicked", self.on_remove_item_clicked, treeview)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_rem,
+        x=area[2]-but_width,
+        y=area[1] + but_height + vgap,
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_rem.show()
+
+      button_imp = gtk.Button(_("Import file"))
+      button_imp.connect("clicked", self.on_import_cvs_clicked, treeview)
+      self.rootitem.add(
+        gnome.canvas.CanvasWidget,
+        widget=button_imp,
+        x=area[2]-but_width,
+        y=area[1] + (but_height + vgap) * 2,
+        width=100,
+        height=but_height,
+        anchor=gtk.ANCHOR_NW,
+        size_pixels=gtk.FALSE)
+      button_imp.show()
+
+
+  # -------------------
+  # User Management
+  # -------------------
+
+  def __create_model(self):
+    model = gtk.ListStore(
+      gobject.TYPE_INT,
+      gobject.TYPE_STRING,
+      gobject.TYPE_STRING,
+      gobject.TYPE_STRING,
+      gobject.TYPE_STRING,
+      gobject.TYPE_INT,
+      gobject.TYPE_BOOLEAN)
+
+    for item in self.user_data:
+      iter = model.append()
+      model.set(iter,
+                 COLUMN_USERID,    item[COLUMN_USERID],
+                 COLUMN_LOGIN,     item[COLUMN_LOGIN],
+                 COLUMN_FIRSTNAME, item[COLUMN_FIRSTNAME],
+                 COLUMN_LASTNAME,  item[COLUMN_LASTNAME],
+                 COLUMN_BIRTHDATE, item[COLUMN_BIRTHDATE],
+                 COLUMN_CLASS,     item[COLUMN_CLASS],
+                 COLUMN_USER_EDITABLE,  True)
+    return model
+
+
+  def __add_columns(self, treeview):
+    
+    model = treeview.get_model()
+
+    # columns for login
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_edited, model)
+    renderer.set_data("column", COLUMN_LOGIN)
+    column = gtk.TreeViewColumn(_('Login'), renderer,
+                                text=COLUMN_LOGIN,
+                                editable=COLUMN_USER_EDITABLE)
+    column.set_sort_column_id(COLUMN_LOGIN)
+    treeview.append_column(column)
+
+    # columns for first name
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_edited, model)
+    renderer.set_data("column", COLUMN_FIRSTNAME)
+    column = gtk.TreeViewColumn(_('First Name'), renderer,
+                                text=COLUMN_FIRSTNAME,
+                                editable=COLUMN_USER_EDITABLE)
+    column.set_sort_column_id(COLUMN_FIRSTNAME)
+    treeview.append_column(column)
+
+    # column for last name
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_edited, model)
+    renderer.set_data("column", COLUMN_LASTNAME)
+    column = gtk.TreeViewColumn(_('Last Name'), renderer,
+                                text=COLUMN_LASTNAME,
+                                editable=COLUMN_USER_EDITABLE)
+    column.set_sort_column_id(COLUMN_LASTNAME)
+    treeview.append_column(column)
+
+    # column for birth date
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_edited, model)
+    renderer.set_data("column", COLUMN_BIRTHDATE)
+    column = gtk.TreeViewColumn(_('Birth Date'), renderer,
+                                text=COLUMN_BIRTHDATE,
+                                editable=COLUMN_USER_EDITABLE)
+    column.set_sort_column_id(COLUMN_BIRTHDATE)
+    treeview.append_column(column)
+
+    # column for class
+    renderer = gtk.CellRendererText()
+    renderer.connect("edited", self.on_cell_edited, model)
+    renderer.set_data("column", COLUMN_CLASS)
+    column = gtk.TreeViewColumn(_('Class'), renderer,
+                                text=COLUMN_CLASS,
+                                editable=COLUMN_USER_EDITABLE)
+    column.set_sort_column_id(COLUMN_CLASS)
+    treeview.append_column(column)
+
+
+  # Return the next user id
+  def get_next_user_id(self):
+    self.cur.execute('select max(user_id) from users')
+    user_id = self.cur.fetchone()[0]
+    if(user_id == None):
+      user_id=0
+    else:
+      user_id += 1
+      
+    return user_id
+
+
+  # Add user in the model
+  def add_user_in_model(self, model, user):
+    iter = model.append()
+    model.set (iter,
+               COLUMN_USERID,    user[COLUMN_USERID],
+               COLUMN_LOGIN,     user[COLUMN_LOGIN],
+               COLUMN_FIRSTNAME, user[COLUMN_FIRSTNAME],
+               COLUMN_LASTNAME,  user[COLUMN_LASTNAME],
+               COLUMN_BIRTHDATE, user[COLUMN_BIRTHDATE],
+               COLUMN_CLASS,     user[COLUMN_CLASS],
+               COLUMN_USER_EDITABLE,  True
+               )
+
+    
+  #
+  def on_add_item_clicked(self, button, model):
+    user_id = self.get_next_user_id()
+
+    new_user = [user_id, "?", "?", "?", "?", 0]
+    self.add_user_in_model(model, new_user)
+
+
+  def on_remove_item_clicked(self, button, treeview):
+
+    selection = treeview.get_selection()
+    model, iter = selection.get_selected()
+
+    if iter:
+      path = model.get_path(iter)[0]
+      user_id = model.get_value(iter, COLUMN_USERID)
+      model.remove(iter)
+      # Remove it from the base
+      print "Deleting user_id=" + str(user_id)
+      self.cur.execute('delete from users where user_id=?', (user_id,))
+      self.con.commit()
+
+
+  def on_import_cvs_clicked(self, button, treeview):
+
+    # Tell the user to select a class first
+    dialog = gtk.MessageDialog(None,
+                               gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                               gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+                               _("To import a file, it must be formated like this:\nlogin;First name;Last name;Birth date\nThe separator is autodetected and can be one of ',', ';' or ':'"))
+    dialog.run()
+    dialog.destroy()
+    
+    model = treeview.get_model()
+    
+    dialog = gtk.FileChooserDialog("Open..",
+                                   None,
+                                   gtk.FILE_CHOOSER_ACTION_OPEN,
+                                   (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                                    gtk.STOCK_OPEN, gtk.RESPONSE_OK))
+    dialog.set_default_response(gtk.RESPONSE_OK)
+    
+    filter = gtk.FileFilter()
+    filter.set_name("All files")
+    filter.add_pattern("*")
+    dialog.add_filter(filter)
+
+    response = dialog.run()
+    if response == gtk.RESPONSE_OK:
+      filename = dialog.get_filename()
+    elif response == gtk.RESPONSE_CANCEL:
+      dialog.destroy()
+      return
+    
+    dialog.destroy()
+
+    # Parse the file and include each line in the user table
+    file = open(filename, 'r')
+
+    # Determine the separator (the most used in the set ,;:)
+    # Warning, the input file must use the same separator on each line and
+    # between each fields
+    line = file.readline()
+    file.seek(0)
+    sep=''
+    count=0
+    for asep in [',', ';', ':']:
+      c = line.count(asep)
+      if(c>count):
+        count=c
+        sep=asep
+
+    for line in file.readlines():
+      print line
+      line = line.rstrip("\n\r")
+      user_id = self.get_next_user_id()
+      login, firstname, lastname, birthdate = line.split(sep)
+      # Save the changes in the base
+      new_user = [user_id, login, firstname, lastname, birthdate, 0]
+      self.add_user_in_model(model, new_user)
+      self.cur.execute('insert or replace into users (user_id, login, name, firstname, birthdate, class_id) values (?, ?, ?, ?, ?, ?)', new_user)
+      self.con.commit()
+
+    file.close()
+
+  def on_cell_edited(self, cell, path_string, new_text, model):
+
+    iter = model.get_iter_from_string(path_string)
+    path = model.get_path(iter)[0]
+    column = cell.get_data("column")
+
+    user_id = model.get_value(iter, COLUMN_USERID)
+    
+    if column == COLUMN_LOGIN:
+      model.set(iter, column, new_text)
+
+    elif column == COLUMN_FIRSTNAME:
+      model.set(iter, column, new_text)
+
+    elif column == COLUMN_LASTNAME:
+      model.set(iter, column, new_text)
+
+    elif column == COLUMN_BIRTHDATE:
+      model.set(iter, column, new_text)
+
+    user_data = (user_id,
+                 model.get_value(iter, COLUMN_LOGIN),
+                 model.get_value(iter, COLUMN_FIRSTNAME),
+                 model.get_value(iter, COLUMN_LASTNAME),
+                 model.get_value(iter, COLUMN_BIRTHDATE),
+                 model.get_value(iter, COLUMN_CLASS))
+
+    # Save the changes in the base
+    self.cur.execute('insert or replace into users (user_id, login, name, firstname, birthdate, class_id) values (?, ?, ?, ?, ?, ?)',
+                     user_data)
+    self.con.commit()
+
+
diff --git a/src/boards/python/tuxpaint.py b/src/boards/python/tuxpaint.py
index 5ce5fdb..b711e30 100644
--- a/src/boards/python/tuxpaint.py
+++ b/src/boards/python/tuxpaint.py
@@ -22,6 +22,8 @@ import gcompris
 import gcompris.utils
 import gcompris.bonus
 import gcompris.skin
+import gtk
+
 #import gobject
 from gettext import gettext as _
 
@@ -91,7 +93,7 @@ class Gcompris_tuxpaint:
     pass
 
   def key_press(self, keyval):
-    return FALSE
+    return gtk.FALSE
 
   def repeat(self):
     pass