tobias/cinnamon-dynamic-wallpaper
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Switch from libheif to imagemagick, fix #23

Browse Source
This commit is contained in:
Tobias Zoghaib
2024-08-08 18:41:08 +02:00
parent 8b9a708cb4
commit fb91bd3b30
5 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
View File

@@ -1,5 +1,5 @@
# GTK
from gi.repository import Gio, Gdk
from gi.repository import Gio, Gdk, GLib
# Packages
import os, time, locale, subprocess, getpass
@@ -244,7 +244,8 @@ class Main_View_Model:
os.remove(extract_folder + file)
# Extract the HEIC file
os.system("heif-convert '" + file_uri + "' '" + extract_folder + file_name + ".jpg'")
print(self.get_imagemagick_prompt() + " " + file_uri + " -quality 100% " + extract_folder + file_name + ".jpg")
os.system(self.get_imagemagick_prompt() + " " + file_uri + " -quality 100% " + extract_folder + file_name + ".jpg")
return True
except:
@@ -328,3 +329,24 @@ class Main_View_Model:
if os.path.isfile('/etc/lightdm/slick-greeter.conf.backup'):
subprocess.call(['pkexec', 'rm', '/etc/lightdm/slick-greeter.conf'])
subprocess.call(['pkexec', 'mv', '/etc/lightdm/slick-greeter.conf.backup', '/etc/lightdm/slick-greeter.conf'])
def check_for_imagemagick(self) -> bool:
# Imagemagick < v.7.0
if GLib.find_program_in_path("convert") != None:
return True
# Imagemagick >= v.7.0
elif GLib.find_program_in_path("imagemagick") != None:
return True
# Not installed
else:
return False
def get_imagemagick_prompt(self) -> str:
# Imagemagick < v.7.0
if GLib.find_program_in_path("convert") != None:
return "convert"
# Imagemagick >= v.7.0
elif GLib.find_program_in_path("imagemagick") != None:
return "imagemagick convert"

7
cinnamon-dynamic-wallpaper@TobiZog/5.4/src/view/main_window.py
View File

@@ -171,6 +171,13 @@ class Main_Window:
self.add_items_to_combo_box(self.cb_image_set, self.view_model.image_sets)
self.image_source = self.image_source # This triggers the @image_source.setter
## Disable the HEIF-Converter option, if the plugin isn't installed
if not self.view_model.check_for_imagemagick():
self.tb_heic_file.set_sensitive(False)
else:
## Remove the Tooltip
self.tb_heic_file.set_tooltip_text("")
# Page 2: Location & Times
self.add_items_to_combo_box(self.cb_network_provider, self.view_model.network_location_provider)
self.period_source = self.period_source # This triggers the @period_source.setter