with app icon

diff --git a/bin/booh b/bin/booh
index 0565eaa9c391cd6ed4babe09c82d5153728117e1..83e0378f947b97f4426854ddbf35b5d60a1369d8 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -266,7 +266,7 @@ def view_element(filename, closures)
         return
     end
 
-    w = Gtk::Window.new.set_title(filename)
+    w = create_window.set_title(filename)
 
     msg 3, "filename: #{filename}"
     dest_img = build_full_dest_filename(filename).sub(/\.[^\.]+$/, '') + "-#{$default_size['fullscreen']}.jpg"
@@ -1949,7 +1949,7 @@ def show_popup(parent, msg, *options)
 end
 
 def backend_wait_message(parent, msg, infopipe_path, mode)
-    w = Gtk::Window.new
+    w = create_window
     w.set_transient_for(parent)
     w.modal = true
 
@@ -2162,7 +2162,7 @@ def sort_by_exif_date
     dates = {}
 
     if current_order.size > 20
-        w = Gtk::Window.new
+        w = create_window
         w.set_transient_for($main_window)
         w.modal = true
         vb = Gtk::VBox.new(false, 5).set_border_width(5)
@@ -4440,7 +4440,7 @@ def create_main_window
     main_vbox.pack_start(paned, true, true)
     main_vbox.pack_end($statusbar = Gtk::Statusbar.new, false, false)
 
-    $main_window = Gtk::Window.new
+    $main_window = create_window
     $main_window.add(main_vbox)
     $main_window.signal_connect('delete-event') {
         try_quit({ :disallow_cancel => true })

diff --git a/bin/booh-classifier b/bin/booh-classifier
index a761b8e7f0939270aa1d85942a5daed10cf61e11..9743ed75fa95cb39d99b127207583af73f221276 100644 (file)
--- a/bin/booh-classifier
+++ b/bin/booh-classifier
@@ -1664,7 +1664,7 @@ def create_main_window
 
     $imagesline.set_size_request(-1, Gtk::Button.new.size_request[1] + Entry.thumbnails_height + 15)
 
-    $main_window = Gtk::Window.new
+    $main_window = create_window
     $main_window.add(main_vbox)
     $main_window.signal_connect('delete-event') {
         try_quit({ :disallow_cancel => true })

diff --git a/data/booh/images/booh-16x16.png b/data/booh/images/booh-16x16.png
new file mode 100755 (executable)
index 0000000..66abd80
Binary files /dev/null and b/data/booh/images/booh-16x16.png differ

diff --git a/data/booh/images/booh-32x32.png b/data/booh/images/booh-32x32.png
new file mode 100755 (executable)
index 0000000..d589968
Binary files /dev/null and b/data/booh/images/booh-32x32.png differ

diff --git a/data/booh/images/booh-48x48.png b/data/booh/images/booh-48x48.png
new file mode 100755 (executable)
index 0000000..0da00d9
Binary files /dev/null and b/data/booh/images/booh-48x48.png differ

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index d8c024a399686ef91b751ec536b9e6f945c8eae9..3d34ce9389aa003242655523a910a08cffb1acaf 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -845,6 +845,14 @@ French: Guillaume Cottenceau')),
     def defer_translation(msg)
         return "@@#{msg}@@"
     end
+
+    def create_window
+        w = Gtk::Window.new
+        w.icon_list = [ Gdk::Pixbuf.new("#{$FPATH}/images/booh-16x16.png"),
+                        Gdk::Pixbuf.new("#{$FPATH}/images/booh-32x32.png"),
+                        Gdk::Pixbuf.new("#{$FPATH}/images/booh-48x48.png") ]
+        return w
+    end
 end
 
 class File