Piggy 0.4.2.4 → 0.4.3.0

data/lib/piggy-gui/html_generation_dialog.rb

@@ -9,172 +9,99 @@ require 'piggy-core/winshell'
 require 'piggy-gui/require-fox'
 require 'piggy-gui/modal_dialog'
 require 'piggy-gui/dir_chooser'
+require 'piggy-gui/html_options_widget'
 
 # Dialog for manipulation some of Piggy's html generation parameters.
 class HtmlGenerationDialog < ModalDialog
   attr_reader(:options)
   
   def initialize(owner, options = PiggyOptions.new)
-    title = "Thumbnail page generator options"
+    title = "Generate HTML image gallery"
     @options = options
     @shell = WinShell.instance
     super(owner, title, DECOR_TITLE|DECOR_BORDER|DECOR_CLOSE)
-    initializeVariables
-    initializeLayout
-    setDefaults
-    connectEvents
+    init_gui
   end
-  
-  def initializeVariables
-    @frame = FXVerticalFrame.new(self)
-    @contents = FXMatrix.new(@frame, 2, MATRIX_BY_COLUMNS)
-    @labels = Array.new
-    @labels.push(FXLabel.new(@contents, "Output directory:"))
-    DirChooser.new(@contents, @options.localDestinationPath) { |v|
-      @options.localDestinationPath = v
+
+  def init_gui
+    frame = FXVerticalFrame.new(self)
+    contents = HtmlOptionsWidget.new(frame, @options, false)
+    labels = Array.new
+    labels.push(FXLabel.new(contents, "Title:"))
+    @titleField = FXTextField.new(contents, 32)
+    @titleField.connect(SEL_COMMAND) { |sender, sel, new_txt|
+      on_title_changed(fox_2_ruby(new_txt)) if (new_txt)
     }
-    @labels.push(FXLabel.new(@contents, "Framepage:"))
-    @genFrameRadioButtons = FXMatrix.new(@contents, 2, MATRIX_BY_COLUMNS)
-    @genFrameYes = FXRadioButton.new(@genFrameRadioButtons, "&Yes")
-    @genFrameNo = FXRadioButton.new(@genFrameRadioButtons, "&No")
-    @labels.push(FXLabel.new(@contents, "Title:"))
-    @titleField = FXTextField.new(@contents, 32)
-    @labels.push(FXLabel.new(@contents, "Subdirectory:"))
-    @subdirField = FXTextField.new(@contents, 32)
-    FXLabel.new(@contents, ""); # TODO empty cell in matrix layout
-    @addZipCheck = FXCheckButton.new(@contents, 'Add zipfile')
-    FXLabel.new(@contents, ""); # TODO empty cell in matrix layout
-    @addSlideshowCheck = FXCheckButton.new(@contents, 'Add slideshow')
-    @labels.push(FXLabel.new(@contents, "Style:"))
-    @styleTextField = newCombobox(@contents, 32,
-                                  10,
-                                  nil, 0, COMBOBOX_INSERT_LAST)
-    @styleTextField.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
-    @styleTextField.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
-    @labels.push(FXLabel.new(@contents, "Image size:"))
-    sizeFrame = FXHorizontalFrame.new(@contents, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0)
-    @imageWidthField = FXTextField.new(sizeFrame, 4)
-    FXLabel.new(sizeFrame, " x ")
-    @imageHeightField = FXTextField.new(sizeFrame, 4) 
-    addOkCancelButtonsTo(@frame)
+    labels.push(FXLabel.new(contents, "Subdirectory:"))
+    @subdirField = FXTextField.new(contents, 32)
+    labels.each { |label| label.setLayoutHints LAYOUT_CENTER_Y }
+    contents.init_gui
+    add_ok_cancel_buttons_to(frame)
   end
 
-  def initializeLayout
-    @labels.each { |label| label.setLayoutHints LAYOUT_CENTER_Y }
+  def on_title_changed(title)
+    title_letters = title.gsub(/\W/, '')
+    return unless title_letters
+    dir_suggestion = title_letters.slice(0..8).downcase
+    @subdirField.setText(ruby_2_fox(dir_suggestion)) 
   end
 
-  def updateStylesList
-    styleDir = File.join(PIGGY_PATH, 'templates/styles')
-    @styleTextField.clearItems
-    Dir[File.join(styleDir, '*')].entries.reject { |f| f =~ /^\.+$/ }.each do
-      |folder|
-      @styleTextField.appendItem(File.basename(folder))
-    end
-    @styleTextField.setText(@options.style)
+  def get_subdir
+    return fox_2_ruby(@subdirField.getText)
   end
   
-  def setDefaults
-    @genFrameYes.setCheck(@options.generateFramePage)
-    @genFrameNo.setCheck(!@options.generateFramePage) 
-    @addZipCheck.setCheck(@options.addZip?)
-    @addSlideshowCheck.setCheck(@options.addSlideshow?)
-    @imageWidthField.setText(ruby2Fox(@options.imageWidth.to_s))
-    @imageHeightField.setText(ruby2Fox(@options.imageHeight.to_s))
-    updateStylesList
-  end
-  
-  def connectEvents
-    @genFrameYes.connect(SEL_COMMAND) {
-      @genFrameNo.setCheck false
-      @options.generateFramePage = true
-    }
-    @genFrameNo.connect(SEL_COMMAND)  {
-      @genFrameYes.setCheck false
-      @options.generateFramePage = false
-    }
-    @addZipCheck.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.addZip = ptr
-    }
-    @addSlideshowCheck.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.addSlideshow = ptr
-    }
-    @styleTextField.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.style = ptr
-      validateStyle
-    }
-    @imageWidthField.connect(SEL_COMMAND) { |sender, sel, ptr|
-      begin 
-	@options.imageWidth = fox2Ruby(@imageWidthField.getText).to_i
-      rescue StandardError => ex
-	@imageWidthField.setText(ruby2Fox(@options.imageWidth.to_s))
-      end
-    }
-    @imageHeightField.connect(SEL_COMMAND) { |sender, sel, ptr|
-      begin
-	@options.imageHeight = fox2Ruby(@imageHeightField.getText).to_i
-      rescue StandardError => ex
-	@imageHeightField.setText(ruby2Fox(@options.imageHeight.to_s))
-      end
-    }
-  end
-
-  def getSubdir
-    return fox2Ruby(@subdirField.getText)
-  end
-  
-  def getTitle
-    return fox2Ruby(@titleField.getText)
+  def get_title
+    return fox_2_ruby(@titleField.getText)
   end
   
   def validate
-    validateOutputPath && validateSubdir && validateStyle
+    validate_output_path && validate_subdir && validate_style
   end
 
-  def validateOutputPath
+  def validate_output_path
     unless File.directory?(@options.localDestinationPath)
-      warnOutputPath
+      warn_output_path
       return false
     end
     return true;
   end
 
-  def validateSubdir
-    subdir = getSubdir
+  def validate_subdir
+    subdir = get_subdir
     if subdir.empty?
-      warnNoSubdirGiven
+      warn_no_subdir_given
       return false
     end
-    pathToSubdir = File.join(@options.localDestinationPath, subdir)
-    if(File.directory? pathToSubdir)
-      warn("Overwrite protection!", "#{pathToSubdir} allready exists")
-      return false
+    path_to_subdir = File.join(@options.localDestinationPath, subdir)
+    if(File.directory? path_to_subdir)
+      return yes?("Overwrite?", "#{path_to_subdir} allready exists. Overwrite?")
     end
     return true
   end
 
-  def validateStyle
-    styleDir = File.join(PIGGY_PATH, 'templates/styles', @options.style)
-    unless File.directory?(styleDir)
-      warnStyleMissing
+  def validate_style
+    style_dir = File.join(PIGGY_PATH, 'templates/styles', @options.style)
+    unless File.directory?(style_dir)
+      warn_style_missing
       false
     else
       true
     end
   end
  
-  def warnOutputPath
+  def warn_output_path
     title = "Output path does not exist"
     msg = "Output path does not exist"
     warn(title, msg)
   end
  
-  def warnNoSubdirGiven
+  def warn_no_subdir_given
     title = "No subdirectory"
     msg = "Specify a subdirectory first"
     warn(title, msg)
   end
 
-  def warnStyleMissing
+  def warn_style_missing
     title = "Style not found"
     msg = "Style missing: #{@options.style}"
     warn(title, msg)

data/lib/piggy-gui/html_options_widget.rb

@@ -0,0 +1,97 @@
+#!/usr/bin/ruby
+## $Id: options_dialog.rb 161 2006-12-23 15:41:01Z Sascha $
+
+require 'piggy-core/options'
+require 'piggy-gui/require-fox'
+require 'piggy-gui/dir_chooser'
+
+class HtmlOptionsWidget < Fox::FXMatrix
+  include Fox
+  include Responder
+
+  def initialize(parent, options, init=true)
+    super(parent, 2, MATRIX_BY_COLUMNS)
+    @options = options
+    init_gui if init
+  end
+
+  def cb_flags
+    ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP
+  end
+
+  def add_label_to(frame, msg)
+    FXLabel.new(frame, msg, :opts => JUSTIFY_LEFT|LAYOUT_CENTER_Y)
+  end
+
+  def add_txt_to(frame, msg)
+    FXLabel.new(frame, msg, :opts => JUSTIFY_LEFT)
+  end
+  
+  def init_gui
+    add_label_to(self, "Output directory:")
+    DirChooser.new(self, @options.localDestinationPath) { |v|
+      @options.localDestinationPath = v
+    }
+    add_label_to(self, "Framepage:")
+    gen_frame_radio_buttons = FXMatrix.new(self, 2, MATRIX_BY_COLUMNS)
+    gen_frame_yes = FXRadioButton.new(gen_frame_radio_buttons, "&Yes")
+    gen_frame_no = FXRadioButton.new(gen_frame_radio_buttons, "&No")
+    gen_frame_yes.setCheck(@options.generateFramePage)
+    gen_frame_no.setCheck(!@options.generateFramePage)
+    gen_frame_yes.connect(SEL_COMMAND) {
+      gen_frame_no.setCheck false
+      @options.generateFramePage = true
+    }
+    gen_frame_no.connect(SEL_COMMAND)  {
+      gen_frame_yes.setCheck false
+      @options.generateFramePage = false
+    }
+    add_label_to(self, ""); # TODO empty cell in matrix layout
+    add_zip_check = FXCheckButton.new(self, 'Add zipfile')
+    add_zip_check.setCheck(@options.addZip?)
+    add_zip_check.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.addZip = ptr
+    }
+    add_label_to(self, ""); # TODO empty cell in matrix layout
+    add_slideshow_check = FXCheckButton.new(self, 'Add slideshow')
+    add_slideshow_check.setCheck(@options.addSlideshow?)
+    add_slideshow_check.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.addSlideshow = ptr
+    }
+    add_label_to(self, "Style:")
+    style_text_field = new_combobox(self, 32,
+      10,
+      nil, 0, COMBOBOX_INSERT_LAST)
+    style_text_field.setFrameStyle(FRAME_SUNKEN|FRAME_THICK)
+    style_text_field.setLayoutHints(LAYOUT_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    style_text_field.clearItems
+    get_style_list.each { |style|
+      style_text_field.appendItem(style)
+    }
+    style_text_field.setText(@options.style)
+    style_text_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.style = ptr
+    }
+    add_label_to(self, "Image size:")
+    size_frame = FXHorizontalFrame.new(self, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0)
+    image_width_field = FXTextField.new(size_frame, 4)
+    add_label_to(size_frame, " x ")
+    image_height_field = FXTextField.new(size_frame, 4)
+    image_width_field.setText(ruby_2_fox(@options.imageWidth.to_s))
+    image_height_field.setText(ruby_2_fox(@options.imageHeight.to_s))
+    image_width_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.imageWidth = fox_2_ruby(image_width_field.getText).to_i
+      rescue StandardError => ex
+        image_width_field.setText(ruby_2_fox(@options.imageWidth.to_s))
+      end
+    }
+    image_height_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.imageHeight = fox_2_ruby(image_height_field.getText).to_i
+      rescue StandardError => ex
+        image_height_field.setText(ruby_2_fox(@options.imageHeight.to_s))
+      end
+    }
+  end
+end

data/lib/piggy-gui/image_processor.rb

@@ -11,23 +11,23 @@ class ImageProcessor
     @app = application
   end
   
-  def isSupportedImageFile? file
-    return getImageClassForFile(file) != nil
+  def is_supported_image_file? file
+    return get_image_class_for_file(file) != nil
   end
   
-  def loadIcon(file, create = true)
-    img = getIconInstanceForFile file
-    return basicLoad(img, file, create)
+  def load_icon(file, create = true)
+    img = get_icon_instance_for_file file
+    return basic_load(img, file, create)
   end
   
-  def loadImage(file, create = true)
-    img = getImageInstanceForFile file
-    return basicLoad(img, file, create)
+  def load_image(file, create = true)
+    img = get_image_instance_for_file file
+    return basic_load(img, file, create)
   end
   
-  def basicLoad(img, rubyfile, create)
+  def basic_load(img, rubyfile, create)
     return nil if img == nil
-    file = ruby2Fox(rubyfile)
+    file = ruby_2_fox(rubyfile)
     begin
       FXFileStream.open(file, FXStreamLoad) do
         |stream|
@@ -40,47 +40,47 @@ class ImageProcessor
     return img
   end
   
-  def saveImage(img, rubyfile)
-    file = ruby2Fox(rubyfile)
+  def save_image(img, rubyfile)
+    file = ruby_2_fox(rubyfile)
     FXFileStream.open(file, FXStreamSave) do
       |stream|
       img.savePixels stream
     end
   end
   
-  def uncreateImage(img)
+  def uncreate_image(img)
     img.destroy
     img.release
   end
 
-  def destroyAll(imageCache)
-    imageCache.each { |i| uncreateImage(i) }
+  def destroy_all(imageCache)
+    imageCache.each { |i| uncreate_image(i) }
     imageCache.clear
   end
   
-  def garbageImage(img)
-    uncreateImage(img)
+  def garbage_image(img)
+    uncreate_image(img)
     GC.start
   end
   
-  def fitImage(img, maxW, maxH, quality = 1)
+  def fit_image(img, maxW, maxH, quality = 1)
     w = img.getWidth
     h = img.getHeight
     ratios = Array.new(2)
     ratios[0] = maxW.to_f / w.to_f
     ratios[1] = maxH.to_f / h.to_f
     ratio = ratios.min
-    newW = (w * ratio).to_i
-    newH = (h * ratio).to_i
-    if newW < 10 or newH < 10
+    new_w = (w * ratio).to_i
+    new_h = (h * ratio).to_i
+    if new_w < 10 or new_h < 10
       return false
     end
-    img.scale(newW, newH, quality)
+    img.scale(new_w, new_h, quality)
     return true
   end
   
-  def rotateImage(img, degree)
-    foxDegree = case degree
+  def rotate_image(img, degree)
+    fox_degree = case degree
     when 0 then 0
     when 90 then 270
     when 180 then 180		  
@@ -88,53 +88,53 @@ class ImageProcessor
     else
       return error('Illegal degree')
     end
-    img.rotate(foxDegree)
+    img.rotate(fox_degree)
   end
   
   private
   
-  def hasExtension(filename, ext)
+  def has_extension(filename, ext)
     File.basename(filename.upcase, ext.upcase) !=
-    File.basename(filename.upcase)
-  end
-  
-  def getImageClassForFile(file)
-    return FXGIFImage if hasExtension(file, ".gif")
-    return FXBMPImage if hasExtension(file, ".bmp")
-    return FXXPMImage if hasExtension(file, ".xpm")
-    return FXPNGImage if hasExtension(file, ".png")
-    return FXJPGImage if hasExtension(file, ".jpg")
-    return FXPCXImage if hasExtension(file, ".pcx")
-    return FXTIFImage if hasExtension(file, ".tif")
-    return FXTGAImage if hasExtension(file, ".tga")
-    return FXICOImage if hasExtension(file, ".ico")
+      File.basename(filename.upcase)
+  end
+  
+  def get_image_class_for_file(file)
+    return FXGIFImage if has_extension(file, ".gif")
+    return FXBMPImage if has_extension(file, ".bmp")
+    return FXXPMImage if has_extension(file, ".xpm")
+    return FXPNGImage if has_extension(file, ".png")
+    return FXJPGImage if has_extension(file, ".jpg")
+    return FXPCXImage if has_extension(file, ".pcx")
+    return FXTIFImage if has_extension(file, ".tif")
+    return FXTGAImage if has_extension(file, ".tga")
+    return FXICOImage if has_extension(file, ".ico")
     return nil
   end
   
-  def getIconClassForFile(file)
-    return FXGIFIcon if hasExtension(file, ".gif")
-    return FXBMPIcon if hasExtension(file, ".bmp")
-    return FXXPMIcon if hasExtension(file, ".xpm")
-    return FXPNGIcon if hasExtension(file, ".png")
-    return FXJPGIcon if hasExtension(file, ".jpg")
-    return FXPCXIcon if hasExtension(file, ".pcx")
-    return FXTIFIcon if hasExtension(file, ".tif")
-    return FXTGAIcon if hasExtension(file, ".tga")
-    return FXICOIcon if hasExtension(file, ".ico")
+  def get_icon_class_for_file(file)
+    return FXGIFIcon if has_extension(file, ".gif")
+    return FXBMPIcon if has_extension(file, ".bmp")
+    return FXXPMIcon if has_extension(file, ".xpm")
+    return FXPNGIcon if has_extension(file, ".png")
+    return FXJPGIcon if has_extension(file, ".jpg")
+    return FXPCXIcon if has_extension(file, ".pcx")
+    return FXTIFIcon if has_extension(file, ".tif")
+    return FXTGAIcon if has_extension(file, ".tga")
+    return FXICOIcon if has_extension(file, ".ico")
     return nil
   end
   
-  def getImageInstanceForFile(file)
-    imageClass = getImageClassForFile file
-    return nil if !imageClass
-    return imageClass.new(@app, nil, IMAGE_KEEP|
-                          IMAGE_OWNED|IMAGE_SHMI|IMAGE_SHMP
+  def get_image_instance_for_file(file)
+    image_class = get_image_class_for_file file
+    return nil if !image_class
+    return image_class.new(@app, nil, IMAGE_KEEP|
+      IMAGE_OWNED|IMAGE_SHMI|IMAGE_SHMP
     )
   end
   
-  def getIconInstanceForFile(file)
-    iconClass = getIconClassForFile file
-    return nil if !iconClass
-    return iconClass.new(@app, nil)
+  def get_icon_instance_for_file(file)
+    icon_class = get_icon_class_for_file file
+    return nil if !icon_class
+    return icon_class.new(@app, nil)
   end
 end

data/lib/piggy-gui/modal_dialog.rb

@@ -11,16 +11,16 @@ class ModalDialog < Fox::FXDialogBox
   
   def initialize(*args)
     super(*args)
-    FXMAPFUNC(SEL_COMMAND, FXDialogBox::ID_ACCEPT, :onCmdAccept)
+    FXMAPFUNC(SEL_COMMAND, FXDialogBox::ID_ACCEPT, :on_cmd_accept)
   end
 
   # utility method for use in subclasses
-  def addOkCancelButtonsTo(frame)
+  def add_ok_cancel_buttons_to(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)
+      BUTTON_NORMAL|BUTTON_INITIAL|BUTTON_DEFAULT)
     buttons.setLayoutHints(LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X)
     buttons.setPackingHints(PACK_UNIFORM_WIDTH)
     accept.setLayoutHints(LAYOUT_RIGHT)
@@ -29,13 +29,13 @@ class ModalDialog < Fox::FXDialogBox
   end
 
   # This is the overwrite that integrates the validation hook
-  def onCmdAccept(p1, p2, p3)
+  def on_cmd_accept(p1, p2, p3)
     begin
       view2model
     rescue Error => ex
       warn(ex.to_s, "Error")
     end
-    super(p1, p2, p3) if validate
+    onCmdAccept(p1, p2, p3) if validate
   end
 
   # this method will be sent before validation
@@ -56,6 +56,12 @@ class ModalDialog < Fox::FXDialogBox
     FXMessageBox::warning(self, style, title, msg)
     return false
   end
+
+  def yes?(title, question)
+    style = MBOX_YES_NO|DECOR_TITLE|DECOR_CLOSE|Placement
+    answer = FXMessageBox.question(self, style, title, question)
+    return answer == MBOX_CLICKED_YES
+  end
  
   # Return a boolean
   def execute(placement=Placement)