move check for gimp and firefox to when needed, to allow soft require

diff --git a/INSTALL b/INSTALL
index 30fbd4675a7d9c71546045497a68605e64757dd2..2bf6ba6655c6294e335813f396f687d89a56b24c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,9 @@ And for runtime:
 - identify (from ImageMagick) - for photos captions
 - exif - to show full formatted EXIF information from photos
 - mplayer - for videos thumbnails generation
-- gimp - for photos editing
+- gimp - for photos editing (may not be a hard require)
+- mozilla-firefox - for showing albums in browser, and going on the
+  web for tutorials (may not be a hard require)
 
 
         Compiling and Installing Quick Start

diff --git a/bin/booh b/bin/booh
index 02512af5bb03d9b1877a8559a74d0acc4df49b97..ead68716444cd1eb8d95a3884009eb9b2b9c60f2 100755 (executable)
--- a/bin/booh
+++ b/bin/booh
@@ -166,6 +166,9 @@ Problem was: '%s' is not an executable file.
 Hint: don't forget to specify the full path to the executable,
 e.g. '/usr/bin/mplayer' is correct but 'mplayer' only is not.") % viewer_binary), { :pos_centered => true, :not_transient => true })
     end
+end
+
+def check_image_editor
     image_editor_binary = $config['image-editor'].split.first
     if image_editor_binary && !File.executable?(image_editor_binary)
         show_popup($main_window, utf8(_("The configured image editor seems to be unavailable.
@@ -174,13 +177,9 @@ You should fix this in Edit/Preferences so that you can edit photos externally.
 Problem was: '%s' is not an executable file.
 Hint: don't forget to specify the full path to the executable,
 e.g. '/usr/bin/gimp-remote' is correct but 'gimp-remote' only is not.") % image_editor_binary), { :pos_centered => true, :not_transient => true })
-    end
-    browser_binary = $config['browser'].split.first
-    if browser_binary && !File.executable?(browser_binary)
-        show_popup($main_window, utf8(_("The configured browser seems to be unavailable.
-You should fix this in Edit/Preferences so that you can open URLs.
-
-Problem was: '%s' is not an executable file.") % browser_binary), { :pos_centered => true, :not_transient => true })
+        return false
+    else
+        return true
     end
 end
 
@@ -1033,9 +1032,11 @@ def popup_thumbnail_menu(event, optionals, fullpath, type, xmldir, attributes_pr
         menu.append(editexternally = Gtk::ImageMenuItem.new(utf8(_("Edit image"))))
         editexternally.image = Gtk::Image.new("#{$FPATH}/images/stock-tool-ink-16.png")
         editexternally.signal_connect('activate') {
-            cmd = from_utf8($config['image-editor']).gsub('%f', "'#{fullpath}'")
-            msg 2, cmd
-            system(cmd)
+            if check_image_editor
+                cmd = from_utf8($config['image-editor']).gsub('%f', "'#{fullpath}'")
+                msg 2, cmd
+                system(cmd)
+            end
         }
     end
     menu.append(refresh_item = Gtk::ImageMenuItem.new(Gtk::Stock::REFRESH))

diff --git a/lib/booh/booh-lib.rb b/lib/booh/booh-lib.rb
index 0235647fd8fe09f2070da626129dcd60ee4ed0a4..13e63c4ac6acf22654691c28f01c9ee5c7ff4710 100644 (file)
--- a/lib/booh/booh-lib.rb
+++ b/lib/booh/booh-lib.rb
@@ -529,10 +529,25 @@ module Booh
         ios.close
     end
 
+    def check_browser
+        browser_binary = $config['browser'].split.first
+        if browser_binary && !File.executable?(browser_binary)
+            show_popup($main_window, utf8(_("The configured browser seems to be unavailable.
+You should fix this in Edit/Preferences so that you can open URLs.
+
+Problem was: '%s' is not an executable file.") % browser_binary), { :pos_centered => true, :not_transient => true })
+            return false
+        else
+            return true
+        end
+    end
+
     def open_url(url)
-        cmd = $config['browser'].gsub('%f', "'#{url}'") + ' &'
-        msg 2, cmd
-        system(cmd)
+        if check_browser
+            cmd = $config['browser'].gsub('%f', "'#{url}'") + ' &'
+            msg 2, cmd
+            system(cmd)
+        end
     end
 
     def get_license