diff --git a/contrib/AutoGrouper.lua b/contrib/AutoGrouper.lua index 849b881..fd7bbac 100644 --- a/contrib/AutoGrouper.lua +++ b/contrib/AutoGrouper.lua @@ -37,7 +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 @@ -176,7 +176,7 @@ if dt.gui.current_view().id == "lighttable" then else if not Ag.event_registered then dt.register_event( - "AutoGrouper", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/HDRMerge.lua b/contrib/HDRMerge.lua index aafff83..476e1c6 100644 --- a/contrib/HDRMerge.lua +++ b/contrib/HDRMerge.lua @@ -46,7 +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 = '/' @@ -439,7 +439,7 @@ if dt.gui.current_view().id == "lighttable" then else if not HDRM.event_registered then dt.register_event( - "HDRmerge", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/LabelsToTags.lua b/contrib/LabelsToTags.lua index e2dc5c4..50e1359 100644 --- a/contrib/LabelsToTags.lua +++ b/contrib/LabelsToTags.lua @@ -49,7 +49,6 @@ local darktable = require("darktable") local du = require "lib/dtutils" - require "lib/darktable_transition" du.check_min_api_version("3.0.0", "LabelsToTags") @@ -249,7 +248,7 @@ if darktable.gui.current_view().id == "lighttable" then else if not ltt.event_registered then darktable.register_event( - LIB_ID, "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/OpenInExplorer.lua b/contrib/OpenInExplorer.lua index 4f0c5d5..53a8e0b 100644 --- a/contrib/OpenInExplorer.lua +++ b/contrib/OpenInExplorer.lua @@ -50,7 +50,6 @@ 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 @@ -211,7 +210,7 @@ if act_os ~= "windows" then end dt.register_event( - "OpenInExplorer", "shortcut", + "shortcut", function(event, shortcut) open_in_fmanager() end, "OpenInExplorer" ) diff --git a/contrib/autostyle.lua b/contrib/autostyle.lua index fc726a6..cd144b0 100644 --- a/contrib/autostyle.lua +++ b/contrib/autostyle.lua @@ -38,7 +38,6 @@ GPLv2 local darktable = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" local filelib = require "lib/dtutils.file" -- Forward declare the functions @@ -153,12 +152,12 @@ function get_stdout(cmd) end -- Registering events -darktable.register_event("autostyle", "shortcut", autostyle_apply, +darktable.register_event("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("autostyle", "post-import-image", +darktable.register_event("post-import-image", autostyle_apply_one_image_event) diff --git a/contrib/clear_GPS.lua b/contrib/clear_GPS.lua index d919cca..5495abf 100644 --- a/contrib/clear_GPS.lua +++ b/contrib/clear_GPS.lua @@ -38,7 +38,7 @@ local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" + local gettext = dt.gettext -- not a number @@ -71,7 +71,7 @@ dt.gui.libs.image.register_action( ) dt.register_event( - "clearGPS", "shortcut", + "shortcut", function(event, shortcut) clear_GPS(dt.gui.action_images) end, _("Clear GPS data") ) diff --git a/contrib/copy_attach_detach_tags.lua b/contrib/copy_attach_detach_tags.lua index 6f2b936..45f2c03 100644 --- a/contrib/copy_attach_detach_tags.lua +++ b/contrib/copy_attach_detach_tags.lua @@ -39,7 +39,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" local debug = require "darktable.debug" - require "lib/darktable_transition" local gettext = dt.gettext @@ -235,7 +234,7 @@ if dt.gui.current_view().id == "lighttable" then else if not cadt.event_registered then dt.register_event( - "cadt", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() @@ -248,22 +247,22 @@ end -- shortcut for copy -dt.register_event("cadt_ct", "shortcut", +dt.register_event("shortcut", mcopy_tags, _('copy tags from selected image(s)')) -- shortcut for attach -dt.register_event("cadt_at", "shortcut", +dt.register_event("shortcut", attach_tags, _('paste tags to selected image(s)')) -- shortcut for detaching tags -dt.register_event("cadt_dt", "shortcut", +dt.register_event("shortcut", detach_tags, _('remove tags from selected image(s)')) -- shortcut for replace tags -dt.register_event("cadt_rt", "shortcut", +dt.register_event("shortcut", replace_tags, _('replace tags from selected image(s)')) diff --git a/contrib/cr2hdr.lua b/contrib/cr2hdr.lua index c27082e..15b348a 100644 --- a/contrib/cr2hdr.lua +++ b/contrib/cr2hdr.lua @@ -34,7 +34,6 @@ 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") @@ -109,11 +108,11 @@ local function convert_action_images(shortcut) convert_images() end -darktable.register_event("cr2hdr", "shortcut", +darktable.register_event("shortcut", convert_action_images, "Run cr2hdr (Magic Lantern DualISO converter) on selected images") -darktable.register_event("cr2hdr", "post-import-image", +darktable.register_event("post-import-image", file_imported) -darktable.register_event("cr2hdr", "post-import-film", +darktable.register_event("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) diff --git a/contrib/exportLUT.lua b/contrib/exportLUT.lua index 4b039a8..a0858d6 100644 --- a/contrib/exportLUT.lua +++ b/contrib/exportLUT.lua @@ -30,7 +30,6 @@ 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 @@ -163,7 +162,7 @@ if dt.gui.current_view().id == "lighttable" then else if not eL.event_registered then dt.register_event( - "exportLUT", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/ext_editor.lua b/contrib/ext_editor.lua index 7e1460c..3aa622a 100644 --- a/contrib/ext_editor.lua +++ b/contrib/ext_editor.lua @@ -68,7 +68,6 @@ 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" @@ -429,7 +428,7 @@ if dt.gui.current_view().id == "lighttable" then else if not ee.event_registered then dt.register_event( - MODULE_NAME, "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module(show_dr) @@ -466,7 +465,7 @@ dt.preferences.register(MODULE_NAME, "show_in_darkrooom", "bool", -- register the new shortcuts ------------------------------------------------- for i = 1, MAX_EDITORS do - dt.register_event(MODULE_NAME .. i, "shortcut", + dt.register_event("shortcut", program_shortcut, _("edit with program ")..string.format("%02d", i)) end diff --git a/contrib/face_recognition.lua b/contrib/face_recognition.lua index 77cd2ab..980c0d7 100644 --- a/contrib/face_recognition.lua +++ b/contrib/face_recognition.lua @@ -44,7 +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 @@ -491,7 +491,7 @@ if dt.gui.current_view().id == "lighttable" then else if not fc.event_registered then dt.register_event( - MODULE, "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/fujifilm_dynamic_range.lua b/contrib/fujifilm_dynamic_range.lua index 4986675..66bfd1f 100644 --- a/contrib/fujifilm_dynamic_range.lua +++ b/contrib/fujifilm_dynamic_range.lua @@ -60,7 +60,6 @@ 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 @@ -106,7 +105,7 @@ local function detect_dynamic_range(event, image) dt.print_log("[fujifilm_dynamic_range] raw exposure bias " .. tostring(raf_result)) end -dt.register_event("fujifilm_dr", "post-import-image", +dt.register_event("post-import-image", detect_dynamic_range) dt.print_log("[fujifilm_dynamic_range] loaded") diff --git a/contrib/fujifilm_ratings.lua b/contrib/fujifilm_ratings.lua index 05319d4..524d1bd 100644 --- a/contrib/fujifilm_ratings.lua +++ b/contrib/fujifilm_ratings.lua @@ -26,7 +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") @@ -68,7 +68,7 @@ local function detect_rating(event, image) end end -dt.register_event("fujifilm_rat", "post-import-image", +dt.register_event("post-import-image", detect_rating) print(_("fujifilm_ratings loaded.")) diff --git a/contrib/geoToolbox.lua b/contrib/geoToolbox.lua index cdbc1c0..09b0513 100644 --- a/contrib/geoToolbox.lua +++ b/contrib/geoToolbox.lua @@ -28,7 +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") @@ -689,7 +689,7 @@ if dt.gui.current_view().id == "lighttable" then else if not gT.event_registered then dt.register_event( - "geoToolbox", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() @@ -709,14 +709,14 @@ dt.preferences.register("geoToolbox", '' ) -- Register -dt.register_event("geoToolbox_cd", "shortcut", +dt.register_event("shortcut", print_calc_distance, _("Calculate the distance from latitude and longitude in km")) -dt.register_event("geoToolbox", "mouse-over-image-changed", +dt.register_event("mouse-over-image-changed", toolbox_calc_distance) -dt.register_event("geoToolbox_wg", "shortcut", +dt.register_event("shortcut", select_with_gps, _("Select all images with GPS information")) -dt.register_event("geoToolbox_ng", "shortcut", +dt.register_event("shortcut", select_without_gps, _("Select all images without GPS information")) -- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua diff --git a/contrib/gpx_export.lua b/contrib/gpx_export.lua index 58e4147..0995ba9 100644 --- a/contrib/gpx_export.lua +++ b/contrib/gpx_export.lua @@ -25,7 +25,7 @@ For each source folder, a separate 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") @@ -175,7 +175,7 @@ if dt.gui.current_view().id == "lighttable" then else if not gpx.event_registered then dt.register_event( - "gpx_export", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/image_time.lua b/contrib/image_time.lua index 0f09c2d..ed60a5a 100644 --- a/contrib/image_time.lua +++ b/contrib/image_time.lua @@ -107,7 +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 = {} @@ -553,7 +553,7 @@ if dt.gui.current_view().id == "lighttable" then else if not img_time.event_registered then dt.register_event( - "image_time", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/photils.lua b/contrib/photils.lua index e3e0e4b..c2858f2 100644 --- a/contrib/photils.lua +++ b/contrib/photils.lua @@ -39,7 +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" @@ -454,7 +454,7 @@ dt.preferences.register(MODULE_NAME, "The embedded thumbnail could speedup the tag suggestion but can fail if the RAW file is not supported."), true) -dt.register_event("photils", "mouse-over-image-changed", +dt.register_event("mouse-over-image-changed", PHOTILS.image_changed) if dt.gui.current_view().id == "lighttable" then @@ -462,7 +462,7 @@ if dt.gui.current_view().id == "lighttable" then else if not PHOTILS.event_registered then dt.register_event( - "photils", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/quicktag.lua b/contrib/quicktag.lua index ef1987e..51bf57d 100644 --- a/contrib/quicktag.lua +++ b/contrib/quicktag.lua @@ -45,7 +45,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" local debug = require "darktable.debug" local qt = {} @@ -258,7 +257,7 @@ if dt.gui.current_view().id == "lighttable" then else if not qt.event_registered then dt.register_event( - "quicktag", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() @@ -271,7 +270,7 @@ end -- create shortcuts for i=1,qnr do - dt.register_event("quicktag", "shortcut", + dt.register_event("shortcut", function(event, shortcut) tagattach(tostring(quicktag_table[i])) end, string.format(_("quicktag %i"),i)) end diff --git a/contrib/rate_group.lua b/contrib/rate_group.lua index 80fb4a6..88bbf55 100644 --- a/contrib/rate_group.lua +++ b/contrib/rate_group.lua @@ -40,7 +40,6 @@ 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") @@ -61,37 +60,37 @@ local function apply_rating(rating) end end -dt.register_event("rg_reject", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(-1) end, "Reject group") -dt.register_event("rg0", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(0) end, "Rate group 0") -dt.register_event("rg1", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(1) end, "Rate group 1") -dt.register_event("rg2", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(2) end, "Rate group 2") -dt.register_event("rg3", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(3) end, "Rate group 3") -dt.register_event("rg4", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(4) end, "Rate group 4") -dt.register_event("rg5", "shortcut", +dt.register_event("shortcut", function(event, shortcut) apply_rating(5) end, "Rate group 5") diff --git a/contrib/rename-tags.lua b/contrib/rename-tags.lua index e8a5c9e..6f1eea9 100644 --- a/contrib/rename-tags.lua +++ b/contrib/rename-tags.lua @@ -30,7 +30,6 @@ Changes local darktable = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" local debug = require "darktable.debug" -- check API version @@ -138,7 +137,7 @@ if darktable.gui.current_view().id == "lighttable" then else if not rt.event_registered then darktable.register_event( - "rename_tags", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/contrib/slideshowMusic.lua b/contrib/slideshowMusic.lua index ff216af..0e66f4d 100644 --- a/contrib/slideshowMusic.lua +++ b/contrib/slideshowMusic.lua @@ -27,7 +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") @@ -79,5 +79,5 @@ dt.preferences.register("slideshowMusic", _("Plays music with rhythmbox if a slideshow starts"), true) -- Register -dt.register_event("slideshow_music", "view-changed", +dt.register_event("view-changed", playSlideshowMusic) diff --git a/contrib/transfer_hierarchy.lua b/contrib/transfer_hierarchy.lua index 03c1523..291950d 100755 --- a/contrib/transfer_hierarchy.lua +++ b/contrib/transfer_hierarchy.lua @@ -76,7 +76,6 @@ 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) @@ -368,7 +367,7 @@ if darktable.gui.current_view().id == "lighttable" then else if not th.event_registered then darktable.register_event( - LIB_ID, "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/examples/moduleExample.lua b/examples/moduleExample.lua index b778dca..93c182d 100644 --- a/examples/moduleExample.lua +++ b/examples/moduleExample.lua @@ -32,7 +32,6 @@ https://www.darktable.org/lua-api/index.html.php#darktable_new_widget local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" du.check_min_api_version("3.0.0", "moduleExample") local CURR_API_STRING = dt.configuration.api_version_string @@ -149,7 +148,7 @@ else if not mE.event_registered then -- if we are not in lighttable view then register an event to signal when we might be -- https://www.darktable.org/lua-api/index.html#darktable_register_event dt.register_event( - "mdouleExample", "view-changed", -- we want to be informed when the view changes + "view-changed", -- we want to be informed when the view changes function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then -- if the view changes from darkroom to lighttable install_module() -- register the lib diff --git a/examples/multi_os.lua b/examples/multi_os.lua index c7afdf3..1227e5e 100644 --- a/examples/multi_os.lua +++ b/examples/multi_os.lua @@ -52,8 +52,7 @@ ]] local dt = require "darktable" - require "lib/darktable_transition" - + --[[ require "lib/..." provides access to functions that have been pulled from various scripts and consolidated into libraries. Using the libraries eliminates having to @@ -243,7 +242,7 @@ dt.gui.libs.image.register_action( ]] dt.register_event( - "multi_os", "shortcut", + "shortcut", function(event, shortcut) extract_embedded_jpeg(dt.gui.action_images) end, "extract embedded jpeg" ) diff --git a/official/copy_paste_metadata.lua b/official/copy_paste_metadata.lua index 1db3d62..0580816 100644 --- a/official/copy_paste_metadata.lua +++ b/official/copy_paste_metadata.lua @@ -27,7 +27,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" local gettext = dt.gettext du.check_min_api_version("3.0.0", "copy_paste_metadata") @@ -127,13 +126,13 @@ dt.gui.libs.image.register_action( ) dt.register_event( - "capmd1", "shortcut", + "shortcut", function(event, shortcut) copy(dt.gui.action_images[1]) end, "copy metadata" ) dt.register_event( - "capmd2", "shortcut", + "shortcut", function(event, shortcut) paste(dt.gui.action_images) end, "paste metadata" ) diff --git a/official/enfuse.lua b/official/enfuse.lua index 1f494d9..ecb2b8e 100644 --- a/official/enfuse.lua +++ b/official/enfuse.lua @@ -36,7 +36,6 @@ 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 PS = dt.configuration.running_os == "windows" and "\\" or "/" local CURR_API_STRING = dt.configuration.api_version_string @@ -270,7 +269,7 @@ if enfuse_installed then else if not enf.event_registered then dt.register_event( - "enfuse", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/official/generate_image_txt.lua b/official/generate_image_txt.lua index b4ea475..3d9906d 100644 --- a/official/generate_image_txt.lua +++ b/official/generate_image_txt.lua @@ -36,7 +36,6 @@ USAGE local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" require "darktable.debug" du.check_min_api_version("2.1.0", "generate_image_txt") @@ -67,7 +66,7 @@ end local command_setting = dt.preferences.read("generate_image_txt", "command", "string") check_command(command_setting) -dt.register_event("gen_img_txt", "mouse-over-image-changed", +dt.register_event("mouse-over-image-changed", function(event, img) -- no need to waste processing time if the image has a txt file already if not img or img.has_txt or not dt.preferences.read("generate_image_txt", "enabled", "bool") then diff --git a/official/image_path_in_ui.lua b/official/image_path_in_ui.lua index d98e571..23ff89a 100644 --- a/official/image_path_in_ui.lua +++ b/official/image_path_in_ui.lua @@ -30,7 +30,6 @@ This plugin will add a widget at the bottom of the left column in lighttable mod ]] local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" du.check_min_api_version("2.0.0", "image_path_in_ui") local CURR_API_STRING = dt.configuration.api_version_string @@ -86,7 +85,7 @@ else end end -dt.register_event("ipiu", "mouse-over-image-changed", reset_widget); +dt.register_event("mouse-over-image-changed", reset_widget); -- -- vim: shiftwidth=2 expandtab tabstop=2 cindent syntax=lua diff --git a/official/import_filter_manager.lua b/official/import_filter_manager.lua index 74b5027..63466c5 100644 --- a/official/import_filter_manager.lua +++ b/official/import_filter_manager.lua @@ -31,7 +31,6 @@ USAGE ]] local dt = require "darktable" - require "lib/darktable_transition" local import_filter_list = {} local n_import_filters = 1 @@ -58,7 +57,7 @@ dt.gui.libs.import.register_widget(filter_dropdown) -- this is just a wrapper which calls the active import filter -dt.register_event("ifm", "pre-import", function(event, images) +dt.register_event("pre-import", function(event, images) local active_filter = dt.preferences.read("import_filter_manager", "active_filter", "string") if active_filter == "" then return end local callback = import_filter_list[active_filter] diff --git a/official/save_selection.lua b/official/save_selection.lua index ba229f2..6861b5f 100644 --- a/official/save_selection.lua +++ b/official/save_selection.lua @@ -35,7 +35,7 @@ increase it if you need more temporary selection buffers ]] local dt = require "darktable" local du = require "lib/dtutils" - require "lib/darktable_transition" + du.check_min_api_version("2.0.0", "save_selection") local CURR_API_STRING = dt.configuration.api_version_string @@ -43,16 +43,16 @@ local buffer_count = 5 for i=1,buffer_count do local saved_selection - dt.register_event("save_selection", "shortcut", function() + dt.register_event("shortcut", function() saved_selection = dt.gui.selection() end,"save to buffer "..i) - dt.register_event("save_selection1", "shortcut", function() + dt.register_event("shortcut", function() dt.gui.selection(saved_selection) end,"restore from buffer "..i) end local bounce_buffer = {} -dt.register_event("save_selection2", "shortcut", function() +dt.register_event("shortcut", function() bounce_buffer = dt.gui.selection(bounce_buffer) end,"switch selection with temporary buffer") diff --git a/tools/executable_manager.lua b/tools/executable_manager.lua index c2afcec..14c4d7b 100644 --- a/tools/executable_manager.lua +++ b/tools/executable_manager.lua @@ -31,7 +31,6 @@ local dt = require "darktable" local du = require "lib/dtutils" local df = require "lib/dtutils.file" - require "lib/darktable_transition" du.check_min_api_version("5.0.0", "executable_manager") @@ -216,7 +215,7 @@ if dt.gui.current_view().id == "lighttable" then else if not exec_man.event_registered then dt.register_event( - "executable_manager", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module() diff --git a/tools/script_manager.lua b/tools/script_manager.lua index 531cd4e..3ab0b54 100644 --- a/tools/script_manager.lua +++ b/tools/script_manager.lua @@ -54,7 +54,6 @@ local df = require "lib/dtutils.file" local ds = require "lib/dtutils.string" local dtsys = require "lib/dtutils.system" local log = require "lib/dtutils.log" - require "lib/darktable_transition" local gettext = dt.gettext @@ -875,7 +874,7 @@ if dt.gui.current_view().id == "lighttable" then else if not sm.event_registered then dt.register_event( - "script_manager", "view-changed", + "view-changed", function(event, old_view, new_view) if new_view.name == "lighttable" and old_view.name == "darkroom" then install_module()