no longer use internalized rexml

[booh] / bin / booh-classifier

diff --git a/bin/booh-classifier b/bin/booh-classifier
index 3b526e12f76df65a1b1a079d99d1547b0854d779..3be4fab23d05dc1e5ca9ee46b0649b64d269b3c6 100644 (file)
--- a/bin/booh-classifier
+++ b/bin/booh-classifier
@@ -10,7 +10,7 @@
 # called Boo, so this one will be it "Booh". Or whatever.
 #
 #
 # called Boo, so this one will be it "Booh". Or whatever.
 #
 #

-# Copyright (c) 2004-2011 Guillaume Cottenceau <http://zarb.org/~gc/resource/gc_mail.png>
+# Copyright (c) 2004-2013 Guillaume Cottenceau <http://zarb.org/~gc/resource/gc_mail.png>

 #
 # This software may be freely redistributed under the terms of the GNU
 # public license version 2.
 #
 # This software may be freely redistributed under the terms of the GNU
 # public license version 2.


@@ -34,7 +34,7 @@ require 'gettext'
 include GetText
 bindtextdomain("booh")
 
 include GetText
 bindtextdomain("booh")
 

-require 'booh/rexml/document'
+require 'rexml/document'

 include REXML
 
 require 'booh/booh-lib'
 include REXML
 
 require 'booh/booh-lib'


@@ -78,7 +78,7 @@ def handle_options
             when '--version'
                 puts _("Booh version %s
 
             when '--version'
                 puts _("Booh version %s
 

-Copyright (c) 2005-2011 Guillaume Cottenceau.
+Copyright (c) 2005-2013 Guillaume Cottenceau.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") % $VERSION
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") % $VERSION
 


@@ -315,14 +315,14 @@ class Entry
             if @pixbuf_full.width.to_f / @pixbuf_full.height > width.to_f / height
                 resized_height = @pixbuf_full.height * (width.to_f/@pixbuf_full.width)
                 if @pixbuf_full.width > width || @pixbuf_full.height > resized_height
             if @pixbuf_full.width.to_f / @pixbuf_full.height > width.to_f / height
                 resized_height = @pixbuf_full.height * (width.to_f/@pixbuf_full.width)
                 if @pixbuf_full.width > width || @pixbuf_full.height > resized_height

-                    @pixbuf_main = @pixbuf_full.scale(width, resized_height, Gdk::Pixbuf::INTERP_BILINEAR)
+                    @pixbuf_main = @pixbuf_full.scale(width, resized_height, :bilinear)

                 else
                     @pixbuf_main = @pixbuf_full
                 end
             else
                 resized_width = @pixbuf_full.width * (height.to_f/@pixbuf_full.height)
                 if @pixbuf_full.width > resized_width || @pixbuf_full.height > height
                 else
                     @pixbuf_main = @pixbuf_full
                 end
             else
                 resized_width = @pixbuf_full.width * (height.to_f/@pixbuf_full.height)
                 if @pixbuf_full.width > resized_width || @pixbuf_full.height > height

-                    @pixbuf_main = @pixbuf_full.scale(resized_width, height, Gdk::Pixbuf::INTERP_BILINEAR)
+                    @pixbuf_main = @pixbuf_full.scale(resized_width, height, :bilinear)

                 else
                     @pixbuf_main = @pixbuf_full
                 end
                 else
                     @pixbuf_main = @pixbuf_full
                 end


@@ -348,7 +348,7 @@ class Entry
         if @pixbuf_thumbnail.nil?
             if @pixbuf_main
                 msg 3, ">>> pixbuf_thumbnail from main #{path}"
         if @pixbuf_thumbnail.nil?
             if @pixbuf_main
                 msg 3, ">>> pixbuf_thumbnail from main #{path}"

-                @pixbuf_thumbnail = @pixbuf_main.scale(@pixbuf_main.width * (Entry.thumbnails_height.to_f/@pixbuf_main.height), Entry.thumbnails_height, Gdk::Pixbuf::INTERP_BILINEAR)
+                @pixbuf_thumbnail = @pixbuf_main.scale(@pixbuf_main.width * (Entry.thumbnails_height.to_f/@pixbuf_main.height), Entry.thumbnails_height, :bilinear)

             else
                 msg 3, ">>> pixbuf_thumbnail from file #{path}"
                 @pixbuf_thumbnail = load_into_pixbuf_at_size { |w, h|
             else
                 msg 3, ">>> pixbuf_thumbnail from file #{path}"
                 @pixbuf_thumbnail = load_into_pixbuf_at_size { |w, h|


@@ -477,7 +477,7 @@ class Entry
             #- use a pixbuf loader and check Gtk.events_pending? on each chunk, to keep the UI responsive even
             #- if loaded pictures are several MBs large
             if @loader.nil?
             #- use a pixbuf loader and check Gtk.events_pending? on each chunk, to keep the UI responsive even
             #- if loaded pictures are several MBs large
             if @loader.nil?

-                @loader = Gdk::PixbufLoader.new
+                @loader = GdkPixbuf::PixbufLoader.new

                 @loader.signal_connect('size-prepared') { |l, w, h|
                     @loader.set_size(*specify_size.call(w, h))
                 }
                 @loader.signal_connect('size-prepared') { |l, w, h|
                     @loader.set_size(*specify_size.call(w, h))
                 }


@@ -907,7 +907,7 @@ def show_popup(parent, msg, *options)
         dialog.add_button(Gtk::Stock::YES, Gtk::Dialog::RESPONSE_YES)
         dialog.add_button(utf8(_("Yes to all")), Gtk::Dialog::RESPONSE_ACCEPT)
     else
         dialog.add_button(Gtk::Stock::YES, Gtk::Dialog::RESPONSE_YES)
         dialog.add_button(utf8(_("Yes to all")), Gtk::Dialog::RESPONSE_ACCEPT)
     else

-        ok = dialog.add_button(Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK).grab_focus
+        ok = dialog.add_button(Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK)

         if ! options[:bottomwidget]
             ok.grab_focus
         end
         if ! options[:bottomwidget]
             ok.grab_focus
         end


@@ -1243,7 +1243,7 @@ def show_entries(allentries)
     update_counters
     sb_msg(_("Loading images..."))
     $loading_progressbar.fraction = 0
     update_counters
     sb_msg(_("Loading images..."))
     $loading_progressbar.fraction = 0

-    $loading_progressbar.text = utf8(_("Loading... %d%") % 0)
+    $loading_progressbar.text = utf8(_("Loading... %d%%") % 0)

     $loading_progressbar.show
     t1 = Time.now
     total_loaded_files = 0
     $loading_progressbar.show
     t1 = Time.now
     total_loaded_files = 0


@@ -1295,7 +1295,7 @@ def show_entries(allentries)
             allentries.delete_at(i)
         end
         $loading_progressbar.fraction = i.to_f / allentries.size
             allentries.delete_at(i)
         end
         $loading_progressbar.fraction = i.to_f / allentries.size

-        $loading_progressbar.text = utf8(_("Loading... %d%") % (100 * $loading_progressbar.fraction))
+        $loading_progressbar.text = utf8(_("Loading... %d%%") % (100 * $loading_progressbar.fraction))

         if $quit
             return
         end
         if $quit
             return
         end


@@ -1375,6 +1375,8 @@ def open_dir(*paths)
                 date_time = Exif.datetimeoriginal(file)
                 if ! date_time.nil?
                     dates[file] = date_time
                 date_time = Exif.datetimeoriginal(file)
                 if ! date_time.nil?
                     dates[file] = date_time

+                elsif file =~ /(20\d{2}).?(\d{2}).?(\d{2}).(\d{2}).?(\d{2}).?(\d{2})/
+                    dates[file] = "#$1:#$2:#$3 #$4:#$5:#$6"

                 end
             }
             entries = smartsort(entries, dates)
                 end
             }
             entries = smartsort(entries, dates)


@@ -1483,7 +1485,7 @@ def execute
         table.attach(examples, 2, 3, row, row + 1, Gtk::FILL, Gtk::FILL, 5, 5)
 
         if counter == 0
         table.attach(examples, 2, 3, row, row + 1, Gtk::FILL, Gtk::FILL, 5, 5)
 
         if counter == 0

-            return {}
+            next {}

         end
 
         combostore = Gtk::ListStore.new(Gdk::Pixbuf, String)
         end
 
         combostore = Gtk::ListStore.new(Gdk::Pixbuf, String)


@@ -2021,7 +2023,7 @@ end
 
 def create_main_window
 
 
 def create_main_window
 

-    $videoborder_pixbuf = Gdk::Pixbuf.new("#{$FPATH}/images/video_border.png")
+    $videoborder_pixbuf = GdkPixbuf::Pixbuf.new(:file => "#{$FPATH}/images/video_border.png")

     $videoborder_pixmap, = $videoborder_pixbuf.render_pixmap_and_mask(0)
 
     mb = create_menubar
     $videoborder_pixmap, = $videoborder_pixbuf.render_pixmap_and_mask(0)
 
     mb = create_menubar


@@ -2031,7 +2033,7 @@ def create_main_window
     mainview_hbox = Gtk::HBox.new
     mainview_hbox.pack_start(Gtk::Alignment.new(0.5, 0, 1, 1).add(left_vbox = Gtk::VBox.new(false, 5)), false, true)
     left_vbox.pack_start(($labels_vbox = Gtk::VBox.new(false, 5)), false, true)
     mainview_hbox = Gtk::HBox.new
     mainview_hbox.pack_start(Gtk::Alignment.new(0.5, 0, 1, 1).add(left_vbox = Gtk::VBox.new(false, 5)), false, true)
     left_vbox.pack_start(($labels_vbox = Gtk::VBox.new(false, 5)), false, true)

-    left_vbox.pack_end($loading_progressbar = Gtk::ProgressBar.new.set_text(utf8(_("Loading... %d%") % 0)), false, true)
+    left_vbox.pack_end($loading_progressbar = Gtk::ProgressBar.new.set_text(utf8(_("Loading... %d%%") % 0)), false, true)

     mainview_hbox.pack_start($mainview = MainView.new, true, true)
     main_vbox.pack_start(mainview_hbox, true, true)
     $imagesline_sw = Gtk::ScrolledWindow.new(nil, nil)
     mainview_hbox.pack_start($mainview = MainView.new, true, true)
     main_vbox.pack_start(mainview_hbox, true, true)
     $imagesline_sw = Gtk::ScrolledWindow.new(nil, nil)