From 1c6060d8d56f51926647a9e83afa9e7acbad414e Mon Sep 17 00:00:00 2001
From: TobiZog <developer@zoghaib.de>
Date: Thu, 15 Feb 2024 17:34:07 +0100
Subject: [PATCH] Small fixes, changlelog

---
 .gitignore                                       |  1 +
 CHANGELOG                                        |  4 ++++
 .../5.4/settings-schema.json                     |  4 ++--
 .../5.4/src/main.py                              |  1 +
 .../5.4/src/model/main_view_model.py             |  3 ---
 .../5.4/src/service/cinnamon_pref_handler.py     | 16 ++++++++--------
 cinnamon-dynamic-wallpaper@TobiZog/metadata.json |  2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1592744..2713c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.glade#
 *.txt
 *.json
+*.tar.gz
 extracted_images/
 selected/
 __pycache__
diff --git a/CHANGELOG b/CHANGELOG
index 40be92b..736b610 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+# Version 2.4
+- Adding Login window support
+- Adding Russian translation (Thanks to blogdron)
+
 # Version 2.3
 - Adding Dutch translation
 - Adding German translation
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/settings-schema.json b/cinnamon-dynamic-wallpaper@TobiZog/5.4/settings-schema.json
index 1a87cd6..8f1a446 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/settings-schema.json
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/settings-schema.json
@@ -5,7 +5,7 @@
   },
   "picture_aspect": {
     "type": "generic",
-    "default": "scaled"
+    "default": "zoom"
   },
   "dynamic_background_color": {
     "type": "generic",
@@ -133,6 +133,6 @@
   },
   "login_image": {
     "type": "generic",
-    "default": true
+    "default": false
   }
 }
\ No newline at end of file
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/main.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/main.py
index dc5bd96..1204b6b 100755
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/main.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/main.py
@@ -13,5 +13,6 @@ if __name__ == "__main__":
   elif sys.argv[1] == "loop":
     # Run the methods which updates the data
     view_model = Main_View_Model()
+    view_model.set_login_image()
     view_model.refresh_image()
     view_model.set_background_gradient()
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
index 5821df0..78c199e 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/model/main_view_model.py
@@ -121,8 +121,6 @@ class Main_View_Model:
 		hour = raw_str[0:raw_str.find(":")]
 		minute = raw_str[raw_str.find(":") + 1:]
 
-		time(1, 2)
-
 		return time(hour=int(hour), minute=int(minute))
 	
 
@@ -297,7 +295,6 @@ class Main_View_Model:
 				for line in conf_file.readlines():
 					if line.startswith("background"):
 						# Case 1: Preference is already set as expected -> leave function
-						print(line)
 						if line.find("cinnamon_dynamic_wallpaper/login_image.jpg") != -1 and self.cinnamon_prefs.login_image or \
 							line.find("cinnamon_dynamic_wallpaper/login_image.jpg") == -1 and not self.cinnamon_prefs.login_image:
 							return
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/cinnamon_pref_handler.py b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/cinnamon_pref_handler.py
index b7bc03d..76028c3 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/cinnamon_pref_handler.py
+++ b/cinnamon-dynamic-wallpaper@TobiZog/5.4/src/service/cinnamon_pref_handler.py
@@ -11,7 +11,7 @@ class Cinnamon_Pref_Handler:
     self.load_preferences()
 
   
-  def extract_json(self, parameter: str) -> str:
+  def extract_json(self, parameter: str) -> any:
     """ Get a parameter from the json dictionary safely
 
     Args:
@@ -52,13 +52,13 @@ class Cinnamon_Pref_Handler:
       self.extract_json('period_9_image')
     ]
 
-    self.period_source =self.extract_json('period_source')
-    self.location_refresh_intervals =self.extract_json('location_refresh_intervals')
-    self.network_location_provider =self.extract_json('network_location_provider')
-    self.latitude_auto =self.extract_json('latitude_auto')
-    self.longitude_auto =self.extract_json('longitude_auto')
-    self.latitude_custom =self.extract_json('latitude_custom')
-    self.longitude_custom =self.extract_json('longitude_custom')
+    self.period_source = self.extract_json('period_source')
+    self.location_refresh_intervals = self.extract_json('location_refresh_intervals')
+    self.network_location_provider = self.extract_json('network_location_provider')
+    self.latitude_auto = self.extract_json('latitude_auto')
+    self.longitude_auto = self.extract_json('longitude_auto')
+    self.latitude_custom = self.extract_json('latitude_custom')
+    self.longitude_custom = self.extract_json('longitude_custom')
 
     self.period_custom_start_time = [
       self.extract_json('period_0_custom_start_time'),
diff --git a/cinnamon-dynamic-wallpaper@TobiZog/metadata.json b/cinnamon-dynamic-wallpaper@TobiZog/metadata.json
index 5488a57..5f884e3 100644
--- a/cinnamon-dynamic-wallpaper@TobiZog/metadata.json
+++ b/cinnamon-dynamic-wallpaper@TobiZog/metadata.json
@@ -3,7 +3,7 @@
 	"uuid": "cinnamon-dynamic-wallpaper@TobiZog",
 	"name": "Cinnamon Dynamic Wallpaper",
 	"description": "Cinnamon extension for dynamic desktop backgrounds based on time and location",
-	"version": "2.3",
+	"version": "2.4",
 	"multiversion": true,
 	"cinnamon-version": [
 		"5.4",