From 1643a3d393e9a21208591bf65bac9ded980b7138 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Sep 2023 14:51:26 +0200 Subject: [PATCH] 1.1.10 --- CONTROL/control | 2 +- src/Makefile.am | 2 + src/Version.py | 26 ++ src/skin/screen_AC3LipSync.xmlinc | 17 + src/skin/screen_About.xmlinc | 4 +- src/skin/screen_AudioSelection.xmlinc | 55 +++ src/skin/screen_AutoMountManager.xmlinc | 1 - src/skin/screen_AutoTimerEditor.xmlinc | 1 - src/skin/screen_AutoTimerFilterEditor.xmlinc | 1 - src/skin/screen_AutoTimerImporter.xmlinc | 2 +- src/skin/screen_AutoTimerServiceEditor.xmlinc | 1 - src/skin/screen_ChannelSelection.xmlinc | 1 - ...een_ChannelSelectionDisplaySettings.xmlinc | 4 +- src/skin/screen_ChannelSelectionRadio.xmlinc | 1 - src/skin/screen_Console.xmlinc | 3 +- src/skin/screen_DefaultSatLists.xmlinc | 1 - .../screen_EPGRefreshConfiguration.xmlinc | 1 - ...eshConfigurationFunctionContextMenu.xmlinc | 8 +- .../screen_EPGRefreshServiceEditor.xmlinc | 1 - src/skin/screen_EPGSearch.xmlinc | 1 - src/skin/screen_EPGSelection.xmlinc | 1 - src/skin/screen_EPGSelectionMulti.xmlinc | 1 - src/skin/screen_EventView.xmlinc | 1 - src/skin/screen_GraphMultiEPG.xmlinc | 1 - src/skin/screen_HarddiskDriveSelection.xmlinc | 1 - src/skin/screen_InputDeviceManagement.xmlinc | 1 - src/skin/screen_InputDeviceSelection.xmlinc | 1 - src/skin/screen_InputDeviceSetup.xmlinc | 1 - src/skin/screen_MovieSelection.xmlinc | 1 - src/skin/screen_NetworkBrowser.xmlinc | 1 - src/skin/screen_NetworkServiceConfig.xmlinc | 1 - src/skin/screen_NetworkServiceNSConfig.xmlinc | 1 - src/skin/screen_PluginBrowser.xmlinc | 8 +- src/skin/screen_SimpleChannelSelection.xmlinc | 1 - src/skin/screen_SkinSelector.xmlinc | 4 +- src/skin/screen_StorageInformation.xmlinc | 17 + src/skin/screen_TextBox.xmlinc | 5 +- src/skin/screen_TimeDateInput.xmlinc | 8 +- src/skin/screen_TimerEditList.xmlinc | 1 - src/skin/screen_TimerLog.xmlinc | 1 - src/skin/screen_TimerSanityConflict.xmlinc | 9 +- src/skin/screen_VideoSetup.xmlinc | 2 +- src/skin/screen_picshow.xmlinc | 1 - src/skin/screenpart_4Buttons_name.xmlinc | 1 + src/skin/screenpart_4Buttons_source.xmlinc | 1 + src/skin/screenpart_Text_OK_Popup.xmlinc | 2 - src/skin/screenpart_TitleAbout.xmlinc | 6 - src/skin/screenpart_TitleOnly.xmlinc | 3 - src/skin/skin.xml | 425 ++++++++---------- src/skin/skin_src.xml | 3 + 50 files changed, 336 insertions(+), 307 deletions(-) create mode 100644 src/Version.py create mode 100644 src/skin/screen_AC3LipSync.xmlinc create mode 100644 src/skin/screen_AudioSelection.xmlinc create mode 100644 src/skin/screen_StorageInformation.xmlinc delete mode 100644 src/skin/screenpart_Text_OK_Popup.xmlinc delete mode 100644 src/skin/screenpart_TitleAbout.xmlinc diff --git a/CONTROL/control b/CONTROL/control index c13cf04..6da25e6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,6 +1,6 @@ Description: Shadow-FHD Maintainer: dream-alpha Package: enigma2-skin-shadow-fhd -Version: 1.1.3 +Version: 1.1.10 Architecture: all Depends: enigma2-plugin-skincomponents-compatibilitycomponents, enigma2-plugin-systemplugins-componentscockpit, enigma2-plugin-skincomponents-extaudioinfo, enigma2-plugin-skincomponents-extchnumber, enigma2-plugin-skincomponents-extdiskspaceinfo, enigma2-plugin-skincomponents-exteventname, enigma2-plugin-skincomponents-extmovieinfo, enigma2-plugin-skincomponents-extvolumetext, enigma2-plugin-skincomponents-eventlist, enigma2-plugin-skincomponents-serviceresolution, enigma2-plugin-skincomponents-extvolumetext, enigma2-plugin-skincomponents-extcaidinfo diff --git a/src/Makefile.am b/src/Makefile.am index 5a37dd4..276fc56 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1,3 @@ +installdir = /usr/share/enigma2/Shadow-FHD SUBDIRS = skin +install_PYTHON = *.py diff --git a/src/Version.py b/src/Version.py new file mode 100644 index 0000000..e24a981 --- /dev/null +++ b/src/Version.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# coding=utf-8 +# +# Copyright (C) 2018-2023 by dream-alpha +# +# In case of reuse of this source code please do not remove this copyright. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# For more information on the GNU General Public License see: +# . + + +PLUGIN = "Shadow-FHD" +ID = "SHA" +VERSION = "1.1.10" +COPYRIGHT = "2018-2023 by dream-alpha" +LICENSE = "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." diff --git a/src/skin/screen_AC3LipSync.xmlinc b/src/skin/screen_AC3LipSync.xmlinc new file mode 100644 index 0000000..8fc22e5 --- /dev/null +++ b/src/skin/screen_AC3LipSync.xmlinc @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/skin/screen_About.xmlinc b/src/skin/screen_About.xmlinc index f54e9d2..4f6e05f 100644 --- a/src/skin/screen_About.xmlinc +++ b/src/skin/screen_About.xmlinc @@ -1,6 +1,8 @@ - + + + diff --git a/src/skin/screen_AudioSelection.xmlinc b/src/skin/screen_AudioSelection.xmlinc new file mode 100644 index 0000000..effebb7 --- /dev/null +++ b/src/skin/screen_AudioSelection.xmlinc @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + {"templates": + {"default":(45,[ + MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), + MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), + MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), + MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), + MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), + ],True,"showNever"), + "notselected":(45,[ + MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), + MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), + MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), + MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), + MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), + ],False,"showNever"), + "subs":(45,[ + MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), + MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), + MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), + MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), + MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), + ],True,"showNever"), + "subs_notselected":(45,[ + MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), + MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), + MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), + MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), + MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), + ],False,"showNever")}, + "fonts":[gFont("Regular",28),gFont("Regular",22)],"itemHeight":45} + + + + diff --git a/src/skin/screen_AutoMountManager.xmlinc b/src/skin/screen_AutoMountManager.xmlinc index bea819c..c5f759a 100644 --- a/src/skin/screen_AutoMountManager.xmlinc +++ b/src/skin/screen_AutoMountManager.xmlinc @@ -11,5 +11,4 @@ "fonts":[gFont("Bold",26),gFont("Regular",22)],"itemHeight":100} - diff --git a/src/skin/screen_AutoTimerEditor.xmlinc b/src/skin/screen_AutoTimerEditor.xmlinc index dc5e487..7ce68b9 100644 --- a/src/skin/screen_AutoTimerEditor.xmlinc +++ b/src/skin/screen_AutoTimerEditor.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_AutoTimerFilterEditor.xmlinc b/src/skin/screen_AutoTimerFilterEditor.xmlinc index d62ac9d..2208c0c 100644 --- a/src/skin/screen_AutoTimerFilterEditor.xmlinc +++ b/src/skin/screen_AutoTimerFilterEditor.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_AutoTimerImporter.xmlinc b/src/skin/screen_AutoTimerImporter.xmlinc index b9a038f..3576b86 100644 --- a/src/skin/screen_AutoTimerImporter.xmlinc +++ b/src/skin/screen_AutoTimerImporter.xmlinc @@ -1,7 +1,7 @@ - + diff --git a/src/skin/screen_AutoTimerServiceEditor.xmlinc b/src/skin/screen_AutoTimerServiceEditor.xmlinc index bf8fd2b..01d6513 100644 --- a/src/skin/screen_AutoTimerServiceEditor.xmlinc +++ b/src/skin/screen_AutoTimerServiceEditor.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_ChannelSelection.xmlinc b/src/skin/screen_ChannelSelection.xmlinc index 408d050..cf21b2a 100644 --- a/src/skin/screen_ChannelSelection.xmlinc +++ b/src/skin/screen_ChannelSelection.xmlinc @@ -4,5 +4,4 @@ - diff --git a/src/skin/screen_ChannelSelectionDisplaySettings.xmlinc b/src/skin/screen_ChannelSelectionDisplaySettings.xmlinc index 54c2364..d0282d5 100644 --- a/src/skin/screen_ChannelSelectionDisplaySettings.xmlinc +++ b/src/skin/screen_ChannelSelectionDisplaySettings.xmlinc @@ -1,7 +1,7 @@ - + - + diff --git a/src/skin/screen_ChannelSelectionRadio.xmlinc b/src/skin/screen_ChannelSelectionRadio.xmlinc index 6557546..a8d45c2 100644 --- a/src/skin/screen_ChannelSelectionRadio.xmlinc +++ b/src/skin/screen_ChannelSelectionRadio.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_Console.xmlinc b/src/skin/screen_Console.xmlinc index 60cd72a..b671d26 100644 --- a/src/skin/screen_Console.xmlinc +++ b/src/skin/screen_Console.xmlinc @@ -1,4 +1,5 @@ - + + diff --git a/src/skin/screen_DefaultSatLists.xmlinc b/src/skin/screen_DefaultSatLists.xmlinc index 6fc8772..c50a3c7 100644 --- a/src/skin/screen_DefaultSatLists.xmlinc +++ b/src/skin/screen_DefaultSatLists.xmlinc @@ -5,7 +5,6 @@ - diff --git a/src/skin/screen_EPGRefreshConfiguration.xmlinc b/src/skin/screen_EPGRefreshConfiguration.xmlinc index c364bda..2d2936c 100644 --- a/src/skin/screen_EPGRefreshConfiguration.xmlinc +++ b/src/skin/screen_EPGRefreshConfiguration.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_EPGRefreshConfigurationFunctionContextMenu.xmlinc b/src/skin/screen_EPGRefreshConfigurationFunctionContextMenu.xmlinc index d254784..bf0a65a 100644 --- a/src/skin/screen_EPGRefreshConfigurationFunctionContextMenu.xmlinc +++ b/src/skin/screen_EPGRefreshConfigurationFunctionContextMenu.xmlinc @@ -1,11 +1,9 @@ - + - - - + - {"template":[MultiContentEntryText(pos=(10,0),size=(900,50),flags=RT_VALIGN_CENTER,text=0)], + {"template":[MultiContentEntryText(pos=(10,0),size=(eval($screen_width-60),50),flags=RT_VALIGN_CENTER,text=0)], "fonts":[gFont("Regular",26)],"itemHeight":50} diff --git a/src/skin/screen_EPGRefreshServiceEditor.xmlinc b/src/skin/screen_EPGRefreshServiceEditor.xmlinc index b4637da..5b8770f 100644 --- a/src/skin/screen_EPGRefreshServiceEditor.xmlinc +++ b/src/skin/screen_EPGRefreshServiceEditor.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_EPGSearch.xmlinc b/src/skin/screen_EPGSearch.xmlinc index c2660ae..38a65d7 100644 --- a/src/skin/screen_EPGSearch.xmlinc +++ b/src/skin/screen_EPGSearch.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_EPGSelection.xmlinc b/src/skin/screen_EPGSelection.xmlinc index 544c882..4bd973a 100644 --- a/src/skin/screen_EPGSelection.xmlinc +++ b/src/skin/screen_EPGSelection.xmlinc @@ -12,5 +12,4 @@ FullDescription - diff --git a/src/skin/screen_EPGSelectionMulti.xmlinc b/src/skin/screen_EPGSelectionMulti.xmlinc index 6377d0d..9e864f3 100644 --- a/src/skin/screen_EPGSelectionMulti.xmlinc +++ b/src/skin/screen_EPGSelectionMulti.xmlinc @@ -1,6 +1,5 @@ - diff --git a/src/skin/screen_EventView.xmlinc b/src/skin/screen_EventView.xmlinc index 4f2c5ed..1a9a0e9 100644 --- a/src/skin/screen_EventView.xmlinc +++ b/src/skin/screen_EventView.xmlinc @@ -8,5 +8,4 @@ - diff --git a/src/skin/screen_GraphMultiEPG.xmlinc b/src/skin/screen_GraphMultiEPG.xmlinc index b1c22f7..a9e7058 100644 --- a/src/skin/screen_GraphMultiEPG.xmlinc +++ b/src/skin/screen_GraphMultiEPG.xmlinc @@ -15,5 +15,4 @@ - diff --git a/src/skin/screen_HarddiskDriveSelection.xmlinc b/src/skin/screen_HarddiskDriveSelection.xmlinc index 09cccf3..149863c 100644 --- a/src/skin/screen_HarddiskDriveSelection.xmlinc +++ b/src/skin/screen_HarddiskDriveSelection.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_InputDeviceManagement.xmlinc b/src/skin/screen_InputDeviceManagement.xmlinc index 8c78350..62d961e 100644 --- a/src/skin/screen_InputDeviceManagement.xmlinc +++ b/src/skin/screen_InputDeviceManagement.xmlinc @@ -13,5 +13,4 @@ - diff --git a/src/skin/screen_InputDeviceSelection.xmlinc b/src/skin/screen_InputDeviceSelection.xmlinc index ab73191..e1f8b3a 100644 --- a/src/skin/screen_InputDeviceSelection.xmlinc +++ b/src/skin/screen_InputDeviceSelection.xmlinc @@ -8,7 +8,6 @@ "fonts":[gFont("Regular",28)],"itemHeight":60} - diff --git a/src/skin/screen_InputDeviceSetup.xmlinc b/src/skin/screen_InputDeviceSetup.xmlinc index 87c029a..bfe974b 100644 --- a/src/skin/screen_InputDeviceSetup.xmlinc +++ b/src/skin/screen_InputDeviceSetup.xmlinc @@ -2,7 +2,6 @@ - diff --git a/src/skin/screen_MovieSelection.xmlinc b/src/skin/screen_MovieSelection.xmlinc index 4eabda7..82fdc47 100644 --- a/src/skin/screen_MovieSelection.xmlinc +++ b/src/skin/screen_MovieSelection.xmlinc @@ -2,7 +2,6 @@ - Name diff --git a/src/skin/screen_NetworkBrowser.xmlinc b/src/skin/screen_NetworkBrowser.xmlinc index b05da95..2f9e179 100644 --- a/src/skin/screen_NetworkBrowser.xmlinc +++ b/src/skin/screen_NetworkBrowser.xmlinc @@ -12,6 +12,5 @@ "fonts":[gFont("Bold",30),gFont("Regular",24)],"itemHeight":80} - diff --git a/src/skin/screen_NetworkServiceConfig.xmlinc b/src/skin/screen_NetworkServiceConfig.xmlinc index e6aa0f4..f4d882e 100644 --- a/src/skin/screen_NetworkServiceConfig.xmlinc +++ b/src/skin/screen_NetworkServiceConfig.xmlinc @@ -18,6 +18,5 @@ - diff --git a/src/skin/screen_NetworkServiceNSConfig.xmlinc b/src/skin/screen_NetworkServiceNSConfig.xmlinc index 5f728c2..48f74ac 100644 --- a/src/skin/screen_NetworkServiceNSConfig.xmlinc +++ b/src/skin/screen_NetworkServiceNSConfig.xmlinc @@ -3,6 +3,5 @@ - diff --git a/src/skin/screen_PluginBrowser.xmlinc b/src/skin/screen_PluginBrowser.xmlinc index e22e09d..e4911f4 100644 --- a/src/skin/screen_PluginBrowser.xmlinc +++ b/src/skin/screen_PluginBrowser.xmlinc @@ -1,13 +1,9 @@ - + - - + {"template": [MultiContentEntryText(pos=(8,105), size=(225,51), flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER|RT_WRAP, text=1, backcolor=MultiContentTemplateColor("Tile"), backcolor_sel=MultiContentTemplateColor("CursorBackground"), color=MultiContentTemplateColor("foreground"), color_sel=0xFF000004), MultiContentEntryPixmapAlphaTest(pos=(23,15), size=(195,78), png=3), ], "fonts": [gFont("Regular",23)], "itemHeight":199, "itemWidth":266} - - 2 - diff --git a/src/skin/screen_SimpleChannelSelection.xmlinc b/src/skin/screen_SimpleChannelSelection.xmlinc index 2c8844c..eb6a4ea 100644 --- a/src/skin/screen_SimpleChannelSelection.xmlinc +++ b/src/skin/screen_SimpleChannelSelection.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_SkinSelector.xmlinc b/src/skin/screen_SkinSelector.xmlinc index 03499ed..f5028ea 100644 --- a/src/skin/screen_SkinSelector.xmlinc +++ b/src/skin/screen_SkinSelector.xmlinc @@ -2,7 +2,7 @@ - + - + diff --git a/src/skin/screen_StorageInformation.xmlinc b/src/skin/screen_StorageInformation.xmlinc new file mode 100644 index 0000000..cf96078 --- /dev/null +++ b/src/skin/screen_StorageInformation.xmlinc @@ -0,0 +1,17 @@ + + + + + Path + + + + + + + + + + + + diff --git a/src/skin/screen_TextBox.xmlinc b/src/skin/screen_TextBox.xmlinc index 9aeebe0..819ddc5 100644 --- a/src/skin/screen_TextBox.xmlinc +++ b/src/skin/screen_TextBox.xmlinc @@ -1,6 +1,5 @@ - + - - + diff --git a/src/skin/screen_TimeDateInput.xmlinc b/src/skin/screen_TimeDateInput.xmlinc index 3b982a6..cf58981 100644 --- a/src/skin/screen_TimeDateInput.xmlinc +++ b/src/skin/screen_TimeDateInput.xmlinc @@ -1,6 +1,8 @@ - + - - + + + + diff --git a/src/skin/screen_TimerEditList.xmlinc b/src/skin/screen_TimerEditList.xmlinc index 8c1305c..d3b7587 100644 --- a/src/skin/screen_TimerEditList.xmlinc +++ b/src/skin/screen_TimerEditList.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_TimerLog.xmlinc b/src/skin/screen_TimerLog.xmlinc index 2769af0..0cd1d9a 100644 --- a/src/skin/screen_TimerLog.xmlinc +++ b/src/skin/screen_TimerLog.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screen_TimerSanityConflict.xmlinc b/src/skin/screen_TimerSanityConflict.xmlinc index 1211bb9..091a8e5 100644 --- a/src/skin/screen_TimerSanityConflict.xmlinc +++ b/src/skin/screen_TimerSanityConflict.xmlinc @@ -1,10 +1,9 @@ - - - + - - + + + diff --git a/src/skin/screen_VideoSetup.xmlinc b/src/skin/screen_VideoSetup.xmlinc index 0c8b9fc..bd2bd8f 100644 --- a/src/skin/screen_VideoSetup.xmlinc +++ b/src/skin/screen_VideoSetup.xmlinc @@ -3,5 +3,5 @@ - + diff --git a/src/skin/screen_picshow.xmlinc b/src/skin/screen_picshow.xmlinc index 6425b89..e5fe198 100644 --- a/src/skin/screen_picshow.xmlinc +++ b/src/skin/screen_picshow.xmlinc @@ -1,7 +1,6 @@ - diff --git a/src/skin/screenpart_4Buttons_name.xmlinc b/src/skin/screenpart_4Buttons_name.xmlinc index 968ac25..53fa5b2 100644 --- a/src/skin/screenpart_4Buttons_name.xmlinc +++ b/src/skin/screenpart_4Buttons_name.xmlinc @@ -2,3 +2,4 @@ + diff --git a/src/skin/screenpart_4Buttons_source.xmlinc b/src/skin/screenpart_4Buttons_source.xmlinc index f33b3ac..867c360 100644 --- a/src/skin/screenpart_4Buttons_source.xmlinc +++ b/src/skin/screenpart_4Buttons_source.xmlinc @@ -2,3 +2,4 @@ + diff --git a/src/skin/screenpart_Text_OK_Popup.xmlinc b/src/skin/screenpart_Text_OK_Popup.xmlinc deleted file mode 100644 index aada9bf..0000000 --- a/src/skin/screenpart_Text_OK_Popup.xmlinc +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/skin/screenpart_TitleAbout.xmlinc b/src/skin/screenpart_TitleAbout.xmlinc deleted file mode 100644 index 67b65d9..0000000 --- a/src/skin/screenpart_TitleAbout.xmlinc +++ /dev/null @@ -1,6 +0,0 @@ - - - - - Format:%a %d.%m. %H:%M - diff --git a/src/skin/screenpart_TitleOnly.xmlinc b/src/skin/screenpart_TitleOnly.xmlinc index 6bece04..4586ea8 100644 --- a/src/skin/screenpart_TitleOnly.xmlinc +++ b/src/skin/screenpart_TitleOnly.xmlinc @@ -1,4 +1 @@ - - Format:%a %d.%m. %H:%M - diff --git a/src/skin/skin.xml b/src/skin/skin.xml index 63eec84..b5a282a 100644 --- a/src/skin/skin.xml +++ b/src/skin/skin.xml @@ -148,9 +148,6 @@ - - Format:%a %d.%m. %H:%M - @@ -225,6 +222,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -241,6 +260,32 @@ + + + + + + + + + + + + + + + + + + + + + + + {"templates": {"default":(45,[ MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), ],True,"showNever"), "notselected":(45,[ MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), ],False,"showNever"), "subs":(45,[ MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), ],True,"showNever"), "subs_notselected":(45,[ MultiContentEntryText(pos=(5,0),size=(35,45),font=0,flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER,text=1), MultiContentEntryText(pos=(45,0),size=(340,45),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=2), MultiContentEntryText(pos=(395,0),size=(240,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=3), MultiContentEntryText(pos=(645,0),size=(490,45),font=1,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER,text=4), MultiContentEntryPixmapAlphaTest(pos=(1125,2),size=(35,35),png=5), ],False,"showNever")}, "fonts":[gFont("Regular",28),gFont("Regular",22)],"itemHeight":45} + + + @@ -270,7 +315,6 @@ {"template":[MultiContentEntryText(pos=(10,20),size=(640,35),font=0,text=0), MultiContentEntryText(pos=(10,55),size=(640,25),font=1,text=2), MultiContentEntryPixmapAlphaTest(pos=(0,0),size=(0,0),png=3),], "fonts":[gFont("Bold",26),gFont("Regular",22)],"itemHeight":100} - @@ -293,17 +337,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + @@ -312,17 +353,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + @@ -330,10 +368,7 @@ - - Format:%a %d.%m. %H:%M - - + @@ -346,9 +381,6 @@ - - Format:%a %d.%m. %H:%M - @@ -379,17 +411,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + @@ -397,9 +426,6 @@ - - Format:%a %d.%m. %H:%M - @@ -445,9 +471,6 @@ - - Format:%a %d.%m. %H:%M - @@ -469,9 +492,6 @@ - - Format:%a %d.%m. %H:%M - @@ -523,9 +543,6 @@ - - Format:%a %d.%m. %H:%M - Name @@ -557,37 +574,31 @@ - - - - - - - Format:%a %d.%m. %H:%M - - - - - - - + + + + + + + + + + + - - Format:%a %d.%m. %H:%M - - - - - + + + + FullDescription @@ -641,10 +652,11 @@ - + + @@ -663,9 +675,6 @@ - - Format:%a %d.%m. %H:%M - Name @@ -697,7 +706,6 @@ - @@ -709,9 +717,6 @@ - - Format:%a %d.%m. %H:%M - @@ -724,9 +729,6 @@ - - Format:%a %d.%m. %H:%M - @@ -734,35 +736,26 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + - - - - - - - Format:%a %d.%m. %H:%M - - - - - - {"template":[MultiContentEntryText(pos=(10,0),size=(900,50),flags=RT_VALIGN_CENTER,text=0)], "fonts":[gFont("Regular",26)],"itemHeight":50} + + + + + + + {"template":[MultiContentEntryText(pos=(10,0),size=(1140,50),flags=RT_VALIGN_CENTER,text=0)], "fonts":[gFont("Regular",26)],"itemHeight":50} @@ -770,17 +763,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + @@ -789,17 +779,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + Name @@ -813,9 +800,6 @@ - - Format:%a %d.%m. %H:%M - @@ -829,9 +813,6 @@ - - Format:%a %d.%m. %H:%M - Reference @@ -855,14 +836,14 @@ - - - - + + + + @@ -938,9 +919,6 @@ - - Format:%a %d.%m. %H:%M - Name @@ -1005,17 +983,14 @@ - - Format:%a %d.%m. %H:%M - - - - - + + + + {"template":[MultiContentEntryText(pos=(100,5),size=(1000,35),font=0,text=0), MultiContentEntryText(pos=(130,40),size=(1000,60),font=1,flags=RT_WRAP,text=2), MultiContentEntryPixmapAlphaTest(pos=(0,10),size=(80,80),png=7), MultiContentEntryPixmapAlphaTest(pos=(90,42),size=(25,25),png=8), MultiContentEntryPixmapAlphaTest(pos=(0,0),size=(0,0),png=9),], "fonts":[gFont("Bold",26),gFont("Regular",24)],"itemHeight":100} @@ -1075,9 +1050,6 @@ - - Format:%a %d.%m. %H:%M - @@ -1262,9 +1234,6 @@ - - Format:%a %d.%m. %H:%M - @@ -1301,7 +1270,6 @@ {"template":[MultiContentEntryPixmapAlphaTest(pos=(10,10),size=(40,40),png=2), MultiContentEntryText(pos=(60,0),size=(1600,60),font=0,flags=RT_HALIGN_LEFT|RT_VALIGN_CENTER|RT_WRAP,text=1),], "fonts":[gFont("Regular",28)],"itemHeight":60} - @@ -1316,7 +1284,6 @@ - @@ -1339,9 +1306,6 @@ - - Format:%a %d.%m. %H:%M - @@ -1533,9 +1497,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - @@ -1591,14 +1552,14 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - - - + + + + @@ -1621,34 +1582,31 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - - - + + + + - - Format:%a %d.%m. %H:%M - {"template":[MultiContentEntryPixmapAlphaTest(pos=(10,10),size=(60,60),png=1), MultiContentEntryText(pos=(100,0),size=(1660,80),font=0,flags=RT_VALIGN_CENTER,text=2), MultiContentEntryText(pos=(270,9),size=(1500,30),font=1,text=3), MultiContentEntryText(pos=(270,43),size=(1500,30),font=1,text=4), MultiContentEntryPixmapAlphaTest(pos=(90,10),size=(60,60),png=5), MultiContentEntryPixmapAlphaTest(pos=(175,10),size=(60,60),png=6),], "fonts":[gFont("Bold",30),gFont("Regular",24)],"itemHeight":80} - - - - + + + + @@ -1735,30 +1693,21 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - - + - - - Format:%a %d.%m. %H:%M - - + + {"template": [MultiContentEntryText(pos=(8,105), size=(225,51), flags=RT_HALIGN_CENTER|RT_VALIGN_CENTER|RT_WRAP, text=1, backcolor=MultiContentTemplateColor("Tile"), backcolor_sel=MultiContentTemplateColor("CursorBackground"), color=MultiContentTemplateColor("foreground"), color_sel=0xFF000004), MultiContentEntryPixmapAlphaTest(pos=(23,15), size=(195,78), png=3), ], "fonts": [gFont("Regular",23)], "itemHeight":199, "itemWidth":266} - - 2 - @@ -1874,9 +1823,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - @@ -1885,9 +1831,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - @@ -1898,9 +1841,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - @@ -1929,9 +1869,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - SNRdB @@ -2128,9 +2065,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - TYPE 0,0 @@ -2187,17 +2121,14 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - - - - - + + + + @@ -2207,7 +2138,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - + @@ -2280,6 +2211,32 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) + + + + + + + Path + + + + + + + + + + + + + + + + + + + @@ -2419,29 +2376,25 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) Reference - - - - - - - Format:%a %d.%m. %H:%M - - - - + + + + + + - - - - - - - Format:%a %d.%m. %H:%M - - - - + + + + + + + + + + + + @@ -2449,14 +2402,14 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - - - + + + + @@ -2481,14 +2434,14 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - - - + + + + @@ -2498,18 +2451,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - - - + + + + - - - - + + + + @@ -2578,9 +2531,6 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - - Format:%a %d.%m. %H:%M - @@ -2631,16 +2581,13 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2,orgpos.y())) - + - - Format:%a %d.%m. %H:%M - diff --git a/src/skin/skin_src.xml b/src/skin/skin_src.xml index 6a9ef9f..0b90ffc 100644 --- a/src/skin/skin_src.xml +++ b/src/skin/skin_src.xml @@ -28,7 +28,9 @@ + + @@ -135,6 +137,7 @@ +