Piggy 0.4.3.0 → 0.5.0.0

data/CHANGES.txt

@@ -1,3 +1,10 @@
+Changes in 0.5.0-0
+- Ftp: Abort upload
+- Ftp: Delete directories (if empty)
+- New JavaFX gallery
+- A few more tags in html output
+- Switched to beta status
+
 Changes in 0.4.3-0
 - Bugfix (Vista): LOCAL_APPDATA path
   solved with win32-dir

data/README.txt

@@ -33,3 +33,10 @@ Uncheck this option if this metadata includes personal information
 that you do not want to publish.
 (See http://netzreport.googlepages.com/hidden_data_in_jpeg_files.html
 for more information on this topic.)
+
+Piggy output optionally contains Javascript and Java FX Script.
+Note that JavaFX is relatively new technology with several bugs.
+For example Version 1.2 seems to prevent the Opera browser from shutting
+down the opera process.
+
+

data/lib/piggy-core/alive_check.rb

@@ -34,6 +34,7 @@ class AliveCheck
     begin 
       yield
     ensure
+      @alive = false
       alive_checker.kill if alive_checker and alive_checker.alive?
     end
   end

data/lib/piggy-core/ftp_adapter.rb

@@ -18,8 +18,15 @@ class FtpAdapter
   end
 
   def connect(host, user, password)
-    c_timeout { @connection = Net::FTP.open(host, user, password) }
-    @connection.debug_mode = @options.debug
+    @host = host
+    @user = user
+    @password = password
+    reconnect
+  end
+  
+  def reconnect
+    c_timeout { @connection = Net::FTP.open(@host, @user, @password) }
+    @connection.debug_mode = @options.debug    
   end
 
   def chdir(path)
@@ -53,11 +60,15 @@ class FtpAdapter
   def delete(file)
     c_timeout { @connection.delete(file) }
   end
+  
+  def rmdir(dir)
+    c_timeout { @connection.rmdir(dir) }
+  end
 
   # Upload with progress events.
   #
   # Example:
-  #   upload('C:\tmp\bla\big.zip', 'C:\tmp') {
+  #   upload('C:\tmp', 'C:\tmp\bla\big.zip') {
   #     |data|
   #     ...
   #     data.size
@@ -67,9 +78,11 @@ class FtpAdapter
   # and every chunk of transferred data will
   # be given to the block.
   def upload(local_path, file, &block)
+    puts "FtpAdapter\#upload #{file}"
     depth_offset = FilePath.split(local_path).size
     path_sections = FilePath.split(file)
     dirs = path_sections[depth_offset..-2]
+    pwd = c_timeout { @connection.pwd } 
     unless dirs == nil
       dirs.each do
         |dir|
@@ -81,22 +94,60 @@ class FtpAdapter
         end
       end
     end
+    if(putbinaryfile(file, &block))
+      unless dirs == nil
+        dirs.each { |dir| chdir('..') }
+      end
+      puts "Done"
+    else
+      begin
+        puts "Abortion delete: #{file}"
+        reconnect
+        chdir(pwd + dirs.join("/"))
+        puts(@connection.pwd)
+        delete(File.basename(file))
+        puts "Abortion delete done"
+      rescue StandardError => ex
+        puts "Abortion delete failed"
+        puts "#{ex.class.to_s}: #{ex.message}"
+      ensure
+        # force cleanup after error or abortion
+        begin
+          c_timeout { @connection.close }
+        rescue StandardError => ex
+          puts "Abortion cleanup failed"
+          puts "#{ex.class.to_s}: #{ex.message}"
+        end
+      end
+    end
+  end
+
+  def putbinaryfile(file, &block)
+    aborted = false
     alive_checker = AliveCheck.new(@options.ftpTransferTimeout,
       "ftp transfer timeout")
     alive_checker.check do
       @connection.putbinaryfile(file) { |data|
         alive_checker.alive!
-        block.call(data)
+        if block.call(data)
+          print "."
+        else
+          # @connection.abort would cause Errno::EINVAL later on
+          aborted = true
+          break 
+        end
       }
     end
-    unless dirs == nil
-      dirs.each { |dir| chdir('..') }
-    end
+    return !aborted
   end
-
+  
   def close
     @connection.close unless @connection.nil?
   end
+  
+  def closed?
+    @connection.nil? or @connection.closed?
+  end
 
   private
 

data/lib/piggy-core/htmlgen.rb

@@ -39,27 +39,33 @@ class HtmlGenerator
   
   # Start a RSS 2.0 feed
   def new_rss(title_string, desc_string, &block)
+    new_xml do
+        @page += '<rss version="2.0">'
+        cr
+        channel {
+            title { add_html(title_string) }
+            description { add_html(desc_string) }
+            language      
+            block.call
+            }
+        cr
+        @page += '</rss>'
+        cr
+    end
+  end
+  
+  def new_xml(encoding="utf-8", &block)
     reset
-    @page = '<?xml version="1.0" encoding="utf-8"?>'
-    cr
-    @page += '<rss version="2.0">'
-    cr
-    channel {
-      title { add_html(escape_html(title_string)) }
-      description { add_html(escape_html(desc_string)) }
-      language      
-      block.call
-    }
-    cr
-    @page += '</rss>'
+    @page = "<?xml version=\"1.0\" encoding=\"#{encoding}\"?>"
     cr
+    block.call
   end
   
   def add_item(title_string, link_string, desc_string)
     tag('item', {}) {
-      title { add_html(escape_html(title_string)) }
-      tag('link', {}) { add_html(escape_html(link_string)) }
-      description { add_html(escape_html(desc_string)) }
+      title { add_html(title_string) }
+      tag('link', {}) { add_html(link_string) }
+      description { add_html(desc_string) }
     }
   end
   
@@ -153,7 +159,7 @@ class HtmlGenerator
   end
   
   def language(value = 'de')
-    tag('language', {}) { add_html value }
+    tag('language', {}) { add value }
   end
   
   def center(&block)
@@ -184,6 +190,10 @@ class HtmlGenerator
     tag 'div', params, &block
   end
   
+  def span(params = {}, &block)
+    tag 'span', params, &block
+  end
+  
   def img(src_path, alt_name)
     begin_tag('img', { 'src'=>src_path, 'alt'=>alt_name })
   end
@@ -229,7 +239,11 @@ class HtmlGenerator
   end
   
   def add_html(html_string)
-    @page += html_string
+    add(escape_html(html_string))
+  end
+  
+  def add(string)
+    @page += string
   end
   
   def get_page

data/lib/piggy-core/options.rb

@@ -11,9 +11,9 @@ class PiggyOptions
     :localDestinationPath, :remoteDestinationPath,
     :ftpUser, :ftpHost, :ftpHasLocaltime,
     :ftpConnectionTimeout, :ftpTransferTimeout,
-    :addZip, :addSlideshow,
+    :addZip, :addSlideshow, :addJavaFxSlideshow,
     :preselectDirectories,
-		:slideshowDelay,
+		:slideshowDelay, 
 		:style, :stylesSample, :skipImageProcessing,
 		:browser,
     :excludeFilters,
@@ -44,6 +44,7 @@ class PiggyOptions
     @ftpTransferTimeout = nil
     @addZip = nil
     @addSlideshow = nil
+    @addJavaFxSlideshow = nil
     @preselectDirectories = nil
     @slideshowDelay = nil
     @style = nil
@@ -78,6 +79,7 @@ class PiggyOptions
     @ftpTransferTimeout = 30 if @ftpTransferTimeout.nil?
     @addZip = true if @addZip.nil?
     @addSlideshow = true if @addSlideshow.nil?
+    @addJavaFxSlideshow = false if @addJavaFxSlideshow.nil?
     @preselectDirectories = true if @preselectDirectories.nil?
     @slideshowDelay = 5 if @slideshowDelay.nil?
     @style = 'shadow' if @style.nil?
@@ -114,7 +116,7 @@ class PiggyOptions
   def browser?
     !@browser.nil? && !@browser.empty?
   end
-  
+    
   alias :usePreview? :usePreview
   alias :useLog? :useLog
   alias :generateFramePage? :generateFramePage
@@ -122,8 +124,10 @@ class PiggyOptions
   alias :ftpHasLocaltime? :ftpHasLocaltime
   alias :addZip? :addZip
   alias :addSlideshow? :addSlideshow
+  alias :addJavaFxSlideshow? :addJavaFxSlideshow
   alias :preselectDirectories? :preselectDirectories
   alias :debug? :debug
   alias :stylesSample? :stylesSample
+  alias :initializeNilsWithDefault :initialize_nils_with_default
 end
 

data/lib/piggy-core/thumbnail_page_generator.rb

@@ -59,8 +59,9 @@ class ThumbnailPageGenerator < HtmlGenerator
   attr_writer(:client)
   
   HtmlExt = '.htm'
-  DownloadName = "download.zip"
-  SlideshowName = "slideshow"
+  DownloadName = 'download.zip'
+  SlideshowName = 'slideshow'
+  JavaFxName = 'animation'
   
   def initialize(options)
     @client = self
@@ -174,18 +175,24 @@ class ThumbnailPageGenerator < HtmlGenerator
         }
         body({"class"=>"image_page"}) {
           div({'class' => 'content'}){
-            div({'class' => 'navigation'}){
+            div({'class' => 'navigation', 'id'=>'toprevnext'}){
               div {
                 div {
                   p {
-                    a({"HREF" => escape_html(pred) + HtmlExt}){
-                      add_html(escape_html(i == 0 ? 'last' : 'previous'))
+                    span {
+                      a({"HREF" => escape_html(pred) + HtmlExt}){
+                        add(i == 0 ? 'last' : 'previous')
+                      }
                     }
-                    a({"HREF" => escape_html(backlink) }) {
-                      add_html(escape_html('overview'))
+                    span {
+                      a({"HREF" => escape_html(backlink) }) {
+                        add('overview')
+                      }
                     }
-                    a({"HREF" => escape_html(succ) + HtmlExt}) {
-                      add_html(escape_html(i == max_ind ? 'first' : 'next'))
+                    span {
+                      a({"HREF" => escape_html(succ) + HtmlExt}) {
+                        add(i == max_ind ? 'first' : 'next')
+                      }
                     }
                   }
                 }
@@ -203,7 +210,7 @@ class ThumbnailPageGenerator < HtmlGenerator
             div({'class' => 'comment'}){
               div {
                 div {
-                  p { add_html(escape_html(comment)) }
+                  p { add_html(comment) }
                 }
               }
             }
@@ -216,6 +223,27 @@ class ThumbnailPageGenerator < HtmlGenerator
     }
   end
   
+  def build_javafx_config()
+    new_xml do
+      tag('root', {}) do
+          add("<title>#{escape_html(@title)}</title>")
+          cr
+          tag('images', {}){
+            cr
+            maxInd = @inputFilenames.size - 1
+            (0..maxInd).each { | i |
+              current = image_name(@inputFilenames[i])
+              add("<image src=\"#{string_as_utf8(current)}\"/>")
+              cr
+            }
+          }
+          tag('layout', {}) {
+            add("<imageSize width=\"#{@options.imageWidth}\" height=\"#{@options.imageHeight}\"/>")
+          }
+      end
    end
+    write_file(File.join(imageOutputPath, 'config.xml'), get_page)
+  end
+    
   def build_slideshow_list
     File.open(File.join(imageOutputPath, 'images.js'), 'w') { | fp |
       fp.print("var images = new Array(\n")
@@ -283,15 +311,28 @@ class ThumbnailPageGenerator < HtmlGenerator
         stylesheet sub_stylesheet_url
       }
       body({'class'=>'thumbs'}){
-        h3({}){ add_html(escape_html(@title)) }
-        if(size_of_zipfile > 0)
-          a({"href" => DownloadName }) { add_html(DownloadName) }
-          add_html("(#{bytes_as_string(size_of_zipfile)})")
-        end
-        if(@options.addSlideshow?)
-          a({"href" => File.join('slideshow.htm'), "target" => "_top"}) {
-            add_html(SlideshowName)
-          }
+        h3({}){ add(escape_html(@title)) }
+        div({'class'=>'navigation', 'id'=>'toslides' }) do
+          if(size_of_zipfile > 0)
+            span {
+              a({"href" => DownloadName }) { add_html(DownloadName) }
+              add_html("(#{bytes_as_string(size_of_zipfile)})")
+            }
+          end
+          if(@options.addSlideshow?)
+            span {
+              a({"href" => File.join('slideshow.htm'), "target" => "_top"}) {
+                add_html(SlideshowName)
+              }
+            }
+          end
+          if(@options.addJavaFxSlideshow?)
+            span {
+              a({"href" => File.join('javafx.htm'), "target" => "_top"}) {
+                add_html(JavaFxName)
+              }
+            }
+          end
         end
         image_table({'class'=>'table'}) {
           matrix.each do |m_row|
@@ -388,9 +429,9 @@ class ThumbnailPageGenerator < HtmlGenerator
           })
         noframes(){
           cr
-          add_html('Ohne Frames siehe: ')
+          add('Ohne Frames siehe: ')
           a({'href'=>"navigation.htm"}){
-            add_html('Navigationsleiste')
+            add('Navigationsleiste')
           }
         }
       }
@@ -436,8 +477,19 @@ class ThumbnailPageGenerator < HtmlGenerator
     if @options.addSlideshow?
       copy_templates(['slideshow.htm', 'slideshow.js'], imageOutputPath)
       link = "<link href=\"#{sub_stylesheet_url}\" rel=\"stylesheet\" type=\"text/css\">"
-      insert_in_file(File.join(imageOutputPath, 'slideshow.htm'),
-        /<!--STYLE-->/, link)
+      insert_in_file(File.join(imageOutputPath, 'slideshow.htm'), /<!--STYLE-->/, link)
+    end
+    if @options.addJavaFxSlideshow?
+      fx_files = ['javafx.htm', 'PiggyFX.jnlp', 'PiggyFX_browser.jnlp']
+      copy_templates(fx_files + ['PiggyFX.jar'], imageOutputPath)
+      fx_files.each { |file_name|
+        # magic numbers from javafx code
+        w = @options.imageWidth + 205
+        h = @options.imageHeight + 140
+        h = 700 if h < 700 # need this height for image bar with 5 images
+        replace_in_file(File.join(imageOutputPath, file_name), /@WIDTH@/, w.to_s)
+        replace_in_file(File.join(imageOutputPath, file_name), /@HEIGHT@/, h.to_s)
+      }
     end
   end
 
@@ -473,6 +525,15 @@ class ThumbnailPageGenerator < HtmlGenerator
       }
     }
   end
+  
+  def replace_in_file(file, pattern, replacement)
+    lines = File.readlines(file)
+    File.open(file, 'w') { |fp|
+      lines.each { |line|
+        fp.print(line.gsub(pattern, replacement))
+      }
+    }
+  end
 
   def update_navigation_frame()
     reset
@@ -480,7 +541,7 @@ class ThumbnailPageGenerator < HtmlGenerator
     a({
         'href' => escape_html(subDir) + '/index.htm',
         'target' => 'Daten'}) {
-      add_html(escape_html(@title))
+      add_html(@title)
     }
     br
     add_html("\n")
@@ -523,6 +584,7 @@ class ThumbnailPageGenerator < HtmlGenerator
     build_thumbnail_page(size_of_zipfile)
     copy_template_files
     build_slideshow_list if @options.addSlideshow?
+    build_javafx_config if @options.addJavaFxSlideshow?
     if @options.generateFramePage?
       build_frame_page
       update_navigation_frame

data/lib/piggy-core/version.rb

@@ -4,13 +4,13 @@
 # Provide release information for Piggy.
 module PiggyVersion
   def PiggyVersion.version_string
-    '0.4.3-0'
+    '0.5.0-0'
   end
   def PiggyVersion.copyright_string
     'Copyright (C) 2009 Sascha D�rdelmann'
   end
   def PiggyVersion.development_status
-    'alpha'
+    'beta'
   end
   def PiggyVersion.display_string
     "#{PiggyVersion.version_string} (#{PiggyVersion.development_status})"

data/lib/piggy-gui/ftp_browser_widget.rb

@@ -243,22 +243,26 @@ class FtpBrowserWidget < DirectoryDiffWidget
     @leftFileList.clearItems
     @leftContents = DirectoryContents.new(left_path)
     begin
-      @connectionDataVerified = false
-      @ftpAdapter.connect(host, user, password)
-      @connectionDataVerified = true
-      @connect_button.setState(STATE_DOWN)
-      @ftpAdapter.chdir(left_path)
+      connect
       block.call # <------ the call
-      update_list(@ftpAdapter.nlst, @leftFileList, @leftContents) do
-        |file, path|
-        @ftpAdapter.info(file, path)
+      puts 'ftpDo: call finished'
+      begin
+        connect if @ftpAdapter.closed? 
+        update_left_connected
+      rescue Errno::EINVAL => ex
+        puts "Recover from: #{ex.message}"
+        # abortion and big files
+        # might cause socket errors
+        # force reconnect
+        connect
+        update_left_connected
       end
     rescue SocketError => ex
-      error(ex.message)
+      error("SocketError: #{ex.message}")
     rescue Net::FTPError => ex
-      error(ex.message)
+      error("Net::FTPError: #{ex.message}")
     rescue StandardError => ex
-      error(ex.message)
+      error("#{ex.class.to_s}: #{ex.message}")
     rescue Timeout::Error => ex
       error("Timeout - operation took longer than expected. \nCheck network connection and try again.")
     ensure
@@ -268,6 +272,20 @@ class FtpBrowserWidget < DirectoryDiffWidget
     getApp.endWaitCursor
   end
   
+  def connect
+    @connectionDataVerified = false
+    @ftpAdapter.connect(host, user, password)
+    @ftpAdapter.chdir(left_path)
+    @connectionDataVerified = true
+    @connect_button.setState(STATE_DOWN)  
+  end
+  
+  def update_left_connected
+    update_list(@ftpAdapter.nlst, @leftFileList, @leftContents) do
+      |file, path|
+      @ftpAdapter.info(file, path)
+    end
  end
+  
   def update_ftp_list
     ftp_do {} # every ftp action includes an update :-)
   end
@@ -322,27 +340,48 @@ class FtpBrowserWidget < DirectoryDiffWidget
     end
     update_status_icons
   end
+  
+  def ftp_remove_left(dirs)
+    ftp_do do
+      dirs.each { |dir|
+        @ftpAdapter.rmdir(dir)
+      }
+    end
+    update_status_icons
+  end
 
   def ftp_upload_right(hash, totalSize)
+    all = hash.keys.size
+    current = 0
     ftp_do do
       progressDialog = FXProgressDialog.new(self,
         'Transferring data',
-        'Transferring data')
+        'Transferring data',
+         PROGRESSDIALOG_NORMAL | PROGRESSDIALOG_CANCEL)
       begin
-        progressDialog.setProgress(1)
+        progressDialog.setProgress(0)
         progressDialog.setTotal(totalSize)
         progressDialog.create
         progressDialog.show
         progressDialog.repaint
         hash.keys.sort.each do
           |file|
+          current = current + 1
+          progressDialog.setMessage(ruby_2_fox("Transferring #{current.to_s}/#{all.to_s}: #{File.basename(file)}"))
+          progressDialog.repaint
           @ftpAdapter.upload(right_path, file) { |data|
-            progressDialog.setMessage(ruby_2_fox("Transferring #{File.basename(file)}"))
             progressDialog.increment(data.size)
             progressDialog.repaint
+            # Workaround for
+            # response problem with vista
+            # getApp().runModalWhileEvents()
+            getApp().runWhileEvents()
+            !progressDialog.cancelled?
           }
+          break if progressDialog.cancelled?
         end
       ensure
+        puts "Upload stopped at #{current.to_s}/#{all.to_s}"
         progressDialog.hide
       end
     end
@@ -370,12 +409,17 @@ class FtpBrowserWidget < DirectoryDiffWidget
     dirs = sel.select { |file|
       @leftContents[file].directory?
     }
-    return error("Sorry, can't remove directories, yet") unless dirs.empty?
+    files = sel.reject { |file|
+      @leftContents[file].directory?
+    }
     return false if sel.empty?
-    num = sel.size
-    answer = FXMessageBox.question(self, MBOX_YES_NO, 'Really delete?',
-      "Delete #{num} fil#{num == 1 ? 'e' : 'es'}?")
-    ftp_delete_left(sel) if answer == MBOX_CLICKED_YES
+    answer = FXMessageBox.question(self, MBOX_YES_NO,
+      "Really delete?",
+      "Selected:\n#{dirs.size.to_s} directories\n#{files.size.to_s} files\nReally delete?")
+    if answer == MBOX_CLICKED_YES
+      ftp_delete_left(files)
+      ftp_remove_left(dirs)
+    end 
   end
 
   # events

data/lib/piggy-gui/html_options_widget.rb

@@ -53,11 +53,17 @@ class HtmlOptionsWidget < Fox::FXMatrix
       @options.addZip = ptr
     }
     add_label_to(self, ""); # TODO empty cell in matrix layout
-    add_slideshow_check = FXCheckButton.new(self, 'Add slideshow')
+    add_slideshow_check = FXCheckButton.new(self, 'Add Javascript slideshow')
     add_slideshow_check.setCheck(@options.addSlideshow?)
     add_slideshow_check.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.addSlideshow = ptr
     }
+    add_label_to(self, ""); # TODO empty cell in matrix layout
+        add_slideshow_check = FXCheckButton.new(self, 'Add JavaFX slideshow')
+        add_slideshow_check.setCheck(@options.addJavaFxSlideshow?)
+        add_slideshow_check.connect(SEL_COMMAND) { |sender, sel, ptr|
+          @options.addJavaFxSlideshow = ptr
+    }
     add_label_to(self, "Style:")
     style_text_field = new_combobox(self, 32,
       10,

data/lib/piggy-gui/piggy_image_browser.rb

@@ -195,6 +195,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     msg += "- FXRuby #{Fox.fxrubyversion}\n"
     msg += "- FOX Toolkit #{Fox.fxversion}\n"
     msg += "- Javascript slideshow no version information availiable\n"
+    msg += "- JavaFX animation uses JavaFX Script Version 1.2 which runs on top of Java 6\n"
     msg += "- Piggy #{PiggyVersion.display_string}\n"
     about_title = "About Piggy"
     tmp = FXMenuCommand.new(menus['help'], "&About Piggy...")
@@ -543,7 +544,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     if @currentRotation >= 360
       @currentRotation = @currentRotation - 360
     end
-    @orientationStatus.setText(ruby_2_fox(@currentRotation.to_s + '�'))
+    @orientationStatus.setText(ruby_2_fox(@currentRotation.to_s + '�'))
     current_file_info.rotation = @currentRotation
   end
 
@@ -790,6 +791,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
           get_style_list.each { |style|
             @options.style = style
             @options.skipImageProcessing = (style != 'basic')
+            @options.addJavaFxSlideshow = (style == 'basic')
             @options.stylesSample = (style != 'basic')
             generator.set_title(style)
             generator.set_output_directory(style)

data/lib/templates/PiggyFX.jnlp

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" codebase="http://piggy.rubyforge.org/samples/basic/" href="PiggyFX.jnlp">
+    <information>
+        <title>PiggyFX</title>
+        <vendor>piggy project at rubyforge.org</vendor>
+        <homepage href="http://piggy.rubyforge.org"/>
+        <description>PiggyFX</description>
+        <offline-allowed/>
+        <shortcut>
+            <desktop/>
+        </shortcut>
+    </information>
+    <security>
+        <all-permissions/>
+    </security>
+    <resources>
+        <j2se version="1.5+"/>
+        <extension name="JavaFX Runtime" href="http://dl.javafx.com/1.2/javafx-rt.jnlp"/>
+        <jar href="PiggyFX.jar" main="true"/>
+    </resources>
+    <application-desc main-class="piggyfx.Main">
+    </application-desc>
+</jnlp>

data/lib/templates/PiggyFX_browser.jnlp

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jnlp spec="1.0+" href="PiggyFX_browser.jnlp">
+    <update check="background"/>
+    <information>
+        <title>PiggyFX</title>
+        <vendor>piggy project at rubyforge.org</vendor>
+        <homepage href="http://piggy.rubyforge.org"/>
+        <description>PiggyFX</description>
+        <offline-allowed/>
+    </information>
+    <resources>
+        <j2se version="1.5+"/>
+        <extension name="JavaFX Runtime" href="http://dl.javafx.com/1.2/javafx-rt.jnlp"/>
+        <jar href="PiggyFX.jar" main="true"/>
+    </resources>
+    <applet-desc name="PiggyFX" main-class="com.sun.javafx.runtime.adapter.Applet" width="@WIDTH@" height="@HEIGHT@">
+        <param name="MainJavaFXScript" value="piggyfx.Main">
+    </applet-desc>
+</jnlp>

data/lib/templates/javafx.htm

@@ -0,0 +1,34 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
+<META HTTP-EQUIV="EXPIRES" CONTENT="0">
+<title>PiggyFX gallery</title>
+</head>
+<body id="body" style="background:black;margin:0;padding:0;" >
+<center>
+<script src="http://dl.javafx.com/1.2/dtfx.js"></script>
+<script>
+    javafx(
+        {
+            archive: "PiggyFX.jar",
+            draggable: true,
+            width: @WIDTH@,
+            height: @HEIGHT@,
+            code: "piggyfx.Main",
+            name: "PiggyFX",
+            id: "app"
+        },
+        {
+            isApplet: "true",
+            configfile: "config.xml"
+        }
+    );
+</script>
+<noscript>
+The slideshow only loads with active Javascript and Java.<br>
+(Java 6 Update 13 or newer is recommended.)
+</noscript>
+</center>
+</body>
+</html>

data/lib/templates/styles/basic/style.css

@@ -2,6 +2,11 @@ body {
     text-align: center;
 }
 
+.navigation span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 dl, table.table {
     margin-left: auto;
     margin-right: auto;

data/lib/templates/styles/black/style.css

@@ -24,6 +24,11 @@ a:active {
     text-decoration: none;
 }
 
+.navigation  span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 dl, table.table {
     margin-left: auto;
     margin-right: auto;

data/lib/templates/styles/roundedbox/style.css

@@ -3,6 +3,11 @@ body {
     text-align: center;
 }
 
+.navigation  span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 h1,h2,h3 {
     color:#667553;
 }

data/lib/templates/styles/shadow/style.css

@@ -2,6 +2,11 @@ body {
     text-align: center;
 }
 
+.navigation span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 div {
     margin:0;
 }

data/lib/templates/styles/shadow_D9F5F3/style.css

@@ -3,6 +3,11 @@ body {
   background: #D9F5F3;
 }
 
+#toslides span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 .image_page a {
   margin: 10px;
 }

data/lib/templates/styles/shadow_black/style.css

@@ -12,6 +12,22 @@ a {
     margin: 10px;
 }
 
+.navigation  span {
+    margin-left: 1em;
+    padding: 0.1em;
+    background: #222222;
+    border-right: solid lightgray 1pt;
+    border-bottom: solid lightgray 1pt;
+}
+
+.navigation span a{
+    text-decoration: none;
+}
+
+.navigation span:hover{
+    background: #444444;
+}
+
 .thumbs dl.table {
     padding-left: 84px;
 }

data/lib/templates/styles/shadow_bowers/style.css

@@ -45,16 +45,19 @@ dd {
     margin-bottom: 8px;
 }
 
-.image_page .navigation a {
+.navigation a {
     display: block;
-    float: left;
-    width: 60px;
     margin: 10px;
     text-decoration: none;
     color: Silver;
     font-weight: bold;
 }
 
+.image_page .navigation a {
+    float: left;
+    width: 60px;
+}
+
 .image_page .image {
     clear: both;
     float: left;

data/lib/templates/styles/sylvester/style.css

@@ -13,6 +13,11 @@ a {
   color:yellow;
 }
 
+#toslides span {
+    margin-left: 1.2em;
+    padding: 0.1em;
+}
+
 .image_page a {
   margin: 10px;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Piggy
 version: !ruby/object:Gem::Version 
-  version: 0.4.3.0
+  version: 0.5.0.0
 platform: ruby
 authors: 
 - "Sascha D\xF6rdelmann"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 +01:00
+date: 2009-06-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,8 +128,12 @@ files:
 - lib/piggy.rb
 - lib/templates
 - lib/templates/fuss.htm
+- lib/templates/javafx.htm
 - lib/templates/kopf.htm
 - lib/templates/navigation.htm
+- lib/templates/PiggyFX.jar
+- lib/templates/PiggyFX.jnlp
+- lib/templates/PiggyFX_browser.jnlp
 - lib/templates/slideshow.htm
 - lib/templates/slideshow.js
 - lib/templates/styles