Skip to content

Commit 9251c78

Browse files
jbleyeljbleyel
authored
Merge pull request #3577 from openatv/InfoBar
InfoBar Cleanup
2 parents bbf6fe0 + 148c677 commit 9251c78

File tree

7 files changed

+90
-309
lines changed

7 files changed

+90
-309
lines changed

‎data/keymap.u80‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,6 @@
2828
<key id="KEY_VMODE" mapto="toggleAspectRatio" flags="b" />
2929
</map>
3030

31-
<map context="InfobarExtensions">
32-
<key id="KEY_RED" mapto="RedPressed" flags="b" />
33-
<!--
34-
<key id="KEY_RED" mapto="showEventInfo" flags="l" />
35-
<key id="KEY_GREEN" mapto="openTimerList" flags="b" />
36-
<key id="KEY_GREEN" mapto="openAutoTimerList" flags="l" />
37-
<key id="KEY_YELLOW" mapto="openEPGSearch" flags="b" />
38-
<key id="KEY_YELLOW" mapto="openIMDB" flags="l" />
39-
<key id="KEY_BLUE" mapto="showPluginBrowser" flags="l" />
40-
-->
41-
<key id="KEY_F1" mapto="RedPressed" flags="b" />
42-
<key id="KEY_F1" mapto="showEventInfo" flags="l" />
43-
<key id="KEY_F2" mapto="openTimerList" flags="b" />
44-
<key id="KEY_F2" mapto="openAutoTimerList" flags="l" />
45-
<key id="KEY_F3" mapto="openEPGSearch" flags="b" />
46-
<key id="KEY_F3" mapto="openIMDB" flags="l" />
47-
<key id="KEY_F4" mapto="showPluginBrowser" flags="l" />
48-
<key id="KEY_F4" mapto="extensions" flags="b" />
49-
<!--key id="KEY_BLUE" mapto="extensions" flags="l" /-->
50-
<!--key id="KEY_BLUE" mapto="quickmenu" flags="b" /-->
51-
</map>
52-
5331
<map context="InfobarChannelSelection">
5432
<key id="KEY_LEFT" mapto="LeftPressed" flags="mr" />
5533
<key id="KEY_RIGHT" mapto="RightPressed" flags="mr" />

‎data/keymap.xml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -861,29 +861,6 @@
861861
<key id="KEY_EPG" mapto="showEventInfoPlugin" flags="l" />
862862
</map>
863863

864-
<map context="InfobarExtensions">
865-
<key id="KEY_RED" mapto="RedPressed" flags="b" />
866-
<!--
867-
<key id="KEY_RED" mapto="showEventInfo" flags="l" />
868-
<key id="KEY_GREEN" mapto="openTimerList" flags="b" />
869-
<key id="KEY_GREEN" mapto="openAutoTimerList" flags="l" />
870-
<key id="KEY_YELLOW" mapto="openEPGSearch" flags="b" />
871-
<key id="KEY_YELLOW" mapto="openIMDB" flags="l" />
872-
<key id="KEY_BLUE" mapto="showPluginBrowser" flags="l" />
873-
-->
874-
<key id="KEY_F1" mapto="RedPressed" flags="b" />
875-
<key id="KEY_F1" mapto="showEventInfo" flags="l" />
876-
<key id="KEY_F2" mapto="openTimerList" flags="b" />
877-
<key id="KEY_F2" mapto="openAutoTimerList" flags="l" />
878-
<key id="KEY_F3" mapto="openEPGSearch" flags="b" />
879-
<key id="KEY_F3" mapto="openIMDB" flags="l" />
880-
<key id="KEY_F4" mapto="showPluginBrowser" flags="l" />
881-
<key id="KEY_F4" mapto="extensions" flags="b" />
882-
<key id="KEY_BLUE" mapto="extensions" flags="l" />
883-
<key id="KEY_BLUE" mapto="quickmenu" flags="b" />
884-
<key id="KEY_MOUSE" mapto="extensions" flags="b" />
885-
</map>
886-
887864
<map context="InfobarHDMIActions">
888865
<key id="KEY_AUX" mapto="HDMIin" flags="b" />
889866
<key id="KEY_AUX" mapto="HDMIinLong" flags="l" />
@@ -910,10 +887,6 @@
910887
<key id="KEY_F6" mapto="activatePiP" flags="b" />
911888
</map>
912889

913-
<map context="InfoBarQuickMenu">
914-
<key id="KEY_BLUE" mapto="quickmenu" flags="b" />
915-
</map>
916-
917890
<map context="InfobarRdsActions">
918891
<key id="KEY_TEXT" mapto="startRassInteractive" flags="m" />
919892
</map>

‎data/setup.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,6 @@
819819
<item level="1" text="History buttons mode" description="Configure the function of the &lt; and &gt; buttons.">config.usage.historymode</item>
820820
<item level="0" text="Channel +/- button mode" description="Select what you want the Channel +/- button to activate.">config.usage.channelbutton_mode</item>
821821
<item level="0" text="Up/Down button mode" description="Select what you want the Up/Down button to activate.">config.usage.updownbutton_mode</item>
822-
<!--item level="0" text="Use image colored Buttons *" description="Select if you want to use the image colored Buttons (set to 'no' if you want to use (Multi) Quick Button).">config.plisettings.ColouredButtons</item-->
823822
<item level="0" text="BLUE switch: BLUE/BLUE long" description="Switch BLUE short (QuickMenu) with BLUE long (Extension Menu).">config.workaround.blueswitch</item>
824823
<item level="0" text="Long press emulation with button" description="Press this button to emulate a long press on a button pressed afterwards (this also overrides any other actions assigned to emulation button).">config.usage.long_press_emulation_key</item>
825824
<item level="0" text="Add legacy LEFT/RIGHT actions" description="Select 'Yes' to enable use of the LEFT/RIGHT buttons to move PageUp/PageDown when the LEFT/RIGHT buttons are otherwise undefined. This provides legacy navigation for users who prefer it.">config.misc.actionLeftRightToPageUpPageDown</item>

‎lib/python/Components/UsageConfig.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,6 @@ def setSubtitleUseCache(configElement):
20572057
config.logmanager.sentfiles = ConfigLocations(default=[])
20582058

20592059
config.plisettings = ConfigSubsection()
2060-
config.plisettings.ColouredButtons = ConfigYesNo(default=False)
20612060
config.plisettings.InfoBarEpg_mode = ConfigSelection(default="0", choices=[
20622061
("0", _("As plugin in extended bar")),
20632062
("1", _("With long OK press")),

‎lib/python/Screens/ButtonSetup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def getButtonSetupFunctions():
272272
ButtonSetupFunctions.append((_("Channel Info"), "Module/Screens.Information/ServiceInformation", textSetup))
273273
ButtonSetupFunctions.append((_("SkinSelection"), "Module/Screens.SkinSelection/SkinSelection", textSetup))
274274
ButtonSetupFunctions.append((_("RecordTimer"), "Module/Screens.Timers/RecordTimerOverview", textSetup))
275-
ButtonSetupFunctions.append((_("Open AutoTimer"), "Infobar/showAutoTimerList", textSetup))
275+
ButtonSetupFunctions.append((_("Open AutoTimer"), "Infobar/openAutoTimerList", textSetup))
276276
for plugin in plugins.getPluginsForMenu("system"):
277277
if plugin[2]:
278278
ButtonSetupFunctions.append((plugin[0], "MenuPlugin/system/" + plugin[2], textSetup))

‎lib/python/Screens/InfoBar.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,6 @@ def showMenu(self):
123123
self.showMainMenu()
124124

125125
def doButtonsCheck(self):
126-
if config.plisettings.ColouredButtons.value:
127-
self["key_yellow"].setText(_("Search"))
128-
self["key_red"].setText(_("Single EPG"))
129-
if config.usage.subservice.value == 0:
130-
self["key_green"].setText(_("Timers"))
131-
elif config.usage.subservice.value == 1:
132-
self["key_green"].setText(_("Plugins"))
133-
else:
134-
self["key_green"].setText(_("Subservices"))
135126
self["key_blue"].setText(_("Extensions"))
136127

137128
def __onClose(self):
@@ -567,9 +558,6 @@ def switchAudio(self):
567558
setAudioTrack(service)
568559

569560
def doButtonsCheck(self):
570-
if config.plisettings.ColouredButtons.value:
571-
self["key_yellow"].setText(_("Search"))
572-
self["key_green"].setText(_("Timers"))
573561
self["key_blue"].setText(_("Extensions"))
574562

575563
def __onClose(self):

0 commit comments

Comments
 (0)