Merge branch 'matrix' into napisy-matrix

xbmc · Jul 15, 2024 · 6845b31 · 6845b31
2 parents dc07b24 + 51ea9ed
commit 6845b31
Show file tree

Hide file tree

Showing 3,177 changed files with 340,829 additions and 171,206 deletions.
diff --git a/.github/workflows/addon-checker.yml b/.github/workflows/addon-checker.yml
@@ -22,7 +22,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip3 install --user kodi-addon-checker
-
     - name: Extract job variables
       shell: bash
 

diff --git a/screensaver.digitalclock/README.md b/screensaver.digitalclock/README.md
@@ -1,7 +1,7 @@
 Digital clock screensaver
 =================
 **Branches guide:**
- - **master:** Works just on Kodi v19 Codename Matrix
+ - **master:** Works on Kodi v19 Codename Matrix and up
  - **krypton:** Works on Kodi v17 Codename Krypton and on Kodi V18 Codename Leia
 
 Digital clock screensaver with a lot of options.
@@ -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.
 

diff --git a/screensaver.digitalclock/addon.xml b/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.3"
+	version="6.0.5"
 	provider-name="Vojislav Vlasic">
 	<requires>
 		<import addon="xbmc.python" version="3.0.0"/>
@@ -14,6 +14,8 @@
 		<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
 			6.0.1 (2021-1-15) - Added support for several skins and fixed a bug
@@ -26,32 +28,46 @@
 			<screenshot>resources/screenshot-2.png</screenshot>
 			<screenshot>resources/screenshot-3.png</screenshot>
 		</assets>
+		<summary lang="da_DK">Pauseskærm med digitalt ur</summary>
+		<summary lang="de_DE">Bildschirmschoner Digitaluhr</summary>
 		<summary lang="en_GB">Digital clock screensaver</summary>
+		<summary lang="es_ES">Salvapantallas Reloj digital</summary>
+		<summary lang="it_IT">Salvaschermo orologio digitale</summary>
 		<summary lang="pl_PL">Wygaszacz ekranu jako zegar cyfrowy</summary>
+		<summary lang="ru_RU">Застава &quot;Цифровые часы&quot;</summary>
 		<summary lang="sr_RS@latin">Čuvar ekrana digitalni sat</summary>
+		<summary lang="zh_CN">数字时钟屏幕保护程序</summary>
+		<description lang="da_DK">Pauseskærm med digitalt ur og dato, afspilningsinformation, vejrinformation, billeddiasshow og flere indstillinger.</description>
+		<description lang="de_DE">Bildschirmschoner mit Digitaluhr, Datum, Information über die aktuelle Wiedergabe, Wetter, Diashow und weitere Optionen.</description>
 		<description lang="en_GB">Digital clock screensaver with date, now playing information, weather information, image slideshow and several options.</description>
 		<description lang="en_NZ">Digital clock screensaver with date, now playing information, weather information, image slideshow and several options.</description>
-		<description lang="es_ES">Salvapantallas reloj digital con fecha, información de la reproducción actual, información meteorológica, imágenes y más opciones</description>
-		<description lang="fr_CA">Économiseur d'écran affichant une horloge numérique avec la date, des informations sur la lecture en cours, la météo, un diaporama d'images et plusieurs options.</description>
-		<description lang="fr_FR">Économiseur d'écran horloge numérique avec date, informations de lecture, informations météo, avec diaporama d'images et plusieurs options.</description>
-		<description lang="it_IT">Screensaver orologio digitale con data, informazioni su elementi in riproduzione, meteo, presentazione immagini e altre opzioni.</description>
+		<description lang="es_ES">Salvapantallas de reloj digital con fecha, información de reproducción actual, información meteorológica, presentación de imágenes y varias opciones.</description>
+		<description lang="fr_CA">Économiseur d&apos;écran affichant une horloge numérique avec la date, des informations sur la lecture en cours, la météo, un diaporama d&apos;images et plusieurs options.</description>
+		<description lang="fr_FR">Économiseur d&apos;écran horloge numérique avec date, informations de lecture, informations météo, avec diaporama d&apos;images et plusieurs options.</description>
+		<description lang="it_IT">Salvaschermo orologio digitale con data, informazioni su elementi in riproduzione, meteo, presentazione immagini e altre opzioni.</description>
 		<description lang="lt_LT">Skaitmeninio laikrodžio ekrano užsklanda su data, šiuo metu atkuriamo įrašo bei orų informacija, skaidrių demonstracija ar keletu kitų parinkčių</description>
 		<description lang="ms_MY">Penyelamat skrin jam digital dengan tarikh, maklumat kini dimainkan, maklumat cuaca, paparan slaid imej dan beberapa pilihan lain.</description>
 		<description lang="pl_PL">Wygaszacz ekranu wyświetlający cyfrowy zegar z datą, informacjami o aktualnie odtwarzanych mediach, o pogodzie, pokaz slajdów i kilkoma innymi opcjami.</description>
+		<description lang="ru_RU">Заставка цифровых часов, с датой, с информацией о погоде, со слайд-шоу и с несколькими опциями.</description>
 		<description lang="sr_RS">Чувар екрана дигитални сат са датумом, подацима о тренутној репродукцији, подацима о временској прогнози, репродукцијом слајдова слика и неколико опција.</description>
 		<description lang="sr_RS@latin">Čuvar ekrana digitalni sat sa datumom, podacima o trenutnoj reprodukciji, podacima o vremenskoj prognozi, reprodukcijom slajdova slika i nekoliko opcija.</description>
 		<description lang="tr_TR">Dijital saat ekran koruyucu, tarih ve saatin yanı sıra şimdi oynatılıyor bilgisi, hava durumu bilgisi, resim slayt gösterisi gibi çeşitli seçenekler sunar.</description>
+		<description lang="zh_CN">数字时钟屏幕保护程序，带有日期、当前播放信息、天气信息、图片幻灯片和多个选项。</description>
+		<disclaimer lang="da_DK">Ved fejl, anmodninger eller generelle spørgsmål, besøg tråden Pauseskærm med digital ur på Kodi-forummet.</disclaimer>
+		<disclaimer lang="de_DE">Für Fehler, Wünsche oder allgemeine Fragen den Thread „Digital clock screensaver“ im Kodi-Forum besuchen.</disclaimer>
 		<disclaimer lang="en_GB">For bugs, requests or general questions visit the Digital clock screensaver thread on the Kodi forum.</disclaimer>
 		<disclaimer lang="en_NZ">For bugs, requests or general questions visit the Digital clock screensaver thread on the Kodi forum.</disclaimer>
-		<disclaimer lang="es_ES">Para errores, peticiones o cuestiones generales visite el hilo Salvapantallas reloj digital en el foro de Kodi</disclaimer>
+		<disclaimer lang="es_ES">Para errores, peticiones o cuestiones generales visite el hilo Salvapantallas reloj digital en el foro de Kodi.</disclaimer>
 		<disclaimer lang="fr_CA">Concernant les bogues ou pour des questions générales, visitez le fil « Digital clock screensaver » du forum de Kodi.</disclaimer>
-		<disclaimer lang="fr_FR">Pour les bogues, demandes ou questions générales, merci de visiter le fil de discussion de l'économiseur d'écran horloge numérique, Digital clock screensaver, sur le forum Kodi.</disclaimer>
-		<disclaimer lang="it_IT">Per bug, richieste o domande generali visita il thread dello Screensaver orologio digitale sul forum Kodi.</disclaimer>
+		<disclaimer lang="fr_FR">Pour les bogues, demandes ou questions générales, merci de visiter le fil de discussion de l&apos;économiseur d&apos;écran horloge numérique, Digital clock screensaver, sur le forum Kodi.</disclaimer>
+		<disclaimer lang="it_IT">Per bug, richieste o domande generali visita il thread del salvaschermo orologio digitale sul forum Kodi.</disclaimer>
 		<disclaimer lang="lt_LT">Norėdami pranešti apie klaidą, pateikti prašymą ar tiesiog paklausti, aplankykite skaitmeninio laikrodžio ekrano užsklandos temą Kodi forume.</disclaimer>
 		<disclaimer lang="ms_MY">Jika ada pepijat, permintaan atau persoalan umum sila lawati bebenang Digital clock screensaver di dalam forum Kodi.</disclaimer>
 		<disclaimer lang="pl_PL">Odwiedź dedykowany wygaszaczowi wątek na forum Kodi, aby zgłosić błędy, prośbę o funkcje albo zadać ogólne pytanie.</disclaimer>
+		<disclaimer lang="ru_RU">Для сообщений об ошибках, для пожеланий, для общих вопросов, посетите тему дополнения в форуме Kodi.</disclaimer>
 		<disclaimer lang="sr_RS">За проблеме, захтеве или општа питања посетите Digital clock screensaver тему на Kodi форуму.</disclaimer>
 		<disclaimer lang="sr_RS@latin">Za probleme, zahteve ili opšta pitanja posetite Digital clock screensaver temu na Kodi forumu.</disclaimer>
 		<disclaimer lang="tr_TR">Hata bildirme, istek ve genel sorularınız için Kodi forumunda dijital saat ekran koruyucu başlığını ziyaret edebilirsiniz.</disclaimer>
+		<disclaimer lang="zh_CN">有关 bug、请求或一般问题，请访问 Kodi 论坛上的数字时钟屏幕保护程序讨论贴。</disclaimer>
 	</extension>
 </addon>
diff --git a/screensaver.digitalclock/default.py b/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"))

diff --git a/screensaver.digitalclock/resources/language/resource.language.af_za/strings.po b/screensaver.digitalclock/resources/language/resource.language.af_za/strings.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: KODI Addons\n"
 "Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-03-01 17:13+0000\n"
+"Last-Translator: Christian Gade <[email protected]>\n"
+"Language-Team: Afrikaans (South Africa) <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-digitalclock/af_za/>\n"
 "Language: af_za\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.11\n"
 
 msgctxt "Addon Summary"
 msgid "Digital clock screensaver"
@@ -85,15 +86,15 @@ msgstr ""
 
 msgctxt "#32111"
 msgid "Slow"
-msgstr ""
+msgstr "Stadig"
 
 msgctxt "#32112"
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 msgctxt "#32113"
 msgid "Fast"
-msgstr ""
+msgstr "Vinnig"
 
 # empty strings from id 32114 to 32119
 msgctxt "#32120"
@@ -193,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"
@@ -653,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 ""
diff --git a/screensaver.digitalclock/resources/language/resource.language.am_et/strings.po b/screensaver.digitalclock/resources/language/resource.language.am_et/strings.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: KODI Addons\n"
 "Report-Msgid-Bugs-To: http://trac.kodi.tv/\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kodi Translation Team\n"
-"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/kodi-addons/language/am_ET/)\n"
-"Language: am_ET\n"
+"PO-Revision-Date: 2022-03-01 17:13+0000\n"
+"Last-Translator: Christian Gade <[email protected]>\n"
+"Language-Team: Amharic (Ethiopia) <https://kodi.weblate.cloud/projects/kodi-add-ons-look-and-feel/screensaver-digitalclock/am_et/>\n"
+"Language: am_et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.11\n"
 
 msgctxt "Addon Summary"
 msgid "Digital clock screensaver"
@@ -85,15 +86,15 @@ msgstr ""
 
 msgctxt "#32111"
 msgid "Slow"
-msgstr ""
+msgstr "በዝግታ"
 
 msgctxt "#32112"
 msgid "Normal"
-msgstr ""
+msgstr "መደበኛ"
 
 msgctxt "#32113"
 msgid "Fast"
-msgstr ""
+msgstr "በፍጥነት"
 
 # empty strings from id 32114 to 32119
 msgctxt "#32120"
@@ -193,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,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 "የ ሰአት ቀለም"