multiple sizes support

diff --git a/booh b/booh
index 15c7e3ba81c8c22153d78763e7c1c423fd1aa956..28ae4a56921478ebdf9eebdefffeb2aa6888f5df 100755 (executable)
--- a/booh
+++ b/booh
@@ -42,7 +42,6 @@ $options = [
     [ '--clean',         '-c', GetoptLong::NO_ARGUMENT,       _("Clean destination directory") ],
 
     [ '--theme',         '-t', GetoptLong::REQUIRED_ARGUMENT, _("Select HTML theme to use") ],
-    [ '--size',          '-z', GetoptLong::REQUIRED_ARGUMENT, _("Size of images for `fullscreen' slideshow") ],
     [ '--captions',      '-C', GetoptLong::REQUIRED_ARGUMENT, _("File containing captions of images") ],
     [ '--captions-skel', '-k', GetoptLong::REQUIRED_ARGUMENT, _("Filename where the script will output a captions skeleton") ],
 
@@ -53,7 +52,6 @@ $options = [
 
 #- default values for some globals 
 $convert = 'convert -interlace line +profile "*"'
-$size = 'medium'
 $verbose_level = 2
 $captions = {}
 
@@ -119,8 +117,6 @@ def handle_options
 
             when '--theme'
                 select_theme(arg)
-            when '--size'
-                $size = arg
             when '--captions'
                 if File.readable?(arg)
                     use_captions(arg)
@@ -160,14 +156,6 @@ def handle_options
         select_theme('simple')
     end
 
-    size = $images_size.detect { |e| e['name'] == $size }
-    if !size
-        die __("Size %s not found in parameters of theme.", $size)
-    else
-        $sizeval = size['size']
-        $sizeval_thumbnails = size['thumbnails']
-        msg 3, __("Using sizes: fullscreen=%s, thumbnails=%s", $sizeval, $sizeval_thumbnails)
-    end
 end
 
 def select_theme(name)
@@ -294,150 +282,201 @@ def walk_source_dir
         msg 2, __("Outputting in %s...", dest_dir)
 
         #- resizes
-        fullscreen_images = []
-        thumbnail_images = []
+        for sizeobj in $images_size
+            fullscreen_images ||= {}
+            fullscreen_images[sizeobj['name']] = []
+            thumbnail_images ||= {}
+            thumbnail_images[sizeobj['name']] = []
+            thumbnail_videos ||= {}
+            thumbnail_videos[sizeobj['name']] = []
+        end
+
         images.each { |img|
             base_dest_img = dest_dir + '/' + img.sub(/\.[^\.]+$/, '')
-            fullscreen_dest_img = base_dest_img + "-#{$sizeval}.jpg"
-            thumbnail_dest_img  = base_dest_img + "-#{$sizeval_thumbnails}.jpg"
-            fullscreen_images << File.basename(fullscreen_dest_img)
-            thumbnail_images  << File.basename(thumbnail_dest_img)
-            if !File.exists?(fullscreen_dest_img) || !File.exists?(thumbnail_dest_img)
-                convert_options = ''
-                orientation = `exif #{img}`.detect { |line| line =~ /^Orientation/ }
-                if orientation =~ /right - top/
-                    convert_options += '-rotate 90 '
-                end
-                if orientation =~ /left - bottom/
-                    convert_options += '-rotate -90 '
-                end
-                if !File.exists?(fullscreen_dest_img)
-                    psys("#{$convert} #{convert_options}-geometry #{$sizeval} '#{dir}/#{img}' '#{fullscreen_dest_img}'")
-                end
-                if !File.exists?(thumbnail_dest_img)
-                    psys("#{$convert} #{convert_options}-geometry #{$sizeval_thumbnails} '#{dir}/#{img}' '#{thumbnail_dest_img}'")
+            for sizeobj in $images_size
+                size_fullscreen = sizeobj['fullscreen']
+                size_thumbnails = sizeobj['thumbnails']
+                fullscreen_dest_img = base_dest_img + "-#{size_fullscreen}.jpg"
+                thumbnail_dest_img  = base_dest_img + "-#{size_thumbnails}.jpg"
+                fullscreen_images[sizeobj['name']] << File.basename(fullscreen_dest_img)
+                thumbnail_images[sizeobj['name']]  << File.basename(thumbnail_dest_img)
+                if !File.exists?(fullscreen_dest_img) || !File.exists?(thumbnail_dest_img)
+                    convert_options = ''
+                    orientation = `exif '#{dir}/#{img}'`.detect { |line| line =~ /^Orientation/ }
+                    if orientation =~ /right - top/
+                        convert_options += '-rotate 90 '
+                    end
+                    if orientation =~ /left - bottom/
+                        convert_options += '-rotate -90 '
+                    end
+                    if !File.exists?(fullscreen_dest_img)
+                        psys("#{$convert} #{convert_options}-geometry #{size_fullscreen} '#{dir}/#{img}' '#{fullscreen_dest_img}'")
+                    end
+                    if !File.exists?(thumbnail_dest_img)
+                        psys("#{$convert} #{convert_options}-geometry #{size_thumbnails} '#{dir}/#{img}' '#{thumbnail_dest_img}'")
+                    end
                 end
             end
         }
 
         #- create thumbnails for videos
-        thumbnail_videos = []
         videos.each { |video|
-            thumbnail_dest_img = dest_dir + '/' + video.sub(/\.[^\.]+$/, '') + "-#{$sizeval_thumbnails}.jpg"
-            thumbnail_videos  << File.basename(thumbnail_dest_img)
-            if !File.exists?(thumbnail_dest_img)
-                cmd = "transcode -a 0 -c 1 -i '#{dir}/#{video}' -y jpg -o #{dest_dir}/screenshot.jpg >/dev/null 2>/dev/null"
-                msg 2, cmd
-                if system(cmd)
-                    sys("#{$convert} -geometry #{$sizeval_thumbnails} #{dest_dir}/screenshot.jpg000000.jpg '#{thumbnail_dest_img}'")
-                    destvideo = "#{dest_dir}/#{video}"
-                    if !File.exists?(destvideo)
-                        psys("cp '#{dir}/#{video}' '#{destvideo}'")
+            for sizeobj in $images_size
+                size_thumbnails = sizeobj['thumbnails']
+                thumbnail_dest_img = dest_dir + '/' + video.sub(/\.[^\.]+$/, '') + "-#{size_thumbnails}.jpg"
+                thumbnail_videos[sizeobj['name']] << File.basename(thumbnail_dest_img)
+                if !File.exists?(thumbnail_dest_img)
+                    if !File.exists?("#{dest_dir}/screenshot.jpg000000.jpg")
+                        cmd = "transcode -a 0 -c 1 -i '#{dir}/#{video}' -y jpg -o #{dest_dir}/screenshot.jpg >/dev/null 2>/dev/null"
+                        msg 2, cmd
+                        if !system(cmd)
+                            break
+                        end
                     end
+                    sys("#{$convert} -geometry #{size_thumbnails} #{dest_dir}/screenshot.jpg000000.jpg '#{thumbnail_dest_img}'")
                 end
+            end
+            destvideo = "#{dest_dir}/#{video}"
+            if !File.exists?(destvideo)
+                psys("cp '#{dir}/#{video}' '#{destvideo}'")
+            end
+            if File.exists?("#{dest_dir}/screenshot.jpg000000.jpg")
                 File.delete("#{dest_dir}/screenshot.jpg000000.jpg")
-                #mencoder $i -nosound -ovc lavc -lavcopts vcodec=mpeg4 -o foo.avi -frames 1
-            end            
+            end
+            #mencoder $i -nosound -ovc lavc -lavcopts vcodec=mpeg4 -o foo.avi -frames 1
         }
 
+        sizenames = { 'small' => _("small"), 'medium' => _("medium"), 'large' => _("large") }
+        
         #- index.html (page with thumbnails)
-        html = $html_thumbnails.collect { |l| l.clone }
-        iterations = {}
-        for i in html
-            i.sub!(/~~run_slideshow~~/, _('Run slideshow!'))
-            i.sub!(/~~title~~/, File.basename(dir))
-            if i =~ /~~iterate(\d)_open(_max(\d+))?~~/
-                for iter in iterations.values
-                    if iter['open']
-                        iter['open'] = false
-                        iter['close_wait'] = $1.to_i
+        for sizeobj in $images_size
+            html = $html_thumbnails.collect { |l| l.clone }
+            iterations = {}
+            for i in html
+                i.sub!(/~~run_slideshow~~/, _('Run slideshow!'))
+                i.sub!(/~~title~~/, File.basename(dir))
+                for sizeobj2 in $images_size
+                    if sizeobj != sizeobj2
+                        i.sub!(/~~size_#{sizeobj2['name']}~~/, '<a href="index-' + sizeobj2['name'] + '.html">' + sizenames[sizeobj2['name']] + '</a>')
+                    else
+                        i.sub!(/~~size_#{sizeobj2['name']}~~/, sizenames[sizeobj2['name']])
                     end
                 end
-                iterations[$1.to_i] = { 'open' => true, 'max' => $3, 'opening' => '', 'closing' => '' }
-                if $1.to_i == 1
-                    i.sub!(/.*/, '~~thumbnails~~')
-                else
-                    i.sub!(/.*/, '')
-                end
-            elsif i =~ /~~iterate(\d)_close~~/
-                iterations[$1.to_i]['open']  = false;
-                iterations[$1.to_i]['close'] = true;
-                i.sub!(/.*/, '')
-            else
-                for iter in iterations.values
-                    if iter['open']
-                        iter['opening'] += i
-                        i.sub!(/.*/, '')
+                if i =~ /~~iterate(\d)_open(_max(\d+))?~~/
+                    for iter in iterations.values
+                        if iter['open']
+                            iter['open'] = false
+                            iter['close_wait'] = $1.to_i
+                        end
                     end
-                    if !iter['close'] && iter['close_wait'] && iterations[iter['close_wait']]['close']
-                        iter['closing'] += i
+                    iterations[$1.to_i] = { 'open' => true, 'max' => $3, 'opening' => '', 'closing' => '' }
+                    if $1.to_i == 1
+                        i.sub!(/.*/, '~~thumbnails~~')
+                    else
                         i.sub!(/.*/, '')
                     end
+                elsif i =~ /~~iterate(\d)_close~~/
+                    iterations[$1.to_i]['open']  = false;
+                    iterations[$1.to_i]['close'] = true;
+                    i.sub!(/.*/, '')
+                else
+                    for iter in iterations.values
+                        if iter['open']
+                            iter['opening'] += i
+                            i.sub!(/.*/, '')
+                        end
+                        if !iter['close'] && iter['close_wait'] && iterations[iter['close_wait']]['close']
+                            iter['closing'] += i
+                            i.sub!(/.*/, '')
+                        end
+                    end
                 end
             end
-        end
-        html_thumbnails = ''
-        for iter in iterations.values
-            iter['value'] = 1
-        end
-        for file in entries
-            type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
-            if type
-                for level in iterations.keys.sort
-                    if iterations[level]['value'] == 1 || level == iterations.keys.max
-                        html_thumbnails += iterations[level]['opening']
+            html_thumbnails = ''
+            for iter in iterations.values
+                iter['value'] = 1
+            end
+            for file in entries
+                type = images.include?(file) ? 'image' : videos.include?(file) ? 'video' : nil
+                if type
+                    for level in iterations.keys.sort
+                        if iterations[level]['value'] == 1 || level == iterations.keys.max
+                            html_thumbnails += iterations[level]['opening']
+                        end
+                        iterations[level]['value'] += 1
+                        if iterations[level]['max'] && iterations[level]['value'] > iterations[level]['max'].to_i
+                            iterations[level]['value'] = 1
+                            iterations[level-1]['value'] = 1
+                            html_thumbnails += iterations[level-1]['closing']
+                        end
                     end
-                    iterations[level]['value'] += 1
-                    if iterations[level]['max'] && iterations[level]['value'] > iterations[level]['max'].to_i
-                        iterations[level]['value'] = 1
-                        iterations[level-1]['value'] = 1
-                        html_thumbnails += iterations[level-1]['closing']
+                    if type == 'image'
+                        index = images.index(file)
+                        html_thumbnails.gsub!(/~~image_iteration~~/,
+                                              '<a href="image-' + sizeobj['name'] + '.html?current=' + fullscreen_images[sizeobj['name']][index] + '">' +
+                                                  '<img src="' + thumbnail_images[sizeobj['name']][index] + '" border="0"/></a>')
+                        html_thumbnails.gsub!(/~~caption_iteration~~/,
+                                              find_caption_value("#{dir}/#{images[index]}") || images[index])
+                        html_thumbnails.gsub!(/~~ifimage\?~~([^~]+)~~/) { $1 }
+                        html_thumbnails.gsub!(/~~ifvideo\?~~[^~]+~~/, '')
+                    elsif type == 'video'
+                        index = videos.index(file)
+                        html_thumbnails.gsub!(/~~image_iteration~~/,
+                                              '<a href="' + videos[index] + '"><img src="' + thumbnail_videos[sizeobj['name']][index] + '" border="0"/></a>')
+                        html_thumbnails.gsub!(/~~caption_iteration~~/,
+                                              find_caption_value("#{dir}/#{videos[index]}") || videos[index])
+                        html_thumbnails.gsub!(/~~ifimage\?~~[^~]+~~/, '')
+                        html_thumbnails.gsub!(/~~ifvideo\?~~([^~]+)~~/) { $1 }
                     end
                 end
-                if type == 'image'
-                    index = images.index(file)
-                    html_thumbnails.gsub!(/~~image_iteration~~/,
-                                          '<a href="image.html?current=' + fullscreen_images[index] + '"><img src="' + thumbnail_images[index] + '" border="0"/></a>')
-                    html_thumbnails.gsub!(/~~caption_iteration~~/,
-                                          find_caption_value("#{dir}/#{images[index]}") || images[index])
-                    html_thumbnails.gsub!(/~~ifimage\?~~([^~]+)~~/) { $1 }
-                    html_thumbnails.gsub!(/~~ifvideo\?~~[^~]+~~/, '')
-                elsif type == 'video'
-                    index = videos.index(file)
-                    html_thumbnails.gsub!(/~~image_iteration~~/,
-                                          '<a href="' + videos[index] + '"><img src="' + thumbnail_videos[index] + '" border="0"/></a>')
-                    html_thumbnails.gsub!(/~~caption_iteration~~/,
-                                          find_caption_value("#{dir}/#{videos[index]}") || videos[index])
-                    html_thumbnails.gsub!(/~~ifimage\?~~[^~]+~~/, '')
-                    html_thumbnails.gsub!(/~~ifvideo\?~~([^~]+)~~/) { $1 }
-                end
             end
+            for level in iterations.keys.sort.reverse
+                html_thumbnails += iterations[level]['closing']
+            end
+            for i in html
+                i.sub!(/~~thumbnails~~/, html_thumbnails)
+            end
+            ios = File.open("#{dest_dir}/index-#{sizeobj['name']}.html", "w")
+            ios.write(html)
+            ios.close
         end
-        for level in iterations.keys.sort.reverse
-            html_thumbnails += iterations[level]['closing']
-        end
-        for i in html
-            i.sub!(/~~thumbnails~~/, html_thumbnails)
-        end
-        ios = File.open("#{dest_dir}/index.html", "w")
-        ios.write(html)
-        ios.close
 
         #- image.html (page with fullscreen images)
-        html = $html_images.collect { |l| l.clone }
-        images4js = fullscreen_images.collect { |e| "\"#{e}\"" }.join(', ')
         #- don't ask me why I need so many backslashes... the aim is to print \\\" for each " in the javascript source
         captions4js = find_captions(dir, images).collect { |e| e ? '"' + e.gsub('"', '\\\\\\\\\\\\\\\\\"' ) + '"' : '""' }.join(', ')
         find_captions(dir, videos)  #- dummy for --captions-skel
-        for i in html
-            i.sub!(/~~images~~/, images4js)
-            i.sub!(/~~captions~~/, captions4js)
-            i.sub!(/~~title~~/, File.basename(dir))
-            i.sub!(/~~thumbnails~~/, _('Return to thumbnails'))
+        for sizeobj in $images_size
+            html = $html_images.collect { |l| l.clone }
+            images4js = fullscreen_images[sizeobj['name']].collect { |e| "\"#{e}\"" }.join(', ')
+            otherimages4js = ''
+            othersizes = []
+            for sizeobj2 in $images_size
+                if sizeobj != sizeobj2
+                    otherimages4js += "var images_#{sizeobj2['name']} = new Array(" + fullscreen_images[sizeobj2['name']].collect { |e| "\"#{e}\"" }.join(', ') + ")\n"
+                    othersizes << "\"#{sizeobj2['name']}\""
+                end
+            end
+            for i in html
+                i.sub!(/~~images~~/, images4js)
+                i.sub!(/~~other_images~~/, otherimages4js)
+                i.sub!(/~~other_sizes~~/, othersizes.join(', '))
+                i.sub!(/~~captions~~/, captions4js)
+                i.sub!(/~~title~~/, File.basename(dir))
+                i.sub!(/~~thumbnails~~/, '<a href="index-' + sizeobj['name'] + '.html">' + _('Return to thumbnails') + '</a>')
+                for sizeobj2 in $images_size
+                    if sizeobj != sizeobj2
+                        i.sub!(/~~size_#{sizeobj2['name']}~~/,
+                               '<a href="image-' + sizeobj2['name'] + '.html" id="link' + sizeobj2['name'] + '">' + sizenames[sizeobj2['name']] + '</a>')
+                    else
+                        i.sub!(/~~size_#{sizeobj2['name']}~~/,
+                               sizenames[sizeobj2['name']])
+                    end
+                end
+            end
+            ios = File.open("#{dest_dir}/image-#{sizeobj['name']}.html", "w")
+            ios.write(html)
+            ios.close
         end
-        ios = File.open("#{dest_dir}/image.html", "w")
-        ios.write(html)
-        ios.close
 
         #- copy any resource file that goes with the theme (css, images..)
         for entry in Dir.entries("#{$FPATH}/themes/#{$theme}")

diff --git a/html_merges.rb b/html_merges.rb
index dd8a1df819928e53bdac0d29c48a327a0f297b9b..4632fe45f14ace4f5d4713f02c54aee530dcda04 100644 (file)
--- a/html_merges.rb
+++ b/html_merges.rb
@@ -28,6 +28,8 @@ $head_code = <<'EOF'
 <script language="JavaScript1.1" type="text/JavaScript">
 
 var images = new Array(~~images~~);
+~~other_images~~
+var other_sizes = new Array(~~other_sizes~~);
 var captions = new Array(~~captions~~);
 
 var images_ary = new Array();
@@ -161,6 +163,10 @@ function show_current_text() {
                      ".firstChild.data = '" + ( current + 1 ) + "/" + images.length + "'");
         eval("document.getElementById('main_text')" +
                      ".firstChild.data = \"" + ( captions[current] || images[current] ) + "\"");
+        for (i = 0; i < other_sizes.length; i++) { 
+            eval("linkelems = document.getElementById('link" + other_sizes[i] + "').href.split('?');" +
+                 "document.getElementById('link" + other_sizes[i] + "').href = linkelems[0] + '?current=" + eval("images_" + other_sizes[i] + "[current]") + "'");
+        }
         set_cursor("default");
     } else {
         setTimeout("show_current_text()", 100);

diff --git a/po/Makefile b/po/Makefile
index 665d4e49b937baa9f74003e322e99a23d8e745cc..ddd208c4447ebb1f1c1c3572e7200b294e0240f6 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -8,9 +8,6 @@ POFILES = $(wildcard *.po)
 MOFILES = $(POFILES:%.po=%.mo)
 LANGS = $(POFILES:%.po=%)
 
-# because of different charsets or encodings.. :-(
-IGNOREPOMS = 
-
 PREFIX = /usr/local
 DATADIR = $(PREFIX)/share
 LOCALEDIR=$(DATADIR)/locale

diff --git a/po/booh.pot b/po/booh.pot
new file mode 100644 (file)
index 0000000..ce9168d
--- /dev/null
+++ b/po/booh.pot
@@ -0,0 +1,169 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2005-03-06 17:18+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../booh:36
+msgid "Get help message"
+msgstr ""
+
+#: ../booh:38
+msgid "Don't check for needed external programs at startup"
+msgstr ""
+
+#: ../booh:40
+msgid "Directory which contains original images/videos as files or subdirs"
+msgstr ""
+
+#: ../booh:41
+msgid "Directory which will contain the web-album"
+msgstr ""
+
+#: ../booh:42
+msgid "Clean destination directory"
+msgstr ""
+
+#: ../booh:44
+msgid "Select HTML theme to use"
+msgstr ""
+
+#: ../booh:45
+msgid "File containing captions of images"
+msgstr ""
+
+#: ../booh:46
+msgid "Filename where the script will output a captions skeleton"
+msgstr ""
+
+#: ../booh:48
+msgid "Specify the number of processors for multi-processors machines"
+msgstr ""
+
+#: ../booh:50
+msgid "Set max verbosity level (0: errors, 1: warnings, 2: important messages, 3: other messages)"
+msgstr ""
+
+#: ../booh:69
+msgid "Usage: %s [OPTION]..."
+msgstr ""
+
+#: ../booh:78
+msgid "***ERROR***: %s"
+msgstr ""
+
+#: ../booh:80
+msgid "Warning: %s"
+msgstr ""
+
+#: ../booh:108
+msgid "Argument to --source must be a directory"
+msgstr ""
+
+#: ../booh:113
+msgid "If --destination exists, it must be a directory"
+msgstr ""
+
+#: ../booh:124
+msgid "Captions file does not exist or is unreadable."
+msgstr ""
+
+#: ../booh:128
+msgid "Captions skeleton file already exists, wont overwrite"
+msgstr ""
+
+#: ../booh:149
+msgid "Missing --source parameter."
+msgstr ""
+
+#: ../booh:152
+msgid "Missing --destination parameter."
+msgstr ""
+
+#: ../booh:163
+msgid "Selecting theme `%s'"
+msgstr ""
+
+#: ../booh:166
+msgid "Theme was not found (tried %s directory)."
+msgstr ""
+
+#: ../booh:186
+msgid "The `%s' program is typically needed. Re-run with --no-check if you're sure you're fine without it."
+msgstr ""
+
+#: ../booh:196
+msgid "No `%s' found for substitution"
+msgstr ""
+
+#: ../booh:267
+msgid "Handling %s from captions list..."
+msgstr ""
+
+#: ../booh:272
+msgid "Examining %s..."
+msgstr ""
+
+#: ../booh:276
+msgid "\t%s images"
+msgstr ""
+
+#: ../booh:278
+msgid "\t%s videos"
+msgstr ""
+
+#: ../booh:282
+msgid "Outputting in %s..."
+msgstr ""
+
+#: ../booh:349
+msgid "small"
+msgstr ""
+
+#: ../booh:349
+msgid "medium"
+msgstr ""
+
+#: ../booh:349
+msgid "large"
+msgstr ""
+
+#: ../booh:356 ../html_merges.rb:262 ../html_merges.rb:296
+msgid "Run slideshow!"
+msgstr ""
+
+#: ../booh:465
+msgid "Return to thumbnails"
+msgstr ""
+
+#: ../html_merges.rb:263
+msgid "Stop slideshow"
+msgstr ""
+
+#: ../html_merges.rb:272
+msgid "<<- First"
+msgstr ""
+
+#: ../html_merges.rb:278
+msgid "<- Previous"
+msgstr ""
+
+#: ../html_merges.rb:284
+msgid "Next ->"
+msgstr ""
+
+#: ../html_merges.rb:290
+msgid "Last ->>"
+msgstr ""

diff --git a/po/fr.po b/po/fr.po
index c6a3c9ba4c154d27b97081004a9adac343425b5f..35880ef34272fe6357c73c9234a1374eb43e06f1 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-03-05 19:19+0100\n"
-"PO-Revision-Date: 2005-03-05 19:20+0100\n"
+"POT-Creation-Date: 2005-03-06 17:18+0100\n"
+"PO-Revision-Date: 2005-03-06 17:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,23 +43,19 @@ msgid "Select HTML theme to use"
 msgstr "Sélectionner le thème HTML à utiliser"
 
 #: ../booh:45
-msgid "Size of images for `fullscreen' slideshow"
-msgstr "Taille des images pour la présentation plein-écran"
-
-#: ../booh:46
 msgid "File containing captions of images"
 msgstr "Fichier contenant les légendes des images"
 
-#: ../booh:47
+#: ../booh:46
 msgid "Filename where the script will output a captions skeleton"
 msgstr "Nom de fichier à utiliser pour la création du squelette des légendes"
 
-#: ../booh:49
+#: ../booh:48
 msgid "Specify the number of processors for multi-processors machines"
 msgstr ""
 "Spécifier le nombre de processeurs pour les ordinateurs multi-processeurs"
 
-#: ../booh:51
+#: ../booh:50
 msgid ""
 "Set max verbosity level (0: errors, 1: warnings, 2: important messages, 3: "
 "other messages)"
@@ -67,61 +63,53 @@ msgstr ""
 "Déterminer le niveau de verbosité maximal (0 : erreurs, 1: avertissements, "
 "2 : messages importants, 3 : autres messages)"
 
-#: ../booh:65
+#: ../booh:69
 msgid "Usage: %s [OPTION]..."
 msgstr "Utilisation: %s [OPTION]..."
 
-#: ../booh:74
+#: ../booh:78
 msgid "***ERROR***: %s"
 msgstr "***ERREUR*** : %s"
 
-#: ../booh:76
+#: ../booh:80
 msgid "Warning: %s"
 msgstr "Avertissement : %s"
 
-#: ../booh:104
+#: ../booh:108
 msgid "Argument to --source must be a directory"
 msgstr "L'argument de --source doit être un répertoire"
 
-#: ../booh:109
+#: ../booh:113
 msgid "If --destination exists, it must be a directory"
 msgstr "Si --destination existe, il doit être un répertoire"
 
-#: ../booh:122
+#: ../booh:124
 msgid "Captions file does not exist or is unreadable."
 msgstr "Le fichier de légendes n'existe pas ou est non lisible."
 
-#: ../booh:126
+#: ../booh:128
 msgid "Captions skeleton file already exists, wont overwrite"
 msgstr ""
 "Le fichier pour le squelette de légendes existe déjà, et je ne vais pas le "
 "remplacer"
 
-#: ../booh:147
+#: ../booh:149
 msgid "Missing --source parameter."
 msgstr "Il manque le paramètre --source."
 
-#: ../booh:150
+#: ../booh:152
 msgid "Missing --destination parameter."
 msgstr "Il manque le paramètre --destination."
 
-#: ../booh:159
-msgid "Size %s not found in parameters of theme."
-msgstr "Taille %s non trouvée dans les paramètres du thème."
+#: ../booh:163
+msgid "Selecting theme `%s'"
+msgstr "Sélection du thème `%s'"
 
-#: ../booh:162
-msgid "Using size for fullscreen images of value: %s"
-msgstr "Utilisation de la taille pour images plein-écran de valeur : %s"
-
-#: ../booh:170
+#: ../booh:166
 msgid "Theme was not found (tried %s directory)."
 msgstr "Thème non trouvé (le répertoire %s a été essayé)."
 
-#: ../booh:180
-msgid "Unrecognized line in %s: %s"
-msgstr "Ligne non reconnue dans %s : %s"
-
-#: ../booh:191
+#: ../booh:186
 msgid ""
 "The `%s' program is typically needed. Re-run with --no-check if you're sure "
 "you're fine without it."
@@ -129,50 +117,67 @@ msgstr ""
 "Le programme `%s' est typiquement nécessaire. Relancez avec --no-check si "
 "vous êtes sûr que vous n'en aurez pas besoin."
 
-#: ../booh:201
+#: ../booh:196
 msgid "No `%s' found for substitution"
 msgstr "`%s' non trouvé pour substitution"
 
-#: ../booh:207
-msgid "Read theme `%s'"
-msgstr "Lecture du thème `%s'"
+#: ../booh:267
+msgid "Handling %s from captions list..."
+msgstr "Prise en charge de %s selon la liste des légendes..."
 
-#: ../booh:247
+#: ../booh:272
 msgid "Examining %s..."
 msgstr "Examen de %s..."
 
-#: ../booh:249
+#: ../booh:276
 msgid "\t%s images"
 msgstr "\t%s images"
 
-#: ../booh:251
+#: ../booh:278
 msgid "\t%s videos"
 msgstr "\t%s vidéos"
 
-#: ../booh:255
+#: ../booh:282
 msgid "Outputting in %s..."
 msgstr "Écriture dans %s..."
 
-#: ../html_merges.rb:231 ../html_merges.rb:265
+#: ../booh:349
+msgid "small"
+msgstr "petit"
+
+#: ../booh:349
+msgid "medium"
+msgstr "moyen"
+
+#: ../booh:349
+msgid "large"
+msgstr "grand"
+
+#: ../booh:356 ../html_merges.rb:262 ../html_merges.rb:296
 msgid "Run slideshow!"
 msgstr "Lancer la présentation !"
 
-#: ../html_merges.rb:232
+#: ../booh:465
+msgid "Return to thumbnails"
+msgstr "Retourner aux vignettes"
+
+#: ../html_merges.rb:263
 msgid "Stop slideshow"
 msgstr "Arrêter la présentation"
 
-#: ../html_merges.rb:241
+#: ../html_merges.rb:272
 msgid "<<- First"
 msgstr "<<- Premier"
 
-#: ../html_merges.rb:247
+#: ../html_merges.rb:278
 msgid "<- Previous"
 msgstr "<- Précédent"
 
-#: ../html_merges.rb:253
+#: ../html_merges.rb:284
 msgid "Next ->"
 msgstr "Prochain ->"
 
-#: ../html_merges.rb:259
+#: ../html_merges.rb:290
 msgid "Last ->>"
 msgstr "Dernier ->>"
+

diff --git a/themes/simple/parameters.rb b/themes/simple/parameters.rb
index 2bade8c2e999295a18d6b2c58b965cdf7b4fbd1e..8775518ffaaa3ce83d75b7983a57aa40c6df7698 100644 (file)
--- a/themes/simple/parameters.rb
+++ b/themes/simple/parameters.rb
@@ -19,8 +19,6 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 
-#- sizes for "fullscreen" images
-#-
 #- we often will want to have one size to nicely fit 800x600 screens,
 #- one for 1024x768 and one for 1280x1024
 #- it's necessary to fit according to the typical space taken by
@@ -28,18 +26,17 @@
 $images_size = [
     {
         'name' => 'small',
-        'explanation' => { 'en' => 'Small (for 800x600 screens)' },
-        'size' => '550x412'
+        'fullscreen' => '550x412',
+        'thumbnails' => '190x152',
     },
     {
         'name' => 'medium',
-        'explanation' => { 'en' => 'Medium (for 1024x768 screens)' },
-        'size' => '704x528'
+        'fullscreen' => '704x528',
+        'thumbnails' => '240x192',
     },
     {
         'name' => 'large',
-        'explanation' => { 'en' => 'Large (for 1280x1024 screens)' },
-        'size' => '880x704',
+        'fullscreen' => '880x704',
         'thumbnails' => '300x240',
     }
 ]

diff --git a/themes/simple/skeleton.html b/themes/simple/skeleton.html
index 4d4646dfe8c11e7ba3948bdda0d39621ba51873c..dfccbf4467b99735c501d4d736d4146b12f34f8d 100644 (file)
--- a/themes/simple/skeleton.html
+++ b/themes/simple/skeleton.html
@@ -26,6 +26,9 @@
         ~~~image~~~
     </td>
 </tr>
+<tr>
+    <td align="center" colspan="9"><font size="-2">[ ~~size_small~~ | ~~size_medium~~ | ~~size_large~~ ]</font></td>
+</tr>
 <tr>
     <td align="center" colspan="9">
     <font size="+1" ~~~caption_additions~~~>&nbsp;</font>
@@ -40,7 +43,7 @@
     <td align="center">~~~button_slideshow~~~</td>
 </tr>
 <tr>
-    <td align="center"><font size="-1"><a href="index.html">~~thumbnails~~</a></font></td>
+    <td align="center"><font size="-1">~~thumbnails~~</font></td>
 </tr>
 </table>
 

diff --git a/themes/simple/skeleton_thumbnails.html b/themes/simple/skeleton_thumbnails.html
index 4daa9ae2cf591c04b107433bd49be359a2231aea..1e7a980b181ce475b8436bbe1aae1d642042c115 100644 (file)
--- a/themes/simple/skeleton_thumbnails.html
+++ b/themes/simple/skeleton_thumbnails.html
@@ -10,6 +10,8 @@
 
 <p align="center"><font size="+3">~~title~~</font></p>
 
+<p align="center"><font size="-2">[ ~~size_small~~ | ~~size_medium~~ | ~~size_large~~ ]</font></p>
+
 <p align="center"><a href="image.html?run_slideshow">~~run_slideshow~~</a></p>
 
 <table width="100%">