Index: /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py =================================================================== --- /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py (revision 4494) +++ /ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/plugin.py (revision 4495) @@ -18,4 +18,5 @@ from Components.FileList import FileList from Components.Sources.StaticText import StaticText +from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest #import ServiceReference @@ -56,6 +57,10 @@ def main(session, **kwargs): - session.open(Addonpanel) + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": evfd.getInstance().vfd_write_string(AAF_Panel_Version) + session.open(Addonpanel) def Apanel(menuid, **kwargs): @@ -71,5 +76,5 @@ #PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 23/02/2009", where = PluginDescriptor.WHERE_MENU, fnc = Addonpanel), #// show Addonpanel in EXTENSIONS Menu - PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 23/02/2009", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main) ] + PluginDescriptor(name="Addon-Manager", description="Addonpanel AAF-Enigma2 07/11/2010", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc = main) ] font = "Regular;18" @@ -83,12 +88,37 @@ return skin + +# ------------------------------------------------------------------- +class PanelList(MenuList): + def __init__(self, list, font0 = 24, font1 = 16, itemHeight = 50, enableWrapAround = True): + MenuList.__init__(self, list, enableWrapAround, eListboxPythonMultiContent) + self.l.setFont(0, gFont("Regular", font0)) + self.l.setFont(1, gFont("Regular", font1)) + self.l.setItemHeight(itemHeight) + +def MenuEntryItem(entry): + res = [entry] + res.append(MultiContentEntryPixmapAlphaTest(pos=(2, 5), size=(100, 40), png=entry[0])) # png vorn + res.append(MultiContentEntryText(pos=(110, 10), size=(440, 40), font=0, text=entry[1])) # menupunkt +# res.append(MultiContentEntryText(pos=(10, 29), size=(340, 14), font=1, text=entry[2])) # menubeschreibung + return res + + +def AafEntryComponent(file): + png = LoadPixmap("/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/" + file + ".png") + if png == None: + png = LoadPixmap("/usr/lib/enigma2/python/Plugins/Extensions/Aafpanel/pics/default.png") + res = (png) + return res + +# ------------------------------------------------------------------- class Addonpanel(Screen): skin = """ - - - - - + + + + + @@ -140,21 +170,30 @@ self["label1"] = Label(AAF_Panel_Version) self.Mlist = [] - self["Mlist"] = MenuList(self.Mlist) - - #if os.path.exists("/tmp/netok") is True: - self.Mlist.append("Download Manager") - self.Mlist.append("Install from /tmp") - self.Mlist.append("Uninstall Plugins") - #if os.path.exists("/tmp/netok") is True: - self.Mlist.append("Update Addon-Manager") - self.Mlist.append("BA-Image Manager") + +# -- changeg by bb for the new png-menu ---------------------------------------------------------- + self.Mlist.append(MenuEntryItem((AafEntryComponent('Download Manager'), _("Download Manager"), 'Download Manager'))) + self.Mlist.append(MenuEntryItem((AafEntryComponent('Install from tmp'), _("Install from tmp"), 'Install from tmp'))) + self.Mlist.append(MenuEntryItem((AafEntryComponent('Uninstall Plugins'), _("Uninstall Plugins"), 'Uninstall Plugins'))) + self.Mlist.append(MenuEntryItem((AafEntryComponent('Update Addon-Manager'), _("Update Addon-Manager"), 'Update Addon-Manager'))) + #self.Mlist.append(MenuEntryItem((AafEntryComponent('BA-Image Manager'), _("BA-Image Manager"), 'BA-Image Manager'))) + self.onChangedEntry = [] + if (getDesktop(0).size().width() == 1280): + self["Mlist"] = PanelList([]) + else: + self["Mlist"] = PanelList([], font0=24, font1=15, itemHeight=50) + self["Mlist"].l.setList(self.Mlist) + menu = 0 + + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string( self['Mlist'].l.getCurrentSelection()[0][1] ) +# ------------------------------------------------------------------- self["key_green"] = Label(" ") self["key_red"] = Label(" ") self["key_yellow"] = Label(" ") - #if os.path.exists("/tmp/netok") is True: self["key_blue"] = Label("update") - #else: - # self["key_blue"] = Label(" ") global menu @@ -179,9 +218,18 @@ def up(self): self["Mlist"].up() - evfd.getInstance().vfd_write_string( self["Mlist"].getCurrent()) + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string( self['Mlist'].l.getCurrentSelection()[0][1] ) + def down(self): self["Mlist"].down() - evfd.getInstance().vfd_write_string( self["Mlist"].getCurrent()) + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string( self['Mlist'].l.getCurrentSelection()[0][1] ) def left(self): @@ -242,15 +290,21 @@ service = self.service.toCompareString() servicename = ServiceReference.ServiceReference(service).getServiceName().replace('\xc2\x87', '').replace('\xc2\x86', '').ljust(16) - evfd.getInstance().vfd_write_string( servicename ) + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string( servicename ) self.close() def ok(self): #// Menu Selection - menu = self["Mlist"].getCurrent() +# menu = self["Mlist"].getCurrent() +# global AAFCONF + menu = self['Mlist'].l.getCurrentSelection()[0][2] if menu == "Download Manager": self.session.open(PLUGINDownload,"/tmp/usb") elif menu == "Uninstall Plugins": self.session.open(FileBrowse) - elif menu == "Install from /tmp": + elif menu == "Install from tmp": self.session.open(TmpBrowse) elif menu == "Update Addon-Manager": @@ -1014,6 +1068,9 @@ if self.error_counter == "0": #if os.path.exists("/var/baroot/activImage") is True: - - evfd.getInstance().vfd_write_string("Install Image") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Install Image") self["statusbar"].text = _("Decompressing Image in progress...") #message = "%s" % (_("Das Image wird nun entpackt und installiert!")) @@ -1125,5 +1182,9 @@ # and now we copy the settings if config.AddonManager.ba_settings_on.value == 1: - evfd.getInstance().vfd_write_string("install Settings") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("install Settings") self["statusbar"].text = _("Settings werden uebernommen....") @@ -1221,6 +1282,9 @@ os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") - - evfd.getInstance().vfd_write_string("Image Ready!") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Image Ready!") restartbox = self.session.openWithCallback(self.restart,MessageBox,_("Das Image ist nun fertig installiert!\nSoll ein Neustart durchgefuehrt werden?"), MessageBox.TYPE_YESNO) restartbox.setTitle(_("UFS-Box starten?")) @@ -1350,5 +1414,9 @@ # is it an multiboot environment? if self.error_counter == "0": - evfd.getInstance().vfd_write_string("Settings copy") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Settings copy") # write name to userfile @@ -1366,5 +1434,9 @@ # and now we copy the settings if config.AddonManager.ba_settings_on.value == 1: - evfd.getInstance().vfd_write_string("install Settings") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("install Settings") self["statusbar"].text = _("Settings werden uebernommen....") @@ -1462,6 +1534,9 @@ os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") - - evfd.getInstance().vfd_write_string("Image Ready!") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Image Ready!") restartbox = self.session.openWithCallback(self.restart,MessageBox,_("Die Settings wurden kopiert!\nSoll ein Neustart durchgefuehrt werden?"), MessageBox.TYPE_YESNO) restartbox.setTitle(_("UFS-Box starten?")) @@ -1488,5 +1563,9 @@ # install Old-Image if self.BAtyp == "old": - evfd.getInstance().vfd_write_string("Install Image") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Install Image") self["statusbar"].text = _("Decompressing Image in progress...") @@ -1544,5 +1623,9 @@ # and now we copy the settings if config.AddonManager.ba_settings_on.value == 1: - evfd.getInstance().vfd_write_string("install Settings") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("install Settings") self["statusbar"].text = _("Settings werden uebernommen....") @@ -1640,5 +1723,9 @@ os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") - evfd.getInstance().vfd_write_string("Image Ready!") + file = open("/proc/stb/info/model", "r") + box = file.readline().strip() + file.close() + if box <> "dm8000": + evfd.getInstance().vfd_write_string("Image Ready!") #restartbox = self.session.openWithCallback(self.restart,MessageBox,_("Das Image ist nun fertig installiert!\nSoll ein Neustart durchgefuehrt werden?"), MessageBox.TYPE_YESNO) #restartbox.setTitle(_("UFS-Box starten?"))