Small fixes, changlelog

Add Russian translation

.gitignore

@@ -2,6 +2,7 @@
 *.glade#
 *.txt
 *.json
+*.tar.gz
 extracted_images/
 selected/
 __pycache__

CHANGELOG

@@ -1,4 +1,23 @@
-# Version 2.0 (upcoming)
+# Version 2.4
+- Adding Login window support
+- Adding Russian translation (Thanks to blogdron)
+
+# Version 2.3
+- Adding Dutch translation
+- Adding German translation
+- Adding Spanish translation (Thanks to rcalixte)
+
+# Version 2.2
+- Bugfixes
+- Migrate code to MVVM pattern
+- Adding option to change the location provider
+- Adding example image for dynamic background color
+
+# Version 2.1
+- Bugfixes
+- Smaller UI for displays with reduced resolution (< 1000px height)
+
+# Version 2.0
 - New App icon
 - Preferences window redesign - All settings are now in one window accessable!
 - Graphic visualizing of the time periods of a day with a bar chart

README.md

@@ -1,5 +1,5 @@
 # Cinnamon Dynamic Wallpaper
-<img src="cinnamon-dynamic-wallpaper@TobiZog/5.4/icons/icon.svg" alt="drawing" width="200" style="margin-left:auto; margin-right:auto; width:50%; display:block"/>
+<img src="cinnamon-dynamic-wallpaper@TobiZog/5.4/res/icons/icon.svg" alt="drawing" width="200" style="margin-left:auto; margin-right:auto; width:50%; display:block"/>
 
 ![](res/wallpaper_merged.jpg)
 
@@ -7,15 +7,15 @@
 This extension switches the background image of your Cinnamon desktop multiple times in a day, based on a location or custom time periods. You can choose between included image-sets, your own HEIC-file or a source folder with single images. Configuration through a user-friendly configuration window.
 
 ### Features
-- 8 included image sets
+- 9 included image sets
 - 10 day periods
 - HEIF converter
 - Image configuration assistent with simple one-click setup for image choices
-- Online location estimation or offline with manual latitude and longitude input
+- Online location estimation (three provider) or offline with manual latitude and longitude input
 - Time periods individual configured by user
 - Offline sun angles estimation
 - Image stretching over multiple displays or repeat image for every display
-- Show image on lock screen
+- Creating a color gradient based on the current wallpaper for images which not fill the whole screen
 
 ### Tested Cinnamon versions
 - 5.4 (Mint 21)
@@ -23,11 +23,6 @@ This extension switches the background image of your Cinnamon desktop multiple t
 - 5.8 (Mint 21.2)
 - 6.0 (Mint 21.3)
 
-#### Only supported with version 1.x
-- 4.8 (Mint 20.1)
-- 5.0 (Mint 20.2)
-- 5.2 (Mint 20.3)
-
 ### Technology
 - `JavaScript`
 	- Display desktop notifications
@@ -48,7 +43,7 @@ This extension switches the background image of your Cinnamon desktop multiple t
 3. Search and download it
 
 ### From the repo
-1. Download the Repository
+1. Download the latest from the Releases page on GitHub: https://github.com/TobiZog/cinnamon-dynamic-wallpaper/releases
 2. Extract the files
 3. Copy the folder `cinnamon-dynamic-wallpaper@TobiZog` to `~/.local/share/cinnamon/extensions/`
 ---
@@ -64,6 +59,17 @@ Because of the lack of configuration options in the standard Cinnamon configurat
 All configuration will be handled there. You can choose between included image sets, a HEIC file or a folder source and set the image to ten different daytime periods. Time periods will be estimated via network, custom coordinations or custom time periods. Some behaviour preferences (strech image, fill empty background with gradient color) are also here.
 
 ![](res/image_configurator.png)
+---
+## Contribute
+### Translation
+You want to contribute a language which isn't supported yet? Here is how to do:
+
+1. Fork the cinnamon-spices-extensions project: https://github.com/linuxmint/cinnamon-spices-extensions
+2. Pull the repository
+3. Open `cinnamon-dynamic-wallpaper@TobiZog/files/cinnamon-dynamic-wallpaper@TobiZog/po/cinnamon-dynamic-wallpaper@TobiZog.pot` with a po-tool like poedit (https://poedit.net/).
+4. Create a new translation in your language
+5. Push the changes to your repository
+6. Create a pull request
 
 ---
 ## Included image sets
@@ -71,12 +77,12 @@ The image sets are from https://github.com/adi1090x/dynamic-wallpaper
 
 | Aurora | Beach | Bitday |
 | ------ | ----- | ------ |
-| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/aurora/5.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/beach/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/bitday/4.jpg) |
+| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/aurora/5.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/beach/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/bitday/4.jpg) |
 
-| Cliffs | Gradient | Lakeside | 
+| Cliffs | Earth | Gradient | 
 | -------- | --------- | ------ |
-| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/cliffs/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/gradient/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/lakeside/4.jpg) |
+| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/cliffs/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/earth/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/gradient/4.jpg) | 
 
-| Mountains | Sahara |
+| Lakeside | Mountains | Sahara |
-| --------- | ------ |
+| --------- | ------ | ------ |
-| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/mountains/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/images/included_image_sets/sahara/4.jpg) |
+| ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/lakeside/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/mountains/4.jpg) | ![](cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/sahara/4.jpg) |

cinnamon-dynamic-wallpaper@TobiZog/5.4/extension.js

@@ -1,7 +1,7 @@
 /**
- * @name	Cinnamon-Dynamic-Wallpaper
+ * @name  Cinnamon-Dynamic-Wallpaper
- * @alias 	TobiZog
+ * @alias TobiZog
- * @since	2023-05-17
+ * @since 2023-05-17
  * 
  * @description Main application file
  */
@@ -17,7 +17,8 @@ const Gio = imports.gi.Gio;
 const MessageTray = imports.ui.messageTray;
 const St = imports.gi.St;
 const Main = imports.ui.main;
-
+const Gettext = imports.gettext;
+const GLib = imports.gi.GLib;
 
 
 /******************** Constants ********************/
@@ -33,9 +34,6 @@ const PATH = DIRECTORY.path;
 // The extension object
 let extension;
 
-// Time and date of the last location update
-let lastLocationUpdate = -1
-
 // Loop state
 let looping = true
 
@@ -47,6 +45,15 @@ function CinnamonDynamicWallpaperExtension(uuid) {
 }
 
 
+function _(str) {
+	let customTranslation = Gettext.dgettext(UUID, str);
+	if (customTranslation !== str) {
+		return customTranslation;
+	}
+	return Gettext.gettext(str);
+}
+
+
 CinnamonDynamicWallpaperExtension.prototype = {
 
 	/******************** Lifecycle ********************/
@@ -59,16 +66,18 @@ CinnamonDynamicWallpaperExtension.prototype = {
 	_init: function(uuid) { 
 		this.settings = new Settings.ExtensionSettings(this, uuid);
 
+		Gettext.bindtextdomain(UUID, GLib.get_home_dir() + '/.local/share/locale');
+
 		// Check for the first startup
 		if (this.settings.getValue("first_start")) {
 
 			// Welcome notification
-			this.showNotification("Welcome to Cinnamon Dynamic Wallpaper", 
+			this.showNotification(_("Welcome to Cinnamon Dynamic Wallpaper"), 
-				"Check the preferences to choose a dynamic wallpaper", true)
+				_("Check the preferences to choose a dynamic wallpaper"), true)
 
 			// Hide the notification on system restart
 			this.settings.setValue("first_start", false)
-			this.settings.setValue("source_folder", DIRECTORY["path"] + "/images/included_image_sets/lakeside/")
+			this.settings.setValue("source_folder", DIRECTORY["path"] + "/res/images/included_image_sets/lakeside/")
 		}
 
 		// Start the main loop, checks in fixed time periods the 
@@ -99,10 +108,10 @@ CinnamonDynamicWallpaperExtension.prototype = {
 	_loop: function () {
 		if (looping) {
 			try {
-				Util.spawnCommandLine("/usr/bin/env python3 " + DIRECTORY.path + "/loop.py")
+				Util.spawnCommandLine("/usr/bin/env python3 " + DIRECTORY.path + "/src/main.py loop")
 			} catch(e) {
-				this.showNotification("Error!", 
+				this.showNotification(_("Error!"), 
-					"Cinnamon Dynamic Wallpaper got an error while running the loop script. Please create an issue on GitHub.")
+					_("Cinnamon Dynamic Wallpaper got an error while running the loop script. Please create an issue on GitHub."))
 			}
 
 			// Refresh every 60 seconds
@@ -130,8 +139,7 @@ CinnamonDynamicWallpaperExtension.prototype = {
 			notification.addButton("open-settings", _("Open settings"));
 
 			notification.connect("action-invoked", () =>
-				Util.spawnCommandLine("/usr/bin/env python3 " +
+				Util.spawnCommandLine("/usr/bin/env python3 " + DIRECTORY.path + "/src/main.py"));
-					DIRECTORY.path + "/preferences.py"));
 		}
 
 		// Put all together

cinnamon-dynamic-wallpaper@TobiZog/5.4/icon.svg

@@ -1 +1 @@
-icons/icon.svg
+res/icons/icon.svg

cinnamon-dynamic-wallpaper@TobiZog/5.4/loop.py

@@ -1,106 +0,0 @@
-#!/usr/bin/python3
-
-from scripts.cinnamon_pref_handler import *
-from scripts.suntimes import *
-from datetime import datetime, time
-from enums.PeriodSourceEnum import *
-from scripts.location import *
-from gi.repository import Gio
-from PIL import Image
-
-
-class Loop():
-  def __init__(self) -> None:
-    self.prefs = Cinnamon_Pref_Handler()
-
-    self.suntimes = Suntimes()
-    self.location = Location()
-    self.background_settings = Gio.Settings.new("org.cinnamon.desktop.background")
-
-    # Position should estimate by network
-    if self.prefs.period_source == PeriodSourceEnum.NETWORKLOCATION:
-      current_location = self.location.run()
-
-      self.suntimes.calc_suntimes(float(current_location["latitude"]), float(current_location["longitude"]))
-      self.start_times = self.suntimes.day_periods
-
-    # Position is given by user
-    elif self.prefs.period_source == PeriodSourceEnum.CUSTOMLOCATION:
-      self.suntimes.calc_suntimes(float(self.prefs.latitude_custom), float(self.prefs.longitude_custom))
-      self.start_times = self.suntimes.day_periods
-
-    # No position, concrete times
-    else:
-      def string_to_time_converter(raw_str: str) -> time:
-        hour = raw_str[0:raw_str.find(":")]
-        minute = raw_str[raw_str.find(":") + 1:]
-
-        return time(hour=int(hour), minute=int(minute))
-      
-      self.start_times = [
-        string_to_time_converter(self.prefs.period_custom_start_time[0]),
-        string_to_time_converter(self.prefs.period_custom_start_time[1]),
-        string_to_time_converter(self.prefs.period_custom_start_time[2]),
-        string_to_time_converter(self.prefs.period_custom_start_time[3]),
-        string_to_time_converter(self.prefs.period_custom_start_time[4]),
-        string_to_time_converter(self.prefs.period_custom_start_time[5]),
-        string_to_time_converter(self.prefs.period_custom_start_time[6]),
-        string_to_time_converter(self.prefs.period_custom_start_time[7]),
-        string_to_time_converter(self.prefs.period_custom_start_time[8]),
-        string_to_time_converter(self.prefs.period_custom_start_time[9])
-      ]
-
-
-  def exchange_image(self):
-    """ Replace the desktop image
-    """
-    # Get the time of day
-    time_now = time(datetime.now().hour, datetime.now().minute)
-
-    # Assign the last image as fallback
-    self.current_image_uri = self.prefs.source_folder + self.prefs.period_images[9]
-
-    for i in range(0, 9):
-      # Replace the image URI, if it's not the last time period of the day
-      if self.start_times[i] <= time_now and time_now < self.start_times[i + 1]:
-        self.current_image_uri = self.prefs.source_folder + self.prefs.period_images[i]
-        break
-    
-    # Set the background
-    self.background_settings['picture-uri'] = "file://" + self.current_image_uri
-
-    # Set background stretching
-    self.background_settings['picture-options'] = self.prefs.picture_aspect
-
-    self.set_background_gradient()
-
-    
-  def set_background_gradient(self):
-    """ Setting a gradient background to hide images, which are not high enough
-    """
-    # Load the image
-    im = Image.open(self.current_image_uri)
-    pix = im.load()
-
-    # Width and height of the current setted image
-    width, height = im.size
-
-    # Color of the top and bottom pixel in the middle of the image
-    top_color = pix[width / 2,0]
-    bottom_color = pix[width / 2, height - 1]
-
-    # Create the gradient
-    self.background_settings['color-shading-type'] = "vertical"
-
-    if self.prefs.dynamic_background_color:
-      self.background_settings['primary-color'] = f"#{top_color[0]:x}{top_color[1]:x}{top_color[2]:x}"
-      self.background_settings['secondary-color'] = f"#{bottom_color[0]:x}{bottom_color[1]:x}{bottom_color[2]:x}"
-    else:
-      self.background_settings['primary-color'] = "#000000"
-      self.background_settings['secondary-color'] = "#000000"
-
-
-# Needed for JavaScript
-if __name__ == "__main__":
-  l = Loop()
-  l.exchange_image()

cinnamon-dynamic-wallpaper@TobiZog/5.4/preferences.py

@@ -1,644 +0,0 @@
-#!/usr/bin/python3
-
-# Imports
-import gi, os, subprocess, time
-from datetime import timedelta
-from scripts.time_bar_chart import Time_Bar_Chart
-from scripts.cinnamon_pref_handler import *
-from scripts.suntimes import *
-from scripts.location import *
-from scripts.images import *
-from enums.ImageSourceEnum import ImageSourceEnum
-from enums.PeriodSourceEnum import PeriodSourceEnum
-from loop import *
-
-gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, GdkPixbuf
-
-
-# Global definitions
-PREFERENCES_URI = os.path.dirname(os.path.abspath(__file__))
-GLADE_URI = PREFERENCES_URI + "/preferences.glade"
-
-
-class Preferences:
-	""" Preference window class
-	"""
-
-	############################################################
-	#                         Lifecycle                        #
-	############################################################
-
-	def __init__(self) -> None:
-		# Objects from external scripts
-		self.time_bar_chart = Time_Bar_Chart()
-		self.c_prefs = Cinnamon_Pref_Handler()
-		self.suntimes = Suntimes()
-		self.images = Images()
-		self.location = Location()
-
-		# Glade
-		self.builder = Gtk.Builder()
-		self.builder.add_from_file(GLADE_URI)
-		self.builder.connect_signals(self)
-		
-		########## UI objects ##########
-		
-		#### Page 1: Image Configuration
-		self.tb_image_set: Gtk.ToggleButton = self.builder.get_object("tb_image_set")
-		self.tb_heic_file: Gtk.ToggleButton = self.builder.get_object("tb_heic_file")
-		self.tb_source_folder: Gtk.ToggleButton = self.builder.get_object("tb_source_folder")
-
-		# Image set
-		self.lbr_image_set: Gtk.ListBoxRow = self.builder.get_object("lbr_image_set")
-		self.cb_image_set: Gtk.ComboBox = self.builder.get_object("cb_image_set")
-
-		# HEIC file		
-		self.lbr_heic_file: Gtk.ListBoxRow = self.builder.get_object("lbr_heic_file")
-
-		# Source folder
-		self.lbr_source_folder: Gtk.ListBoxRow = self.builder.get_object("lbr_source_folder")
-		self.fc_source_folder: Gtk.FileChooser = self.builder.get_object("fc_source_folder")
-
-		# Time bar chart
-		self.img_bar_images: Gtk.Image = self.builder.get_object("img_bar_images")
-		self.etr_periods: list[Gtk.Entry] = [
-			self.builder.get_object("etr_period_1"), self.builder.get_object("etr_period_2"),
-			self.builder.get_object("etr_period_3"), self.builder.get_object("etr_period_4"),
-			self.builder.get_object("etr_period_5"), self.builder.get_object("etr_period_6"),
-			self.builder.get_object("etr_period_7"), self.builder.get_object("etr_period_8"),
-			self.builder.get_object("etr_period_9"), self.builder.get_object("etr_period_10"),
-		]
-
-		self.img_periods: list[Gtk.Image] = [
-			self.builder.get_object("img_period_0"), self.builder.get_object("img_period_1"),
-			self.builder.get_object("img_period_2"), self.builder.get_object("img_period_3"),
-			self.builder.get_object("img_period_4"), self.builder.get_object("img_period_5"),
-			self.builder.get_object("img_period_6"), self.builder.get_object("img_period_7"),
-			self.builder.get_object("img_period_8"), self.builder.get_object("img_period_9"),
-		]
-
-		self.cb_periods: list[Gtk.ComboBox] = [
-			self.builder.get_object("cb_period_0"), self.builder.get_object("cb_period_1"), 
-			self.builder.get_object("cb_period_2"), self.builder.get_object("cb_period_3"), 
-			self.builder.get_object("cb_period_4"), self.builder.get_object("cb_period_5"), 
-			self.builder.get_object("cb_period_6"), self.builder.get_object("cb_period_7"), 
-			self.builder.get_object("cb_period_8"), self.builder.get_object("cb_period_9"), 
-		]
-
-
-
-		#### Page 2: Location & Times
-		self.tb_network_location: Gtk.ToggleButton = self.builder.get_object("tb_network_location")
-		self.lb_current_location: Gtk.Label = self.builder.get_object("lb_current_location")
-		self.lbr_current_location: Gtk.ListBoxRow = self.builder.get_object("lbr_current_location")
-		self.tb_custom_location: Gtk.ToggleButton = self.builder.get_object("tb_custom_location")
-		self.tb_time_periods: Gtk.ToggleButton = self.builder.get_object("tb_time_periods")
-		self.lbr_network_location: Gtk.ListBoxRow = self.builder.get_object("lbr_network_location")
-		self.spb_network_location_refresh_time: Gtk.SpinButton = self.builder.get_object("spb_network_location_refresh_time")
-		self.lbr_custom_location_longitude: Gtk.ListBoxRow = self.builder.get_object("lbr_custom_location_longitude")
-		self.lbr_custom_location_latitude: Gtk.ListBoxRow = self.builder.get_object("lbr_custom_location_latitude")
-		self.lbr_time_periods: Gtk.ListBoxRow = self.builder.get_object("lbr_time_periods")
-		self.etr_longitude: Gtk.Entry = self.builder.get_object("etr_longitude")
-		self.etr_latitude: Gtk.Entry = self.builder.get_object("etr_latitude")
-		self.img_bar_times: Gtk.Image = self.builder.get_object("img_bar_times")
-		self.spb_periods_hour: list[Gtk.SpinButton] = [
-			self.builder.get_object("spb_period_1_hour"),
-			self.builder.get_object("spb_period_2_hour"),
-			self.builder.get_object("spb_period_3_hour"),
-			self.builder.get_object("spb_period_4_hour"),
-			self.builder.get_object("spb_period_5_hour"),
-			self.builder.get_object("spb_period_6_hour"),
-			self.builder.get_object("spb_period_7_hour"),
-			self.builder.get_object("spb_period_8_hour"),
-			self.builder.get_object("spb_period_9_hour"),
-		]
-		self.spb_periods_minute: list[Gtk.SpinButton] = [
-			self.builder.get_object("spb_period_1_minute"),
-			self.builder.get_object("spb_period_2_minute"),
-			self.builder.get_object("spb_period_3_minute"),
-			self.builder.get_object("spb_period_4_minute"),
-			self.builder.get_object("spb_period_5_minute"),
-			self.builder.get_object("spb_period_6_minute"),
-			self.builder.get_object("spb_period_7_minute"),
-			self.builder.get_object("spb_period_8_minute"),
-			self.builder.get_object("spb_period_9_minute")
-		]
-		self.lb_period_end: list[Gtk.Label] = [
-			self.builder.get_object("lb_period_0_end"), self.builder.get_object("lb_period_1_end"),
-			self.builder.get_object("lb_period_2_end"), self.builder.get_object("lb_period_3_end"),
-			self.builder.get_object("lb_period_4_end"), self.builder.get_object("lb_period_5_end"),
-			self.builder.get_object("lb_period_6_end"), self.builder.get_object("lb_period_7_end"),
-			self.builder.get_object("lb_period_8_end"), self.builder.get_object("lb_period_9_end"), 
-		]
-
-
-		# Page 3: Behaviour
-		self.cb_picture_aspect: Gtk.ComboBox = self.builder.get_object("cb_picture_aspect")
-		self.sw_dynamic_background_color: Gtk.Switch = self.builder.get_object("sw_dynamic_background_color")
-
-
-	def show(self):
-		""" Display the window to the screen
-		"""
-		window = self.builder.get_object("window_main")
-		window.show_all()
-
-		# todo: Remove after HEIC implementation
-		self.tb_heic_file.set_visible(False)
-
-		# Load from preferences
-		if self.c_prefs.image_source == ImageSourceEnum.IMAGESET:
-			self.tb_image_set.set_active(True)
-		elif self.c_prefs.image_source == ImageSourceEnum.HEICFILE:
-			self.tb_heic_file.set_active(True)
-		elif self.c_prefs.image_source == ImageSourceEnum.SOURCEFOLDER:
-			self.tb_source_folder.set_active(True)
-
-
-		picture_aspects = ["mosaic", "centered", "scaled", "stretched", "zoom", "spanned"]
-		self.add_items_to_combo_box(self.cb_picture_aspect, picture_aspects)
-		self.set_active_combobox_item(self.cb_picture_aspect, self.c_prefs.picture_aspect)
-
-		self.sw_dynamic_background_color.set_active(self.c_prefs.dynamic_background_color)
-
-
-		if self.c_prefs.period_source == PeriodSourceEnum.NETWORKLOCATION:
-			self.tb_network_location.set_active(True)
-		elif self.c_prefs.period_source == PeriodSourceEnum.CUSTOMLOCATION:
-			self.tb_custom_location.set_active(True)
-		elif self.c_prefs.period_source == PeriodSourceEnum.CUSTOMTIMEPERIODS:
-			self.tb_time_periods.set_active(True)
-
-
-		# Time diagram
-		try:
-			self.refresh_chart()
-		except:
-			pass
-
-		# Show the main window
-		Gtk.main()
-
-	
-	def on_destroy(self, *args):
-		""" Lifecycle handler when window will be destroyed
-		"""
-		Gtk.main_quit()
-
-
-
-	############################################################
-	#												Local methods											 #
-	############################################################
-
-	def refresh_chart(self):
-		""" Recomputes both time bar charts and load them to the UI
-		"""
-		# Stores the start times of the periods in minutes since midnight
-		time_periods_min = []
-
-		if self.c_prefs.period_source == PeriodSourceEnum.CUSTOMTIMEPERIODS:
-			for i in range(0, 10):
-				time_str = self.c_prefs.period_custom_start_time[i]
-
-				time_periods_min.append(int(time_str[0:2]) * 60 + int(time_str[3:5]))
-		else:
-			if self.c_prefs.period_source == PeriodSourceEnum.NETWORKLOCATION:
-				self.suntimes.calc_suntimes(float(self.c_prefs.latitude_auto), 
-																float(self.c_prefs.longitude_auto))
-			else:
-				self.suntimes.calc_suntimes(float(self.etr_latitude.get_text()), float(self.etr_longitude.get_text()))	
-
-			
-			# Get all time periods. Store the minutes to the list and print the values to the text views
-			for i in range(0, 10):
-				time_range_now = self.suntimes.day_periods[i]
-
-				if i != 9:
-					time_range_next = self.suntimes.day_periods[i + 1]
-				else:
-					time_range_next = time(hour=23, minute=59)
-
-				self.etr_periods[i].set_text(
-					str(time_range_now.hour).rjust(2, '0') + ":" + str(time_range_now.minute).rjust(2, '0') +\
-						" - " + str(time_range_next.hour).rjust(2, '0') + ":" + str(time_range_next.minute).rjust(2, '0'))
-				
-				time_periods_min.append(time_range_now.hour * 60 + time_range_now.minute)
-
-		# Create time bar
-		self.time_bar_chart.create_bar_chart_with_polylines(PREFERENCES_URI, 1300, 150, time_periods_min)
-		self.time_bar_chart.create_bar_chart(PREFERENCES_URI, 1300, 150, time_periods_min)
-
-		# Load to the views
-		pixbuf = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar_polylines.svg")
-		self.img_bar_images.set_from_pixbuf(pixbuf)
-
-		pixbuf2 = GdkPixbuf.Pixbuf.new_from_file(PREFERENCES_URI + "/time_bar.svg")
-		self.img_bar_times.set_from_pixbuf(pixbuf2)
-
-
-	def load_image_options_to_combo_boxes(self, options: list):
-		""" Add a list of Strings to all image option comboboxes
-
-		Args:
-				options (list): All possible options
-		"""
-		for combobox in self.cb_periods:
-			self.add_items_to_combo_box(combobox, options)
-
-
-	def load_image_to_preview(self, image_preview: Gtk.Image, image_src: list):
-		try:
-			pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_src)
-			pixbuf = pixbuf.scale_simple(250, 175, GdkPixbuf.InterpType.BILINEAR)
-
-			image_preview.set_from_pixbuf(pixbuf)
-		except:
-			pass
-
-
-	############################################################
-	#										UI helper methods											 #
-	############################################################
-
-	def set_active_combobox_item(self, combobox: Gtk.ComboBoxText, active_item: str):
-		""" Change active item in combobox by String value
-
-		Args:
-				combobox (Gtk.ComboBoxText): ComboBox to set active
-				active_item (str): String item to set active
-		"""
-		list_store = combobox.get_model()
-
-		for i in range(0, len(list_store)):
-			row = list_store[i]
-			if row[0] == active_item:
-				combobox.set_active(i)
-
-
-	def add_items_to_combo_box(self, combobox: Gtk.ComboBox, items: list):
-		""" Add items to a combo box
-
-		Args:
-				combobox (Gtk.ComboBox): ComboBox where to add the options
-				items (list): Possible options
-		"""
-		model = combobox.get_model()
-		store = Gtk.ListStore(str)
-
-		for image_set in items:
-			store.append([image_set])
-
-		combobox.set_model(store)
-
-		if model == None:
-			renderer_text = Gtk.CellRendererText()
-			combobox.pack_start(renderer_text, True)
-			combobox.add_attribute(renderer_text, "text", 0)
-
-
-
-	############################################################
-	#													Callbacks											 	 #
-	############################################################
-
-	## Image Configuration
-			
-	# +-----------+-----------+---------------+
-	# | Image Set | HEIC file | Source Folder |
-	# +-----------+-----------+---------------+
-
-	def on_toggle_button_image_set_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.image_source = ImageSourceEnum.IMAGESET
-			self.tb_heic_file.set_active(False)
-			self.tb_source_folder.set_active(False)
-
-			self.lbr_image_set.set_visible(True)
-			self.lbr_heic_file.set_visible(False)
-			self.lbr_source_folder.set_visible(False)
-
-			image_set_choices = ["aurora", "beach", "bitday", "cliffs", "gradient", "lakeside", "mountains", "sahara"]
-			self.add_items_to_combo_box(self.cb_image_set, image_set_choices)
-
-			self.set_active_combobox_item(self.cb_image_set, self.c_prefs.selected_image_set)
-
-			for i, combobox in enumerate(self.cb_periods):
-				selected_image_name = self.c_prefs.period_images[i]
-				self.set_active_combobox_item(combobox, selected_image_name)
-
-			# Make the comboboxes invisible
-			for combobox in self.cb_periods:
-				combobox.set_visible(False)
-		
-	
-	def on_toggle_button_heic_file_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.image_source = ImageSourceEnum.HEICFILE
-			self.tb_image_set.set_active(False)
-			self.tb_source_folder.set_active(False)
-
-			self.lbr_image_set.set_visible(False)
-			self.lbr_heic_file.set_visible(True)
-			self.lbr_source_folder.set_visible(False)
-
-			# Make the comboboxes visible
-			for combobox in self.cb_periods:
-				combobox.set_visible(True)
-
-
-	def on_toggle_button_source_folder_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.image_source = ImageSourceEnum.SOURCEFOLDER
-			self.tb_image_set.set_active(False)
-			self.tb_heic_file.set_active(False)
-
-			self.lbr_image_set.set_visible(False)
-			self.lbr_heic_file.set_visible(False)
-			self.lbr_source_folder.set_visible(True)
-
-			# Make the comboboxes visible
-			for combobox in self.cb_periods:
-				combobox.set_visible(True)
-
-			# Load the source folder to the view
-			# This will update the comboboxes in the preview to contain the right items
-			self.fc_source_folder.set_filename(self.c_prefs.source_folder)
-
-
-
-	def on_cb_image_set_changed(self, combobox: Gtk.ComboBox):
-		tree_iter = combobox.get_active_iter()
-
-		if tree_iter is not None and self.c_prefs.image_source == ImageSourceEnum.IMAGESET:
-			# Get the selected value
-			model = combobox.get_model()
-			selected_image_set = model[tree_iter][0]
-
-			# Store to the preferences
-			self.c_prefs.selected_image_set = selected_image_set
-			self.c_prefs.source_folder = os.path.abspath(os.path.join(PREFERENCES_URI, os.pardir)) + \
-				  "/5.4/images/included_image_sets/" + selected_image_set + "/"
-			
-			# Load all possible options to the comboboxes
-			image_names = self.images.get_images_from_folder(self.c_prefs.source_folder)
-			self.load_image_options_to_combo_boxes(image_names)
-
-			# Image sets have the same names for the images:
-			# 9.jpg = Period 0
-			# 1.jpg = Period 1
-			# 2.jpg = Period 2
-			# and so on....
-			self.cb_periods[0].set_active(8)
-			for i in range(1, 10):
-				self.cb_periods[i].set_active(i - 1)
-
-
-	def on_fc_heic_file_file_set(self, fc_button: Gtk.FileChooser):
-		file_path = fc_button.get_filename()
-		extract_folder = os.path.abspath(os.path.join(PREFERENCES_URI, os.pardir)) + \
-				  "/images/extracted_images/"
-
-		file_name = file_path[file_path.rfind("/") + 1:]
-		file_name = file_name[:file_name.rfind(".")]
-
-		# Update the preferences
-		self.c_prefs.selected_image_set = ""
-		self.c_prefs.source_folder = extract_folder
-
-		# Create the buffer folder
-		try:
-			os.mkdir(extract_folder)
-		except:
-			pass
-
-		# Extract the HEIC file
-		for file in self.images.get_images_from_folder(extract_folder):
-			os.remove(extract_folder + file)
-
-		os.system("heif-convert " + file_path + " " + extract_folder + file_name + ".jpg")
-
-		# Collect all extracted images and push them to the comboboxes
-		image_names = self.images.get_images_from_folder(self.c_prefs.source_folder)
-		self.load_image_options_to_combo_boxes(image_names)
-
-	
-
-	def on_fc_source_folder_file_set(self, fc_button: Gtk.FileChooser):
-		files = self.images.get_images_from_folder(fc_button.get_filename())
-
-		# Update the preferences
-		self.c_prefs.selected_image_set = ""
-		self.c_prefs.source_folder = fc_button.get_filename() + "/"
-		
-		if len(files) != 0:
-			self.load_image_options_to_combo_boxes(files)
-
-			# Load the values for the images from the preferences
-			for i in range(0, 10):
-				self.set_active_combobox_item(self.cb_periods[i], self.c_prefs.period_images[i])
-		else:
-			pass
-	
-
-	def on_cb_period_preview_changed(self, combobox: Gtk.ComboBox):
-		tree_iter = combobox.get_active_iter()
-
-		combobox_name = Gtk.Buildable.get_name(combobox)
-		period_index = int(combobox_name[10:11])
-
-		if tree_iter is not None:
-			# Get the selected value
-			model = combobox.get_model()
-			image_file_name = model[tree_iter][0]
-
-			# Store selection to preferences
-			self.c_prefs.period_images[period_index] = image_file_name
-
-			# Build up image path
-			image_path = self.c_prefs.source_folder + image_file_name
-
-			self.load_image_to_preview(self.img_periods[period_index], image_path)
-	
-
-	## Location & Times
-
-	def on_toggle_button_network_location_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.period_source = PeriodSourceEnum.NETWORKLOCATION
-			self.tb_custom_location.set_active(False)
-			self.tb_time_periods.set_active(False)
-
-			self.lbr_network_location.set_visible(True)
-			self.lbr_current_location.set_visible(True)
-			self.lbr_custom_location_longitude.set_visible(False)
-			self.lbr_custom_location_latitude.set_visible(False)
-			self.lbr_time_periods.set_visible(False)
-
-			self.spb_network_location_refresh_time.set_value(self.c_prefs.location_refresh_intervals)
-		
-
-			# Display the location in the UI
-			current_location = self.location.run()
-			self.lb_current_location.set_text("Latitude: " + current_location["latitude"] + \
-																		 ", Longitude: " + current_location["longitude"])
-			
-			# Store the location to the preferences
-			self.c_prefs.latitude_auto = float(current_location["latitude"])
-			self.c_prefs.longitude_auto = float(current_location["longitude"])
-
-			self.refresh_chart()
-
-
-	def on_toggle_button_custom_location_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.period_source = PeriodSourceEnum.CUSTOMLOCATION
-			self.tb_network_location.set_active(False)
-			self.tb_time_periods.set_active(False)
-
-			self.lbr_network_location.set_visible(False)
-			self.lbr_current_location.set_visible(False)
-			self.lbr_custom_location_longitude.set_visible(True)
-			self.lbr_custom_location_latitude.set_visible(True)
-			self.lbr_time_periods.set_visible(False)
-
-			self.etr_latitude.set_text(str(self.c_prefs.latitude_custom))
-			self.etr_longitude.set_text(str(self.c_prefs.longitude_custom))
-
-
-	def on_toggle_button_time_periods_clicked(self, button: Gtk.Button):
-		if button.get_active():
-			self.c_prefs.period_source = PeriodSourceEnum.CUSTOMTIMEPERIODS
-			self.tb_network_location.set_active(False)
-			self.tb_custom_location.set_active(False)
-
-			self.lbr_network_location.set_visible(False)
-			self.lbr_current_location.set_visible(False)
-			self.lbr_custom_location_longitude.set_visible(False)
-			self.lbr_custom_location_latitude.set_visible(False)
-			self.lbr_time_periods.set_visible(True)
-			
-			
-			for i in range(0, 9):
-				pref_value = self.c_prefs.period_custom_start_time[i + 1]
-				time_parts = [int(pref_value[0:pref_value.find(":")]), int(pref_value[pref_value.find(":") + 1:])]
-
-				self.spb_periods_hour[i].set_value(time_parts[0])
-				self.spb_periods_minute[i].set_value(time_parts[1])
-
-
-
-	def on_spb_period_value_changed(self, spin_button: Gtk.SpinButton):
-		""" Callback if one of the time spinners (minute or hour) will be clicked
-
-					 (1)							 (2)							 (3)
-			Previous period		Current period		 Next period
-			12:34 - 14:40			14:41 - 16:20			16:21 - 17:30
-													^
-										Variable to change
-
-		Args:
-				spin_button (Gtk.SpinButton): SpinButton which was changed
-		"""
-		spin_button_name = Gtk.Buildable.get_name(spin_button)
-		index = int(spin_button_name[11:12]) - 1
-
-		# Determe time string and store to prefs
-		time_current_start = datetime(2024,1,1, int(self.spb_periods_hour[index].get_value()), int(self.spb_periods_minute[index].get_value()))
-		time_current_start_str = str(time_current_start.hour).rjust(2, '0') + ":" + str(time_current_start.minute).rjust(2, '0')
-
-		self.c_prefs.period_custom_start_time[index + 1] = time_current_start_str
-		
-
-		time_previous_end = time_current_start - timedelta(minutes=1)
-		self.lb_period_end[index].set_text(str(time_previous_end.hour).rjust(2, '0') + ":" + str(time_previous_end.minute).rjust(2, '0'))
-
-
-		self.refresh_chart()
-
-
-	def on_spb_network_location_refresh_time_changed(self, spin_button):
-		self.c_prefs.location_refresh_intervals = spin_button.get_value()
-
-
-	def on_etr_longitude_changed(self, entry):
-		try:
-			self.c_prefs.longitude_custom = float(entry.get_text())
-			self.refresh_chart()
-		except:
-			pass
-
-
-	def on_etr_latitude_changed(self, entry):
-		try:
-			self.c_prefs.latitude_custom = float(entry.get_text())
-			self.refresh_chart()
-		except:
-			pass
-
-
-	# Behaviour
-		
-	def on_cb_picture_aspect_changed(self, combobox: Gtk.ComboBox):
-		tree_iter = combobox.get_active_iter()
-
-		if tree_iter is not None:
-			model = combobox.get_model()
-			self.c_prefs.picture_aspect = model[tree_iter][0]
-		
-	def on_sw_dynamic_background_color_state_set(self, switch: Gtk.Switch, state):
-		self.c_prefs.dynamic_background_color = state
-
-
-	# About
-
-	def on_cinnamon_spices_website_button_clicked(self, button: Gtk.Button):
-		""" Callback for the button to navigate to the Cinnamon Spices web page of this project
-
-		Args:
-				button (Gtk.Button): Button which was clicked
-		"""
-		subprocess.Popen(["xdg-open", "https://cinnamon-spices.linuxmint.com/extensions/view/97"])
-
-
-	def on_github_website_button_clicked(self, button: Gtk.Button):
-		""" Callback for the button to navigate to the GitHub web page of this project
-
-		Args:
-				button (Gtk.Button): Button which was clicked
-		"""
-		subprocess.Popen(["xdg-open", "https://github.com/TobiZog/cinnamon-dynamic-wallpaper"])
-
-
-	def on_create_issue_button_clicked(self, button):
-		""" Callback for the button to navigate to the Issues page on GitHub of this project
-
-		Args:
-				button (Gtk.Button): Button which was clicked
-		"""
-		subprocess.Popen(["xdg-open", "https://github.com/TobiZog/cinnamon-dynamic-wallpaper/issues/new"])
-
-
-	def on_ok(self, *args):
-		""" Callback for the OK button in the top bar
-		"""
-		self.on_apply()
-
-		# Close the window
-		self.on_destroy()
-
-
-	def on_apply(self, *args):
-		""" Callback for the Apply button in the top bar
-		"""
-		# Store all values to the JSON file
-		self.c_prefs.store_preferences()
-
-		# Use the new settings
-		loop = Loop()
-		loop.exchange_image()
-
-
-if __name__ == "__main__":
-	Preferences().show()

cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/beach/9.jpg

@@ -0,0 +1 @@
+0.jpg

cinnamon-dynamic-wallpaper@TobiZog/5.4/res/images/included_image_sets/cliffs/9.jpg

@@ -0,0 +1 @@
+0.jpg