Merge pull request #335 from wpferguson/revert-dt35-api-changes

Revert API 6.1+ compatibility changes.  Partially fixes #334
This commit is contained in:
wpferguson
2021-06-19 16:38:36 -04:00
committed by GitHub
35 changed files with 122 additions and 289 deletions

View File

@@ -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()

View File

@@ -175,63 +175,31 @@ local function CollectOnAll_AND()
end
-- GUI --
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("collect: previous"),
function() PreviousCollection() end,
_("Sets the Collect parameters to be the previously active parameters")
)
else
dt.gui.libs.image.register_action(
"CollectHelper_prev", _("collect: previous"),
function() PreviousCollection() end,
_("Sets the Collect parameters to be the previously active parameters")
)
end
dt.gui.libs.image.register_action(
_("collect: previous"),
function() PreviousCollection() end,
_("Sets the Collect parameters to be the previously active parameters")
)
if dt.preferences.read('module_CollectHelper','folder','bool') then
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("collect: folder"),
function() CollectOnFolder(_ , false) end,
_("Sets the Collect parameters to be the selected images's folder")
)
else
dt.gui.libs.image.register_action(
"CollectHelper_folder", _("collect: folder"),
function() CollectOnFolder(_ , false) end,
_("Sets the Collect parameters to be the selected images's folder")
)
end
dt.gui.libs.image.register_action(
_("collect: folder"),
function() CollectOnFolder(_ , false) end,
_("Sets the Collect parameters to be the selected images's folder")
)
end
if dt.preferences.read('module_CollectHelper','colors','bool') then
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("collect: color label(s)"),
function() CollectOnColors(_ , false) end,
_("Sets the Collect parameters to be the selected images's color label(s)")
)
else
dt.gui.libs.image.register_action(
"CollectHelper_labels", _("collect: color label(s)"),
function() CollectOnColors(_ , false) end,
_("Sets the Collect parameters to be the selected images's color label(s)")
)
end
dt.gui.libs.image.register_action(
_("collect: color label(s)"),
function() CollectOnColors(_ , false) end,
_("Sets the Collect parameters to be the selected images's color label(s)")
)
end
if dt.preferences.read('module_CollectHelper','all_and','bool') then
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("collect: all (AND)"),
function() CollectOnAll_AND() end,
_("Sets the Collect parameters based on all activated CollectHelper options")
)
else
dt.gui.libs.image.register_action(
"CollectHelper_and", _("collect: all (AND)"),
function() CollectOnAll_AND() end,
_("Sets the Collect parameters based on all activated CollectHelper options")
)
end
dt.gui.libs.image.register_action(
_("collect: all (AND)"),
function() CollectOnAll_AND() end,
_("Sets the Collect parameters based on all activated CollectHelper options")
)
end
-- PREFERENCES --

View File

@@ -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()

View File

@@ -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()

View File

@@ -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
@@ -184,20 +183,11 @@ end
-- GUI --
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("show in file explorer"),
function() open_in_fmanager() end,
_("Open the file manager at the selected image's location")
)
else
dt.gui.libs.image.register_action(
"OpenInExplorer", _("show in file explorer"),
function() open_in_fmanager() end,
_("Open the file manager at the selected image's location")
)
end
dt.gui.libs.image.register_action(
_("show in file explorer"),
function() open_in_fmanager() end,
_("Open the file manager at the selected image's location")
)
if act_os ~= "windows" then
dt.preferences.register("OpenInExplorer", "linked_image_files_dir", -- name
@@ -220,7 +210,7 @@ if act_os ~= "windows" then
end
dt.register_event(
"OpenInExplorer", "shortcut",
"shortcut",
function(event, shortcut) open_in_fmanager() end,
"OpenInExplorer"
)

View File

@@ -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)

View File

@@ -38,7 +38,7 @@
local dt = require "darktable"
local du = require "lib/dtutils"
require "lib/darktable_transition"
local gettext = dt.gettext
-- not a number
@@ -64,24 +64,14 @@ local function clear_GPS(images)
end
end
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("clear GPS data"),
function(event, images) clear_GPS(images) end,
_("Clear GPS data from selected images")
)
else
dt.gui.libs.image.register_action(
_"clear_GPS", ("clear GPS data"),
function(event, images) clear_GPS(images) end,
_("Clear GPS data from selected images")
)
end
dt.gui.libs.image.register_action(
_("clear GPS data"),
function(event, images) clear_GPS(images) end,
_("Clear GPS data from selected images")
)
dt.register_event(
"clearGPS", "shortcut",
"shortcut",
function(event, shortcut) clear_GPS(dt.gui.action_images) end,
_("Clear GPS data")
)

View File

@@ -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)'))

View File

@@ -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)

View File

@@ -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()

View File

@@ -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

View File

@@ -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()

View File

@@ -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")

View File

@@ -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."))

View File

@@ -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

View File

@@ -25,7 +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")
@@ -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()

View File

@@ -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()

View File

@@ -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()

View File

@@ -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

View File

@@ -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")

View File

@@ -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()

View File

@@ -64,14 +64,7 @@ local function select_untagged_images(event, images)
return selection
end
if CURR_API_STRING >= "6.2.2" then
dt.gui.libs.select.register_selection(
"select_untagged", _("select untagged"),
select_untagged_images,
_("select all images containing no tags or only tags added by darktable"))
else
dt.gui.libs.select.register_selection(
_("select untagged"),
select_untagged_images,
_("select all images containing no tags or only tags added by darktable"))
end
dt.gui.libs.select.register_selection(
_("select untagged"),
select_untagged_images,
_("select all images containing no tags or only tags added by darktable"))

View File

@@ -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)

View File

@@ -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()

View File

@@ -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

View File

@@ -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
@@ -231,28 +230,19 @@ end
Add a button to the selected images module in lighttable
]]
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("extract embedded jpeg"),
function(event, images) extract_embedded_jpeg(images) end,
"extract embedded jpeg"
)
else
dt.gui.libs.image.register_action(
"multi_os", _("extract embedded jpeg"),
function(event, images) extract_embedded_jpeg(images) end,
"extract embedded jpeg"
)
end
dt.gui.libs.image.register_action(
_("extract embedded jpeg"),
function(event, images) extract_embedded_jpeg(images) end,
"extract embedded jpeg"
)
--[[
Add a shortcut
]]
dt.register_event(
"multi_os", "shortcut",
"shortcut",
function(event, shortcut) extract_embedded_jpeg(dt.gui.action_images) end,
"extract embedded jpeg"
)

View File

@@ -1,51 +0,0 @@
--[[
darktable_transition.lua - temporary library to help with API transition
Copyright (C) 2016 Bill Ferguson <wpferguson@gmail.com>.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
]]
--[[
darktable_transition - routines to maintain compatibility with new and previous API versions
]]
local dt
for k,v in pairs(package.loaded) do
if string.match(k, "darktable") then
dt = v
break
end
end
if dt then
dt.orig_register_event = dt.register_event
function dt.register_event(name, event, callback, tooltip)
if dt.configuration.api_version_string >= "6.2.1" then
if tooltip then
dt.orig_register_event(name, event, callback, tooltip)
else
dt.orig_register_event(name, event, callback)
end
else
if tooltip then
dt.orig_register_event(event, callback, tooltip)
else
dt.orig_register_event(event, callback)
end
end
end
end

View File

@@ -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")
@@ -114,46 +113,26 @@ local function paste(images)
end
end
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("copy metadata"),
function(event, images) copy(images[1]) end,
_("copy metadata of the first selected image")
)
else
dt.gui.libs.image.register_action(
"metadata_copy", _("copy metadata"),
function(event, images) copy(images[1]) end,
_("copy metadata of the first selected image")
)
end
if CURR_API_STRING < "6.2.3" then
dt.gui.libs.image.register_action(
_("paste metadata"),
function(event, images) paste(images) end,
_("paste metadata to the selected images")
)
else
dt.gui.libs.image.register_action(
"metadata_paste", _("paste metadata"),
function(event, images) paste(images) end,
_("paste metadata to the selected images")
)
end
dt.gui.libs.image.register_action(
_("copy metadata"),
function(event, images) copy(images[1]) end,
_("copy metadata of the first selected image")
)
dt.gui.libs.image.register_action(
_("paste metadata"),
function(event, images) paste(images) end,
_("paste metadata to the selected images")
)
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"
)

View File

@@ -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()

View File

@@ -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

View File

@@ -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

View File

@@ -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]

View File

@@ -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")

View File

@@ -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()

View File

@@ -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
@@ -68,7 +67,7 @@ end
-- api check
du.check_min_api_version("5.0.0", "script_manager")
du.check_min_api_version("6.1.0", "script_manager")
-- - - - - - - - - - - - - - - - - - - - - - - -
@@ -461,9 +460,7 @@ local function populate_buttons(category, first, last)
else
button.label = script.name .. _(" stopped")
end
if CURR_API_STRING >= "6.0.1" then
button.ellipsize = "middle"
end
button.ellipsize = "middle"
button.sensitive = true
button.tooltip = script.doc
button.clicked_callback = function (this)
@@ -772,12 +769,8 @@ for i =1, DEFAULT_BUTTONS_PER_PAGE do
sm.page_status.buttons_create = sm.page_status.buttons_created + 1
end
local page_back = "<"
local page_forward = ">"
if CURR_API_STRING < "6.1.0" then
page_back = " < "
page_forward = " > "
end
local page_back = " < "
local page_forward = " > "
sm.widgets.page_status = dt.new_widget("label"){label = _("Page:")}
sm.widgets.page_back = dt.new_widget("button"){
@@ -849,10 +842,8 @@ sm.widgets.main_stack = dt.new_widget("stack"){
sm.widgets.scripts,
}
if CURR_API_STRING >= "6.0.1" then
sm.widgets.main_stack.h_size_fixed = false
sm.widgets.main_stack.v_size_fixed = false
end
sm.widgets.main_stack.h_size_fixed = false
sm.widgets.main_stack.v_size_fixed = false
-- main menu
@@ -883,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()