inline if didn't work. Added intermediate register_event function in transition library

contrib/AutoGrouper.lua

@@ -37,6 +37,7 @@ selected images, the other button performs grouping on the entire active collect
 ]]
 
 local dt = require "darktable"
+           require "lib/darktable_transition"
 local MOD = 'autogrouper'
 local gettext = dt.gettext
 -- Tell gettext where to find the .mo file translating messages for a particular domain
@@ -175,7 +176,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not Ag.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "AutoGrouper", "view-changed" or "view-changed" ,
+      "AutoGrouper", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/HDRMerge.lua

@@ -46,6 +46,7 @@ Select a style, whether you want tags to be copied from the original, and any ad
 
 local dt = require 'darktable'
 local df = require 'lib/dtutils.file'
+           require "lib/darktable_transition"
 local dsys = require 'lib/dtutils.system'
 local mod = 'module_HDRMerge'
 local os_path_seperator = '/'
@@ -438,7 +439,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not HDRM.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "HDRmerge", "view-changed" or "view-changed" ,
+      "HDRmerge", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/LabelsToTags.lua

@@ -49,6 +49,7 @@
 
 local darktable = require("darktable")
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 
 du.check_min_api_version("3.0.0", "LabelsToTags") 
 
@@ -248,7 +249,7 @@ if darktable.gui.current_view().id == "lighttable" then
 else
   if not ltt.event_registered then
     darktable.register_event(
-      CURR_API_STRING >= "6.2.1" and LIB_ID, "view-changed" or "view-changed" ,
+      LIB_ID, "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/OpenInExplorer.lua

@@ -50,6 +50,7 @@ As an alternative option you can choose to show the image file names as symbolic
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local dsys = require "lib/dtutils.system"
 local gettext = dt.gettext
 
@@ -209,7 +210,7 @@ if act_os ~= "windows" then
 end
 
 dt.register_event(
-    CURR_API_STRING >= "6.2.1" and "OpenInExplorer", "shortcut" or "shortcut",
+    "OpenInExplorer", "shortcut",
     function(event, shortcut) open_in_fmanager() end,
     "OpenInExplorer"
 )  

contrib/autostyle.lua

@@ -38,6 +38,7 @@ GPLv2
 
 local darktable = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 local filelib = require "lib/dtutils.file"
 
 -- Forward declare the functions
@@ -152,12 +153,12 @@ function get_stdout(cmd)
 end
 
 -- Registering events
-darktable.register_event(CURR_API_STRING >= "6.2.1" and "autostyle", "shortcut" or "shortcut" ,autostyle_apply,
+darktable.register_event("autostyle", "shortcut", autostyle_apply,
        "Apply your chosen style from exiftool tags")
 
 darktable.preferences.register("autostyle","exif_tag","string","Autostyle: EXIF_tag=value=>style","apply a style automatically if an EXIF_tag matches value. Find the tag with exiftool","")
 
-darktable.register_event(CURR_API_STRING >= "6.2.1" and "autostyle", "post-import-image" or "post-import-image" ,
+darktable.register_event("autostyle", "post-import-image",
   autostyle_apply_one_image_event)
 
 

contrib/clear_GPS.lua

@@ -38,6 +38,7 @@
 
 local dt = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 -- not a number
@@ -71,7 +72,7 @@ dt.gui.libs.image.register_action(
 )
 
 dt.register_event(
-  CURR_API_STRING >= "6.2.1" and "clearGPS", "shortcut" or "shortcut" ,
+  "clearGPS", "shortcut",
   function(event, shortcut) clear_GPS(dt.gui.action_images) end,
   _("Clear GPS data")
 )

contrib/copy_attach_detach_tags.lua

@@ -39,6 +39,7 @@ USAGE
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local debug = require "darktable.debug"
+           require "lib/darktable_transition"
 
 local gettext = dt.gettext
 
@@ -234,7 +235,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not cadt.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "cadt", "view-changed" or "view-changed" ,
+      "cadt", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()
@@ -247,22 +248,22 @@ end
 
 
 -- shortcut for copy
-dt.register_event(CURR_API_STRING >= "6.2.1" and "cadt_ct", "shortcut" or "shortcut" ,
+dt.register_event("cadt_ct", "shortcut",
                    mcopy_tags,
                    _('copy tags from selected image(s)'))
 
 -- shortcut for attach
-dt.register_event(CURR_API_STRING >= "6.2.1" and "cadt_at", "shortcut" or "shortcut" ,
+dt.register_event("cadt_at", "shortcut",
                    attach_tags,
                    _('paste tags to selected image(s)'))
 
 -- shortcut for detaching tags
-dt.register_event(CURR_API_STRING >= "6.2.1" and "cadt_dt", "shortcut" or "shortcut" ,
+dt.register_event("cadt_dt", "shortcut",
                    detach_tags,
                    _('remove tags from selected image(s)'))
 
                    -- shortcut for replace tags
-dt.register_event(CURR_API_STRING >= "6.2.1" and "cadt_rt", "shortcut" or "shortcut" ,
+dt.register_event("cadt_rt", "shortcut",
                    replace_tags,
                    _('replace tags from selected image(s)'))
 

contrib/cr2hdr.lua

@@ -34,6 +34,7 @@ USAGE
 
 local darktable = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 
 -- Tested with darktable 2.0.1
 du.check_min_api_version("2.0.0", "cr2hdr")
@@ -108,11 +109,11 @@ local function convert_action_images(shortcut)
     convert_images()
 end
 
-darktable.register_event(CURR_API_STRING >= "6.2.1" and "cr2hdr", "shortcut" or "shortcut" , 
+darktable.register_event("cr2hdr", "shortcut", 
     convert_action_images, "Run cr2hdr (Magic Lantern DualISO converter) on selected images")
-darktable.register_event(CURR_API_STRING >= "6.2.1" and "cr2hdr", "post-import-image" or "post-import-image" , 
+darktable.register_event("cr2hdr", "post-import-image", 
     file_imported)
-darktable.register_event(CURR_API_STRING >= "6.2.1" and "cr2hdr", "post-import-film" or "post-import-film" , 
+darktable.register_event("cr2hdr", "post-import-film", 
     film_imported)
 
 darktable.preferences.register("cr2hdr", "onimport", "bool", "Invoke on import", "If true then cr2hdr will try to proccess every file during importing. Warning: cr2hdr is quite slow even in figuring out on whether the file is Dual ISO or not.", false)

contrib/exportLUT.lua

@@ -30,6 +30,7 @@ local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require("lib/dtutils.file")
 local ds = require("lib/dtutils.system")
+           require "lib/darktable_transition"
 
 local gettext = dt.gettext
 
@@ -162,7 +163,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not eL.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "exportLUT", "view-changed" or "view-changed" ,
+      "exportLUT", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/ext_editor.lua

@@ -70,6 +70,7 @@
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local dtsys = require "lib/dtutils.system"
 
 
@@ -417,7 +418,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not ee.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and MODULE_NAME, "view-changed" or "view-changed" ,
+      MODULE_NAME, "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()
@@ -452,7 +453,7 @@ for i = MAX_EDITORS, 1, -1 do
 
 -- register the new shortcuts -------------------------------------------------
 for i = 1, MAX_EDITORS do
-  dt.register_event(CURR_API_STRING >= "6.2.1" and MODULE_NAME .. i, "shortcut" or "shortcut" , 
+  dt.register_event(MODULE_NAME .. i, "shortcut", 
     program_shortcut, _("edit with program ")..string.format("%02d", i)) 
   end
 

contrib/face_recognition.lua

@@ -44,6 +44,7 @@ local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
 local dtsys = require "lib/dtutils.system"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 -- constants
@@ -490,7 +491,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not fc.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and MODULE, "view-changed" or "view-changed" ,
+      MODULE, "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/fujifilm_dynamic_range.lua

@@ -60,6 +60,7 @@ cameras may behave in other ways.
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 
 du.check_min_api_version("4.0.0", "fujifilm_dynamic_range")
 local CURR_API_STRING = dt.configuration.api_version_string
@@ -105,7 +106,7 @@ local function detect_dynamic_range(event, image)
 	dt.print_log("[fujifilm_dynamic_range] raw exposure bias " .. tostring(raf_result))
 end
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "fujifilm_dr", "post-import-image" or "post-import-image" , 
+dt.register_event("fujifilm_dr", "post-import-image", 
 	detect_dynamic_range)
 
 dt.print_log("[fujifilm_dynamic_range] loaded")

contrib/fujifilm_ratings.lua

@@ -26,6 +26,7 @@ Dependencies:
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 du.check_min_api_version("4.0.0", "fujifilm_ratings")
@@ -67,7 +68,7 @@ local function detect_rating(event, image)
 	end
 end
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "fujifilm_rat", "post-import-image" or "post-import-image" , 
+dt.register_event("fujifilm_rat", "post-import-image", 
 	detect_rating)
 
 print(_("fujifilm_ratings loaded."))

contrib/geoToolbox.lua

@@ -28,6 +28,7 @@ require "geoToolbox"
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 du.check_min_api_version("3.0.0", "geoToolbox") 
@@ -688,7 +689,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not gT.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "geoToolbox", "view-changed" or "view-chagned",
+      "geoToolbox", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()
@@ -708,14 +709,14 @@ dt.preferences.register("geoToolbox",
 	'' )
 
 -- Register
-dt.register_event(CURR_API_STRING >= "6.2.1" and "geoToolbox_cd", "shortcut" or "shortcut" , 
+dt.register_event("geoToolbox_cd", "shortcut", 
   print_calc_distance, _("Calculate the distance from latitude and longitude in km"))
-dt.register_event(CURR_API_STRING >= "6.2.1" and "geoToolbox", "mouse-over-image-changed" or "mouse-over-image-changed" , 
+dt.register_event("geoToolbox", "mouse-over-image-changed", 
   toolbox_calc_distance)
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "geoToolbox_wg", "shortcut" or "shortcut" , 
+dt.register_event("geoToolbox_wg", "shortcut", 
   select_with_gps, _("Select all images with GPS information"))
-dt.register_event(CURR_API_STRING >= "6.2.1" and "geoToolbox_ng", "shortcut" or "shortcut" , 
+dt.register_event("geoToolbox_ng", "shortcut", 
   select_without_gps, _("Select all images without GPS information"))
 
 -- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua

contrib/gpx_export.lua

@@ -25,6 +25,7 @@ For each source folder, a separate <trk> is generated in the gpx file.
 local dt = require "darktable"
 local df = require "lib/dtutils.file"
 local dl = require "lib/dtutils"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 dl.check_min_api_version("3.0.0", "gpx-export") 
@@ -174,7 +175,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not gpx.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "gpx_export", "view-changed" or "view-changed" ,
+      "gpx_export", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/image_time.lua

@@ -107,6 +107,7 @@ local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
 local ds = require "lib/dtutils.string"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 local img_time = {}
@@ -552,7 +553,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not img_time.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "image_time", "view-changed" or "view-changed" ,
+      "image_time", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/photils.lua

@@ -39,6 +39,7 @@
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local dtsys = require "lib/dtutils.system"
 
 local MODULE_NAME = "photils"
@@ -434,7 +435,7 @@ dt.preferences.register(MODULE_NAME,
                         _("if enabled, the confidence value for each tag is displayed"),
                         true)
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "photils", "mouse-over-image-changed" or "mouse-over-image-changed" ,
+dt.register_event("photils", "mouse-over-image-changed",
     PHOTILS.image_changed)
 
 if dt.gui.current_view().id == "lighttable" then
@@ -442,7 +443,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not PHOTILS.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "photils", "view-changed" or "view-changed",
+      "photils", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/quicktag.lua

@@ -45,6 +45,7 @@ USAGE
 
 local dt = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 local debug = require "darktable.debug"
 
 local qt = {}
@@ -257,7 +258,7 @@ if dt.gui.current_view().id == "lighttable" then
 else
   if not qt.event_registered then
     dt.register_event(
-      CURR_API_STRING >= "6.2.1" and "quicktag", "view-changed" or "view-changed" ,
+      "quicktag", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()
@@ -270,7 +271,7 @@ end
 
 -- create shortcuts
 for i=1,qnr do
-  dt.register_event(CURR_API_STRING >= "6.2.1" and "quicktag", "shortcut" or "shortcut" ,
+  dt.register_event("quicktag", "shortcut",
 		   function(event, shortcut) tagattach(tostring(quicktag_table[i])) end,
 		  string.format(_("quicktag %i"),i))
 end

contrib/rate_group.lua

@@ -40,6 +40,7 @@
 
 local dt = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 
 -- added version check
 du.check_min_api_version("3.0.0", "rate_group") 
@@ -60,37 +61,37 @@ local function apply_rating(rating)
   end
 end
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg_reject", "shortcut" or "shortcut" ,
+dt.register_event("rg_reject", "shortcut",
   function(event, shortcut)
     apply_rating(-1)
 end, "Reject group")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg0", "shortcut" or "shortcut",
+dt.register_event("rg0", "shortcut",
   function(event, shortcut)
     apply_rating(0)
 end, "Rate group 0")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg1", "shortcut" or "shortcut",
+dt.register_event("rg1", "shortcut",
   function(event, shortcut)
     apply_rating(1)
 end, "Rate group 1")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg2", "shortcut" or "shortcut",
+dt.register_event("rg2", "shortcut",
   function(event, shortcut)
     apply_rating(2)
 end, "Rate group 2")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg3", "shortcut" or "shortcut",
+dt.register_event("rg3", "shortcut",
   function(event, shortcut)
     apply_rating(3)
 end, "Rate group 3")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg4", "shortcut" or "shortcut",
+dt.register_event("rg4", "shortcut",
   function(event, shortcut)
     apply_rating(4)
 end, "Rate group 4")
 
-dt.register_event(CURR_API_STRING >= "6.2.1" and "rg5", "shortcut" or "shortcut",
+dt.register_event("rg5", "shortcut",
   function(event, shortcut)
     apply_rating(5)
 end, "Rate group 5")

contrib/rename-tags.lua

@@ -30,6 +30,7 @@ Changes
 
 local darktable = require "darktable"
 local du = require "lib/dtutils"
+           require "lib/darktable_transition"
 local debug = require "darktable.debug"
 
 -- check API version
@@ -137,7 +138,7 @@ if darktable.gui.current_view().id == "lighttable" then
 else
   if not rt.event_registered then
     darktable.register_event(
-      CURR_API_STRING >= "6.2.1" and "rename_tags", "view-changed" or "view-changed" ,
+      "rename_tags", "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()

contrib/slideshowMusic.lua

@@ -27,6 +27,7 @@ USAGE
 local dt = require "darktable"
 local du = require "lib/dtutils"
 local df = require "lib/dtutils.file"
+           require "lib/darktable_transition"
 local gettext = dt.gettext
 
 du.check_min_api_version("2.0.2", "slideshowMusic") 
@@ -78,5 +79,5 @@ dt.preferences.register("slideshowMusic",
                         _("Plays music with rhythmbox if a slideshow starts"),
                         true)
 -- Register
-dt.register_event(CURR_API_STRING >= "6.2.1" and "slideshow_music", "view-changed" or "view-changed" ,
+dt.register_event("slideshow_music", "view-changed",
   playSlideshowMusic)

contrib/transfer_hierarchy.lua

@@ -76,6 +76,7 @@ local darktable = require("darktable")
 local dtutils = require("lib/dtutils")
 local dtutils_file = require("lib/dtutils.file")
 local dtutils_system = require("lib/dtutils.system")
+           require "lib/darktable_transition"
 
 local LIB_ID = "transfer_hierarchy"
 dtutils.check_min_api_version("5.0.0", LIB_ID)
@@ -367,7 +368,7 @@ if darktable.gui.current_view().id == "lighttable" then
 else
   if not th.event_registered then
     darktable.register_event(
-      CURR_API_STRING >= "6.2.1" and LIB_ID, "view-changed" or "view-changed" ,
+      LIB_ID, "view-changed",
       function(event, old_view, new_view)
         if new_view.name == "lighttable" and old_view.name == "darkroom" then
           install_module()