Skip to content

Commit

Permalink
[lcd4l] update to v 4.8-r0
Browse files Browse the repository at this point in the history
  • Loading branch information
@madie66
madie66 committed Mar 8, 2017
1 parent 94fd970 commit 7c8c485
Show file tree
Hide file tree
Showing 8 changed files with 682 additions and 218 deletions.
13 changes: 9 additions & 4 deletions LCD4linux/src/WebConfigSite.py
View file
Expand Up @@ -26,8 +26,8 @@
L2 = []
L3 = []
L4 = []
M1 = ["LCD4linux.OSD","LCD4linux.Scr","LCD4linux.Bil","LCD4linux.Wet","LCD4linux.Net","LCD4linux.Pop","LCD4linux.Fri","LCD4linux.Fon","LCD4linux.Mai","LCD4linux.Cal","LCD4linux.RBo","LCD4linux.Www","LCD4linux.Web","LCD4linux.MJP","LCD4linux.xml","LCD4linux.Tun","LCD4linux.Key","LCD4linux.Son"]
M2 = [_("OSD"),_("Screen"),_("Picture"),_("Weather"),_("Netatmo"),_("Popup-Text"),_("FritzCall"),_("Font"),_("Mail"),_("Calendar"),_("Remote Box"),_("WWW Converter"),_("WebIF"),_("MJPEG Stream"),_("Box-Skin-LCD"),_("Tuner"),_("Key"),_("Sonos")]
M1 = ["LCD4linux.OSD","LCD4linux.Scr","LCD4linux.Bil","LCD4linux.Wet","LCD4linux.Net","LCD4linux.Pop","LCD4linux.Fri","LCD4linux.Fon","LCD4linux.Mai","LCD4linux.Cal","LCD4linux.RBo","LCD4linux.Www","LCD4linux.Web","LCD4linux.MJP","LCD4linux.xml","LCD4linux.Tun","LCD4linux.Key","LCD4linux.Son","LCD4linux.YMC"]
M2 = [_("OSD"),_("Screen"),_("Picture"),_("Weather"),_("Netatmo"),_("Popup-Text"),_("FritzCall"),_("Font"),_("Mail"),_("Calendar"),_("Remote Box"),_("WWW Converter"),_("WebIF"),_("MJPEG Stream"),_("Box-Skin-LCD"),_("Tuner"),_("Key"),_("Sonos"),_("MusicCast")]

Mode = "1"
ModeOld = ""
Expand Down Expand Up @@ -152,7 +152,7 @@ def action(self, req):
L4logE("IP2:",req.client.host)
if IP.find(".") == -1:
IP = None
if IP is None:
if IP is None:
Block = False
else:
Block = True
Expand All @@ -178,7 +178,8 @@ def action(self, req):
html += "<meta http-equiv=\"expires\" content=\"0\">\n"
html += "</head>"
html += "Config-WebIF Access Deny ( IP: %s )<br>\n" % IP
html += "(Global Setup > %s)\n" % _l(_("WebIF IP Allow"))
html += "Please check Setting in Global > %s\n" % _l(_("WebIF IP Allow"))
html += "Default is: 127. 192.168. 172. 10.\n"
html += "</body>\n"
html += "</html>\n"
return html
Expand Down Expand Up @@ -324,6 +325,10 @@ def action(self, req):
return "0"
else:
return str(getMJPEGreader(ex[0]))
elif command[0] == "getexec" and ex is not None:
L4logE("getexec",ex[0])
exec("getexec = " + ex[0])
return str(getexec)
elif command[0] == "copyMP":
for a in req.args.keys():
if ".Standby" in a:
Expand Down
3 changes: 2 additions & 1 deletion LCD4linux/src/WebSite.py
View file
Expand Up @@ -36,7 +36,8 @@ def render(self, req):
JavaRefresh = ""
html += "<meta http-equiv=\"refresh\" content=\"%s\">\n" % LCD4linux.WebIfRefresh.value
else:
html += "<meta http-equiv=\"refresh\" content=\"300\">\n"
if LCD4linux.WebIfType.value == "0":
html += "<meta http-equiv=\"refresh\" content=\"300\">\n"
JavaRefresh = " id=\"reloader%%d\" onload=\"setTimeout('document.getElementById(\\'reloader%%d\\').src=\\'/lcd4linux/%%s?\\'+new Date().getTime()', %d)\"" % (int(LCD4linux.WebIfRefresh.value)*1000)
html += "<title>LCD4linux</title>\n"
html += "</head>"
Expand Down
18 changes: 11 additions & 7 deletions LCD4linux/src/__init__.py
View file
@@ -1,19 +1,23 @@
# -*- coding: utf-8 -*-
from Components.Language import language
from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
import os, gettext
import os,gettext

PluginLanguageDomain = "LCD4linux"
PluginLanguagePath = "Extensions/LCD4linux/locale"

def localeInit():
lang = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
os.environ["LANGUAGE"] = lang # Enigma doesn't set this (or LC_ALL, LC_MESSAGES, LANG). gettext needs it!
# print "[" + PluginLanguageDomain + "] set language to ", lang
gettext.bindtextdomain(PluginLanguageDomain, resolveFilename(SCOPE_PLUGINS, PluginLanguagePath))

def _(txt):
if gettext.dgettext(PluginLanguageDomain, txt):
return gettext.dgettext(PluginLanguageDomain, txt)
else:
print "[" + PluginLanguageDomain + "] fallback to default translation for " + txt
return gettext.gettext(txt)
t = gettext.dgettext(PluginLanguageDomain, txt)
if t == txt:
# print "[" + PluginLanguageDomain + "] fallback to default translation for ", txt
t = gettext.gettext(txt)
return t

language.addCallback(localeInit())
localeInit()
language.addCallback(localeInit)
Binary file modified LCD4linux/src/data/HDDa.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LCD4linux/src/data/HDDs.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 72 additions & 0 deletions LCD4linux/src/data/skin_data.xml
View file
Expand Up @@ -11,6 +11,10 @@
<screen name="MenuSummary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--SetupSummary-->
<screen name="SetupSummary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--SimpleSummary-->
<screen name="SimpleSummary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
Expand All @@ -19,6 +23,30 @@
<screen name="ChannelSelectionRadio_summary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--InfoBarSummary-->
<screen name="InfoBarSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--ChannelSelection_summary-->
<screen name="ChannelSelection_summary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MenuSummary-->
<screen name="MenuSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--SetupSummary-->
<screen name="SetupSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--SimpleSummary-->
<screen name="SimpleSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--ChannelSelectionRadio_summary-->
<screen name="ChannelSelectionRadio_summary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>

<!--L4L01-->

Expand All @@ -27,6 +55,10 @@
<screen name="InfoBarMoviePlayerSummary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MovieSelection_summary-->
<screen name="MovieSelection_summary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MediaPlayerLCDScreen-->
<screen name="MediaPlayerLCDScreen" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
Expand All @@ -47,13 +79,53 @@
<screen name="webradioFSdisplay" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--webradio YANP-->
<screen name="YampLCDScreen" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--InfoBarMoviePlayerSummary-->
<screen name="InfoBarMoviePlayerSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MovieSelection_summary-->
<screen name="MovieSelection_summary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MediaPlayerLCDScreen-->
<screen name="MediaPlayerLCDScreen" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--MediaPlayer-->
<screen name="MediaPlayer_summary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--EMCMoviePlayerSummary-->
<screen name="EMCMoviePlayerSummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!-- EMC screen -->
<screen name="EMCMoviePlayerSummaryGBHDQ" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--webradio FSdisplay-->
<screen name="webradioFSdisplay" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--webradio YANP-->
<screen name="YampLCDScreen" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--L4L02-->

<!--L4L03 Idle-->
<!--StandbySummary-->
<screen name="StandbySummary" position="0,0" size="$w$,$h$">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--StandbySummary-->
<screen name="StandbySummary" position="0,0" size="$w$,$h$" id="3">
<widget source="global.CurrentTime" render="PixmapLcd4linux" position="0,0" size="$w$,$h$" alphatest="blend" />
</screen>
<!--L4L03-->
######################################################################

Expand Down

3 comments on commit 7c8c485

@opendroid-Team
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crash vu duo 2
File "/usr/lib/enigma2/python/Plugins/Extensions/LCD4linux/plugin.py", line 7961, in CallCheckRefresh
if L4LElist.getRefresh() == True:
IndexError: tuple index out of range

@atvcaptain
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

debug and fix it

@opendroid-Team
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is a problem we just us???

Please sign in to comment.