Skip to content

Commit eadfff9

Browse files
authored
Merge pull request darktable-org#78 from wpferguson/dt-2.2-compatibility
Darktable 2.2 compatibility
2 parents 85ccc66 + 93e30a8 commit eadfff9

26 files changed

+29
-26
lines changed

contrib/autostyle.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ local darktable = require "darktable"
4141
local autostyle_apply_one_image,autostyle_apply_one_image_event,autostyle_apply,exiftool_attribute,capture
4242

4343
-- Tested it with darktable 1.6.1 and darktable git from 2014-01-25
44-
darktable.configuration.check_version(...,{2,0,2},{2,1,0},{3,0,0})
44+
darktable.configuration.check_version(...,{2,0,2},{2,1,0},{3,0,0},{4,0,0})
4545

4646
-- Receive the event triggered
4747
function autostyle_apply_one_image_event(event,image)

contrib/clear_GPS.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ local gettext = dt.gettext
4242
-- not a number
4343
local NaN = 0/0
4444

45-
dt.configuration.check_version(...,{3,0,0})
45+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
4646

4747

4848
-- Tell gettext where to find the .mo file translating messages for a particular domain

contrib/cr2hdr.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ USAGE
3535
local darktable = require "darktable"
3636

3737
-- Tested with darktable 2.0.1
38-
darktable.configuration.check_version(...,{2,0,0},{3,0,0})
38+
darktable.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3939

4040
local queue = {}
4141
local processed_files = {}

contrib/geoJSON_export.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ local dt = require "darktable"
3636
require "official/yield"
3737

3838
local gettext = dt.gettext
39-
dt.configuration.check_version(...,{3,0,0})
39+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
4040

4141
-- Tell gettext where to find the .mo file translating messages for a particular domain
4242
gettext.bindtextdomain("geoJSON_export",dt.configuration.config_dir.."/lua/")

contrib/geo_uri.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ local dt = require "darktable"
3030
require "official/yield"
3131

3232
local gettext = dt.gettext
33-
dt.configuration.check_version(...,{3,0,0})
33+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
3434

3535
-- Tell gettext where to find the .mo file translating messages for a particular domain
3636
gettext.bindtextdomain("geo_uri",dt.configuration.config_dir.."/lua/")

contrib/gimp.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ require "official/yield"
6868

6969
local gettext = dt.gettext
7070

71-
dt.configuration.check_version(...,{3,0,0})
71+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
7272

7373
-- Tell gettext where to find the .mo file translating messages for a particular domain
7474
gettext.bindtextdomain("gimp",dt.configuration.config_dir.."/lua/")

contrib/gps_select.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ USAGE
2525

2626
local dt = require "darktable"
2727
local gettext = dt.gettext
28-
dt.configuration.check_version(...,{2,0,1},{3,0,0})
28+
dt.configuration.check_version(...,{2,0,1},{3,0,0},{4,0,0})
2929

3030
-- Tell gettext where to find the .mo file translating messages for a particular domain
3131
gettext.bindtextdomain("gps_select",dt.configuration.config_dir.."/lua/")

contrib/hugin.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require "official/yield"
3939
local gettext = dt.gettext
4040

4141
-- works with darktable API version 2.0.0 and 3.0.0
42-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
42+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
4343

4444
-- Tell gettext where to find the .mo file translating messages for a particular domain
4545
gettext.bindtextdomain("hugin",dt.configuration.config_dir.."/lua/")

contrib/kml_export.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ local dt = require "darktable"
4040
require "official/yield"
4141

4242
local gettext = dt.gettext
43-
dt.configuration.check_version(...,{3,0,0})
43+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
4444

4545
-- Tell gettext where to find the .mo file translating messages for a particular domain
4646
gettext.bindtextdomain("kml_export",dt.configuration.config_dir.."/lua/")

contrib/rate_group.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040

4141
local dt = require "darktable"
4242

43+
-- added version check
44+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
45+
4346
local function apply_rating(rating)
4447
local images = dt.gui.action_images
4548
for _, i in ipairs(images) do
@@ -81,4 +84,4 @@ end, "Rate group 4")
8184

8285
dt.register_event("shortcut",function(event, shortcut)
8386
apply_rating(5)
84-
end, "Rate group 5")
87+
end, "Rate group 5")

contrib/slideshowMusic.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ local dt = require "darktable"
2828
require "official/yield"
2929

3030
local gettext = dt.gettext
31-
dt.configuration.check_version(...,{2,0,2},{3,0,0})
31+
dt.configuration.check_version(...,{2,0,2},{3,0,0},{4,0,0})
3232

3333
-- Tell gettext where to find the .mo file translating messages for a particular domain
3434
gettext.bindtextdomain("slideshowMusic",dt.configuration.config_dir.."/lua/")

contrib/video_mencoder.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ USAGE
3333
local dt = require "darktable"
3434
require "official/yield"
3535

36-
dt.configuration.check_version(...,{2,0,1})
36+
dt.configuration.check_version(...,{2,0,1},{3,0,0},{4,0,0})
3737

3838
local function show_status(storage, image, format, filename, number, total, high_quality, extra_data)
3939
dt.print("Export Image "..tostring(number).."/"..tostring(total))

examples/gettextExample.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ LUA ERROR Hallo Welt!
5353
5454
]]
5555
local dt = require "darktable"
56-
dt.configuration.check_version(...,{3,0,0})
56+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
5757

5858
-- Not translated Text
5959
dt.print_error("Hello World!")

examples/hello_world.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ USAGE
2727
2828
]]
2929
local dt = require "darktable"
30-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
30+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3131

3232
dt.print("hello, world")
3333

examples/moduleExample.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ https://www.darktable.org/lua-api/index.html.php#darktable_new_widget
3232

3333
local dt = require "darktable"
3434

35-
dt.configuration.check_version(...,{3,0,0})
35+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
3636

3737
-- add a new lib
3838
local check_button = dt.new_widget("check_button"){label = "MyCheck_button", value = true}

examples/preferenceExamples.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ USAGE
2222
* require this script from your main lua file
2323
]]
2424
local dt = require "darktable"
25-
dt.configuration.check_version(...,{2,0,1},{3,0,0})
25+
dt.configuration.check_version(...,{2,0,1},{3,0,0},{4,0,0})
2626

2727
dt.preferences.register("preferenceExamples", -- script: This is a string used to avoid name collision in preferences (i.e namespace). Set it to something unique, usually the name of the script handling the preference.
2828
"preferenceExamplesString", -- name

lib/dtutils.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ local dt = require "darktable"
3232

3333
local log = require "lib/dtutils.log"
3434

35-
dt.configuration.check_version(...,{3,0,0})
35+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
3636

3737
dtutils.libdoc.functions["split"] = {
3838
Name = [[split]],

lib/dtutils/file.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dtutils_file.libdoc = {
2323

2424
local gettext = dt.gettext
2525

26-
dt.configuration.check_version(...,{3,0,0})
26+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
2727

2828
-- Tell gettext where to find the .mo file translating messages for a particular domain
2929
gettext.bindtextdomain("dtutils.file",dt.configuration.config_dir.."/lua/locale/")

official/check_for_updates.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ local dt = require "darktable"
3131
local https = require "ssl.https"
3232
local cjson = require "cjson"
3333

34-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
34+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3535

3636
-- compare two version strings of the form "major.minor.patch"
3737
-- returns -1, 0, 1 if the first version is smaller, equal, greater than the second version,

official/copy_paste_metadata.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ USAGE
2727

2828
local dt = require "darktable"
2929

30-
dt.configuration.check_version(...,{3,0,0})
30+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
3131

3232
-- set this to "false" if you don't want to overwrite metadata fields
3333
-- (title, description, creator, publisher and rights) that are already set

official/delete_long_tags.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ all tags longer than the given length will be automatically deleted at every res
2929
]]
3030

3131
local dt = require "darktable"
32-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
32+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3333

3434
dt.preferences.register("delete_long_tags", "length", "integer",
3535
"maximum length of tags to keep",

official/enfuse.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ local dt = require "darktable"
3636
require "official/yield"
3737

3838

39-
dt.configuration.check_version(...,{3,0,0})
39+
dt.configuration.check_version(...,{3,0,0},{4,0,0})
4040

4141
-- thanks Tobias Jakobs for this function (taken from contrib/hugin.lua)
4242
local function checkIfBinExists(bin)

official/generate_image_txt.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ local dt = require "darktable"
3838
require "darktable.debug"
3939
require "official/yield"
4040

41-
dt.configuration.check_version(...,{2,1,0},{3,0,0})
41+
dt.configuration.check_version(...,{2,1,0},{3,0,0},{4,0,0})
4242

4343
dt.preferences.register("generate_image_txt",
4444
"enabled",

official/image_path_in_ui.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This plugin will add a widget at the bottom of the left column in lighttable mod
2929
3030
]]
3131
local dt = require "darktable"
32-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
32+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3333

3434
local main_label = dt.new_widget("label"){selectable = true, ellipsize = "middle", halign = "start"}
3535

official/save_selection.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ increase it if you need more temporary selection buffers
3434
3535
]]
3636
local dt = require "darktable"
37-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
37+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
3838

3939
local buffer_count = 5
4040

official/selection_to_pdf.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Plugin allows you to choose how many thumbnails you need per row
3636
local dt = require "darktable"
3737
require "official/yield"
3838

39-
dt.configuration.check_version(...,{2,0,0},{3,0,0})
39+
dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0})
4040

4141
dt.preferences.register
4242
("selection_to_pdf","Open with","string",

0 commit comments

Comments
 (0)