Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2005-09-02 20:14:51 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2005-09-02 20:14:51 (GMT)
commitb63e1d05d3144c46caf3162e8a3ea1677e7e7922 (patch)
treeb452a306795c1c86278ae621792ecc8f1174b070
parent13e8c7bcbfc5b3c4f0d8833a1ad494cbab9764a1 (diff)
fixed to make it clickeable renamed, name too longR_7_0_PRE1
* boards/gcompris/misc/raquette.png: fixed to make it clickeable * boards/music/background/Brahms_Johannes-String_Quartet_C_minor_Op _51_mvmt_4.ogg: renamed, name too long * boards/music/background/Brahms__Johannes_-_String_Quartet_C_minor __Op_51_mvmt_4.ogg: * docs/create_thumbnails.pl: fixed, do not overwrite created thumbs * docs/gcompris2spip.pl: fixed menu creation.
-rw-r--r--ChangeLog10
-rw-r--r--boards/gcompris/misc/raquette.pngbin25516 -> 25476 bytes
-rw-r--r--boards/music/background/Brahms_Johannes-String_Quartet_C_minor_Op_51_mvmt_4.ogg (renamed from boards/music/background/Brahms__Johannes_-_String_Quartet_C_minor__Op_51_mvmt_4.ogg)bin4998997 -> 4998997 bytes
-rwxr-xr-xdocs/create_thumbnails.pl4
-rwxr-xr-xdocs/gcompris2spip.pl18
5 files changed, 27 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f31a504..50aa661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-02 Bruno coudoin <bruno.coudoin@free.fr>
+
+ * boards/gcompris/misc/raquette.png: fixed to make it clickeable
+ * boards/music/background/Brahms_Johannes-String_Quartet_C_minor_Op
+ _51_mvmt_4.ogg: renamed, name too long
+ * boards/music/background/Brahms__Johannes_-_String_Quartet_C_minor
+ __Op_51_mvmt_4.ogg:
+ * docs/create_thumbnails.pl: fixed, do not overwrite created thumbs
+ * docs/gcompris2spip.pl: fixed menu creation.
+
2005-09-01 Yves Combe <yves@ycombe.net>
add more trace ofr the strange segfault
diff --git a/boards/gcompris/misc/raquette.png b/boards/gcompris/misc/raquette.png
index 040d786..c8458a0 100644
--- a/boards/gcompris/misc/raquette.png
+++ b/boards/gcompris/misc/raquette.png
Binary files differ
diff --git a/boards/music/background/Brahms__Johannes_-_String_Quartet_C_minor__Op_51_mvmt_4.ogg b/boards/music/background/Brahms_Johannes-String_Quartet_C_minor_Op_51_mvmt_4.ogg
index 2c4bbb7..2c4bbb7 100644
--- a/boards/music/background/Brahms__Johannes_-_String_Quartet_C_minor__Op_51_mvmt_4.ogg
+++ b/boards/music/background/Brahms_Johannes-String_Quartet_C_minor_Op_51_mvmt_4.ogg
Binary files differ
diff --git a/docs/create_thumbnails.pl b/docs/create_thumbnails.pl
index ab37c05..1c88a5e 100755
--- a/docs/create_thumbnails.pl
+++ b/docs/create_thumbnails.pl
@@ -19,9 +19,11 @@ foreach my $image (@files) {
# Skip old thumbs
next if ($image =~ m/_small\.jpg/);
- print "Processing $image\n";
my $file = "$screenshots_dir/$image";
(my $thumb = $file) =~ s/\.jpg/_small\.jpg/;
+
+ next if (-f "$thumb");
+
system ("convert -geometry ".$thumb_size.
" -quality 100 $file $thumb") == 0
|| die "Problems with convert: $?\n";
diff --git a/docs/gcompris2spip.pl b/docs/gcompris2spip.pl
index 0d2e829..114a5f5 100755
--- a/docs/gcompris2spip.pl
+++ b/docs/gcompris2spip.pl
@@ -289,10 +289,15 @@ foreach my $board (@files) {
$board_section = ($board_content =~ /section=\"([a-zA-Z\/\.]+)\"/)[0];
$board_name = ($board_content =~ /name=\"([a-zA-Z\/\.\:]+)\"/)[0];
$board_type = ($board_content =~ /type=\"([a-zA-Z\/\.\:]+)\"/)[0];
- if($board_type eq "menu") {
+
+ if($board_type eq "menu" and $board_name ne "root") {
print " This is a menu\n";
my @section;
- push(@section, "$board_section/$board_name");
+ if( $board_section ne "/") {
+ push(@section, "$board_section/$board_name");
+ } else {
+ push(@section, "/$board_name");
+ }
push(@section, $board_name);
print " Section=$board_section\n";
@@ -313,7 +318,6 @@ foreach my $board (@files) {
done:
close(BOARD);
}
-
print OUTPUT "\n</GComprisBoards>\n";
close (OUTPUT);
@@ -339,7 +343,7 @@ foreach my $onesection (@sections) {
my $output = `xsltproc --stringparam language $lang --stringparam date "${date}" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file`;
- # print "xsltproc --stringparam language $lang --stringparam date \"${date}\" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file\n";
+ #print "xsltproc --stringparam language $lang --stringparam date \"${date}\" --stringparam article_id ${article_id} --stringparam rubrique_id $rubriques{$lang} --stringparam section $section --stringparam name $name --stringparam section_id $sections{$lang} --stringparam traduction_id ${traduction_id} $xslfile $all_boards_file\n";
if ($?>>8) {
print "#\n";
@@ -378,6 +382,12 @@ foreach my $board (@files) {
print "\nProcessing $board\nLang:";
+ # Skip some boards
+ if($board eq "administration.xml") {
+ print " (administration is skipped)";
+ next;
+ }
+
# The first article is the reference article
my $traduction_id = $article_id;