Skip to content

Commit 910daee

Browse files
jbleyeljbleyel
committed
[setup.xml]
* prepare new seek settings
1 parent 3dcfdbc commit 910daee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+174
-103
lines changed

‎data/setup.xml‎

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,49 @@
627627
<item level="2" text="Behavior when a movie is stopped" description="Configure the behavior when movie playback is manually stopped.">config.usage.on_movie_stop</item>
628628
<item level="2" text="Action at end of media" description="Configure the behavior when reaching the end of a movie, during movie playback.">config.usage.on_movie_eof</item>
629629
<item level="2" text="Display message before playing next movie" description="When enabled, a pop up message will be shown when a movie has finished and the next one will start.">config.usage.next_movie_msg</item>
630+
<item level="1" text="Show InfoBar on skip forward/backward" description="Select 'Yes, to display the InfoBar when fast forwarding or rewinding during media playback.">config.usage.show_infobar_on_skip</item>
631+
<item level="1" text="Show PVR status in MoviePlayer InfoBar" description="This option moves the PVR status display from a separate window into the MoviePlayer InfoBar.">config.usage.movieplayer_pvrstate</item>
630632
<item level="2" text="Behavior of 'pause' when paused" description="Configure the behavior of the 'pause' key when movie playback is already paused.">config.seek.on_pause</item>
633+
<item level="1" text="Show persistent InfoBar while paused" description="Select 'Yes' the keep the InfoBar displayed, with no timeout, while media playback is paused.">config.usage.show_infobar_locked_on_pause</item>
634+
<item level="2" text="SeekBar activation" description="Select SeekBar to be activated by arrow L/R (long) or &lt;&lt; &gt;&gt; (long).">config.seek.baractivation</item>
635+
<item level="2" text="Arrow skip mode" description="Select how the arrow ('UP', 'DOWN', 'LEFT', and 'RIGHT') buttons will act during seek actions.">config.seek.arrowSkipMode</item>
636+
<if conditional="config.seek.arrowSkipMode.value == 's'">
637+
<item level="2" text="Skip sensibility (Horizontal)" description="Set the LEFT/RIGHT button skip percentage for the SeekBar.">config.seek.sensibilityHorizontal</item>
638+
<item level="2" text="Skip sensibility (Vertical)" description="Set the UP/DOWN button skip percentage for the SeekBar.">config.seek.sensibilityVertical</item>
639+
<elif conditional="config.seek.arrowSkipMode.value == 'd'" />
640+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="UP">config.seek.defined["UP"]</item>
641+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="LEFT">config.seek.defined["LEFT"]</item>
642+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="RIGHT">config.seek.defined["RIGHT"]</item>
643+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="DOWN">config.seek.defined["DOWN"]</item>
644+
</if>
645+
<item level="2" text="Numeric skip mode" description="Select how the number buttons will act during seek actions.">config.seek.numberSkipMode</item>
646+
<if conditional="config.seek.numberSkipMode.value == 's'">
647+
<item level="2" text="Skip time for '%s'/'%s' buttons" description="Set the skip time interval for the '%s'/'%s' buttons." data="1,3">config.seek.defined[13]</item>
648+
<item level="2" text="Skip time for '%s'/'%s' buttons" description="Set the skip time interval for the '%s'/'%s' buttons." data="4,6">config.seek.defined[46]</item>
649+
<item level="2" text="Skip time for '%s'/'%s' buttons" description="Set the skip time interval for the '%s'/'%s' buttons." data="7,9">config.seek.defined[79]</item>
650+
<elif conditional="config.seek.numberSkipMode.value == 'd'" />
651+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="1">config.seek.defined[1]</item>
652+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="2">config.seek.defined[2]</item>
653+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="3">config.seek.defined[3]</item>
654+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="4">config.seek.defined[4]</item>
655+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="5">config.seek.defined[5]</item>
656+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="6">config.seek.defined[6]</item>
657+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="7">config.seek.defined[7]</item>
658+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="8">config.seek.defined[8]</item>
659+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="9">config.seek.defined[9]</item>
660+
<item level="2" text="Skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="0">config.seek.defined[0]</item>
661+
</if>
662+
<item level="2" text="CutList skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="UP">config.seek.defined["CUT_UP"]</item>
663+
<item level="2" text="CutList skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="LEFT">config.seek.defined["CUT_LEFT"]</item>
664+
<item level="2" text="CutList skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="RIGHT">config.seek.defined["CUT_RIGHT"]</item>
665+
<item level="2" text="CutList skip time for '%s' button" description="Set the skip time interval for the '%s' button." data="DOWN">config.seek.defined["CUT_DOWN"]</item>
666+
<item level="2" text="CutList skip time for '%s'/'%s' buttons" description="Set the CutList Editor skip time interval for the '%s'/'%s' buttons." data="1,3">config.seek.defined["CUT_13"]</item>
667+
<item level="2" text="CutList skip time for '%s'/'%s' buttons" description="Set the CutList Editor skip time interval for the '%s'/'%s' buttons." data="4,6">config.seek.defined["CUT_46"]</item>
668+
<item level="2" text="CutList skip time for '%s'/'%s' buttons" description="Set the CutList Editor skip time interval for the '%s'/'%s' buttons." data="7,9">config.seek.defined["CUT_79"]</item>
669+
<item level="2" text="Seekbar sensibility" description="Set the jump-size of the seekbar.">config.seek.sensibility</item>
631670
<item level="2" text="Custom skip time for '1'/'3' buttons" description="Configure the skip time interval for the '1'/'3' buttons.">config.seek.selfdefined_13</item>
632671
<item level="2" text="Custom skip time for '4'/'6' buttons" description="Configure the skip time interval for the '4'/'6' buttons.">config.seek.selfdefined_46</item>
633672
<item level="2" text="Custom skip time for '7'/'9' buttons" description="Configure the skip time interval for the '7'/'9' buttons.">config.seek.selfdefined_79</item>
634-
<item level="2" text="Seekbar activation" description="Select seekbar to be activated by arrow L/R (long) or &lt;&lt; &gt;&gt; (long).">config.seek.baractivation</item>
635-
<item level="2" text="Seekbar sensibility" description="Set the jump-size of the seekbar.">config.seek.sensibility</item>
636673
<item level="2" text="Fast forward speeds" description="Configure the possible fast forward speeds.">config.seek.speeds_forward</item>
637674
<item level="2" text="Rewind speeds" description="Configure the possible rewind speeds.">config.seek.speeds_backward</item>
638675
<item level="2" text="Slow motion speeds" description="Configure the slow motion speeds.">config.seek.speeds_slowmotion</item>

‎lib/python/Components/UsageConfig.py‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,43 @@ def wakeOnLANChanged(configElement):
14331433
("leftright", _("Long Left/Right")),
14341434
("ffrw", _("Long << / >>"))
14351435
])
1436+
config.seek.sensibilityHorizontal = ConfigSelection(default=1.0, choices=[(x, f"{x:.1f}%") for x in [0.1, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0]])
1437+
config.seek.sensibilityVertical = ConfigSelection(default=2.0, choices=[(x, f"{x:.1f}%") for x in [0.1, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0]])
1438+
config.seek.arrowSkipMode = ConfigSelection(default="t", choices=[
1439+
("t", _("Traditional")),
1440+
("s", _("Symmetrical skips")),
1441+
("d", _("Defined skips"))
1442+
])
1443+
config.seek.numberSkipMode = ConfigSelection(default="s", choices=[
1444+
("s", _("Symmetrical skips")),
1445+
("d", _("Defined skips")),
1446+
("p", _("Percentage skips"))
1447+
])
1448+
config.seek.defined = ConfigSubDict()
1449+
config.seek.defined[13] = ConfigSelectionNumber(default=15, min=1, max=300, stepwidth=1, wraparound=True)
1450+
config.seek.defined[46] = ConfigSelectionNumber(default=60, min=1, max=600, stepwidth=1, wraparound=True)
1451+
config.seek.defined[79] = ConfigSelectionNumber(default=300, min=1, max=1200, stepwidth=1, wraparound=True)
1452+
config.seek.defined[1] = ConfigSelectionNumber(default=-15, min=-1800, max=1800, stepwidth=1, wraparound=True)
1453+
config.seek.defined[2] = ConfigSelectionNumber(default=10, min=-1800, max=1800, stepwidth=1, wraparound=True)
1454+
config.seek.defined[3] = ConfigSelectionNumber(default=15, min=-1800, max=1800, stepwidth=1, wraparound=True)
1455+
config.seek.defined[4] = ConfigSelectionNumber(default=-60, min=-1800, max=1800, stepwidth=1, wraparound=True)
1456+
config.seek.defined[5] = ConfigSelectionNumber(default=30, min=-1800, max=1800, stepwidth=1, wraparound=True)
1457+
config.seek.defined[6] = ConfigSelectionNumber(default=60, min=-1800, max=1800, stepwidth=1, wraparound=True)
1458+
config.seek.defined[7] = ConfigSelectionNumber(default=-300, min=-1800, max=1800, stepwidth=1, wraparound=True)
1459+
config.seek.defined[8] = ConfigSelectionNumber(default=180, min=-1800, max=1800, stepwidth=1, wraparound=True)
1460+
config.seek.defined[9] = ConfigSelectionNumber(default=300, min=-1800, max=1800, stepwidth=1, wraparound=True)
1461+
config.seek.defined[0] = ConfigSelectionNumber(default=300, min=-1800, max=1800, stepwidth=1, wraparound=True)
1462+
config.seek.defined["UP"] = ConfigSelectionNumber(default=180, min=-1800, max=1800, stepwidth=1, wraparound=True)
1463+
config.seek.defined["LEFT"] = ConfigSelectionNumber(default=-10, min=-1800, max=1800, stepwidth=1, wraparound=True)
1464+
config.seek.defined["RIGHT"] = ConfigSelectionNumber(default=15, min=-1800, max=1800, stepwidth=1, wraparound=True)
1465+
config.seek.defined["DOWN"] = ConfigSelectionNumber(default=-120, min=-1800, max=1800, stepwidth=1, wraparound=True)
1466+
config.seek.defined["CUT_13"] = ConfigSelectionNumber(default=10, min=-1800, max=1800, stepwidth=1, wraparound=True)
1467+
config.seek.defined["CUT_46"] = ConfigSelectionNumber(default=30, min=-1800, max=1800, stepwidth=1, wraparound=True)
1468+
config.seek.defined["CUT_79"] = ConfigSelectionNumber(default=90, min=-1800, max=1800, stepwidth=1, wraparound=True)
1469+
config.seek.defined["CUT_UP"] = ConfigSelectionNumber(default=300, min=-600, max=600, stepwidth=1, wraparound=True)
1470+
config.seek.defined["CUT_LEFT"] = ConfigSelectionNumber(default=-1, min=-600, max=600, stepwidth=1, wraparound=True)
1471+
config.seek.defined["CUT_RIGHT"] = ConfigSelectionNumber(default=1, min=-600, max=600, stepwidth=1, wraparound=True)
1472+
config.seek.defined["CUT_DOWN"] = ConfigSelectionNumber(default=-300, min=-600, max=600, stepwidth=1, wraparound=True)
14361473
config.seek.sensibility = ConfigSelectionNumber(min=1, max=10, stepwidth=1, default=10, wraparound=True)
14371474
config.seek.selfdefined_13 = ConfigSelectionNumber(min=1, max=300, stepwidth=1, default=15, wraparound=True)
14381475
config.seek.selfdefined_46 = ConfigSelectionNumber(min=1, max=600, stepwidth=1, default=60, wraparound=True)
@@ -1441,16 +1478,13 @@ def wakeOnLANChanged(configElement):
14411478
config.seek.speeds_forward = ConfigSet(default=[2, 4, 8, 16, 32, 64, 128], choices=[2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128])
14421479
config.seek.speeds_backward = ConfigSet(default=[2, 4, 8, 16, 32, 64, 128], choices=[1, 2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128])
14431480
config.seek.speeds_slowmotion = ConfigSet(default=[2, 4, 8], choices=[2, 4, 6, 8, 12, 16, 25])
1444-
14451481
config.seek.enter_forward = ConfigSelection(default="2", choices=["2", "4", "6", "8", "12", "16", "24", "32", "48", "64", "96", "128"])
14461482
config.seek.enter_backward = ConfigSelection(default="1", choices=["1", "2", "4", "6", "8", "12", "16", "24", "32", "48", "64", "96", "128"])
1447-
14481483
config.seek.on_pause = ConfigSelection(default="play", choices=[
14491484
("play", _("Play")),
14501485
("step", _("Single step (GOP)")),
14511486
("last", _("Last speed"))
14521487
])
1453-
14541488
config.seek.withjumps = ConfigYesNo(default=True)
14551489
config.seek.withjumps_after_ff_speed = ConfigSelection(default="4", choices=[
14561490
("1", _("Never")),

‎po/aa.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15495,7 +15495,7 @@ msgstr ""
1549515495
msgid "Seekbar"
1549615496
msgstr ""
1549715497

15498-
msgid "Seekbar activation"
15498+
msgid "SeekBar activation"
1549915499
msgstr ""
1550015500

1550115501
msgid "Seekbar sensibility"
@@ -16058,7 +16058,7 @@ msgstr ""
1605816058
msgid "Select refresh rate"
1605916059
msgstr ""
1606016060

16061-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
16061+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1606216062
msgstr ""
1606316063

1606416064
msgid "Select service information to view:"

‎po/ar.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16509,7 +16509,7 @@ msgstr "لوحة مفاتيح"
1650916509
msgid "Seekbar"
1651016510
msgstr "بحـث"
1651116511

16512-
msgid "Seekbar activation"
16512+
msgid "SeekBar activation"
1651316513
msgstr ""
1651416514

1651516515
msgid "Seekbar sensibility"
@@ -17076,7 +17076,7 @@ msgstr "أختار مزود الخدمة لإضافته..."
1707617076
msgid "Select refresh rate"
1707717077
msgstr "أختار معدل التحديث"
1707817078

17079-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
17079+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1708017080
msgstr ""
1708117081

1708217082
msgid "Select service information to view:"

‎po/bg.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15660,7 +15660,7 @@ msgstr "Търсете дълго напред"
1566015660
msgid "Seekbar"
1566115661
msgstr "Лента за търсене"
1566215662

15663-
msgid "Seekbar activation"
15663+
msgid "SeekBar activation"
1566415664
msgstr "Активиране на лентата за търсене"
1566515665

1566615666
msgid "Seekbar sensibility"
@@ -16224,7 +16224,7 @@ msgstr "Изберете провайдер, за да добавите..."
1622416224
msgid "Select refresh rate"
1622516225
msgstr "Изберете скорост за обновяване"
1622616226

16227-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
16227+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1622816228
msgstr "Изберете seekbar, който да се активира със стрелка L/R(long) или << >>(long)."
1622916229

1623016230
msgid "Select service information to view:"

‎po/ca.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16834,7 +16834,7 @@ msgstr "Mapa del teclat"
1683416834
msgid "Seekbar"
1683516835
msgstr "Posicionar"
1683616836

16837-
msgid "Seekbar activation"
16837+
msgid "SeekBar activation"
1683816838
msgstr ""
1683916839

1684016840
msgid "Seekbar sensibility"
@@ -17413,7 +17413,7 @@ msgstr "Selecciona proveïdor per afegir …"
1741317413
msgid "Select refresh rate"
1741417414
msgstr "Seleccioneu el percentatge de refresc"
1741517415

17416-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
17416+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1741717417
msgstr ""
1741817418

1741917419
msgid "Select service information to view:"

‎po/cs.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15733,7 +15733,7 @@ msgstr "Procházení dopředu - dlouhý stisk"
1573315733
msgid "Seekbar"
1573415734
msgstr "Panel vyhledávání"
1573515735

15736-
msgid "Seekbar activation"
15736+
msgid "SeekBar activation"
1573715737
msgstr "Aktivace hledání"
1573815738

1573915739
msgid "Seekbar sensibility"
@@ -16296,7 +16296,7 @@ msgstr "Vyberte poskytovatele služeb..."
1629616296
msgid "Select refresh rate"
1629716297
msgstr "Vyberte obnovovací frekvenci"
1629816298

16299-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
16299+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1630016300
msgstr "Vyberte aktivaci lišty šipkou L/R (dlouhý stisk) nebo << >> (dlouhý stisk)."
1630116301

1630216302
msgid "Select service information to view:"

‎po/da.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15769,7 +15769,7 @@ msgstr "Søg fremad"
1576915769
msgid "Seekbar"
1577015770
msgstr "Søgebjælke"
1577115771

15772-
msgid "Seekbar activation"
15772+
msgid "SeekBar activation"
1577315773
msgstr "Søgebjælke aktivering"
1577415774

1577515775
msgid "Seekbar sensibility"
@@ -16332,7 +16332,7 @@ msgstr "Vælg udbyder, der skal tilføjes..."
1633216332
msgid "Select refresh rate"
1633316333
msgstr "Vælg opdateringshastighed"
1633416334

16335-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
16335+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1633616336
msgstr "Vælg om søgebjælke aktiveres med pil V/H (lang) eller << >> (lang)."
1633716337

1633816338
msgid "Select service information to view:"

‎po/de.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16664,7 +16664,7 @@ msgstr "Suche vorwärts lang"
1666416664
msgid "Seekbar"
1666516665
msgstr "Suchleiste"
1666616666

16667-
msgid "Seekbar activation"
16667+
msgid "SeekBar activation"
1666816668
msgstr "Aktivierung der Suchleiste"
1666916669

1667016670
msgid "Seekbar sensibility"
@@ -17245,7 +17245,7 @@ msgstr "Anbieter zum Hinzufügen auswählen..."
1724517245
msgid "Select refresh rate"
1724617246
msgstr "Bildwiederholrate auswählen"
1724717247

17248-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
17248+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1724917249
msgstr "Die Tasten für die Suchleistenaktivierung einstellen, Pfeil Links/Rechts lang oder <</>> lang."
1725017250

1725117251
msgid "Select service information to view:"

‎po/el.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15689,7 +15689,7 @@ msgstr "Αναζήτηση εμπρός παρατεταμένο"
1568915689
msgid "Seekbar"
1569015690
msgstr "Μπάρα αναζήτησης"
1569115691

15692-
msgid "Seekbar activation"
15692+
msgid "SeekBar activation"
1569315693
msgstr "Ενεργοποίηση μπάρας αναζήτησης"
1569415694

1569515695
msgid "Seekbar sensibility"
@@ -16252,7 +16252,7 @@ msgstr "Επιλογή παρόχου για προσθήκη..."
1625216252
msgid "Select refresh rate"
1625316253
msgstr "Επιλογή ρυθμού ανανέωσης"
1625416254

16255-
msgid "Select seekbar to be activated by arrow L/R (long) or << >> (long)."
16255+
msgid "Select SeekBar to be activated by arrow L/R (long) or << >> (long)."
1625616256
msgstr "Επιλογή ενεργοποίησης μπάρας αναζήτησης με τα πλήκτρα Α/Δ (παρατεταμένα) ή << >> (παρατεταμένα)."
1625716257

1625816258
msgid "Select service information to view:"

0 commit comments

Comments
 (0)