Merge remote-tracking branch 'upstream/matrix' into matrix

screensaver.digitalclock/README.md

@@ -87,60 +87,33 @@ __Extra Options__
 - Enable RSS (The screensaver will show the same RSS Kodi shows, so make sure it's properly configured and enabled in Kodi)
 
 This screensaver is configured for every skin separately since it has to use Fonts defined by the skin!
-
-Skin developers have an option to use script-screensaver-digitalclock-custom.xml in their skins 1080i, 720p... folder.
-They should provide and maintain that xml file with their skin!
-Screensaver will check for skin folders in this order: 1080i, 720p, 21x9, 16x9, 4x3Hirez.
-If no script-screensaver-digitalclock-custom.xml is found screensaver will look for an appropriate xml file within screensavers folder.
 If there is no appropriate xml file it will use skin.default.xml
 
-If the skin is not on the list screensaver will use default font names from confluence (It might not look pretty but it will work with any skin):
-
-- Ace2
-- Adonic
-- Aeon Nox 5
+If the skin is not on the list below screensaver will use default font names from confluence (It might not look pretty but it will work with any skin).
+List of supported skins (If the skin is in the official repository it will be supported):
 - Aeon Nox Silvo
-- Aeon Tajo
-- Aeon MQ5
-- Aeon MQ5
-- Aeon MQ6
-- Aeon MQ8
+- Aeon MQ7 (Matrix mod)
+- Aeon MQ8 (Matrix mod, Nexus mod)
+- Aeon MQ9
 - Amber
 - AppTV
-- Arctic: Zephyr
-- Arctic: Zephyr 2
-- Aura
-- Bello 6
-- Bello 7
-- Black Glass Nova
-- Box
-- Chroma
+- Arctic: Zephyr - Reloaded
+- Bello 8
 - Confluence
-- Embuary-Leia
+- EllipsisUI
+- Embuary-Matrix
 - Eminence.2
 - Estouchy
 - Estuary
 - Ftv
-- (Fuse)neue
-- Grid
-- Horizon
-- Madnox
 - Metropolis
-- Mimic
-- Nebula
-- Omni
+- Mimic-LR
 - OSMC
 - Pellucid
-- Phenomenal
 - Quartz
 - Rapier
-- Retouched
-- Reestuarized
-- Revolve
-- Titan
-- Transparency
+- TetradUI
 - Unity
-- Xperience1080
 
 If your skin is not on the list, and you would like it to be - send me a message.
 

screensaver.digitalclock/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="screensaver.digitalclock"
 	name="Digital Clock Screensaver"
-	version="6.0.4"
+	version="6.0.5"
 	provider-name="Vojislav Vlasic">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
@@ -14,6 +14,7 @@
 		<forum>https://forum.kodi.tv/showthread.php?tid=237338</forum>
 		<source>https://github.com/vdb86/screensaver.digitalclock</source>
 		<news>
+			6.0.5 (2024-1-2) - Added support for AeonMQ7 matrix mod, AeonMQ8 mods, for AeonMQ9, Arctic Zephyr - Reloaded, EllipsisUI, Embuary-Matrix, Mimic-LR, TetradUI, updated OSMC skin - thanks Ch1llb0 and petroid! Improved handling of no hour zero padding, added 2 more time formats, added support for turning off screen via CEC	
 			6.0.4 (2023-8-16) - Translations and a visual improvement for ftv skin - thanks Kevin!
 			6.0.3 (2021-9-7) - Bug fixes and translations
 			6.0.2 (2021-1-20) - Got skin.helper.backgrounds to work again

screensaver.digitalclock/default.py

@@ -74,6 +74,8 @@ def onInit(self):
         self.logoutcounter = 0
         self.switch = 0
         self.iconswitch = 0
+        self.turnedoff = 0
+        self.ceccounter = 0
         self.movementtype = int(Addon.getSetting('movementtype'))
         self.movementspeed = int(Addon.getSetting('movementspeed'))
         self.stayinplace = int(Addon.getSetting('stayinplace'))
@@ -134,6 +136,9 @@ def onInit(self):
         self.logout = Addon.getSetting('logout')
         self.logoutplaying = Addon.getSetting('logoutplaying')
         self.logouttime = int(Addon.getSetting('logouttime'))
+        self.cecoff = Addon.getSetting('cecoff')
+        self.cecoffplaying = Addon.getSetting('cecoffplaying')
+        self.cecofftime = int(Addon.getSetting('cecofftime'))
         self.rss = Addon.getSetting('rss')
         self.monitor = xbmc.Monitor()
 
@@ -335,8 +340,8 @@ def onInit(self):
             self.icon_control.setImage(os.path.join(path,"resources/weathericons/",self.weathericonset[int(self.weathericonf)],xbmc.getInfoLabel('Window(Weather).Property(Current.FanartCode)')) + ".png")
 
 		#setting up the time format
-        self.timeformat = ['%H','%I','%I','%#I','%#I','%-I','%-I']
-        if self.timef == '2' or self.timef == '4' or self.timef == '6':
+        self.timeformat = ['%H','%I','%I','%#H','%#I','%#I','%-H','%-I','%-I']
+        if self.timef == '2' or self.timef == '5' or self.timef == '8':
            self.ampm_control.setVisible(True)
         self.time = self.timeformat[int(self.timef)]
 
@@ -450,18 +455,25 @@ def DisplayTime(self):
             if self.logout == 'true' and xbmc.getCondVisibility('Window.Previous(loginscreen)') == 0:
                 self.logoutcounter +=1
                 if self.logoutcounter >= (self.multiplier*self.logouttime*60):
-                    if xbmc.getCondVisibility('Player.HasMedia') == 1:
-                        if self.logoutplaying == 'true':
-                            xbmc.executebuiltin("PlayerControl(Stop)")
-                            xbmc.log('Digital Clock Screensaver %s: Stopping media' %Addonversion)
-                            xbmc.executebuiltin("System.LogOff")
-                            xbmc.log('Digital Clock Screensaver %s: Logging out' %Addonversion)
-                            self.logoutcounter = 0
-                    else:
-                        xbmc.executebuiltin("System.LogOff")
-                        xbmc.log('Digital Clock Screensaver %s: Logging out' %Addonversion)
-                        self.logoutcounter = 0
-
+                    if self.logoutplaying == 'true' and xbmc.getCondVisibility('Player.HasMedia') == 1:
+                        xbmc.executebuiltin("PlayerControl(Stop)")
+                        xbmc.log('Digital Clock Screensaver %s: Stopping media' %Addonversion)
+                    xbmc.executebuiltin("System.LogOff")
+                    xbmc.log('Digital Clock Screensaver %s: Logging out' %Addonversion)
+                    self.logoutcounter = 0
+
+			#Turn off screen via CEC
+            if self.cecoff == 'true' and self.turnedoff == 0:
+                self.ceccounter +=1
+                if self.ceccounter >= (self.multiplier*self.cecofftime*60):
+                    if self.cecoffplaying == 'true' and xbmc.getCondVisibility('Player.HasMedia') == 1:
+                        xbmc.executebuiltin("PlayerControl(Stop)")
+                        xbmc.log('Digital Clock Screensaver %s: Stopping media' %Addonversion)
+                    xbmc.executebuiltin("CECStandby")
+                    xbmc.log('Digital Clock Screensaver %s: Turning screen off via CEC' %Addonversion)
+                    self.ceccounter = 0
+                    self.turnedoff = 1
+
             self.monitor.waitForAbort(self.waittimer)
 
     def setCTR(self):
@@ -506,7 +518,10 @@ def setCTR(self):
             self.shadowcolor = self.rtr + self.shadowcolor[2:]
 
     def Display(self):
-        self.hour_control.setLabel(datetime.now().strftime(self.time))
+        if int(self.timef) == 4 or int(self.timef) == 5 or int(self.timef) == 7 or int(self.timef) == 8 or ((int(self.timef) == 3 or int(self.timef) == 6) and int(datetime.now().strftime(self.time))<10):
+            self.hour_control.setLabel('  ' + datetime.now().strftime(self.time))
+        else:
+            self.hour_control.setLabel(datetime.now().strftime(self.time))
         self.colon_control.setLabel(" : ")
         self.minute_control.setLabel(datetime.now().strftime("%M"))
         self.ampm_control.setLabel(datetime.now().strftime("%p"))

screensaver.digitalclock/resources/language/resource.language.af_za/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-01 17:13+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -194,6 +194,15 @@ msgctxt "#32173"
 msgid "Year: yy(2-digit year) yyyy(4-digit year)"
 msgstr ""
 
+# empty strings from id 32174 to 32179
+msgctxt "#32180"
+msgid "17:14 No hour zero padding Windows"
+msgstr ""
+
+msgctxt "#32181"
+msgid "17:14 No hour zero padding Unix"
+msgstr ""
+
 # empty strings from id 32174 to 32199
 msgctxt "#32200"
 msgid "Enable additional information"
@@ -654,3 +663,15 @@ msgstr ""
 msgctxt "#32621"
 msgid "RSS needs to be properly configured in Kodi and enabled!"
 msgstr ""
+
+msgctxt "#32630"
+msgid "Turn off screen via CEC"
+msgstr ""
+
+msgctxt "#32631"
+msgid "Stop now playing media"
+msgstr ""
+
+msgctxt "#32632"
+msgid "Turn off screen via CEC after (minutes)"
+msgstr ""

screensaver.digitalclock/resources/language/resource.language.am_et/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-01 17:13+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -194,6 +194,15 @@ msgctxt "#32173"
 msgid "Year: yy(2-digit year) yyyy(4-digit year)"
 msgstr ""
 
+# empty strings from id 32174 to 32179
+msgctxt "#32180"
+msgid "17:14 No hour zero padding Windows"
+msgstr ""
+
+msgctxt "#32181"
+msgid "17:14 No hour zero padding Unix"
+msgstr ""
+
 # empty strings from id 32174 to 32199
 msgctxt "#32200"
 msgid "Enable additional information"
@@ -655,6 +664,18 @@ msgctxt "#32621"
 msgid "RSS needs to be properly configured in Kodi and enabled!"
 msgstr ""
 
+msgctxt "#32630"
+msgid "Turn off screen via CEC"
+msgstr ""
+
+msgctxt "#32631"
+msgid "Stop now playing media"
+msgstr ""
+
+msgctxt "#32632"
+msgid "Turn off screen via CEC after (minutes)"
+msgstr ""
+
 #~ msgctxt "#32310"
 #~ msgid "Hour color"
 #~ msgstr "የ ሰአት ቀለም"

screensaver.digitalclock/resources/language/resource.language.ar_sa/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-01 17:13+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -194,6 +194,15 @@ msgctxt "#32173"
 msgid "Year: yy(2-digit year) yyyy(4-digit year)"
 msgstr ""
 
+# empty strings from id 32174 to 32179
+msgctxt "#32180"
+msgid "17:14 No hour zero padding Windows"
+msgstr ""
+
+msgctxt "#32181"
+msgid "17:14 No hour zero padding Unix"
+msgstr ""
+
 # empty strings from id 32174 to 32199
 msgctxt "#32200"
 msgid "Enable additional information"
@@ -654,3 +663,15 @@ msgstr ""
 msgctxt "#32621"
 msgid "RSS needs to be properly configured in Kodi and enabled!"
 msgstr ""
+
+msgctxt "#32630"
+msgid "Turn off screen via CEC"
+msgstr ""
+
+msgctxt "#32631"
+msgid "Stop now playing media"
+msgstr ""
+
+msgctxt "#32632"
+msgid "Turn off screen via CEC after (minutes)"
+msgstr ""

screensaver.digitalclock/resources/language/resource.language.az_az/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-01 17:13+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -194,6 +194,15 @@ msgctxt "#32173"
 msgid "Year: yy(2-digit year) yyyy(4-digit year)"
 msgstr ""
 
+# empty strings from id 32174 to 32179
+msgctxt "#32180"
+msgid "17:14 No hour zero padding Windows"
+msgstr ""
+
+msgctxt "#32181"
+msgid "17:14 No hour zero padding Unix"
+msgstr ""
+
 # empty strings from id 32174 to 32199
 msgctxt "#32200"
 msgid "Enable additional information"
@@ -654,3 +663,15 @@ msgstr ""
 msgctxt "#32621"
 msgid "RSS needs to be properly configured in Kodi and enabled!"
 msgstr ""
+
+msgctxt "#32630"
+msgid "Turn off screen via CEC"
+msgstr ""
+
+msgctxt "#32631"
+msgid "Stop now playing media"
+msgstr ""
+
+msgctxt "#32632"
+msgid "Turn off screen via CEC after (minutes)"
+msgstr ""

screensaver.digitalclock/resources/language/resource.language.be_by/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KODI Addons\n"
-"Report-Msgid-Bugs-To: translations@kodi.tv\n"
+"Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2022-03-21 04:13+0000\n"
 "Last-Translator: Christian Gade <[email protected]>\n"
@@ -194,6 +194,15 @@ msgctxt "#32173"
 msgid "Year: yy(2-digit year) yyyy(4-digit year)"
 msgstr ""
 
+# empty strings from id 32174 to 32179
+msgctxt "#32180"
+msgid "17:14 No hour zero padding Windows"
+msgstr ""
+
+msgctxt "#32181"
+msgid "17:14 No hour zero padding Unix"
+msgstr ""
+
 # empty strings from id 32174 to 32199
 msgctxt "#32200"
 msgid "Enable additional information"
@@ -654,3 +663,15 @@ msgstr ""
 msgctxt "#32621"
 msgid "RSS needs to be properly configured in Kodi and enabled!"
 msgstr ""
+
+msgctxt "#32630"
+msgid "Turn off screen via CEC"
+msgstr ""
+
+msgctxt "#32631"
+msgid "Stop now playing media"
+msgstr ""
+
+msgctxt "#32632"
+msgid "Turn off screen via CEC after (minutes)"
+msgstr ""