Piggy 0.4.2.4 → 0.4.3.0

data/lib/piggy-gui/filtered_file_list.rb

@@ -19,46 +19,46 @@ class FilteredFileList < Fox::FXFileList
     @chosenFiles = Set.new
     @choosable = proc { |file| true }
     @shell = WinShell.instance
-    initIcons
+    init_icons
   end
   
-  def initIcons
-    @checkedIcon = getIcon("checked.ico")
-    @uncheckedIcon = getIcon("unchecked.ico")
+  def init_icons
+    @checkedIcon = get_icon("checked.ico")
+    @uncheckedIcon = get_icon("unchecked.ico")
   end
   
-  def getIcon(filename)
-    iconPath = File.join(PIGGY_PATH, 'icons', filename)
-    @imageProcessor.loadIcon(iconPath)
+  def get_icon(filename)
+    icon_path = File.join(PIGGY_PATH, 'icons', filename)
+    @imageProcessor.load_icon(icon_path)
   end
   
-  def getItemRubyFilename(index)
-    fox2Ruby(getItemFilename(index))
+  def get_item_ruby_filename(index)
+    fox_2_ruby(getItemFilename(index))
   end
   
-  def getItemRubyPathname(index)
-    fox2Ruby(getItemPathname(index))
+  def get_item_ruby_pathname(index)
+    fox_2_ruby(getItemPathname(index))
   end
   
-  def replaceFileIcon(index, rubyfile, modus)
+  def replace_file_icon(index, rubyfile, modus)
     return nil if modus == nil
     icon = (modus == 'add' ? @checkedIcon : @uncheckedIcon)
     if FOXVERSION_GE_1_2
       setItemMiniIcon(index, icon)
     else
-      file = ruby2Fox(rubyfile)
+      file = ruby_2_fox(rubyfile)
       replaceItem(index, file, icon, icon)
     end
   end
   
-  def chooseAllInFilelist
-   (0..getNumItems-1).each do
+  def choose_all_in_filelist
+    (0..getNumItems-1).each do
       |i|
-      if(isItemFile(i) && supports(getItemRubyFilename(i)))
-        shortName = getItemRubyFilename(i)
-        longName = getItemRubyPathname(i)
+      if(isItemFile(i) && supports(get_item_ruby_filename(i)))
+        shortName = get_item_ruby_filename(i)
+        longName = get_item_ruby_pathname(i)
         @chosenFiles.add(longName)
-        replaceFileIcon(i, shortName, 'add')
+        replace_file_icon(i, shortName, 'add')
       end
     end
   end
@@ -67,84 +67,84 @@ class FilteredFileList < Fox::FXFileList
     return @choosable.call(filename)
   end
   
-  def getSelectedImageFiles(fullPath = false, modus = nil)
-    selectedInd = (0..getNumItems-1).select do
+  def get_selected_image_files(full_path = false, modus = nil)
+    selected_ind = (0..getNumItems-1).select do
       |i|
       isItemSelected(i) and
-      isItemFile(i) and
-      supports(getItemRubyFilename(i))
+        isItemFile(i) and
+        supports(get_item_ruby_filename(i))
     end
-    selectedFiles = selectedInd.collect do
+    selected_files = selected_ind.collect do
       |i|
-      shortName = getItemRubyFilename(i)
-      longName = getItemRubyPathname(i)
-      replaceFileIcon(i, shortName, modus)
-      fullPath ? longName : shortName
+      shortName = get_item_ruby_filename(i)
+      longName = get_item_ruby_pathname(i)
+      replace_file_icon(i, shortName, modus)
+      full_path ? longName : shortName
     end
-    return selectedFiles
+    return selected_files
   end
   
-  def addSelectedFiles
-    getSelectedImageFiles(true, 'add').each { |file|
+  def add_selected_files
+    get_selected_image_files(true, 'add').each { |file|
       @chosenFiles.add(file)
     }
   end
   
-  def removeSelectedFiles
-    getSelectedImageFiles(true, 'remove').each { |file|
+  def remove_selected_files
+    get_selected_image_files(true, 'remove').each { |file|
       @chosenFiles.delete(file)
     }
   end
   
-  def updateFileList
+  def update_file_list
     scan(true)
-     (0..getNumItems-1).each do
+    (0..getNumItems-1).each do
       |i|
       if(isItemFile(i))
-        shortName = getItemRubyFilename(i)
+        shortName = get_item_ruby_filename(i)
         if(supports(shortName))
-          longName = getItemRubyPathname(i)
+          longName = get_item_ruby_pathname(i)
           if(@chosenFiles.include?(longName))
-            replaceFileIcon(i, shortName, 'add')
+            replace_file_icon(i, shortName, 'add')
           else
-            replaceFileIcon(i, shortName, 'remove')
+            replace_file_icon(i, shortName, 'remove')
           end
         end
       end
     end
   end
   
-  def addIndex(i)
-    longName = getItemRubyPathname(i)
-    shortName = getItemRubyFilename(i)
-    @chosenFiles.add(longName)
-    replaceFileIcon(i, shortName, 'add')
+  def add_index(i)
+    long_name = get_item_ruby_pathname(i)
+    short_name = get_item_ruby_filename(i)
+    @chosenFiles.add(long_name)
+    replace_file_icon(i, short_name, 'add')
   end
   
-  def removeIndex(i)
-    longName = getItemRubyPathname(i)
-    shortName = getItemRubyFilename(i)
-    @chosenFiles.delete(longName)
-    replaceFileIcon(i, shortName, 'remove')
+  def remove_index(i)
+    long_name = get_item_ruby_pathname(i)
+    short_name = get_item_ruby_filename(i)
+    @chosenFiles.delete(long_name)
+    replace_file_icon(i, short_name, 'remove')
   end
   
-  def chooseSavedInstead(original, saved)
-    originalIndex = getIndex(original)
-    savedIndex = getIndex(saved)
-    removeIndex(originalIndex) unless originalIndex < 0
-    unless savedIndex < 0
-      addIndex(savedIndex) 
-      selectIndex(savedIndex)
+  def choose_saved_instead(original, saved)
+    original_index = get_index(original)
+    saved_index = get_index(saved)
+    remove_index(original_index) unless original_index < 0
+    unless saved_index < 0
+      add_index(saved_index)
+      select_index(saved_index)
     end
   end
   
-  def getIndex(path)
-    rubyPath = rubyPath(path)
-     (0..getNumItems-1).each do
+  def get_index(path)
+    ruby_path = ruby_path(path)
+    (0..getNumItems-1).each do
       |i|
       if(isItemFile(i))
-        longName = getItemRubyPathname(i)
-        if(rubyPath(longName) == rubyPath)
+        longName = get_item_ruby_pathname(i)
+        if(ruby_path(longName) == ruby_path)
           return i
         end
       end
@@ -152,59 +152,59 @@ class FilteredFileList < Fox::FXFileList
     return -1
   end
   
-  def rubyPath(path)
-    @shell.rubyPath(path)
+  def ruby_path(path)
+    @shell.ruby_path(path)
   end
   
-  def assumeSelected(path)
-    index = getIndex(path)
+  def assume_selected(path)
+    index = get_index(path)
     unless index < 0 || itemSelected?(index)
       killSelection()
       selectItem(index)
     end
   end
   
-  def chosenSequence
+  def chosen_sequence
     seq = Array.new
     @chosenFiles.each { |file| seq.push(file) }
     seq.sort! { |x, y| x <=> y }
   end
   
-  def goToDirectory(dirname)
-    self.directory = ruby2Fox(rubyPath(dirname))
+  def go_to_directory(dirname)
+    self.directory = ruby_2_fox(ruby_path(dirname))
     @chosenFiles = Set.new
   end
   
-  def getCurrentDirectory
-    fox2Ruby(self.directory)
+  def get_current_directory
+    fox_2_ruby(self.directory)
   end
   
   # Return index or -1
-  def selectNextChosen
+  def select_next_chosen
     block = proc { |i|
       if(isItemFile(i) &&
-        @chosenFiles.include?(getItemRubyPathname(i)))
+            @chosenFiles.include?(get_item_ruby_pathname(i)))
         killSelection
         makeItemVisible(i)
         selectItem(i)
         return i
       end
     }
-    startingPoint = lastSelectedIndex + 1
-     (startingPoint..getNumItems-1).each(&block)
-     (0..startingPoint-1).each(&block)
+    starting_point = last_selected_index + 1
+    (starting_point..getNumItems-1).each(&block)
+    (0..starting_point-1).each(&block)
     return -1
   end
   
-  def selectPreviousChosen
+  def select_previous_chosen
     max = getNumItems - 1
-    startingPoint = firstSelectedIndex
-    startingPoint = max+1 if(startingPoint < 0 || startingPoint > max)
-     (0..max).each do 
+    starting_point = first_selected_index
+    starting_point = max+1 if(starting_point < 0 || starting_point > max)
+    (0..max).each do
       |index|
-      i = (max - index + startingPoint) % (max + 1)
+      i = (max - index + starting_point) % (max + 1)
       if(isItemFile(i) &&
-        @chosenFiles.include?(getItemRubyPathname(i)))
+            @chosenFiles.include?(get_item_ruby_pathname(i)))
         killSelection
         makeItemVisible(i)
         selectItem(i)
@@ -214,18 +214,18 @@ class FilteredFileList < Fox::FXFileList
     return -1
   end
   
-  def firstSelectedIndex
+  def first_selected_index
     max = getNumItems-1
-     (0..max).each do
+    (0..max).each do
       |i|
       return i if(isItemSelected(i)) 
     end
     -1
   end
   
-  def lastSelectedIndex
+  def last_selected_index
     max = getNumItems-1
-     (0..max).each do
+    (0..max).each do
       |i|
       r = max - i
       return r if(isItemSelected(r)) 
@@ -233,11 +233,11 @@ class FilteredFileList < Fox::FXFileList
     -1
   end
   
-  def anyFilesChosen?
+  def any_files_chosen?
     return !@chosenFiles.empty?
   end
   
-  def numFilesChosen
+  def num_files_chosen
     return @chosenFiles.size
   end
 end

data/lib/piggy-gui/fox_thumbsgen.rb

@@ -9,10 +9,10 @@ class FoxThumbnailPageGenerator < ThumbnailPageGenerator
 
   protected
   
-  def imageProcessing(progress)
-    imageProcessor = ImageProcessor.new(client.getApp)
-    @imageGenerator = ThumbnailGenerator.new(imageProcessor, @options)
-    @imageGenerator.setOutputDirectory(imageOutputPath)
+  def image_processing(progress)
+    image_processor = ImageProcessor.new(client.getApp)
+    @imageGenerator = ThumbnailGenerator.new(image_processor, @options)
+    @imageGenerator.set_output_directory(imageOutputPath)
     @imageGenerator.generate(@inputFilenames, progress) 
   end
 end