gcompris r3734 - in branches/gcomprixogoo/src: administration-activity/admin gcompris login-activity tuxpaint-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Feb 21 22:59:05 2009
New Revision: 3734
URL: http://svn.gnome.org/viewvc/gcompris?rev=3734&view=rev

Log:
Fixed the login menu configuration that was not accessible
from the administration.


Modified:
   branches/gcomprixogoo/src/administration-activity/admin/board_list.py
   branches/gcomprixogoo/src/gcompris/board_config.c
   branches/gcomprixogoo/src/gcompris/menu.c
   branches/gcomprixogoo/src/login-activity/login.py
   branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py

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	Sat Feb 21 22:59:05 2009
@@ -165,13 +165,6 @@
       self.button_locales_sound.show()
       box3.pack_end(self.button_locales_sound, False, False, 0)
 
-      self.button_wordlist = gtk.Button(_('Wordlist'))
-      self.button_wordlist.connect("clicked", self.wordlist)
-      self.button_wordlist.show()
-      box3.pack_end(self.button_wordlist, False, False, 0)
-      #not ready yet
-      self.button_wordlist.set_sensitive(False)
-
       self.button_login = gtk.Button(_('Login'))
       self.button_login.connect("clicked", self.login_configure)
       self.button_login.show()
@@ -398,8 +391,6 @@
   def configure_board(self, button):
     gcompris.admin.board_config_start(self.selected_board,
                                       self.active_profile)
-    #unused
-    #gcompris.admin.board_config_stop(self.selected_board)
 
   def select_all_boards(self, button, Value):
     self.model.foreach(self.update_all, Value)
@@ -699,15 +690,8 @@
 
 
   def login_configure(self, button):
-    print "debug: login_configure"
+
     board_log = self.get_board_by_name('/login/login', self.boards_list)
-    print board_log
-    # FIXME This call no more work
-    gcompris.admin.board_config_start(board_log,
-                                      self.active_profile)
-    print "debug: done"
 
+    gcompris.admin.start(board_log, self.active_profile)
 
-  def wordlist(self, button):
-    import wordlist
-    wordlist.Words_list(self.con, self.cur, self.active_profile)

Modified: branches/gcomprixogoo/src/gcompris/board_config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board_config.c	(original)
+++ branches/gcomprixogoo/src/gcompris/board_config.c	Sat Feb 21 22:59:05 2009
@@ -28,13 +28,18 @@
 gc_board_config_start(GcomprisBoard *aBoard, GcomprisProfile *aProfile)
 {
 
+  if (aBoard->plugin == NULL)
+    gc_board_check_file(aBoard);
+
   if (aBoard->plugin == NULL){
-    g_warning("gc_board_config_start: board %s/%s is not initialised ? Hummmm...", aBoard->section,aBoard->name);
+    g_warning("gc_board_config_start: board %s/%s is not initialised ? Hummmm...",
+	      aBoard->section, aBoard->name);
     return;
   }
 
   if (aBoard->plugin->config_start == NULL) {
-    g_warning("Trying to configure board %s/%s without config_start", aBoard->section,aBoard->name);
+    g_warning("Trying to configure board %s/%s without config_start",
+	      aBoard->section, aBoard->name);
     return;
   }
 

Modified: branches/gcomprixogoo/src/gcompris/menu.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/menu.c	(original)
+++ branches/gcomprixogoo/src/gcompris/menu.c	Sat Feb 21 22:59:05 2009
@@ -643,7 +643,7 @@
       g_date_set_time (today, time (NULL));
 #endif
       gchar date[11];
-      g_date_strftime (date, 11, "%F", today);
+      g_date_strftime (date, 11, "%Y-%m-%d", today);
       gc_db_set_date(date);
       gc_db_set_version(VERSION);
       g_date_free(today);

Modified: branches/gcomprixogoo/src/login-activity/login.py
==============================================================================
--- branches/gcomprixogoo/src/login-activity/login.py	(original)
+++ branches/gcomprixogoo/src/login-activity/login.py	Sat Feb 21 22:59:05 2009
@@ -462,7 +462,6 @@
       widget.set_text('')
 
   def config_start(self, profile):
-    print "debug login.py config_start"
     # keep profile in mind
     self.configuring_profile = profile
 

Modified: branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py
==============================================================================
--- branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py	(original)
+++ branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py	Sat Feb 21 22:59:05 2009
@@ -212,8 +212,10 @@
     self.stamps_control.set_sensitive(not button.get_active())
 
   def apply_callback(self,table):
-    for key,value in table.iteritems():
-      gcompris.set_board_conf(self.configure_profile, self.gcomprisBoard, key, value)
+    if table:
+      for key,value in table.iteritems():
+        gcompris.set_board_conf(self.configure_profile, self.gcomprisBoard,
+                              key, value)
 
   def init_config(self):
     default_config_dict = { 'fullscreen'             : 'True',