Use magick method from ImageMagick library instead of convert

Turiok · Turiok · commit 609551f5fdde · 2025-07-26T15:14:27.000+02:00
fix for bug varietywalls#728
diff --git a/data/config/variety.conf b/data/config/variety.conf
@@ -230,7 +230,7 @@ src5 = True|folder|/usr/share/backgrounds
 src11 = True|flickr|user:www.flickr.com/photos/peter-levi/;user_id:93647178@N00;
 
 # Image filters to apply randomly to every wallpaper (ImageMagick is used for this)
-# Each filter is filterX = <enabled or not|filter name|arguments to pass to ImageMagick when calling convert>
+# Each filter is filterX = <enabled or not|filter name|arguments to pass to ImageMagick when calling magick>
 # BE CAREFUL: all keys below (filter1, filter2, etc.) MUST be different
 [filters]
 filter1 = False|Keep original|
diff --git a/po/bg.po b/po/bg.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -506,7 +506,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/ca.po b/po/ca.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -510,7 +510,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/de.po b/po/de.po
@@ -611,7 +611,7 @@ msgstr ""
 msgid ""
 "Adding your own custom filters is quite easy: open {PROFILE_PATH}"
 "variety.conf in an editor and use the existing filters as an example. Every "
-"filter is just a line of options to be passed to ImageMagick's convert "
+"filter is just a line of options to be passed to ImageMagick's magick "
 "command."
 msgstr ""
 "Das Hinzufügen eigener benutzerdefinierter Filter ist ganz einfach: Öffnen "
diff --git a/po/es.po b/po/es.po
@@ -2,11 +2,11 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
 # Ulices, 2023
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -529,7 +529,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 "Agregar sus propios filtros personalizados es bastante fácil: abra "
 "{PROFILE_PATH}variety.conf en un editor y use los filtros existentes como "
diff --git a/po/fi.po b/po/fi.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -505,7 +505,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/fr.po b/po/fr.po
@@ -2,11 +2,11 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
 # Bruno Veilleux, 2024
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -528,12 +528,12 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 "Vous pouvez facilement ajouter vos propres filtres personnalisés : ouvrez "
 "{PROFILE_PATH}variety.conf dans un éditeur et utilisez les filtres en place "
 "pour vous guider. Chaque filtre est une simple ligne d’options à transmettre"
-" à la commande « convert » d’ImageMagick."
+" à la commande « magick » d’ImageMagick."
 
 #: ../variety/Texts.py:72
 msgid ""
diff --git a/po/ja.po b/po/ja.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -486,10 +486,10 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 "自分で簡単にカスタムフィルターを追加できます。{PROFILE_PATH}variety.conf "
-"をエディターで開き、既存のフィルターを参考にして追加してください。各フィルターは ImageMagick の convert コマンドのオプションです。"
+"をエディターで開き、既存のフィルターを参考にして追加してください。各フィルターは ImageMagick の magick コマンドのオプションです。"
 
 #: ../variety/Texts.py:72
 msgid ""
diff --git a/po/ko.po b/po/ko.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -492,7 +492,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/pl.po b/po/pl.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -503,7 +503,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # Ronaldo Silva <ronaldofas@gmail.com>, 2023
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -524,7 +524,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 "Adicionar seus próprios filtros personalizados é muito fácil: abra "
 "{PROFILE_PATH} variety.conf em um editor e use os filtros existentes como "
diff --git a/po/pt_PT.po b/po/pt_PT.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # Peter J. Mello <admin@petermello.net>, 2025
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -612,12 +612,12 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 "Adicionar os seus próprios filtros personalizados é muito fácil: abra "
 "{PROFILE_PATH}variety.conf num editor e utilize os filtros existentes como "
 "exemplo. Cada filtro é apenas uma linha de opções a serem passadas para o "
-"comando `convert` do ImageMagick."
+"comando `magick` do ImageMagick."
 
 #: ../variety/Texts.py:76
 msgid ""
diff --git a/po/ru.po b/po/ru.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -506,7 +506,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/sr.po b/po/sr.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -505,7 +505,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/tr.po b/po/tr.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -508,7 +508,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/uk.po b/po/uk.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -506,7 +506,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/po/variety.pot b/po/variety.pot
@@ -539,7 +539,7 @@ msgstr ""
 msgid ""
 "Adding your own custom filters is quite easy: open {PROFILE_PATH}"
 "variety.conf in an editor and use the existing filters as an example. Every "
-"filter is just a line of options to be passed to ImageMagick's convert "
+"filter is just a line of options to be passed to ImageMagick's magick "
 "command."
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
@@ -2,10 +2,10 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # James Lu <james@overdrivenetworks.com>, 2021
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -486,7 +486,7 @@ msgid ""
 "Adding your own custom filters is quite easy: open "
 "{PROFILE_PATH}variety.conf in an editor and use the existing filters as an "
 "example. Every filter is just a line of options to be passed to "
-"ImageMagick's convert command."
+"ImageMagick's magick command."
 msgstr ""
 
 #: ../variety/Texts.py:72
diff --git a/variety/Texts.py b/variety/Texts.py
@@ -70,7 +70,7 @@
         "Applying a heavy blurring filter is a great way to get abstract-looking and unobtrusive, yet colorful wallpapers, similar in spirit to the default one in Ubuntu."
     ),
     _(
-        "Adding your own custom filters is quite easy: open {PROFILE_PATH}variety.conf in an editor and use the existing filters as an example. Every filter is just a line of options to be passed to ImageMagick's convert command."
+        "Adding your own custom filters is quite easy: open {PROFILE_PATH}variety.conf in an editor and use the existing filters as an example. Every filter is just a line of options to be passed to ImageMagick's magick command."
     ),
     _(
         'When you select an image source, its images are displayed in a window at the bottom of the screen. Click an image there to set is as wallpaper. Right-click to close the window, to modify its appearance or to perform file operations. You can select multiple image sources to create a "merged" thumbnail view of all of them. Please mind that thumbnail view is limited to several hundred randomly selected images.'
diff --git a/variety/VarietyWindow.py b/variety/VarietyWindow.py
