aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addons/resource.language.en_gb/resources/strings.po34
-rw-r--r--system/keymaps/keyboard.xml42
-rw-r--r--system/keymaps/mouse.xml7
-rw-r--r--xbmc/input/XBMC_keysym.h5
-rw-r--r--xbmc/input/XBMC_keytable.cpp5
-rw-r--r--xbmc/input/XBMC_vkeys.h5
-rw-r--r--xbmc/input/linux/LinuxInputDevices.cpp15
-rw-r--r--xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp2
-rw-r--r--xbmc/pvr/timers/PVRTimerInfoTag.cpp6
9 files changed, 96 insertions, 25 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 180027f249..6c9721c148 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -1344,6 +1344,8 @@ msgstr ""
#: system/peripherals.xml
#: xbmc/filesystem/AddonsDirectory.cpp
#: system/settings/settings.xml
+#. Label of active/inactive radiobutton in PVR timer settings dialog
+#: xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
msgctxt "#305"
msgid "Enabled"
msgstr ""
@@ -3527,23 +3529,11 @@ msgstr ""
#empty string with id 824
-#. Representation of PVR timer state "disabled"
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
-msgctxt "#825"
-msgid "Inactive"
-msgstr ""
+#empty string with id 825
-#. Notification text to announce that a timer was activated
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
-msgctxt "#826"
-msgid "Timer activated"
-msgstr ""
+#empty string with id 826
-#. Notification text to announce that a timer was deactivated
-#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
-msgctxt "#827"
-msgid "Timer deactivated"
-msgstr ""
+#empty string with id 827
#. Text for notification that a repeating timer has been deleted
#: xbmc/pvr/timers/PVRTimers.cpp
@@ -5630,6 +5620,7 @@ msgstr ""
#: xbmc/peripherals/bus/PeripheralBus.cpp
#: system/settings/settings.xml
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
msgctxt "#13106"
msgid "Disabled"
msgstr ""
@@ -8671,8 +8662,14 @@ msgctxt "#19056"
msgid "New timer"
msgstr ""
-# empty string with id 19057
+#. Notification text to announce that a timer was disabled
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
+msgctxt "#19057"
+msgid "Timer disabled"
+msgstr ""
+#. Notification text to announce that a timer was enabled
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
msgctxt "#19058"
msgid "Timer enabled"
msgstr ""
@@ -8753,8 +8750,7 @@ msgctxt "#19073"
msgid "Delay channel switch"
msgstr ""
-#. Label of active/inactive radiobutton in PVR timer settings dialog
-#: xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
+#: addons/skin.confluence/720p/DialogPVRChannelManager.xml
msgctxt "#19074"
msgid "Active"
msgstr ""
@@ -14464,7 +14460,7 @@ msgstr ""
#. Program style name
#: xbmc/cores/dvdplayer/DVDPlayerRadioRDS.cpp
-msgctxt "#29960"
+msgctxt "#29970"
msgid "Alarm Test"
msgstr ""
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index d11d765dfb..7fe13d116b 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -116,6 +116,11 @@
<j>ActivateWindow(RadioChannels)</j>
<k>ActivateWindow(TVRecordings)</k>
<b>ActivateWindow(TVTimers)</b>
+ <!-- PVR -->
+ <red>ActivateWindow(TVChannels)</red>
+ <green>ActivateWindow(MyVideos)</green>
+ <yellow>ActivateWindow(MyMusic)</yellow>
+ <blue>ActivateWindow(MyPictures)</blue>
<!-- Multimedia keyboard keys -->
<browser_back>Back</browser_back>
<browser_forward/>
@@ -123,7 +128,10 @@
<browser_stop/>
<browser_search/>
<browser_favorites>ActivateWindow(Favourites)</browser_favorites>
+ <favorites>ActivateWindow(Favourites)</favorites>
+ <config>ActivateWindow(Settings)</config>
<browser_home>ActivateWindow(Home)</browser_home>
+ <homepage>ActivateWindow(Home)</homepage>
<volume_mute>Mute</volume_mute>
<volume_down>VolumeDown</volume_down>
<volume_up>VolumeUp</volume_up>
@@ -151,6 +159,8 @@
<f mod="ctrl">SkipNext</f> <!-- Skip -->
<b mod="ctrl">SkipPrevious</b> <!-- Replay -->
<d mod="ctrl">Info</d> <!-- MCE Details -->
+ <r mod="ctrl">Record</r> <!-- Record -->
+ <f4 mod="alt">PreviousMenu</f4> <!-- Exit -->
<f10>VolumeUp</f10> <!-- MCE Vol up -->
<f9>VolumeDown</f9> <!-- MCE Vol down -->
<f8>Mute</f8> <!-- MCE mute -->
@@ -211,6 +221,10 @@
<delete>Delete</delete>
<r>Rename</r>
<k>PreviousMenu</k>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
</keyboard>
</MyTVRecordings>
<MyTVTimers>
@@ -218,6 +232,10 @@
<delete>Delete</delete>
<r>Rename</r>
<b>PreviousMenu</b>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
</keyboard>
</MyTVTimers>
<MyRadioChannels>
@@ -230,12 +248,20 @@
<keyboard>
<delete>Delete</delete>
<r>Rename</r>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
</keyboard>
</MyRadioRecordings>
<MyRadioTimers>
<keyboard>
<delete>Delete</delete>
<r>Rename</r>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
</keyboard>
</MyRadioTimers>
<TVGuide>
@@ -302,6 +328,7 @@
<i>Info</i>
<o>CodecInfo</o>
<z>AspectRatio</z>
+ <zoom>AspectRatio</zoom>
<t>ShowSubtitles</t>
<t mod="ctrl">SubtitleAlign</t>
<l>NextSubtitle</l>
@@ -313,6 +340,7 @@
<escape>Fullscreen</escape>
<c>Playlist</c>
<v>ActivateWindow(Teletext)</v>
+ <text>ActivateWindow(Teletext)</text>
<up mod="ctrl">SubtitleShiftUp</up>
<down mod="ctrl">SubtitleShiftDown</down>
<pageup>SkipNext</pageup>
@@ -361,6 +389,7 @@
<i>Info</i>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Addon.Default.OpenSettings(xbmc.player.musicviz)</v>
+ <text>Addon.Default.OpenSettings(xbmc.player.musicviz)</text>
<n>ActivateWindow(MusicPlaylist)</n>
<left>StepBack</left>
<right>StepForward</right>
@@ -385,6 +414,7 @@
<o>CodecInfo</o>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Addon.Default.OpenSettings(xbmc.player.musicviz)</v>
+ <text>Addon.Default.OpenSettings(xbmc.player.musicviz)</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</MusicOSD>
@@ -399,6 +429,7 @@
<o>CodecInfo</o>
<p>ActivateWindow(VisualisationPresetList)</p>
<v>Back</v>
+ <text>Back</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</VisualisationSettings>
@@ -413,6 +444,7 @@
<o>CodecInfo</o>
<p>Back</p>
<v>Back</v>
+ <text>Back</text>
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</VisualisationPresetList>
@@ -472,6 +504,7 @@
<i>Info</i>
<o>CodecInfo</o>
<z>AspectRatio</z>
+ <zoom>AspectRatio</zoom>
<t>ShowSubtitles</t>
<l>NextSubtitle</l>
<a>AudioDelay</a>
@@ -561,6 +594,11 @@
<Teletext>
<keyboard>
<v>Back</v>
+ <text>Back</text>
+ <red>Red</red>
+ <green>Green</green>
+ <yellow>Yellow</yellow>
+ <blue>Blue</blue>
</keyboard>
</Teletext>
<Favourites>
@@ -649,9 +687,13 @@
<Addon>
<keyboard>
<f1>Red</f1>
+ <red>Red</red>
<f2>Green</f2>
+ <green>Green</green>
<f3>Yellow</f3>
+ <yellow>Yellow</yellow>
<f4>Blue</f4>
+ <blue>Blue</blue>
</keyboard>
</Addon>
</keymap>
diff --git a/system/keymaps/mouse.xml b/system/keymaps/mouse.xml
index d83fab0990..c2b39f86d3 100644
--- a/system/keymaps/mouse.xml
+++ b/system/keymaps/mouse.xml
@@ -29,4 +29,11 @@
<wheeldown>NextPicture</wheeldown>
</mouse>
</SlideShow>
+ <FullscreenVideo>
+ <mouse>
+ <rightclick>Info</rightclick>
+ </mouse>
+ </FullscreenVideo>
+
+
</keymap>
diff --git a/xbmc/input/XBMC_keysym.h b/xbmc/input/XBMC_keysym.h
index 873ed8a813..89c21f5c60 100644
--- a/xbmc/input/XBMC_keysym.h
+++ b/xbmc/input/XBMC_keysym.h
@@ -224,6 +224,11 @@ typedef enum {
XBMCK_GREEN = 0x148,
XBMCK_YELLOW = 0x149,
XBMCK_BLUE = 0x14a,
+ XBMCK_ZOOM = 0x14b,
+ XBMCK_TEXT = 0x14c,
+ XBMCK_FAVORITES = 0x14d,
+ XBMCK_HOMEPAGE = 0x14e,
+ XBMCK_CONFIG = 0x14f,
// Add any other keys here
diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp
index dc46204838..4d05464722 100644
--- a/xbmc/input/XBMC_keytable.cpp
+++ b/xbmc/input/XBMC_keytable.cpp
@@ -238,6 +238,11 @@ static const XBMCKEYTABLE XBMCKeyTable[] =
, { XBMCK_GREEN, 0, 0, XBMCVK_GREEN, "green" }
, { XBMCK_YELLOW, 0, 0, XBMCVK_YELLOW, "yellow" }
, { XBMCK_BLUE, 0, 0, XBMCVK_BLUE, "blue" }
+, { XBMCK_ZOOM, 0, 0, XBMCVK_ZOOM, "zoom" }
+, { XBMCK_TEXT, 0, 0, XBMCVK_TEXT, "text" }
+, { XBMCK_FAVORITES, 0, 0, XBMCVK_FAVORITES, "favorites" }
+, { XBMCK_HOMEPAGE , 0, 0, XBMCVK_HOMEPAGE, "homepage" }
+, { XBMCK_CONFIG, 0, 0, XBMCVK_CONFIG, "config" }
};
static int XBMCKeyTableSize = sizeof(XBMCKeyTable)/sizeof(XBMCKEYTABLE);
diff --git a/xbmc/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h
index 7fd8a8647d..af114c976e 100644
--- a/xbmc/input/XBMC_vkeys.h
+++ b/xbmc/input/XBMC_vkeys.h
@@ -216,6 +216,11 @@ typedef enum {
XBMCVK_GREEN = 0xE4,
XBMCVK_YELLOW = 0xE5,
XBMCVK_BLUE = 0xE6,
+ XBMCVK_ZOOM = 0xE7,
+ XBMCVK_TEXT = 0xE8,
+ XBMCVK_FAVORITES = 0xE9,
+ XBMCVK_HOMEPAGE = 0xEA,
+ XBMCVK_CONFIG = 0xEB,
XBMCVK_LAST = 0xFF
} XBMCVKey;
diff --git a/xbmc/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp
index 723f7ae80a..1c17a1327d 100644
--- a/xbmc/input/linux/LinuxInputDevices.cpp
+++ b/xbmc/input/linux/LinuxInputDevices.cpp
@@ -255,13 +255,24 @@ KeyMap keyMap[] = {
{ KEY_PRINT , XBMCK_PRINT },
{ KEY_QUESTION , XBMCK_HELP },
{ KEY_BACK , XBMCK_BACKSPACE },
+ { KEY_ZOOM , XBMCK_ZOOM },
+ { KEY_TEXT , XBMCK_TEXT },
+ { KEY_FAVORITES , XBMCK_FAVORITES },
+ { KEY_RED , XBMCK_RED },
+ { KEY_GREEN , XBMCK_GREEN },
+ { KEY_YELLOW , XBMCK_YELLOW },
+ { KEY_BLUE , XBMCK_BLUE },
+ { KEY_HOMEPAGE , XBMCK_HOMEPAGE },
+ { KEY_MAIL , XBMCK_LAUNCH_MAIL },
+ { KEY_SEARCH , XBMCK_BROWSER_SEARCH},
+ { KEY_FILE , XBMCK_LAUNCH_FILE_BROWSER},
+ { KEY_SELECT , XBMCK_RETURN },
+ { KEY_CONFIG , XBMCK_CONFIG },
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green
{ 381 , XBMCK_UP }, // Yellow
{ 366 , XBMCK_DOWN }, // Blue
- // Rii i7 Home button / wetek openelec remote (code 172)
- { KEY_HOMEPAGE , XBMCK_HOME },
};
typedef enum
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
index 010607f00b..e49e8bb3a2 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
@@ -237,7 +237,7 @@ void CGUIDialogPVRTimerSettings::InitializeSettings()
AddTypeDependentEnableCondition(setting, SETTING_TMR_TYPE);
// Timer enabled/disabled
- setting = AddToggle(group, SETTING_TMR_ACTIVE, 19074, 0, m_bTimerActive);
+ setting = AddToggle(group, SETTING_TMR_ACTIVE, 305, 0, m_bTimerActive);
AddTypeDependentVisibilityCondition(setting, SETTING_TMR_ACTIVE);
AddTypeDependentEnableCondition(setting, SETTING_TMR_ACTIVE);
diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.cpp b/xbmc/pvr/timers/PVRTimerInfoTag.cpp
index ba3b1dd9f3..576309e0e5 100644
--- a/xbmc/pvr/timers/PVRTimerInfoTag.cpp
+++ b/xbmc/pvr/timers/PVRTimerInfoTag.cpp
@@ -420,7 +420,7 @@ std::string CPVRTimerInfoTag::GetStatus() const
else if (m_state == PVR_TIMER_STATE_ERROR)
strReturn = g_localizeStrings.Get(257);
else if (m_state == PVR_TIMER_STATE_DISABLED)
- strReturn = g_localizeStrings.Get(825);
+ strReturn = g_localizeStrings.Get(13106);
return strReturn;
}
@@ -808,7 +808,7 @@ void CPVRTimerInfoTag::GetNotificationText(std::string &strText) const
break;
case PVR_TIMER_STATE_SCHEDULED:
if (IsRepeating())
- stringID = 826; // Timer activated
+ stringID = 19058; // Timer enabled
else
stringID = 19225; // Recording scheduled
break;
@@ -826,7 +826,7 @@ void CPVRTimerInfoTag::GetNotificationText(std::string &strText) const
stringID = 19278; // Recording error
break;
case PVR_TIMER_STATE_DISABLED:
- stringID = 827; // Timer deactivated
+ stringID = 19057; // Timer disabled
break;
default:
break;
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-24 04:27:14 +0000