Piggy 0.4.2.2 → 0.4.2.3

data/CHANGES.txt

@@ -1,3 +1,15 @@
+Changes in 0.4.2-3
+- Bugfix: Convert /^~/ to home directory
+- Usability of modal dialogs (e. g. validate before accept)
+- Added installation description for SUSE linux 
+- Added installation description for Mac OS X
+- Added directory choosers for directory fields
+- Added style shadow_D9F5F3
+- Provide platform independent default options
+- Browser is now an option
+- Layout: FTP-browser fields wider
+- Smaller gem without web content
+
 Changes in Version 0.4.2-2
 - Bugfix: Changing the size of the cancas had an effect
   on the image view's quality

data/INSTALL.txt

@@ -17,11 +17,71 @@ You might be using the Ruby Windows Installer, so you
 probably have FXRuby and most of the other required libraries
 installed on your system.
 
-Continue with the gem installation.
+You can now install piggy with the gem install command
+
+    gem install Piggy
+
+
+Rubygems will check if the required gems rubyzip and exifr are installed on your
+system.
 
-------------
-Debian Linux
-------------
+(Note that for now the gem command won't check if FXRuby is installed
+on your system, so you'll be able to install FXRuby via gem or from source.)
+
+Gem installation might fail if you don't have the rights
+to write the gem directories. You'll need to become admin
+to get rid of these errors.
+
+-------------------
+openSUSE Linux 10.3
+-------------------
+
+First install some RPM packages:
+- ruby 1.8.x
+- rubygems
+- fox16-devel
+- gcc-c++
+
+Additional recommended RPM packages:
+- ruby-RMagick
+- rubygem-rake
+
+Ruby gems:
+- FXRuby 1.6.x (ruby)
+- Piggy
+
+Sample installation session for these gems:
+
+>  sudo gem install fxruby
+Passwort:
+Select which gem to install for your platform (i586-linux)
+ 1. fxruby 1.6.14 (universal-darwin-9)
+ 2. fxruby 1.6.14 (mswin32)
+ 3. fxruby 1.6.14 (ruby)
+ 4. fxruby 1.6.13 (ruby)
+ 5. fxruby 1.6.13 (mswin32)
+ 6. Skip this gem
+ 7. Cancel installation
+> 3
+Building native extensions.  This could take a while...
+Successfully installed fxruby-1.6.14
+Installing ri documentation for fxruby-1.6.14...
+Installing RDoc documentation for fxruby-1.6.14...
+> sudo gem install piggy
+Bulk updating Gem source index for: http://gems.rubyforge.org
+Install required dependency rubyzip? [Yn]  Y
+Install required dependency exifr? [Yn]  Y
+Successfully installed Piggy-0.4.2.2
+Successfully installed rubyzip-0.9.1
+Successfully installed exifr-0.10.6
+Installing ri documentation for Piggy-0.4.2.2...
+Installing ri documentation for exifr-0.10.6...
+Installing RDoc documentation for Piggy-0.4.2.2...
+Installing RDoc documentation for exifr-0.10.6...
+
+--------------------------------
+Debian Linux (might be outdated)
+--------------------------------
 
 Use any package manager you like (apt, aptitude, kpackage,...)
 to install the following debian packages:
@@ -30,48 +90,43 @@ libruby
 libyaml-ruby
 libzlib-ruby
 rdoc
+libfox-1.6-dev
 
-Install FXRuby.
-
-There is a gem availiable but I recommend that you use a debian package
-instead. You'll have to add the following lines to the sources.list:
+Continue with gem installation of FXRuby:
+	$ sudo gem install FXRuby
 
->>
-# FreeRIDE
-deb http://freeride.rubyforge.org/debian/ deb/
-deb-src http://freeride.rubyforge.org/debian/ src/
-<<
+Continue with gem installation of Piggy:
+	$ sudo gem install Piggy
 
-(You may do this via the graphical user interface provided by kpackage.
-Don't forget to update the apt package list afterwards.)
+-------------
+Mac OS X 10.5
+-------------
 
-Continue with the gem installation.
+Leopard already includes Ruby (as a prerequisite for Ruby on Rails)
+	http://www.apple.com/macosx/features/300.html#unix
 
-----------------
-Gem installation
-----------------
 
-It's quite obvious that you'll need RubyGems to be installed
-for this. It is packaged with actual windows installer versions.
-On other systems you'll have to download and install it yourself
-but installation is pretty easy, RubyGems comes with an install.rb
-script.
+FXRuby is availiable as macport (aka darwinport)
+	http://www.macports.org/
+	http://www.macports.org/ports.php?by=name&substr=fxruby
 
-You can now install piggy with the gem install command
+Installation of Macports:
+	http://www.macports.org/install.php
 
-    gem install Piggy-x.x.x.x.gem
+Installation of FXRuby:
+	$ sudo port install rb-fx-ruby
 
-where x.x.x.x is a
-placeholder for the downloaded version of Piggy.
-
-Rubygems will check if the required gems rubyzip and exifr are installed on your
-system.
+Continue with gem installation of Piggy:
+	$ sudo gem install Piggy
 
-(Note that for now the gem command won't check if FXRuby is installed
-on your system, so you'll be able to install FXRuby via gem or from source.)
 
-Gem installation might fail if you don't have the rights
-to write the gem directories. You'll need to become root/admin
-to get rid of these errors.
+------------------------
+Things that can go wrong
+------------------------
 
+Remote gem installation may fail if you are sitting behind an internet proxy.
+In most cases, setting the HTTP_PROXY environment variable will help:
+	http_proxy=http://URL:PORT
 
+For more information on this topic see
+	http://wiki.rubyonrails.org/rails/pages/GemRails

data/lib/piggy-core/options.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 #$Id: options.rb 195 2008-05-29 21:32:40Z Sascha $
 
-# Provide Piggy with user defined settings.
+require 'piggy-core/winshell'
 
 # Provide Piggy with user defined settings.
 class PiggyOptions
@@ -15,6 +15,7 @@ class PiggyOptions
                 :preselectDirectories,
 		:slideshowDelay,
 		:style,
+		:browser,
 		:debug)
   
   # possible values for @imageProcessor
@@ -46,6 +47,7 @@ class PiggyOptions
     @slideshowDelay = nil
     @style = nil
     @debug = nil
+    @browser = nil
     initializeNilsWithDefault
   end
   
@@ -62,9 +64,9 @@ class PiggyOptions
     @thumbHeight = 100 if @thumbHeight.nil?
     @imageWidth = 800 if @imageWidth.nil?
     @imageHeight = 600 if @imageHeight.nil?
-    @generateFramePage = true if @generateFramePage.nil?
-    @useTable = generateFramePage? if @useTable.nil?
-    @localDestinationPath = 'C:/temp/bild' if @localDestinationPath.nil?
+    @generateFramePage = false if @generateFramePage.nil?
+    @useTable = generateFramePage? if @uosPathseTable.nil?
+    @localDestinationPath = WinShell.instance.pictureDirectory if @localDestinationPath.nil?
     @remoteDestinationPath = '' if @remoteDestinationPath.nil?
     @ftpUser = 'anonymous' if @ftpUser.nil?
     @ftpHost = 'ftp.blablabla.de' if @ftpHost.nil?
@@ -77,6 +79,7 @@ class PiggyOptions
     @slideshowDelay = 5 if @slideshowDelay.nil?
     @style = 'shadow' if @style.nil?
     @debug = false if @debug.nil?
+    @browser = '' if @browser.nil?
   end
   
   def useFxruby!
@@ -102,6 +105,10 @@ class PiggyOptions
   def useRmagick?
     @imageProcessor == ProcessorRmagick
   end
+
+  def browser?
+    !@browser.nil? && !@browser.empty?
+  end
   
   alias :usePreview? :usePreview
   alias :useLog? :useLog

data/lib/piggy-core/thumbnail_page_generator.rb

@@ -177,13 +177,13 @@ class ThumbnailPageGenerator < HtmlGenerator
         }
         body({"class"=>"image_page"}) {
           a({"HREF" => escapeHTML(pred) + HtmlExt}){
-            addHtml(escapeHTML(i == 0 ? 'letztes' : 'voriges'))
+            addHtml(escapeHTML(i == 0 ? 'last' : 'previous'))
           }
           a({"HREF" => escapeHTML(backlink) }) {
-            addHtml(escapeHTML('�bersicht'))
+            addHtml(escapeHTML('overview'))
           }
           a({"HREF" => escapeHTML(succ) + HtmlExt}) {
-            addHtml(escapeHTML(i == maxInd ? 'erstes' : 'n�chstes'))
+            addHtml(escapeHTML(i == maxInd ? 'first' : 'next'))
           }
           br
           img(imageName(currentInfo), escapeHTML(current))

data/lib/piggy-core/version.rb

@@ -4,7 +4,7 @@
 # Provide release information for Piggy.
 module PiggyVersion
   def PiggyVersion.versionString
-    '0.4.2-2'
+    '0.4.2-3'
   end
   def PiggyVersion.copyrightString
     'Copyright (C) 2008 Sascha D�rdelmann'

data/lib/piggy-core/winshell.rb

@@ -44,14 +44,21 @@ class ShellInterface
       "TEMPLATES" => 0x15,
       "WINDOWS" => 0x24
     }
+    initHome
+  end
+
+  def initHome
+    @home = ENV['HOME']
+    @home = ENV['HOMEPATH'] unless @home
+    unless @home
+      puts 'ShellInterface could not set @home - using /'   
+      @home = '/'
+    end
   end
   
   # try to provide a platform independent default
   def pathForSpecialFolder(name)
-    home = ENV['HOME']
-    home = ENV['HOMEPATH'] unless home
-    home = '/' unless home
-    return home
+    return @home
   end
   
   def tmpPath
@@ -79,7 +86,7 @@ class ShellInterface
   # Get a path string usable by common ruby classes such as Dir and File.
   # Default: convert '\' to '/' on all systems, even on Unix
   def rubyPath(pathString)
-    return pathString.gsub(/\\/, separator)
+    return pathString.gsub(/\\/, separator).gsub(/^~/, @home)
   end
   
   def pictureDirectory

data/lib/piggy-gui/dir_chooser.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/ruby
+## $Id: html_generation_dialog.rb 190 2008-02-02 18:52:57Z Sascha $
+
+require 'piggy-core/winshell'
+require 'piggy-gui/require-fox'
+
+# Combobox like input field to choose an existing directory
+class DirChooser < Fox::FXHorizontalFrame
+  include Fox
+  def initialize(owner, initValue, &onChangedDir)
+    super(owner, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0) {}
+    @field = FXTextField.new(self, 32)
+    @button = FXButton.new(self, '...')
+    @block = onChangedDir
+    @shell = WinShell.instance
+    connectButtonToField
+    initLayout
+    setPath(initValue)
+    @field.connect(SEL_COMMAND) {
+      @block.call(getPath)
+    }
+  end
+
+  def initLayout
+    @field.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+  end
+
+  def connectButtonToField
+    @button.connect(SEL_COMMAND) {
+      dialog = FXDirDialog.new(self, "Choose directory")
+      dialog.directory = @field.getText
+      unless dialog.execute == 0
+	@field.setText(dialog.directory)
+	@block.call(getPath)
+      end
+    }
+  end
+
+  def getPath
+    @shell.rubyPath(fox2Ruby(@field.getText))
+  end
+
+  def setPath(value)
+    @field.setText(ruby2Fox(@shell.osPath(value)))
+  end
+end

data/lib/piggy-gui/directory_diff_widget.rb

@@ -92,8 +92,8 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
     @splitOR = FXVerticalFrame.new(@fourSplitter)
     @splitUL = FXVerticalFrame.new(@fourSplitter)
     @splitUR = FXVerticalFrame.new(@fourSplitter)
-    @leftListPropFrame = FXMatrix.new(@splitOL, 2, MATRIX_BY_COLUMNS)
-    @rightListPropFrame = FXMatrix.new(@splitOR, 2, MATRIX_BY_COLUMNS)
+    @leftListPropFrame = FXMatrix.new(@splitOL, 2, MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
+    @rightListPropFrame = FXMatrix.new(@splitOR, 2, MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
     @leftButtonsFrame = FXHorizontalFrame.new(@splitUL)
     @rightButtonsFrame = FXHorizontalFrame.new(@splitUR)
     @leftListFrame = FXHorizontalFrame.new(@splitUL)
@@ -112,14 +112,33 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
   end
   
   def initializeControlsOL
-    @labels.push(FXLabel.new(@leftListPropFrame,
-			     "Dir:"))
-    @leftPathField = FXTextField.new(@leftListPropFrame, 32)
+    @labels.push(FXLabel.new(@leftListPropFrame, "Dir:"))
+    combo = FXHorizontalFrame.new(@leftListPropFrame)
+    combo.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
+    @leftPathField = FXTextField.new(combo, 32)
+    @leftPathField.setLayoutHints(LAYOUT_FILL_X)
+    dirChooserForField(@leftPathField, 'left')
   end
   
   def initializeControlsOR
     @labels.push(FXLabel.new(@rightListPropFrame, "Dir:"))
-    @rightPathField = FXTextField.new(@rightListPropFrame, 32)
+    combo = FXHorizontalFrame.new(@rightListPropFrame)
+    combo.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
+    @rightPathField = FXTextField.new(combo, 32)
+    @rightPathField.setLayoutHints(LAYOUT_FILL_X)
+    dirChooserForField(@rightPathField, 'right')
+  end
+
+  def dirChooserForField(field, side)
+    chooserButton = FXButton.new(field.parent, '...')
+    chooserButton.connect(SEL_COMMAND) {
+      dialog = FXDirDialog.new(self, "Choose directory")
+      dialog.directory = field.getText
+      unless dialog.execute == 0
+	field.setText(dialog.directory)
+	dirChanged(side)
+      end
+    }
   end
   
   def initializeControlsUL
@@ -169,16 +188,24 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
     @quitButton.setLayoutHints(LAYOUT_RIGHT)
   end
   
+  def dirChanged(side)
+    if(side == 'right')
+       setRightPath(@rightPathField.getText)
+       updateRightList
+       updateStatusIcons
+    else
+      setLeftPath(@leftPathField.getText)
+      updateLeftList
+      updateStatusIcons	
+    end
+  end
+
   def connectEvents
     @rightPathField.connect(SEL_COMMAND) {
-      setRightPath(@rightPathField.getText)
-      updateRightList
-      updateStatusIcons
+      dirChanged('right')
     }
     @leftPathField.connect(SEL_COMMAND)  {
-      setLeftPath(@leftPathField.getText)
-      updateLeftList
-      updateStatusIcons	
+      dirChanged('left')
     }
     @dirLeftUpButton.connect(SEL_COMMAND, method(:onDirUpLeftList))
     @dirRightUpButton.connect(SEL_COMMAND, method(:onDirUpRightList))
@@ -384,7 +411,7 @@ class DirectoryDiffWidget < Fox::FXScrollWindow
     updateLeftList
     updateRightList
     updateStatusIcons
-    @fourSplitter.setVSplit(600)
+    @fourSplitter.setVSplit(660)
   end
   
   def create

data/lib/piggy-gui/ftp_browser_widget.rb

@@ -80,13 +80,17 @@ class FtpBrowserWidget < DirectoryDiffWidget
   def initializeControlsOL
     @labels.push(FXLabel.new(@leftListPropFrame, "FTP server:"))
     @serverField = FXTextField.new(@leftListPropFrame, 32)
+    @serverField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
     @labels.push(FXLabel.new(@leftListPropFrame, "User:"))
     @userField = FXTextField.new(@leftListPropFrame, 32)
+    @userField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
     @labels.push(FXLabel.new(@leftListPropFrame, "Password:"))
     @passwordField = FXTextField.new(@leftListPropFrame, 32)
+    @passwordField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)    
     @passwordField.setTextStyle(TEXTFIELD_PASSWD)
     @labels.push(FXLabel.new(@leftListPropFrame, "Destination path:"))
     @leftPathField = FXTextField.new(@leftListPropFrame, 32)
+    @leftPathField.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN) 
   end
 
   def initializeControlsUL
@@ -384,7 +388,7 @@ class FtpBrowserWidget < DirectoryDiffWidget
   def inCreate
     updateRightList
     updateStatusIcons
-    @fourSplitter.setVSplit(2450)
+    @fourSplitter.setVSplit(2050)
   end
   
   def prepareClosure

data/lib/piggy-gui/html_generation_dialog.rb

@@ -7,19 +7,18 @@
 require 'piggy-core/options'
 require 'piggy-core/winshell'
 require 'piggy-gui/require-fox'
+require 'piggy-gui/modal_dialog'
+require 'piggy-gui/dir_chooser'
 
 # Dialog for manipulation some of Piggy's html generation parameters.
-class HtmlGenerationDialog < Fox::FXDialogBox
-  include Fox
-  Placement = PIGGY_WINDOW_PLACEMENT
-  
+class HtmlGenerationDialog < ModalDialog
   attr_reader(:options)
   
   def initialize(owner, options = PiggyOptions.new)
     title = "Thumbnail page generator options"
     @options = options
     @shell = WinShell.instance
-    super(owner, title, DECOR_TITLE|DECOR_BORDER)
+    super(owner, title, DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE)
     initializeVariables
     initializeLayout
     setDefaults
@@ -31,7 +30,9 @@ class HtmlGenerationDialog < Fox::FXDialogBox
     @contents = FXMatrix.new(@frame, 2, MATRIX_BY_COLUMNS)
     @labels = Array.new
     @labels.push(FXLabel.new(@contents, "Output directory:"))
-    @outputPathField = FXTextField.new(@contents, 32) 
+    DirChooser.new(@contents, @options.localDestinationPath) { |v|
+      @options.localDestinationPath = v
+    }
     @labels.push(FXLabel.new(@contents, "Framepage:"))
     @genFrameRadioButtons = FXMatrix.new(@contents, 2, MATRIX_BY_COLUMNS)
     @genFrameYes = FXRadioButton.new(@genFrameRadioButtons, "&Yes")
@@ -50,18 +51,11 @@ class HtmlGenerationDialog < Fox::FXDialogBox
                                   nil, 0, COMBOBOX_INSERT_LAST)
     @styleTextField.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
     @styleTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
-    @separator = FXHorizontalSeparator.new(@frame, SEPARATOR_GROOVE)
-    @buttons = FXHorizontalFrame.new(@frame)
-    @cancel = FXButton.new(@buttons, "&Cancel", nil, self, ID_CANCEL)
-    @accept = FXButton.new(@buttons, "&Accept", nil, self, ID_ACCEPT)
+    addOkCancelButtonsTo(@frame)
   end
 
   def initializeLayout
     @labels.each { |label| label.setLayoutHints LAYOUT_CENTER_Y }
-    @buttons.setLayoutHints(LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X)
-    @buttons.setPackingHints(PACK_UNIFORM_WIDTH)
-    @accept.setLayoutHints(LAYOUT_RIGHT)
-    @cancel.setLayoutHints(LAYOUT_RIGHT)
   end
 
   def updateStylesList
@@ -77,7 +71,6 @@ class HtmlGenerationDialog < Fox::FXDialogBox
   def setDefaults
     @genFrameYes.setCheck(@options.generateFramePage)
     @genFrameNo.setCheck(!@options.generateFramePage) 
-    @outputPathField.setText(@shell.winPath(@options.localDestinationPath))
     @addZipCheck.setCheck(@options.addZip?)
     @addSlideshowCheck.setCheck(@options.addSlideshow?)
     updateStylesList
@@ -92,9 +85,6 @@ class HtmlGenerationDialog < Fox::FXDialogBox
       @genFrameYes.setCheck false
       @options.generateFramePage = false
     }
-    @outputPathField.connect(SEL_COMMAND) {
-      @options.localDestinationPath = @shell.rubyPath(@outputPathField.getText)
-    }
     @addZipCheck.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.addZip = ptr
     }
@@ -106,7 +96,7 @@ class HtmlGenerationDialog < Fox::FXDialogBox
       validateStyle
     }
   end
-  
+
   def getSubdir
     return fox2Ruby(@subdirField.getText)
   end
@@ -116,14 +106,28 @@ class HtmlGenerationDialog < Fox::FXDialogBox
   end
   
   def validate
-    validateSubdir && validateStyle
+    validateOutputPath && validateSubdir && validateStyle
   end
-  
-  def validateSubdir # TODO wo aufrufen???
-    if getSubdir.empty?
+
+  def validateOutputPath
+    unless File.directory?(@options.localDestinationPath)
+      warnOutputPath
+      return false
+    end
+    return true;
+  end
+
+  def validateSubdir
+    subdir = getSubdir
+    if subdir.empty?
       warnNoSubdirGiven
       return false
     end
+    pathToSubdir = File.join(@options.localDestinationPath, subdir)
+    if(File.directory? pathToSubdir)
+      warn("Overwrite protection!", "#{pathToSubdir} allready exists")
+      return false
+    end
     return true
   end
 
@@ -136,22 +140,22 @@ class HtmlGenerationDialog < Fox::FXDialogBox
       true
     end
   end
-  
+ 
+  def warnOutputPath
+    title = "Output path does not exist"
+    msg = "Output path does not exist"
+    warn(title, msg)
+  end
+ 
   def warnNoSubdirGiven
-    style = MBOX_OK|DECOR_TITLE|DECOR_CLOSE|Placement
     title = "No subdirectory"
     msg = "Specify a subdirectory first"
-    FXMessageBox::warning(self, style, title, msg)
+    warn(title, msg)
   end
 
   def warnStyleMissing
-    style = MBOX_OK|DECOR_TITLE|DECOR_CLOSE|Placement
     title = "Style not found"
     msg = "Style missing: #{@options.style}"
-    FXMessageBox::warning(self, style, title, msg)
-  end
-  
-  def execute(placement=Placement)
-    return super(placement) > 0 # TODO durch geeignete Konstante ersetzen
+    warn(title, msg)
   end
 end

data/lib/piggy-gui/modal_dialog.rb

@@ -0,0 +1,64 @@
+#!/usr/bin/ruby
+## $Id: html_generation_dialog.rb 190 2008-02-02 18:52:57Z Sascha $
+
+require 'piggy-gui/require-fox'
+
+# Provide a validation hook for ID_ACCEPT action
+class ModalDialog < Fox::FXDialogBox
+  include Fox
+  include Responder
+  Placement = PIGGY_WINDOW_PLACEMENT
+  
+  def initialize(*args)
+    super(*args)
+    FXMAPFUNC(SEL_COMMAND, FXDialogBox::ID_ACCEPT, :onCmdAccept)
+  end
+
+  # utility method for use in subclasses
+  def addOkCancelButtonsTo(frame)
+    FXHorizontalSeparator.new(frame, SEPARATOR_GROOVE)
+    buttons = FXHorizontalFrame.new(frame)
+    cancel = FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL)
+    accept = FXButton.new(buttons, "&Accept", nil, self, ID_ACCEPT,
+			   BUTTON_NORMAL|BUTTON_INITIAL|BUTTON_DEFAULT)
+    buttons.setLayoutHints(LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X)
+    buttons.setPackingHints(PACK_UNIFORM_WIDTH)
+    accept.setLayoutHints(LAYOUT_RIGHT)
+    cancel.setLayoutHints(LAYOUT_RIGHT)
+    buttons
+  end
+
+  # This is the overwrite that integrates the validation hook
+  def onCmdAccept(p1, p2, p3)
+    begin
+      view2model
+    rescue Error => ex
+      warn(ex.to_s, "Error")
+    end
+    super(p1, p2, p3) if validate
+  end
+
+  # this method will be sent before validation
+  # overwrite to perform conversions from view to model
+  def view2model
+  end
+
+  # Overwrite this hook to check conditions and warn.
+  # Return false to keep dialog open.
+  def validate
+    true
+  end
+
+  # utility method for use in validation
+  # usage: return condition | warn('Warning', 'Please ...')
+  def warn(title, msg)
+    style = MBOX_OK|DECOR_TITLE|DECOR_CLOSE|Placement
+    FXMessageBox::warning(self, style, title, msg)
+    return false
+  end
+ 
+  # Return a boolean
+  def execute(placement=Placement)
+    return super(placement) != 0
+  end
+end

data/lib/piggy-gui/options_dialog.rb

@@ -6,19 +6,19 @@
 require 'piggy-core/environment'
 require 'piggy-core/options'
 require 'piggy-gui/require-fox'
+require 'piggy-gui/modal_dialog'
 
 # Dialog to change some of Piggy's options.
-class OptionsDialog < Fox::FXDialogBox
-  include Fox
-  
+class OptionsDialog < ModalDialog
   attr_reader(:options)
   
   def initialize(owner, piggyOptions)
     title = "Piggy general options"
-    super(owner, title, DECOR_TITLE|DECOR_BORDER|PIGGY_WINDOW_PLACEMENT)
+    super(owner, title, DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE|PIGGY_WINDOW_PLACEMENT)
     @options = piggyOptions.clone
     @fillMode = LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_Y
     @frameStyle = FRAME_NONE
+    @shell = WinShell.instance
     initializeLayout
   end
   
@@ -59,21 +59,40 @@ class OptionsDialog < Fox::FXDialogBox
     
     cb = FXCheckButton.new(basicFrame,
 			   'Show log pane',
-    nil, 0, cbFlags)
+			   nil, 0, cbFlags)
     cb.setCheck(@options.useLog)
     cb.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.useLog = ptr
     }
     cb = FXCheckButton.new(basicFrame,
 			   'Show preview pane (experimental)',
-    nil, 0, cbFlags)
+			   nil, 0, cbFlags)
     cb.setCheck(@options.usePreview)
     cb.connect(SEL_COMMAND) { |sender, sel, ptr|
       @options.usePreview = ptr
     }
-    buttons = FXHorizontalFrame.new(basicFrame)
-    @accept = FXButton.new(buttons, "&Accept", nil, self, ID_ACCEPT)
-    @cancel = FXButton.new(buttons, "&Cancel", nil, self, ID_CANCEL)
+    FXLabel.new(basicFrame, "Web browser:")
+    combo = FXHorizontalFrame.new(basicFrame)
+    @browserField = FXTextField.new(combo, 32) 
+    @browserField.setText(ruby2Fox(@shell.osPath(@options.browser)))
+    @browserField.connect(SEL_COMMAND) {
+      browserChanged
+    }
+    chooserButton = FXButton.new(combo, '...')
+    chooserButton.connect(SEL_COMMAND) {
+      dialog = FXFileDialog.new(self, "Choose browser")
+      dialog.filename = @browserField.getText
+      dialog.selectMode = SELECTFILE_EXISTING
+      unless dialog.execute == 0
+	@browserField.setText(dialog.filename)
+	browserChanged
+      end
+    }
+    addOkCancelButtonsTo(basicFrame)
+  end
+
+  def browserChanged
+    @options.browser = @shell.rubyPath(fox2Ruby(@browserField.getText))
   end
   
   def updateProcessor
@@ -82,4 +101,10 @@ class OptionsDialog < Fox::FXDialogBox
     @rbRmagick.setCheck(@options.useRmagick?)
   end
   
+  def validate
+    if @options.browser?
+      return warn("Browser not found", "Warning") unless File.exists?(@options.browser)
+    end
+    true
+  end
 end

data/lib/piggy-gui/piggy_image_browser.rb

@@ -32,7 +32,6 @@ class PiggyImageBrowser < Fox::FXMainWindow
   include Responder
   MsgStyle = MBOX_OK|DECOR_TITLE|DECOR_CLOSE|PIGGY_WINDOW_PLACEMENT
   UseImageView = false
-  @@browser = '"C:\Programme\Internet Explorer\IEXPLORE.exe"'
   
   attr_reader(:imageProcessor)
   
@@ -543,10 +542,10 @@ class PiggyImageBrowser < Fox::FXMainWindow
     if(!File.exist? generator.mainIndexWithPath)
       return error("#{generator.mainIndexWithPath} doesn't exist")
     end
-    if(@@browser)
+    if(@options.browser?)
       getApp.beginWaitCursor
       begin
-        @pipeLog.runCommand(@@browser + ' ' + generator.mainIndexWithPath,
+        @pipeLog.runCommand(@options.browser + ' ' + generator.mainIndexWithPath,
         generator.mainIndexPath)
       rescue
       end
@@ -579,7 +578,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
   
   def onCmdOptions(sender, sel, index)
     dialog = OptionsDialog.new(self, @options.clone)
-    optionsChanged(dialog.options) unless dialog.execute == 0
+    optionsChanged(dialog.options) if dialog.execute
   end
   
   # Open a new file
@@ -595,7 +594,7 @@ class PiggyImageBrowser < Fox::FXMainWindow
     patterns = ["All Files (*)" ] + @supportedImageTypes.values
     openDialog.patternList = patterns
     openDialog.currentPattern = @preferredFileFilter
-    if openDialog.execute != 0
+    if openDialog.execute
       @preferredFileFilter = openDialog.currentPattern
       filename = openDialog.filename
       setDirectory(openDialog.getDirectory)
@@ -696,20 +695,11 @@ class PiggyImageBrowser < Fox::FXMainWindow
     optionsDialog = HtmlGenerationDialog.new(self, @options.clone)
     return false unless optionsDialog.execute
     @options = optionsDialog.options
-    # fixme -> options dialog should handle this
-    return false unless checkLocalDestinationPath
     directory = @filelist.getDirectory
     outputDir = optionsDialog.getSubdir
-    if(!outputDir || outputDir.empty?)
-      return error("no output directory given!") 
-    end
-    subdir = @options.localDestinationPath + '/' + outputDir
-    if(File.directory? subdir)
-      return error("#{subdir} allready exists")
-    end
+    subdir = File.join(@options.localDestinationPath, outputDir)
     title = optionsDialog.getTitle
     title = "" if(!title)
-    # <-
     generator = generatorClass.new(@options)
     generator.client = @pipeLog
     generator.setOutputDirectory(outputDir)

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

@@ -0,0 +1,73 @@
+body {
+  text-align: center;
+  background: #D9F5F3;
+}
+
+.image_page a {
+  margin: 10px;
+}
+
+.thumbs dl.table {
+  padding-left: 84px;
+}
+
+div {
+  margin:0;
+  padding:0;
+}
+
+dl {
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 600px;
+}
+
+/* no max-width in IE < 7 */
+* html dl {
+  width: 600px;
+}
+
+dd {
+  margin: 0px;
+  padding: 0;
+  width: 128px;
+  height: 128px;
+  float: left;
+  vertical-align: middle;
+  text-align: center;
+}
+
+.preview {
+  background:url(ro.jpg) top right no-repeat;
+}
+
+.thumb {
+  background:url(lo.jpg) top left no-repeat;
+}
+
+.thumb p {
+  margin:0;
+  padding:0;
+  background:url(ru.jpg) bottom right no-repeat;
+}
+
+.thumb p a {
+  display: block;
+  background: url(lu.jpg) bottom left no-repeat;
+  padding: 0px;
+  padding-right: 28px;
+  padding-bottom: 28px;
+}
+
+.thumb p a img {
+  border:none;
+}
+
+.image_page img {
+  max-width: 100%;
+}
+
+/* IE 6 image height */
+* html .thumb p a {
+  padding-bottom: 24px;
+}

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: Piggy
 version: !ruby/object:Gem::Version 
-  version: 0.4.2.2
-date: 2008-06-02 00:00:00 +02:00
+  version: 0.4.2.3
+date: 2008-06-18 00:00:00 +02:00
 summary: (P)ick (i)mages and (g)enerate (g)alleries
 require_paths: 
 - lib
@@ -29,20 +29,10 @@ post_install_message:
 authors: 
 - "Sascha D\xF6rdelmann"
 files: 
-- INSTALL.txt
 - LICENCE.txt
 - README.txt
 - test.rb
 - UNINSTALL.txt
-- web
-- web/IMAGE_PROCESSING.txt
-- web/INSTALL.txt
-- web/extern.gif
-- web/ftp-browser.png
-- web/index-de.html
-- web/index.html
-- web/piggy.png
-- web/style.css
 - lib
 - lib/directory_diff.rb
 - lib/ftp_browser.rb
@@ -92,25 +82,27 @@ files:
 - lib/piggy-core/progress.rb
 - lib/piggy-core/rmagick_thumbnail_page_generator.rb
 - lib/piggy-core/thumbnail_generator.rb
-- lib/piggy-core/thumbnail_page_generator.rb
 - lib/piggy-core/upload_info.rb
-- lib/piggy-core/winshell.rb
 - lib/piggy-core/version.rb
-- lib/piggy-core/options.rb
 - lib/piggy-core/ftp_adapter.rb
+- lib/piggy-core/winshell.rb
+- lib/piggy-core/thumbnail_page_generator.rb
+- lib/piggy-core/options.rb
 - lib/piggy-gui
-- lib/piggy-gui/directory_diff_widget.rb
 - lib/piggy-gui/filtered_file_list.rb
 - lib/piggy-gui/fox_thumbsgen.rb
-- lib/piggy-gui/html_generation_dialog.rb
 - lib/piggy-gui/image_processor.rb
 - lib/piggy-gui/multiimagecanvas.rb
-- lib/piggy-gui/options_dialog.rb
-- lib/piggy-gui/piggy_image_browser.rb
 - lib/piggy-gui/pipe_log.rb
 - lib/piggy-gui/progress_with_dialog.rb
 - lib/piggy-gui/require-fox.rb
+- lib/piggy-gui/directory_diff_widget.rb
 - lib/piggy-gui/ftp_browser_widget.rb
+- lib/piggy-gui/piggy_image_browser.rb
+- lib/piggy-gui/options_dialog.rb
+- lib/piggy-gui/modal_dialog.rb
+- lib/piggy-gui/dir_chooser.rb
+- lib/piggy-gui/html_generation_dialog.rb
 - lib/piggy.rb
 - lib/templates
 - lib/templates/fuss.htm
@@ -135,12 +127,19 @@ files:
 - lib/templates/styles/shadow/ro.gif
 - lib/templates/styles/shadow/ru.gif
 - lib/templates/styles/shadow/style.css
+- lib/templates/styles/shadow_D9F5F3
+- lib/templates/styles/shadow_D9F5F3/style.css
+- lib/templates/styles/shadow_D9F5F3/ro.jpg
+- lib/templates/styles/shadow_D9F5F3/lu.jpg
+- lib/templates/styles/shadow_D9F5F3/ru.jpg
+- lib/templates/styles/shadow_D9F5F3/lo.jpg
 - test
 - test/file_info_test.rb
 - bin
 - bin/directory_diff
 - bin/ftp_browser
 - bin/piggy
+- INSTALL.txt
 - CHANGES.txt
 test_files: 
 - test.rb

data/web/IMAGE_PROCESSING.txt

@@ -1,53 +0,0 @@
-Piggy is capable of building thumbnail all by using plain Ruby and FXRuby but you might
-want to increase the quality of the result by switching options and make Piggy use
-one of the following tools:
-- RMagick
-- Nconvert (the batch processing application of the great image converter XNview)
-
-*** RMagick
-
-Homepage: http://rubyforge.org/projects/rmagick/
-
-Installation on Windows:
-
-This is, what worked for me:
-1. Download binary distribution.
-2. Unpack e. g. into something like F:\transfer
-3. Open console window on the RMagick-Folder
-
-Now the gem installation and postinstall:
->>
-F:\transfer\RMAGIC~1.3-W>gem install RMagick-win32-1.9.2-mswin32.gem
-Attempting local installation of 'RMagick-win32-1.9.2-mswin32.gem'
-Successfully installed RMagick-win32, version 1.9.2
-
-F:\transfer\RMAGIC~1.3-W>postinstall
-RMagick 1.9.2 win32 Post Installation (see enclosed README for license informati
-on)
-detecting available fonts, writing to config/type-windows.xml...Warning: Ignored
- file c:/winnt/fonts/micross.ttf, exception occurred.
-Warning: Ignored file c:/winnt/fonts/MICN__DB.TTF, exception occurred.
-[...]
-Warning: Ignored file c:/winnt/fonts/21205___.TTF, exception occurred.
-ok.
-setting MAGICK_CONFIGURE_PATH to 'E:/ruby/lib/ruby/gems/1.8/gems/RMagick-win32-1
-.9.2-mswin32/config'.
-setting is only for current user.
-Copying 5 dlls to E:/ruby/bin...done.
-all done.
-<<
-
-Installation on Linux is most easy if you run a Debian flavoured Linux: Simply
-download and install the Debian package.
-
-
-*** NConvert
-
-Homepage: http://perso.wanadoo.fr/pierre.g/xnview/en_nconvert.html
-
-Installation on Windows:
-
-Copy nconvert.exe into a directory of your choice which is part of the PATH variable, e. g
-into C:\ruby\bin.
-
-For Linux there are RPM packages availiable.

data/web/INSTALL.txt

@@ -1,74 +0,0 @@
-------------------
-Piggy Installation 
-------------------
-
-Installation depends on operation system and ruby version.
-
-Intallation includes the following applications
-- piggy
-- directory_diff
-- ftp_browser
-
-------------------
-Windows NT/2000/XP
-------------------
-
-You might be using the Ruby Windows Installer, so you
-probably have FXRuby and most of the other required libraries
-installed on your system.
-
-Continue with the gem installation.
-
-------------
-Debian Linux
-------------
-
-Use any package manager you like (apt, aptitude, kpackage,...)
-to install the following debian packages:
-
-libruby
-libyaml-ruby
-libzlib-ruby
-rdoc
-
-Install FXRuby.
-
-There is a gem availiable but I recommend that you use a debian package
-instead. You'll have to add the following lines to the sources.list:
-
->>
-# FreeRIDE
-deb http://freeride.rubyforge.org/debian/ deb/
-deb-src http://freeride.rubyforge.org/debian/ src/
-<<
-
-(You may do this via the graphical user interface provided by kpackage.
-Don't forget to update the apt package list afterwards.)
-
-Continue with the gem installation.
-
-----------------
-Gem installation
-----------------
-
-It's quite obvious that you'll need RubyGems to be installed
-for this. It is packaged with actual windows installer versions.
-On other systems you'll have to download and install it yourself
-but installation is pretty easy, RubyGems comes with an install.rb
-script.
-
-You can now install piggy with the gem install command
-
-    gem install Piggy-x.x.x.x.gem
-
-where x.x.x.x is a
-placeholder for the downloaded version of Piggy.
-
-(Note that for now the gem command won't check if
-FXRuby is installed on your system.)
-
-Gem installation might fail if you don't have the rights
-to write the gem directories. You'll need to become root/admin
-to get rid of these errors.
-
-

data/web/index-de.html

@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Piggy</title>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<meta name="author" content="Sascha Doerdelmann">
-<link rel="stylesheet" type="text/css" href="style.css">
-</head>
-<body>
-<h1>Piggy</h1>
-<div class="languages"><a href="index.html">englisch (english)</a>
-</div>
-<div class="content">
-<p>Am Anfang habe ich die Bildseiten h&auml;ndisch mit Hilfe von <a
-  class="extern" href="http://perso.wanadoo.fr/pierre.g/" title="XNview">XNview</a>
-und einiger selbstgestrickter Unix-Scripte erstellt. Inzwischen habe ich
-mir ein kleines Ruby-Programm geschrieben. Dies erm&ouml;glicht eine
-komfortable Bildauswahl, generiert die Seiten auf Knopfdruck und hat
-einen rudiment&auml;ren FTP-Browser f&uuml;r das Hochladen in's Netz integriert.</p>
-<p>Im Bildbetrachter k&ouml;nnen Bilder angesehen und ausgew&auml;hlt werden.
-Die jeweils angeklickte Bilddatei ist im Mittelteil des Fensters zu
-sehen. Jetzt kann man entscheiden, ob es im Album enthalten sein soll:
-<ul>
-  <li>Beim Wechsel in ein anderes Verzeichnis wird die aktuelle
-  Auswahl verworfen und durch die Bilddateien im neu gew&auml;hlten Verzeichns
-  ersetzt.</li>
-  <li>&Uuml;ber die Schaltfl&auml;che &quot;-&quot; lassen sich Bilder aus dem
-  Album l&ouml;schen. Dabei wird nicht das Bild selbst gel&ouml;scht.</li>
-  <li>Analog f&uuml;gt man &uuml;ber die Schaltfl&auml;che &quot;+&quot; das
-  aktuelle Bild dem Album zu.</li>
-</ul>
-<p>Man kann &uuml;ber Pfeiltasten durch die gew&auml;hlten Bilder bl&auml;ttern, um
-sicher zu gehen, dass das Album nur Bilder enth&auml;lt, die man wirklich
-ver&ouml;ffentlichen m&ouml;chte. Es gibt auch eine Vorschau. Diese l&auml;sst sich
-&uuml;ber den Optionen-Dialog aktivieren. Die Vorschau verlangsamt allerdings
-Verzeichniswechsel deutlich.</p>
-<p>Das jeweils aktuelle Bilde kann gedreht und unter neuem Namen
-gespeichert werden. Beim Drehen verringert sich etwas die Bildqualit&auml;t,
-man sollte also das Original aufbewahren.</p>
-<p>Um das so vorbereitete Album zu erzeugen klickt man auf die
-Schaltfl&auml;che &quot;HTML&quot;. Es &ouml;ffnet sich ein Eingabefenster. Dort
-w&auml;hlt man einen Seitentitel und den Namen f&uuml;r ein noch nicht
-vorhandenes(!), unter C:\temp\bild zu erstellendes Unterverzeichnis.
-Nach dem &quot;Accept&quot; werden die ausgew&auml;hlten Bilder kopiert,
-verkleinert und evtl. in einen anderen Dateityp konvertiert oder
-nachgesch&auml;rft. Index, Frameseite und Bilder&uuml;bersicht werden neu
-erstellt, die Navigationsseite aktualisiert.</p>
-<ul>
-  <li>Screenshots: <a href="piggy.png">piggy</a>, <a
-    href="ftp-browser.png">ftp-browser</a></li>
-  <li><a href="INSTALL.txt">Installationsanweisung (englisch)</a></li>
-  <li><a class="extern"
-    href="http://www.gnu.de/documents/gpl.de.html">Lizenz (GPL)</a></li>
-  <li>Download, Newsfeed, Bugtracker und mehr:
-  <a href="http://rubyforge.org/projects/piggy/">Rubyforge: Piggy</a></li>
-  <li><a href="http://sourceforge.net/projects/piggy/">&Auml;ltere Versionen</a></li>
-</ul>
-</div>
-</body>
-</html>

data/web/index.html

@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN">
-<html>
-<head>
-<title>Piggy</title>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<meta name="author" content="Sascha Doerdelmann">
-<link href="style.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<h1>Piggy</h1>
-<div class="languages"><a href="index-de.html">german
-(deutsch)</a></div>
-<div class="content">
-<p>In the beginning I created internet picture albums step by step
-using <a class="extern" href="http://perso.wanadoo.fr/pierre.g/"
-  title="XNview">XNview</a> and some quick and dirty Unix
-scripts.Meanwhile I wrote a little Ruby program. This allows a
-comfortable selection of pictures, generates web pages and includes a
-very basic FTP browser which can be used to upload the album to the
-webspace of your choice.</p>
-<p>The main view of the application is a kind of image viewer.
-Select an image file and it will be shown in the middle frame of the
-application. You may decide if you want this image to be included in the
-internet picture album:
-<ul>
-  <li>Changing the directory will clear the list of chosen images
-  and choose all image files found in the actual folder.</li>
-  <li>Remove images with the button &quot;-&quot;.</li>
-  <li>Add images with the button &quot;+&quot;.</li>
-</ul>
-<p>Step through the chosen images with the next and previous buttons
-to be sure that only images you really want to publish are chosen. You
-can also enable a preview table on the right side but image loading into
-the preview will slow down directory changes.</p>
-<p>You may rotate the currently shown image and then save it under a
-new name. Rotation will introduce a loss in quality which is acceptable
-for the internet picture album but please, keep the original image.</p>
-<p>Html-generation is done by clicking the generation button. You'll
-be prompted for page title, destination path and a name for a
-subdirectory. Piggy will create two resized copies of every preselected
-image into the subdirectory of the destination and html-pages to show
-them.</p>
-<ul>
-  <li>Screenshots: <a href="piggy.png">piggy</a>, <a
-    href="ftp-browser.png">ftp-browser</a></li>
-  <li><a href="INSTALL.txt">How to install</a></li>
-  <li><a class="extern" href="http://www.gnu.org/licenses/gpl.html">Licence
-  (GPL)</a></li>
-  <li>Download, Newsfeed, Bugtracker and more:
-  <a href="http://rubyforge.org/projects/piggy/">Rubyforge: Piggy</a></li>
-  <li><a href="http://sourceforge.net/projects/piggy/">Older releases</a></li>
-  <li><a href="IMAGE_PROCESSING.txt">Further notes on image
-  processing tools</a></li>
-</ul>
-</div>
-</body>
-</html>

data/web/style.css

@@ -1,14 +0,0 @@
-body{
-	background:aliceblue
-}
-
-.extern{
-	background:transparent url(extern.gif) no-repeat center left;
-         padding-left:12px;
-}
-
-.languages{
-	position:absolute;
-         top:10px;
-         right:10px;
-}