Piggy 0.4.2.4 → 0.4.3.0

data/lib/piggy-gui/multiimagecanvas.rb

@@ -14,9 +14,9 @@ class MultiImageCanvas < Fox::FXScrollWindow
 
   def initialize(p1, p2)
     super(p1, p2)
-    drawArea = FXCanvas.new(self, nil, 0,
-			    FRAME_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    drawArea.connect(SEL_PAINT, method(:onPaint))
+    draw_area = FXCanvas.new(self, nil, 0,
+      FRAME_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    draw_area.connect(SEL_PAINT, method(:on_paint))
     @contentWidth = width
     @contentHeight = height
     @images = Array.new
@@ -26,19 +26,19 @@ class MultiImageCanvas < Fox::FXScrollWindow
     @imgProcessor = ImageProcessor.new getApp
   end
 
-  def destroyAll(imageCache)
-    @imgProcessor.destroyAll(imageCache)
+  def destroy_all(imageCache)
+    @imgProcessor.destroy_all(imageCache)
   end
 
-  def imageProcessor
+  def image_processor
     return @imgProcessor
   end
   
-  def getContentWidth
+  def get_content_width
     return @contentWidth
   end
 
-  def getContentHeight
+  def get_content_height
     return @contentHeight
   end
   
@@ -50,59 +50,59 @@ class MultiImageCanvas < Fox::FXScrollWindow
     return @images.empty? ? nil : @images[0]
   end
 
-  def setImages(imageArray)
+  def set_images(imageArray)
     @images = imageArray
   end
 
-  def loadAndShowImage(file)
-    loadImage(file)
+  def load_and_show_image(file)
+    load_image(file)
   end
 
-  def loadImage(file, additive=false, degree=0)
+  def load_image(file, additive=false, degree=0)
     if additive && @thumbs.has_key?(file)
       images.push(@thumbs[file]) 
       return
     end
-    if !@imgProcessor.isSupportedImageFile? file
+    unless @imgProcessor.is_supported_image_file? file
       FXMessageBox.error(self, MBOX_OK, "Warning image type",
-			 "Unsupported image type: #{file}")
+        "Unsupported image type: #{file}")
       return
     end
     getApp.beginWaitCursor do
-      img = @imgProcessor.loadImage(file, false)
+      img = @imgProcessor.load_image(file, false)
       unless degree == 0
-	@imgProcessor.rotateImage(img, degree)
+        @imgProcessor.rotate_image(img, degree)
       end
-      destroyAll(@images) if !additive
+      destroy_all(@images) if !additive
       images.push(img)
       if additive
-	cacheThumbFor(file, img)
+        cache_thumb_for(file, img)
       else
-	w = img.getWidth
-	h = img.getHeight
-	if(w > 1600 && h > 1000)
-	  # reduce footprint
-	  @imgProcessor.fitImage(img, 1600, 1000, 1)
-	end
-	FXMemoryStream.open(FXStreamSave, nil) do |stream|
-	  img.savePixels(stream)
-	  @buffer = stream.takeBuffer
-	end
-	@imgProcessor.fitImage(img, getWidth, getHeight, 1)
+        w = img.getWidth
+        h = img.getHeight
+        if(w > 1600 && h > 1000)
+          # reduce footprint
+          @imgProcessor.fit_image(img, 1600, 1000, 1)
+        end
+        FXMemoryStream.open(FXStreamSave, nil) do |stream|
+          img.savePixels(stream)
+          @buffer = stream.takeBuffer
+        end
+        @imgProcessor.fit_image(img, getWidth, getHeight, 1)
       end
       img.create
-      forceRefresh if !additive
+      force_refresh if !additive
     end
   end
 
-  def cacheThumbFor(file, img)
-    @imgProcessor.fitImage(img, 100, 100, 0)
+  def cache_thumb_for(file, img)
+    @imgProcessor.fit_image(img, 100, 100, 0)
     @thumbs[file] = img
     @fifoThumbsKeys.push(file)
     if @fifoThumbsKeys.size > CacheSize
-      thumbToDestroy = @fifoThumbsKeys.shift
-      @thumbs[thumbToDestroy].destroy
-      @thumbs.delete(thumbToDestroy) 
+      thumb_to_destroy = @fifoThumbsKeys.shift
+      @thumbs[thumb_to_destroy].destroy
+      @thumbs.delete(thumb_to_destroy)
     end
   end
 
@@ -114,49 +114,49 @@ class MultiImageCanvas < Fox::FXScrollWindow
     FXMemoryStream.open(FXStreamLoad, @buffer) do |stream|
       img.loadPixels(stream)
     end
-    @imgProcessor.fitImage(img, w, h)
-    forceRefresh
+    @imgProcessor.fit_image(img, w, h)
+    force_refresh
   end
 
-  def loadImages(files)
+  def load_images(files)
     images.clear
-    files.each { |f| loadImage(f, true) }
-    forceRefresh
+    files.each { |f| load_image(f, true) }
+    force_refresh
   end
 
-  def forceRefresh
+  def force_refresh
     contentWindow.update
     contentWindow.repaint
     contentWindow.recalc
     repaint
   end
 
-  def onPaint(sender, sel, unused)
+  def on_paint(sender, sel, unused)
     sdc = FXDCWindow.new(contentWindow)
     sdc.fillRectangle(0, 0, width, height)
     unless images.empty? || width < 5 || height < 5
       # Draw image table
       x = 0;
       y = 0;
-      lineHeight = 0
-      subWidth = images.size == 1 ? 0 : 16 # width for vScrollbar
-      maxW = [images[0].width + subWidth, width].max
+      line_height = 0
+      sub_width = images.size == 1 ? 0 : 16 # width for vScrollbar
+      max_w = [images[0].width + sub_width, width].max
       images.each { |img|
-	imgHeight = img.height
-	imgWidth = img.width
-	maxW = imgWidth if imgWidth + subWidth > maxW
-	if x + img.width > maxW - subWidth
-	  x = 0
-	  y += lineHeight + 4
-	  lineHeight = 0
-	end
-	lineHeight = imgHeight if imgHeight > lineHeight
-	sdc.drawImage(img, x, y)
-	sdc.fillRectangle(x, y + imgHeight, x + imgWidth, y + lineHeight)      
-	x += imgWidth + 4 
+        imgHeight = img.height
+        imgWidth = img.width
+        max_w = imgWidth if imgWidth + sub_width > max_w
+        if x + img.width > max_w - sub_width
+          x = 0
+          y += line_height + 4
+          line_height = 0
+        end
+        line_height = imgHeight if imgHeight > line_height
+        sdc.drawImage(img, x, y)
+        sdc.fillRectangle(x, y + imgHeight, x + imgWidth, y + line_height)
+        x += imgWidth + 4
       }
-      @contentWidth = maxW
-      @contentHeight = y + lineHeight
+      @contentWidth = max_w
+      @contentHeight = y + line_height
     end
     sdc.end
   end

data/lib/piggy-gui/options_dialog.rb

@@ -7,98 +7,220 @@ require 'piggy-core/environment'
 require 'piggy-core/options'
 require 'piggy-gui/require-fox'
 require 'piggy-gui/modal_dialog'
+require 'piggy-gui/html_options_widget'
 
 # Dialog to change some of Piggy's options.
 class OptionsDialog < ModalDialog
   attr_reader(:options)
   
   def initialize(owner, piggyOptions)
-    title = "Piggy general options"
+    title = "Piggy options"
     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
+    initialize_layout
   end
   
-  def initFrame(aFrame)
+  def init_frame(aFrame)
     aFrame.setFrameStyle(@frameStyle)
     aFrame.setLayoutHints(@fillMode)
     return aFrame
   end
   
-  def initializeLayout
-    basicFrame = FXVerticalFrame.new(self)
-    cbFlags = ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP
-    
-    FXLabel.new(basicFrame, "Image processing:")
-    radioButtonsFrame = initFrame(FXVerticalFrame.new(basicFrame))
-    @rbFxruby = FXRadioButton.new(radioButtonsFrame, "Internal (FXRuby)")
-    @rbNconvert = FXRadioButton.new(radioButtonsFrame, "NConvert (XNView)")
-    @rbRmagick = FXRadioButton.new(radioButtonsFrame, "RMagick")
-    updateProcessor
+  def initialize_layout
+    basic_frame = FXVerticalFrame.new(self)
+    tabs = FXTabBook.new(basic_frame, :opts => LAYOUT_FILL)
+    add_tab_general_to(tabs)
+    add_tab_html_to(tabs)
+    add_tab_ftp_to(tabs)
+    add_tab_experimental_to(tabs)
+    add_ok_cancel_buttons_to(basic_frame)
+  end
+
+  def add_tab(book, name)
+    FXTabItem.new(book, " #{name} ");
+    return FXVerticalFrame.new(book, :opts => FRAME_RAISED|LAYOUT_FILL)
+  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 add_tab_general_to(tabs)
+    tab = add_tab(tabs, "General")
+
+    add_label_to(tab, "Image processing:")
+    radio_buttons_frame = init_frame(FXVerticalFrame.new(tab))
+    @rbFxruby = FXRadioButton.new(radio_buttons_frame, "Internal (FXRuby)")
+    @rbNconvert = FXRadioButton.new(radio_buttons_frame, "NConvert (XNView)")
+    @rbRmagick = FXRadioButton.new(radio_buttons_frame, "RMagick")
+    update_processor
     @rbFxruby.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.useFxruby!
-      updateProcessor
+      @options.use_fxruby!
+      update_processor
     }
     @rbNconvert.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.useNconvert!
-      updateProcessor
+      @options.use_nconvert!
+      update_processor
     }
     if RMAGICK_AVAILIABLE
       @rbRmagick.connect(SEL_COMMAND) { |sender, sel, ptr|
-        @options.useRmagick!
-        updateProcessor
+        @options.use_rmagick!
+        update_processor
       }
     else
       @rbRmagick.disable
     end
-    
-    FXLabel.new(basicFrame, "Main window:")
-    
-    cb = FXCheckButton.new(basicFrame,
-			   'Show log pane',
-			   nil, 0, cbFlags)
+
+    add_label_to(tab, "Main window:")
+
+    cb = FXCheckButton.new(tab,
+      'Show log pane',
+      nil, 0, cb_flags)
     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)
-    cb.setCheck(@options.usePreview)
-    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
-      @options.usePreview = ptr
-    }
-    FXLabel.new(basicFrame, "Web browser:")
-    combo = FXHorizontalFrame.new(basicFrame)
-    @browserField = FXTextField.new(combo, 32) 
-    @browserField.setText(ruby2Fox(@shell.osPath(@options.browser)))
+    
+    add_label_to(tab, "Web browser:")
+    combo = FXHorizontalFrame.new(tab)
+    @browserField = FXTextField.new(combo, 32)
+    @browserField.setText(ruby_2_fox(@shell.os_path(@options.browser)))
     @browserField.connect(SEL_COMMAND) {
-      browserChanged
+      browser_changed
     }
-    chooserButton = FXButton.new(combo, '...')
-    chooserButton.connect(SEL_COMMAND) {
+    chooser_button = FXButton.new(combo, '...')
+    chooser_button.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
+        @browserField.setText(dialog.filename)
+        browser_changed
+      end
+    }
+  end
+
+  def add_tab_html_to(tabs)
+    tab = add_tab(tabs, "Html")
+    HtmlOptionsWidget.new(tab, @options)
+  end
+
+  def add_tab_ftp_to(tabs)
+    tab = add_tab(tabs, "Upload")
+    frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
+    add_label_to(frame, "FTP server:")
+    server_field = FXTextField.new(frame, 32)
+    server_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    server_field.setText(ruby_2_fox(@options.ftpHost))
+    server_field.connect(SEL_COMMAND) {
+      @options.ftpHost = fox_2_ruby(server_field.getText)
+    }
+    add_label_to(frame, "User:")
+    user_field = FXTextField.new(frame, 32)
+    user_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    user_field.setText(@options.ftpUser)
+    user_field.connect(SEL_COMMAND) {
+      @options.ftpUser = fox_2_ruby(user_field.getText)
+    }
+    add_label_to(frame, "Remote path:")
+    remote_path_field = FXTextField.new(frame, 32)
+    remote_path_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    remote_path_field.setText(@options.remoteDestinationPath)
+    remote_path_field.connect(SEL_COMMAND) {
+      @options.remoteDestinationPath = fox_2_ruby(remote_path_field.getText)
+    }
+
+    frame = FXMatrix.new(tab, 2, MATRIX_BY_COLUMNS)
+    add_txt_to(frame, "Expert settings")
+    add_txt_to(frame, "")
+    add_label_to(frame, "Exclude filters:")
+    filters_field = FXTextField.new(frame, 32)
+    filters_field.setLayoutHints(LAYOUT_FILL_X|LAYOUT_FILL_COLUMN)
+    filters_field.setText(@options.excludeFilters.join(','))
+    filters_field.connect(SEL_COMMAND) {
+      filters_txt = fox_2_ruby(filters_field.getText)
+      @options.excludeFilters = filters_txt.split(',').
+        collect { |s| s.strip }.
+        reject { |s| s.length == 0 }
+    }
+  end
+
+  def add_tab_experimental_to(tabs)
+    tab = add_tab(tabs, "Experimental")
+    msg = "These options are old or experimental." +
+      "\nDon't change them unless you really need to."
+    add_txt_to(tab, msg)
+    cb = FXCheckButton.new(tab,
+      'Preselect directories',
+      nil, 0, cb_flags)
+    cb.setCheck(@options.preselectDirectories)
+    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.preselectDirectories = ptr
+    }
+    cb = FXCheckButton.new(tab,
+      'Show preview pane',
+      nil, 0, cb_flags)
+    cb.setCheck(@options.usePreview)
+    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.usePreview = ptr
+    }
+    cb = FXCheckButton.new(tab,
+      'Use HTML tables',
+      nil, 0, cb_flags)
+    cb.setCheck(@options.useTable)
+    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.useTable = ptr
+    }
+    cb = FXCheckButton.new(tab,
+      'Styles sample',
+      nil, 0, cb_flags)
+    cb.setCheck(@options.stylesSample)
+    cb.connect(SEL_COMMAND) { |sender, sel, ptr|
+      @options.stylesSample = ptr
+    }
+
+    size_frame = FXHorizontalFrame.new(tab, FRAME_NONE, 0, 0, 0 , 0, 0, 0, 0, 0)
+    add_txt_to(size_frame, "Thumbnail size:")
+    thumb_width_field = FXTextField.new(size_frame, 4)
+    add_label_to(size_frame, " x ")
+    thumb_height_field = FXTextField.new(size_frame, 4)
+    thumb_width_field.setText(ruby_2_fox(@options.thumbWidth.to_s))
+    thumb_height_field.setText(ruby_2_fox(@options.thumbHeight.to_s))
+    thumb_width_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.thumbWidth = fox_2_ruby(thumb_width_field.getText).to_i
+      rescue StandardError => ex
+        thumb_width_field.setText(ruby_2_fox(@options.thumbWidth.to_s))
+      end
+    }
+    thumb_height_field.connect(SEL_COMMAND) { |sender, sel, ptr|
+      begin
+        @options.thumbHeight = fox_2_ruby(thumb_height_field.getText).to_i
+      rescue StandardError => ex
+        thumb_height_field.setText(ruby_2_fox(@options.thumbHeight.to_s))
       end
     }
-    addOkCancelButtonsTo(basicFrame)
   end
 
-  def browserChanged
-    @options.browser = @shell.rubyPath(fox2Ruby(@browserField.getText))
+  def browser_changed
+    @options.browser = @shell.ruby_path(fox_2_ruby(@browserField.getText))
   end
   
-  def updateProcessor
-    @rbFxruby.setCheck(@options.useFxruby?)
-    @rbNconvert.setCheck(@options.useNconvert?)
-    @rbRmagick.setCheck(@options.useRmagick?)
+  def update_processor
+    @rbFxruby.setCheck(@options.use_fxruby?)
+    @rbNconvert.setCheck(@options.use_nconvert?)
+    @rbRmagick.setCheck(@options.use_rmagick?)
   end
   
   def validate