Commit 90622526 authored by Bruno Coudoin's avatar Bruno Coudoin

Fixed the login menu configuration that was not accessible

from the administration.

svn path=/branches/gcomprixogoo/; revision=3734
parent 4ba2e8f5
......@@ -165,13 +165,6 @@ class Board_list:
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 @@ class Board_list:
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 @@ class Board_list:
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)
......@@ -28,13 +28,18 @@ void
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;
}
......
......@@ -643,7 +643,7 @@ void gc_menu_load()
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);
......
......@@ -462,7 +462,6 @@ class Gcompris_login:
widget.set_text('')
def config_start(self, profile):
print "debug login.py config_start"
# keep profile in mind
self.configuring_profile = profile
......
......@@ -212,8 +212,10 @@ class Gcompris_tuxpaint:
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',
......
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