From: Chang.H.S Date: Fri, 30 Sep 2011 11:54:14 +0000 (+0900) Subject: UI3DSetup : fix plugin name X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=6900df453fd58b36313bda718b8f15dea786b2fb UI3DSetup : fix plugin name --- diff --git a/configure.ac b/configure.ac index 2726be0..ac69b2a 100644 --- a/configure.ac +++ b/configure.ac @@ -215,8 +215,8 @@ lib/python/Plugins/SystemPlugins/Blindscan/Makefile lib/python/Plugins/SystemPlugins/Blindscan/meta/Makefile lib/python/Plugins/SystemPlugins/RemoteControlCode/Makefile lib/python/Plugins/SystemPlugins/RemoteControlCode/meta/Makefile -lib/python/Plugins/SystemPlugins/OSD3DSetup/Makefile -lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/Makefile +lib/python/Plugins/SystemPlugins/UI3DSetup/Makefile +lib/python/Plugins/SystemPlugins/UI3DSetup/meta/Makefile lib/python/Plugins/SystemPlugins/UIPositionSetup/Makefile lib/python/Plugins/SystemPlugins/UIPositionSetup/meta/Makefile lib/python/Tools/Makefile diff --git a/lib/python/Plugins/SystemPlugins/Makefile.am b/lib/python/Plugins/SystemPlugins/Makefile.am index 3d9e4b4..28c3d94 100755 --- a/lib/python/Plugins/SystemPlugins/Makefile.am +++ b/lib/python/Plugins/SystemPlugins/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = SoftwareManager FrontprocessorUpgrade PositionerSetup Satfinder \ DefaultServicesScanner NFIFlash DiseqcTester CommonInterfaceAssignment \ CrashlogAutoSubmit CleanupWizard VideoEnhancement WirelessLan NetworkWizard \ TempFanControl FactoryTest Fancontrol FPGAUpgrade WirelessLanSetup ManualFancontrol \ - Blindscan RemoteControlCode OSD3DSetup UIPositionSetup + Blindscan RemoteControlCode UI3DSetup UIPositionSetup install_PYTHON = \ __init__.py diff --git a/lib/python/Plugins/SystemPlugins/OSD3DSetup/Makefile.am b/lib/python/Plugins/SystemPlugins/OSD3DSetup/Makefile.am deleted file mode 100755 index 60a1406..0000000 --- a/lib/python/Plugins/SystemPlugins/OSD3DSetup/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -installdir = $(pkglibdir)/python/Plugins/SystemPlugins/OSD3DSetup - -SUBDIRS = meta - -install_PYTHON = \ - __init__.py \ - plugin.py diff --git a/lib/python/Plugins/SystemPlugins/OSD3DSetup/__init__.py b/lib/python/Plugins/SystemPlugins/OSD3DSetup/__init__.py deleted file mode 100755 index e69de29..0000000 diff --git a/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/Makefile.am deleted file mode 100755 index 85a9132..0000000 --- a/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -installdir = $(datadir)/meta - -dist_install_DATA = plugin_osd3dsetup.xml diff --git a/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/plugin_osd3dsetup.xml b/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/plugin_osd3dsetup.xml deleted file mode 100755 index 6a2b58a..0000000 --- a/lib/python/Plugins/SystemPlugins/OSD3DSetup/meta/plugin_osd3dsetup.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - hschang - OSD3DSetup - enigma2-plugin-systemplugins-osd3dsetup - Adjust 3D settings - Adjust 3D settings - - - - - - diff --git a/lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py b/lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py deleted file mode 100755 index 67ef166..0000000 --- a/lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py +++ /dev/null @@ -1,119 +0,0 @@ -from Screens.Screen import Screen -from Components.ConfigList import ConfigListScreen -from Components.config import config, ConfigSubsection, ConfigInteger, ConfigSelection, ConfigSlider, getConfigListEntry -from Components.Sources.StaticText import StaticText - -modelist = {"off": _("Off"), "auto": _("Auto"), "sidebyside": _("Side by Side"), "topandbottom": _("Top and Bottom")} -setmodelist = {"mode1": _("Mode 1"), "mode2": _("Mode 2")} - -config.plugins.OSD3DSetup = ConfigSubsection() -config.plugins.OSD3DSetup.mode = ConfigSelection(choices = modelist, default = "auto") -config.plugins.OSD3DSetup.znorm = ConfigInteger(default = 0) -config.plugins.OSD3DSetup.setmode = ConfigSelection(choices = setmodelist, default = "mode1") - -class OSD3DSetupScreen(Screen, ConfigListScreen): - skin = """ - - - - - - - """ - - def __init__(self, session): - self.skin = OSD3DSetupScreen.skin - Screen.__init__(self, session) - - from Components.ActionMap import ActionMap - from Components.Button import Button - self["key_red"] = StaticText(_("Cancel")) - self["key_green"] = StaticText(_("Save")) - - self["actions"] = ActionMap(["SetupActions", "ColorActions"], - { - "ok": self.keyGo, - "save": self.keyGo, - "cancel": self.keyCancel, - "green": self.keyGo, - "red": self.keyCancel, - }, -2) - - self.list = [] - ConfigListScreen.__init__(self, self.list, session = self.session) - - mode = config.plugins.OSD3DSetup.mode.value - znorm = config.plugins.OSD3DSetup.znorm.value - setmode = config.plugins.OSD3DSetup.setmode.value - - self.mode = ConfigSelection(choices = modelist, default = mode) - self.znorm = ConfigSlider(default = znorm + 50, increment = 1, limits = (0, 100)) - self.setmode = ConfigSelection(choices = setmodelist, default = setmode) - self.list.append(getConfigListEntry(_("Setup mode"), self.setmode)) - self.list.append(getConfigListEntry(_("3d mode"), self.mode)) - self.list.append(getConfigListEntry(_("Depth"), self.znorm)) - self["config"].list = self.list - self["config"].l.setList(self.list) - - def keyLeft(self): - ConfigListScreen.keyLeft(self) - self.setPreviewSettings() - - def keyRight(self): - ConfigListScreen.keyRight(self) - self.setPreviewSettings() - - def setPreviewSettings(self): - applySettings(self.mode.value, int(self.znorm.value) - 50, self.setmode.value) - - def keyGo(self): - config.plugins.OSD3DSetup.mode.value = self.mode.value - config.plugins.OSD3DSetup.znorm.value = int(self.znorm.value) - 50 - config.plugins.OSD3DSetup.setmode.value = self.setmode.value - config.plugins.OSD3DSetup.save() - self.close() - - def keyCancel(self): - setConfiguredSettings() - self.close() - -def applySettings(mode, znorm, setmode): - try: - if setmode == "mode1": - file = open("/proc/stb/fb/3dmode", "w") - file.write(mode) - file.close() - file = open("/proc/stb/fb/znorm", "w") - file.write('%d' % znorm) - file.close() - elif setmode == "mode2": - file = open("/proc/stb/fb/primary/3d","w") - if mode == "sidebyside" : - mode = "sbs" - elif mode == "topandbottom": - mode = "tab" - file.write(mode) - file.close() - file = open("/proc/stb/fb/primary/zoffset","w") - file.write('%d' % znorm) - file.close() - except: - return - -def setConfiguredSettings(): - applySettings(config.plugins.OSD3DSetup.mode.value, - int(config.plugins.OSD3DSetup.znorm.value), config.plugins.OSD3DSetup.setmode.value) - -def main(session, **kwargs): - session.open(OSD3DSetupScreen) - -def startup(reason, **kwargs): - setConfiguredSettings() - -def Plugins(**kwargs): - from os import path - if path.exists("/proc/stb/fb/3dmode") or path.exists("/proc/stb/fb/primary/3d"): - from Plugins.Plugin import PluginDescriptor - return [PluginDescriptor(name = "OSD 3D setup", description = _("Adjust 3D settings"), where = PluginDescriptor.WHERE_PLUGINMENU, fnc = main), - PluginDescriptor(name = "OSD 3D setup", description = "", where = PluginDescriptor.WHERE_SESSIONSTART, fnc = startup)] - return [] diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/Makefile.am b/lib/python/Plugins/SystemPlugins/UI3DSetup/Makefile.am new file mode 100755 index 0000000..84f738b --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/UI3DSetup/Makefile.am @@ -0,0 +1,7 @@ +installdir = $(pkglibdir)/python/Plugins/SystemPlugins/UI3DSetup + +SUBDIRS = meta + +install_PYTHON = \ + __init__.py \ + plugin.py diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/__init__.py b/lib/python/Plugins/SystemPlugins/UI3DSetup/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/Makefile.am b/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/Makefile.am new file mode 100755 index 0000000..f8c6be0 --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/Makefile.am @@ -0,0 +1,3 @@ +installdir = $(datadir)/meta + +dist_install_DATA = plugin_ui3dsetup.xml diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/plugin_ui3dsetup.xml b/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/plugin_ui3dsetup.xml new file mode 100755 index 0000000..946e6ff --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/UI3DSetup/meta/plugin_ui3dsetup.xml @@ -0,0 +1,16 @@ + + + + + + hschang + UI3DSetup + enigma2-plugin-systemplugins-ui3dsetup + Adjust 3D settings + Adjust 3D settings + + + + + + diff --git a/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py b/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py new file mode 100755 index 0000000..645b829 --- /dev/null +++ b/lib/python/Plugins/SystemPlugins/UI3DSetup/plugin.py @@ -0,0 +1,119 @@ +from Screens.Screen import Screen +from Components.ConfigList import ConfigListScreen +from Components.config import config, ConfigSubsection, ConfigInteger, ConfigSelection, ConfigSlider, getConfigListEntry +from Components.Sources.StaticText import StaticText + +modelist = {"off": _("Off"), "auto": _("Auto"), "sidebyside": _("Side by Side"), "topandbottom": _("Top and Bottom")} +setmodelist = {"mode1": _("Mode 1"), "mode2": _("Mode 2")} + +config.plugins.UI3DSetup = ConfigSubsection() +config.plugins.UI3DSetup.mode = ConfigSelection(choices = modelist, default = "auto") +config.plugins.UI3DSetup.znorm = ConfigInteger(default = 0) +config.plugins.UI3DSetup.setmode = ConfigSelection(choices = setmodelist, default = "mode1") + +class UI3DSetupScreen(Screen, ConfigListScreen): + skin = """ + + + + + + + """ + + def __init__(self, session): + self.skin = UI3DSetupScreen.skin + Screen.__init__(self, session) + + from Components.ActionMap import ActionMap + from Components.Button import Button + self["key_red"] = StaticText(_("Cancel")) + self["key_green"] = StaticText(_("Save")) + + self["actions"] = ActionMap(["SetupActions", "ColorActions"], + { + "ok": self.keyGo, + "save": self.keyGo, + "cancel": self.keyCancel, + "green": self.keyGo, + "red": self.keyCancel, + }, -2) + + self.list = [] + ConfigListScreen.__init__(self, self.list, session = self.session) + + mode = config.plugins.UI3DSetup.mode.value + znorm = config.plugins.UI3DSetup.znorm.value + setmode = config.plugins.UI3DSetup.setmode.value + + self.mode = ConfigSelection(choices = modelist, default = mode) + self.znorm = ConfigSlider(default = znorm + 50, increment = 1, limits = (0, 100)) + self.setmode = ConfigSelection(choices = setmodelist, default = setmode) + self.list.append(getConfigListEntry(_("Setup mode"), self.setmode)) + self.list.append(getConfigListEntry(_("3d mode"), self.mode)) + self.list.append(getConfigListEntry(_("Depth"), self.znorm)) + self["config"].list = self.list + self["config"].l.setList(self.list) + + def keyLeft(self): + ConfigListScreen.keyLeft(self) + self.setPreviewSettings() + + def keyRight(self): + ConfigListScreen.keyRight(self) + self.setPreviewSettings() + + def setPreviewSettings(self): + applySettings(self.mode.value, int(self.znorm.value) - 50, self.setmode.value) + + def keyGo(self): + config.plugins.UI3DSetup.mode.value = self.mode.value + config.plugins.UI3DSetup.znorm.value = int(self.znorm.value) - 50 + config.plugins.UI3DSetup.setmode.value = self.setmode.value + config.plugins.UI3DSetup.save() + self.close() + + def keyCancel(self): + setConfiguredSettings() + self.close() + +def applySettings(mode, znorm, setmode): + try: + if setmode == "mode1": + file = open("/proc/stb/fb/3dmode", "w") + file.write(mode) + file.close() + file = open("/proc/stb/fb/znorm", "w") + file.write('%d' % znorm) + file.close() + elif setmode == "mode2": + file = open("/proc/stb/fb/primary/3d","w") + if mode == "sidebyside" : + mode = "sbs" + elif mode == "topandbottom": + mode = "tab" + file.write(mode) + file.close() + file = open("/proc/stb/fb/primary/zoffset","w") + file.write('%d' % znorm) + file.close() + except: + return + +def setConfiguredSettings(): + applySettings(config.plugins.UI3DSetup.mode.value, + int(config.plugins.UI3DSetup.znorm.value), config.plugins.UI3DSetup.setmode.value) + +def main(session, **kwargs): + session.open(UI3DSetupScreen) + +def startup(reason, **kwargs): + setConfiguredSettings() + +def Plugins(**kwargs): + from os import path + if path.exists("/proc/stb/fb/3dmode") or path.exists("/proc/stb/fb/primary/3d"): + from Plugins.Plugin import PluginDescriptor + return [PluginDescriptor(name = "UI 3D setup", description = _("Adjust 3D settings"), where = PluginDescriptor.WHERE_PLUGINMENU, fnc = main), + PluginDescriptor(name = "UI 3D setup", description = "", where = PluginDescriptor.WHERE_SESSIONSTART, fnc = startup)] + return []