diff options
| -rw-r--r-- | ChangeLog | 58 | ||||
| -rw-r--r-- | TODO | 52 | ||||
| -rw-r--r-- | docs/website/article.html | 4 | ||||
| -rw-r--r-- | docs/website/auteur.html | 2 | ||||
| -rw-r--r-- | docs/website/footer.html | 2 | ||||
| -rw-r--r-- | docs/website/forum.html | 2 | ||||
| -rw-r--r-- | docs/website/gcompris.css | 33 | ||||
| -rw-r--r-- | docs/website/header.html | 10 | ||||
| -rw-r--r-- | docs/website/rubrique.html | 4 | ||||
| -rw-r--r-- | docs/website/sommaire.html | 4 | ||||
| -rw-r--r-- | src/boards/click_on_letter.c | 18 | ||||
| -rw-r--r-- | src/gcompris/bonus.c | 4 |
12 files changed, 145 insertions, 48 deletions
@@ -1,3 +1,61 @@ +2005-03-09 Bruno coudoin <bruno.coudoin@free.fr> + + Updated TODO related to the PROFILE DESIGN + Web site updated + Fixed major bug and crash in click_on_letter. One problem was a free + on the text being passed to the wagon. The othe is a bad side effect of the + focus on the wagon. + final bonus now hide the toolbar. + + * TODO: + * docs/website/article.html: + * docs/website/auteur.html: + * docs/website/footer.html: + * docs/website/forum.html: + * docs/website/gcompris.css: + * docs/website/header.html: + * docs/website/rubrique.html: + * docs/website/sommaire.html: + * src/boards/click_on_letter.c: (click_on_letter_create_item): + * src/gcompris/bonus.c: (end_board_finished), (board_finished): + +2005-03-07 Bruno coudoin <bruno.coudoin@free.fr> + + Updated the website (on a Aurelie Casties design) + improved docs/gcompris2spip.pl to detect if we miss locale + information + + * docs/C/python.html: + * docs/gcompris2spip.pl: + * docs/website/article.html: + * docs/website/footer.html: + * docs/website/gcompris.css: + * docs/website/header.html: + * docs/website/inc_layer.php3: + * docs/website/menu.html: + * docs/website/rubrique.html: + * docs/website/sommaire.html: + +2005-03-06 Bruno coudoin <bruno.coudoin@free.fr> + + Preparing a new web site design by Aurelie Casties + Fixed anim.py to disable SVG if python xml is not available. (Thanks + Ronny for the test) + Chess, swapped white and black board color to be chess compliant + thanks to Granier Thomas (6 years old) for reporting that. + + * docs/website/gcompris.css: + * docs/website/header.html: + * docs/website/menu.html: + * po_report.pl: + * src/boards/chess.c: + * src/boards/python/anim.py: + +2005-03-05 Bruno coudoin <bruno.coudoin@free.fr> + + * po_report.pl: created by Bruno, it's not gcompris specific. it is used to create + status report of .po translations + 2005-03-04 Bruno coudoin <bruno.coudoin@free.fr> Completed the filemanager for real this time. @@ -91,3 +91,55 @@ faut vider le tampon du clavier au début du tableau) - quand on est en mode plein écran, et qu'on clique sur "aide" dans l'écran "à propos", il lance un navigateur qui n'est pas visible. +----------- PROFILE DESIGN ------------- + +We need to create a profile and edition mecanism in gcompris. Here is a +description of how we plan to implement this. This has been designed on +an IRC chat session with Yves. + +Profiles can be edited when gcompris is started with 'gcompris -e'. + +Profile provides there features: +- A profile can be associated with a list of kids name. In this case, +gcompris will display a login selector with the list of names when run +in this profile. No passwords are managed. +- A profile can be associated a list of activities (currently done in +gcompris_edit, gcompris_edit is deleted). +- There is always at least one profile ('default' by default). + +The trace mecanism includes the profil (default is none selected) andhe gcompris kids name instead of the unix user name if available. + +when gcompris -e is run, if an activities is editable, the edit button +in the gcompris bar will apprear. +Each activity is in charge of editing its content. it's content is +always savedn .gcompris/activities_data/<activity_name>/<profile>/<board specific +here> +GCompris core provides facilities to the edition. The first facility to +be implemented is to edit text. in the api, we provideompris_edit("some explanation", validator_callback). +The explanation will be display above the text entry. The teacher will +edit the text (like list of words in the entry box). The validator +callback returns an empty string if text is ok, an error message else. + +When a board is started it first check for a content +in .gcompris/activities_data/<activity_name>/<profile>/ +if none avalaible here, then the default is usedhese new fatures are mandatory in gcompris is we want to go further, +especialy in reading activities. There is many ideas we could implement +easily in the reading area but we cannot until we have in place a goodowerfull and generic edition and profiling mecanism. + +Teachers want to have some edit capability to adapt gcompris to their +courses. We could make some dirty hack and go faster but in the end we +will loose the maintainabilty of gcompris. I want to keep gcompris fun +to code and continue the strong separation between the boards and the +core. + +Now in term of planning, I cannot work on this now. My plan is to +integrate gcompris with physicfs like we talked here a few monthes ago. +Then make a new release for the windows version. This is most important +because it will make it easier to distribute updates (python activities +only) to all our users, whatever the platform they use. + +This will allows us to make gcompris a complete, full featuredducational software that rivals many proprietary ones. + +If somebody want to work on the profile concept, we will be abble to +provide these features at least 6 monthes earlier than what I can do. + diff --git a/docs/website/article.html b/docs/website/article.html index 51ae4f4..3cd0dd1 100644 --- a/docs/website/article.html +++ b/docs/website/article.html @@ -17,9 +17,9 @@ </head>
- <body>
+ <body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<!-- Titre du site et lien vers l'accueil -->
- <div id="HEADER">
+ <div>
<INCLURE(header.php3)>
</div>
diff --git a/docs/website/auteur.html b/docs/website/auteur.html index 19595bd..a8217fb 100644 --- a/docs/website/auteur.html +++ b/docs/website/auteur.html @@ -9,7 +9,7 @@ <BODY> <!-- Titre du site et lien vers l'accueil --> -<div id="HEADER"> +<div> <INCLURE(header.php3)> </div> diff --git a/docs/website/footer.html b/docs/website/footer.html index f9c803e..f1d9396 100644 --- a/docs/website/footer.html +++ b/docs/website/footer.html @@ -1 +1 @@ -
<!-- Copyright du site -->
Copyright 2004-2005 <A href="mailto:bruno.coudoin@free.fr"> Bruno Coudoin </A> Licence GNU/FDL. <BR>
<!-- Webmaster du site -->
Vous avez constaté un problème technique ? Contactez le Webmaster :
<A href="mailto:bruno.coudoin@free.fr"> Webmaster </A><BR>
<!-- Spip, CMS sous licence GPL -->
Site construit autour de l'application <A href="http://www.spip.net"> SPIP </A> Squelettes
du site. Licence GPL.
Web site design by Aurélie Casties.
<p>
<a href="http://validator.w3.org/check?uri=referer"><img border="0"
src="http://www.w3.org/Icons/valid-html401"
alt="Valid HTML 4.01!" height="31" width="88"></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">
<img style="border:0;width:88px;height:31px"
src="http://jigsaw.w3.org/css-validator/images/vcss"
alt="Valid CSS!">
</a>
</p>
<p>
<a href="http://www.ofset.org/">
<img style="border:0"
src="NAVPICS/ofset-banner.png"
alt="OFSET: Organisation for Free Software in Education and Teaching">
</a>
<a href="http://nosoftwarepatents.com/"><img border="0"
src="http://nosoftwarepatents.com/banners/banner_fr_1.gif"
alt="No Software Patents"></a>
</p>
\ No newline at end of file +
<!-- Copyright du site -->
Copyright 2004-2005 <A href="mailto:bruno.coudoin@free.fr"> Bruno Coudoin </A> Licence GNU/FDL. <BR>
<!-- Webmaster du site -->
Vous avez constaté un problème technique ? Contactez le Webmaster :
<A href="mailto:bruno.coudoin@free.fr"> Webmaster </A><BR>
<!-- Spip, CMS sous licence GPL -->
Site construit autour de l'application <A href="http://www.spip.net"> SPIP </A> Squelettes
du site. Licence GPL.
Web site design by <a href="http://aurelie.casties.free.fr">Aurélie Casties</a>.
<p>
<a href="http://validator.w3.org/check?uri=referer"><img border="0"
src="http://www.w3.org/Icons/valid-html401"
alt="Valid HTML 4.01!" height="31" width="88"></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">
<img style="border:0;width:88px;height:31px"
src="http://jigsaw.w3.org/css-validator/images/vcss"
alt="Valid CSS!">
</a>
</p>
<p>
<a href="http://www.ofset.org/">
<img style="border:0"
src="NAVPICS/ofset-banner.png"
alt="OFSET: Organisation for Free Software in Education and Teaching">
</a>
<a href="http://nosoftwarepatents.com/"><img border="0"
src="http://nosoftwarepatents.com/banners/banner_fr_1.gif"
alt="No Software Patents"></a>
</p>
\ No newline at end of file diff --git a/docs/website/forum.html b/docs/website/forum.html index 3419034..3ae872a 100644 --- a/docs/website/forum.html +++ b/docs/website/forum.html @@ -18,7 +18,7 @@ MM_reloadPage(true); <link href="spip_style.css" rel="stylesheet" type="text/css">
</head>
-<body>
+<body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<!-- Titre du site et lien vers l'accueil -->
<div id="HEADER">
diff --git a/docs/website/gcompris.css b/docs/website/gcompris.css index ef228c1..f5847bb 100644 --- a/docs/website/gcompris.css +++ b/docs/website/gcompris.css @@ -1,26 +1,18 @@ /* CSS Document */ -#HEADER { - position : absolute; - left : 5px; - right : 5px; - top : 10px; - width : 100%; - margin : 0px; - border: 0px solid #111; - background-color: #FFFFFF; - border-color : #FF0000; - padding: 5px; - #display: block; - #float: left; -} - #HEADERRIGHT { position : absolute; - #width: 200px; - top : 5px; - #margin: 0; - right : 5%; + top : 0px; + right : 0%; + z-index: 1; + border: 0px solid; +} +#HEADERLOGO { + position : absolute; + left : 0%; + top : 0px; + z-index: 2; + border: 0px solid; } #MENU { @@ -46,9 +38,6 @@ background-color: #ffffff; border-color : #f27979; } -#logo{ -margin:0em; -} .imprimer { height: 50px; width: 50px; diff --git a/docs/website/header.html b/docs/website/header.html index 6744dca..284ac72 100644 --- a/docs/website/header.html +++ b/docs/website/header.html @@ -1,10 +1,4 @@ -<div id="logo">
<a href="#URL_SITE_SPIP" title="<:accueil_site:>">
- <img alt="<:accueil_site:>" style="border: 0px solid;" src="NAVPICS/bandeauhaut.gif">
+ <img id="HEADERLOGO" alt="<:accueil_site:>" src="NAVPICS/bandeauhaut.gif">
+ <img id="HEADERRIGHT" alt="<:accueil_site:>" src="NAVPICS/hautdroit.gif">
</a>
-</div>
-<div id="HEADERRIGHT">
- <a href="#URL_SITE_SPIP" title="<:accueil_site:>">
- <img alt="<:accueil_site:>" style="border: 0px solid;" src="NAVPICS/hautdroit.gif">
- </a>
-</div>
diff --git a/docs/website/rubrique.html b/docs/website/rubrique.html index 2c25bb9..026f67d 100644 --- a/docs/website/rubrique.html +++ b/docs/website/rubrique.html @@ -17,9 +17,9 @@ <link href="gcompris.css" rel="stylesheet" type="text/css">
</head>
- <body>
+ <body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<!-- Titre du site et lien vers l'accueil -->
- <div id="HEADER">
+ <div>
<INCLURE(header.php3)>
</div>
diff --git a/docs/website/sommaire.html b/docs/website/sommaire.html index d0b0812..f9155a9 100644 --- a/docs/website/sommaire.html +++ b/docs/website/sommaire.html @@ -19,10 +19,10 @@ MM_reloadPage(true); </head>
-<body>
+<body TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
<!-- Titre du site et lien vers l'accueil -->
-<div id="HEADER">
+<div>
<INCLURE (header.php3)>
</div>
diff --git a/src/boards/click_on_letter.c b/src/boards/click_on_letter.c index 6fc58bf..2d29ba1 100644 --- a/src/boards/click_on_letter.c +++ b/src/boards/click_on_letter.c @@ -358,20 +358,20 @@ static GnomeCanvasItem *click_on_letter_create_item(GnomeCanvasGroup *parent) l_items[i] = gnome_canvas_item_new (boardRootItem, - gnome_canvas_text_get_type (), - "text", letters[i] , - "font", gcompris_skin_font_board_huge_bold, - "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", 0x0000ffff, - "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, - "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5, - NULL); + gnome_canvas_text_get_type (), + "text", g_strdup(letters[i]), + "font", gcompris_skin_font_board_huge_bold, + "anchor", GTK_ANCHOR_CENTER, + "fill_color_rgba", 0x0000ffff, + "x", (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2, + "y", (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5, + NULL); g_free(letters[i]); xOffset +=HORIZONTAL_SEPARATION +gdk_pixbuf_get_width(button_pixmap); gtk_signal_connect(GTK_OBJECT(l_items[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i)); gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i)); - gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL); + // gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL); } diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c index 576f596..9871d7b 100644 --- a/src/gcompris/bonus.c +++ b/src/gcompris/bonus.c @@ -81,6 +81,8 @@ void end_board_finished() { board_finished_running = FALSE; + gcompris_bar_hide(FALSE); + // go back to previous board layout if (get_current_board_plugin()->end_board) get_current_board_plugin()->end_board(); @@ -94,6 +96,8 @@ void board_finished(int type) { GdkPixbuf *pixmap_door1 = NULL,*pixmap_door2 = NULL,*pixmap_tuxplane = NULL; char * str = NULL; + gcompris_bar_hide(TRUE); + if (board_finished_running) return; else |