aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/keymaps/appcommand.xml6
-rw-r--r--system/keymaps/customcontroller.AppleRemote.xml15
-rw-r--r--system/keymaps/customcontroller.Harmony.xml66
-rw-r--r--system/keymaps/gamepad.xml43
-rw-r--r--system/keymaps/joystick.xml36
-rw-r--r--system/keymaps/keyboard.xml65
-rw-r--r--system/keymaps/remote.xml66
-rw-r--r--system/keymaps/touchscreen.xml6
8 files changed, 92 insertions, 211 deletions
diff --git a/system/keymaps/appcommand.xml b/system/keymaps/appcommand.xml
index 2cbee66a6f..c51ec72504 100644
--- a/system/keymaps/appcommand.xml
+++ b/system/keymaps/appcommand.xml
@@ -17,9 +17,9 @@
<stop>Stop</stop>
<play_pause>PlayPause</play_pause>
<launch_mail/>
- <launch_media_select>ActivateWindow(MyMusic)</launch_media_select>
- <launch_app1>ActivateWindow(MyPrograms)</launch_app1>
- <launch_app2>ActivateWindow(MyPrograms)</launch_app2>
+ <launch_media_select>ActivateWindow(Music)</launch_media_select>
+ <launch_app1>ActivateWindow(Programs)</launch_app1>
+ <launch_app2>ActivateWindow(Programs)</launch_app2>
<play>Play</play>
<pause>Pause</pause>
<fastforward>FastForward</fastforward>
diff --git a/system/keymaps/customcontroller.AppleRemote.xml b/system/keymaps/customcontroller.AppleRemote.xml
index c20bb98615..4a47364c89 100644
--- a/system/keymaps/customcontroller.AppleRemote.xml
+++ b/system/keymaps/customcontroller.AppleRemote.xml
@@ -8,18 +8,18 @@
<!-- The format is: -->
<!-- <device> -->
-<!-- <button id=""#>xbmc action</button>
+<!-- <button id=""#>xbmc action</button> -->
<!-- </device> -->
<!-- To map keys from other remotes using the RCA protocol, you may add <customcontroller name="AppleRemote"> blocks -->
<!-- In this case, the tags used are <button id=""#> where # is the original button code (OBC) of the key -->
<!-- You set it up by adding a <customcontroller name="AppleRemote"> block to the window or <global> section: -->
<!-- <customcontroller name="AppleRemote"> -->
-<!-- <button id="45">Stop</button>
+<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->
<!-- Note that the action can be a built-in function. -->
-<!-- eg <button id="6">ActivateWindow(Favourites)</button>
+<!-- eg <button id="6">ActivateWindow(Favourites)</button> -->
<!-- would bring up Favourites when the button with the id of 6 is press. In this case, "Menu" -->
<!-- -->
@@ -177,16 +177,11 @@
<button id="8"/>
</customcontroller>
</VideoMenu>
- <MyVideoLibrary>
+ <Videos>
<customcontroller name="AppleRemote">
<button id="7">Info</button>
</customcontroller>
- </MyVideoLibrary>
- <MyVideoFiles>
- <customcontroller name="AppleRemote">
- <button id="7">Info</button>
- </customcontroller>
- </MyVideoFiles>
+ </Videos>
<PictureInfo>
<customcontroller name="AppleRemote">
<button id="3">Left</button>
diff --git a/system/keymaps/customcontroller.Harmony.xml b/system/keymaps/customcontroller.Harmony.xml
index 728cb734e6..6666f11fd2 100644
--- a/system/keymaps/customcontroller.Harmony.xml
+++ b/system/keymaps/customcontroller.Harmony.xml
@@ -15,11 +15,11 @@
<!-- In this case, the tags used are <button id=""#> where # is the original button code (OBC) of the key -->
<!-- You set it up by adding a <customcontroller name="Harmony"> block to the window or <global> section: -->
<!-- <customcontroller name="Harmony"> -->
-<!-- <button id="45">Stop</button>
+<!-- <button id="45">Stop</button> -->
<!-- </customcontroller> -->
<!-- Note that the action can be a built-in function. -->
-<!-- eg <B>ActivateWindow(MyMusic)</B> -->
+<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to My Music on the press of the B button. -->
<!-- Joysticks / Gamepads: -->
@@ -85,17 +85,17 @@
<!-- Mute --> <button id="125">Mute</button>
<!-- Aspect --> <button id="161">AspectRatio</button>
<!-- F1 --> <button id="153">ActivateWindow(Music)</button>
- <!-- F3 --> <button id="155">ActivateWindow(videolibrary,tvshowtitles,return)</button>
- <!-- F2 --> <button id="154">ActivateWindow(videolibrary,movietitles,return)</button>
+ <!-- F3 --> <button id="155">ActivateWindow(Videos,tvshowtitles,return)</button>
+ <!-- F2 --> <button id="154">ActivateWindow(Videos,movietitles,return)</button>
<!-- F4 --> <button id="156">ActivateWindow(Weather)</button>
<!-- F5 --> <button id="193">OSD</button>
<!-- F7 --> <button id="195">ActivateWindow(Home)</button>
- <!-- F6 --> <button id="194">ActivateWindow(Scripts)</button>
+ <!-- F6 --> <button id="194">ActivateWindow(Programs)</button>
<!-- F8 --> <button id="196">ActivateWindow(favourites)</button>
<!-- F9 --> <button id="173">ShowVideoMenu</button>
<!-- F10 --> <button id="174">ShowSubtitles</button>
<!-- F11 --> <button id="175">NextSubtitle</button>
- <!-- F12 --> <button id="176">ActivateWindow(VideoFiles)</button>
+ <!-- F12 --> <button id="176">ActivateWindow(Videos)</button>
<!-- F13 --> <button id="163">Playlist</button>
<!-- F14 --> <button id="164">AudioNextLanguage</button>
<!-- Large Down --> <button id="182">PageDown</button>
@@ -118,14 +118,14 @@
<!-- 1 --> <button id="111">ToggleFullScreen</button>
</customcontroller>
</Home>
- <MyFiles>
+ <FileManager>
<customcontroller name="Harmony">
<!-- 1 --> <button id="111">Highlight</button>
<!-- 4 --> <button id="114">Copy</button>
<!-- 7 --> <button id="133">Move</button>
<!-- * clear --> <button id="145">Delete</button>
</customcontroller>
- </MyFiles>
+ </FileManager>
<MyMusicPlaylist>
<customcontroller name="Harmony">
<!-- * clear --> <button id="145">Delete</button>
@@ -133,9 +133,8 @@
<!-- Channel Down --> <button id="172">MoveItemDown</button>
</customcontroller>
</MyMusicPlaylist>
- <MyMusicFiles>
+ <Music>
<customcontroller name="Harmony">
- <!-- * clear --> <button id="145">Delete</button>
<!-- 1 --> <button id="111">number1</button>
<!-- 2 --> <button id="112">JumpSMS2</button>
<!-- 3 --> <button id="113">JumpSMS3</button>
@@ -146,20 +145,7 @@
<!-- 8 --> <button id="134">JumpSMS8</button>
<!-- 9 --> <button id="143">JumpSMS9</button>
</customcontroller>
- </MyMusicFiles>
- <MyMusicLibrary>
- <customcontroller name="Harmony">
- <!-- 1 --> <button id="111">number1</button>
- <!-- 2 --> <button id="112">JumpSMS2</button>
- <!-- 3 --> <button id="113">JumpSMS3</button>
- <!-- 4 --> <button id="114">JumpSMS4</button>
- <!-- 5 --> <button id="123">JumpSMS5</button>
- <!-- 6 --> <button id="124">JumpSMS6</button>
- <!-- 7 --> <button id="133">JumpSMS7</button>
- <!-- 8 --> <button id="134">JumpSMS8</button>
- <!-- 9 --> <button id="143">JumpSMS9</button>
- </customcontroller>
- </MyMusicLibrary>
+ </Music>
<FullscreenVideo>
<customcontroller name="Harmony">
<!-- up --> <button id="101">ChapterOrBigStepForward</button>
@@ -209,7 +195,7 @@
<!-- Prev --> <button id="132">LockPreset</button>
<!-- Info --> <button id="131">Info</button>
<!-- F8 --> <button id="196">ActivateWindow(VisualisationPresetList)</button>
- <!-- F9 --> <button id="173">ActivateWindow(VisualisationSettings)</button>
+ <!-- F9 --> <button id="173">ActivateWindow(AddonSettings)</button>
</customcontroller>
</Visualisation>
<MusicOSD>
@@ -218,11 +204,11 @@
<!-- Info --> <button id="131">CodecInfo</button>
</customcontroller>
</MusicOSD>
- <VisualisationSettings>
+ <AddonSettings>
<customcontroller name="Harmony">
<!-- menu --> <button id="106">Back</button>
</customcontroller>
- </VisualisationSettings>
+ </AddonSettings>
<VisualisationPresetList>
<customcontroller name="Harmony">
<!-- menu --> <button id="106">Back</button>
@@ -254,13 +240,13 @@
<!-- Guide --> <button id="165">NextResolution</button>
</customcontroller>
</ScreenCalibration>
- <GUICalibration>
+ <ScreenCalibration>
<customcontroller name="Harmony">
<!-- OK --> <button id="105">NextCalibration</button>
<!-- 0 --> <button id="144">ResetCalibration</button>
<!-- # enter --> <button id="136">NextCalibration</button>
</customcontroller>
- </GUICalibration>
+ </ScreenCalibration>
<VideoOSD>
<customcontroller name="Harmony">
<!-- menu --> <button id="106">Back</button>
@@ -288,7 +274,7 @@
<!-- * clear --> <button id="145">Delete</button>
</customcontroller>
</VideoBookmarks>
- <MyVideoLibrary>
+ <Videos>
<customcontroller name="Harmony">
<!-- * clear --> <button id="145">Delete</button>
<!-- # enter --> <button id="136">ToggleWatched</button>
@@ -302,21 +288,7 @@
<!-- 8 --> <button id="134">JumpSMS8</button>
<!-- 9 --> <button id="143">JumpSMS9</button>
</customcontroller>
- </MyVideoLibrary>
- <MyVideoFiles>
- <customcontroller name="Harmony">
- <!-- * clear --> <button id="145">Delete</button>
- <!-- 1 --> <button id="111">number1</button>
- <!-- 2 --> <button id="112">JumpSMS2</button>
- <!-- 3 --> <button id="113">JumpSMS3</button>
- <!-- 4 --> <button id="114">JumpSMS4</button>
- <!-- 5 --> <button id="123">JumpSMS5</button>
- <!-- 6 --> <button id="124">JumpSMS6</button>
- <!-- 7 --> <button id="133">JumpSMS7</button>
- <!-- 8 --> <button id="134">JumpSMS8</button>
- <!-- 9 --> <button id="143">JumpSMS9</button>
- </customcontroller>
- </MyVideoFiles>
+ </Videos>
<MyVideoPlaylist>
<customcontroller name="Harmony">
<!-- * clear --> <button id="145">Delete</button>
@@ -343,11 +315,11 @@
<!-- Fwd --> <button id="142">CursorRight</button>
</customcontroller>
</VirtualKeyboard>
- <Scripts>
+ <Programs>
<customcontroller name="Harmony">
<!-- Info --> <button id="131">info</button>
</customcontroller>
- </Scripts>
+ </Programs>
<NumericInput>
<customcontroller name="Harmony">
<!-- 1 --> <button id="111">Number1</button>
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml
index 1e839ca59d..ab298f0a45 100644
--- a/system/keymaps/gamepad.xml
+++ b/system/keymaps/gamepad.xml
@@ -19,7 +19,7 @@
<!-- </universalremote> -->
<!-- Note that the action can be a built-in function. -->
-<!-- eg <B>ActivateWindow(MyMusic)</B> -->
+<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to My Music on the press of the B button. -->
<!-- An empty action removes the corresponding mapping from the default keymap -->
@@ -61,16 +61,11 @@
<rightthumbstickdown>VolumeDown</rightthumbstickdown>
</gamepad>
</global>
- <Home>
- <gamepad>
- <black>Skin.ToggleSetting(HomeViewToggle)</black>
- </gamepad>
- </Home>
- <MyFiles>
+ <FileManager>
<gamepad>
<Y>Highlight</Y>
</gamepad>
- </MyFiles>
+ </FileManager>
<MyMusicPlaylist>
<gamepad>
<Y>Delete</Y>
@@ -82,18 +77,12 @@
<Y>Queue</Y>
</gamepad>
</MyMusicPlaylistEditor>
- <MyMusicFiles>
- <gamepad>
- <Y>Queue</Y>
- <black>Playlist</black>
- </gamepad>
- </MyMusicFiles>
- <MyMusicLibrary>
+ <Music>
<gamepad>
<Y>Queue</Y>
<black>Playlist</black>
</gamepad>
- </MyMusicLibrary>
+ </Music>
<FullscreenVideo>
<gamepad>
<A>Pause</A>
@@ -167,13 +156,13 @@
<rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
</gamepad>
</MusicOSD>
- <VisualisationSettings>
+ <AddonSettings>
<gamepad>
<start>Back</start>
<leftanalogtrigger>AnalogRewind</leftanalogtrigger>
<rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
</gamepad>
- </VisualisationSettings>
+ </AddonSettings>
<VisualisationPresetList>
<gamepad>
<start>Back</start>
@@ -208,13 +197,13 @@
<white>NextResolution</white>
</gamepad>
</ScreenCalibration>
- <GUICalibration>
+ <ScreenCalibration>
<gamepad>
<leftthumbstick>AnalogMove</leftthumbstick>
<A>NextCalibration</A>
<black>ResetCalibration</black>
</gamepad>
- </GUICalibration>
+ </ScreenCalibration>
<VideoOSD>
<gamepad>
<start>Back</start>
@@ -266,17 +255,11 @@
<rightanalogtrigger>AnalogFastForward</rightanalogtrigger>
</gamepad>
</VideoBookmarks>
- <MyVideoLibrary>
+ <Videos>
<gamepad>
<black>Delete</black>
</gamepad>
- </MyVideoLibrary>
- <MyVideoFiles>
- <gamepad>
- <Y>Queue</Y>
- <black>Playlist</black>
- </gamepad>
- </MyVideoFiles>
+ </Videos>
<MyVideoPlaylist>
<gamepad>
<Y>Delete</Y>
@@ -298,11 +281,11 @@
<white>Back</white>
</gamepad>
</ContextMenu>
- <Scripts>
+ <Programs>
<gamepad>
<black>info</black>
</gamepad>
- </Scripts>
+ </Programs>
<NumericInput>
<gamepad>
<B>BackSpace</B>
diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml
index 976223edcc..516726d76a 100644
--- a/system/keymaps/joystick.xml
+++ b/system/keymaps/joystick.xml
@@ -29,25 +29,18 @@
<rightstickdown>VolumeDown</rightstickdown>
</joystick>
</global>
- <Home>
- <joystick>
- <start>Skin.ToggleSetting(HomeViewToggle)</start>
- </joystick>
- </Home>
- <MyFiles>
+ <FileManager>
<joystick>
<rightbumper>Highlight</rightbumper>
</joystick>
- </MyFiles>
+ </FileManager>
<MyMusicPlaylist>
<joystick>
<leftbumper>Delete</leftbumper>
</joystick>
</MyMusicPlaylist>
- <MyMusicFiles>
- </MyMusicFiles>
- <MyMusicLibrary>
- </MyMusicLibrary>
+ <Music>
+ </Music>
<FullscreenVideo>
<joystick>
<a>Pause</a>
@@ -115,7 +108,7 @@
<joystick>
<a>Pause</a>
<b>Stop</b>
- <x>ActivateWindow(VisualisationSettings)</x>
+ <x>ActivateWindow(AddonSettings)</x>
<y>ActivateWindow(VisualisationPresetList)</y>
<start>Info</start>
<rightthumb>ActivateWindow(MusicOSD)</rightthumb>
@@ -137,11 +130,6 @@
<start>Info</start>
</joystick>
</MusicOSD>
- <VisualisationSettings>
- <joystick>
- <b>Close</b>
- </joystick>
- </VisualisationSettings>
<VisualisationPresetList>
<joystick>
<b>Close</b>
@@ -173,13 +161,13 @@
<rightbumper>NextCalibration</rightbumper>
</joystick>
</ScreenCalibration>
- <GUICalibration>
+ <ScreenCalibration>
<joystick>
<x>ResetCalibration</x>
<leftbumper>NextResolution</leftbumper>
<rightbumper>NextCalibration</rightbumper>
</joystick>
- </GUICalibration>
+ </ScreenCalibration>
<VideoOSD>
<joystick>
<b>Close</b>
@@ -210,10 +198,8 @@
<leftbumper>Delete</leftbumper>
</joystick>
</VideoBookmarks>
- <MyVideoLibrary>
- </MyVideoLibrary>
- <MyVideoFiles>
- </MyVideoFiles>
+ <Videos>
+ </Videos>
<MyVideoPlaylist>
<joystick>
<leftbumper>Delete</leftbumper>
@@ -234,11 +220,11 @@
<b>Close</b>
</joystick>
</ContextMenu>
- <Scripts>
+ <Programs>
<joystick>
<x>ContextMenu</x>
</joystick>
- </Scripts>
+ </Programs>
<Settings>
<joystick>
<b>PreviousMenu</b>
diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml
index 9d0979dd00..b8982428dc 100644
--- a/system/keymaps/keyboard.xml
+++ b/system/keymaps/keyboard.xml
@@ -12,7 +12,7 @@
<!-- not used in the current window's section. -->
<!-- -->
<!-- Actions can be built-in functions. -->
-<!-- eg <B>ActivateWindow(MyMusic)</B> -->
+<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to Music on the press of the B button. -->
<!-- -->
<!-- Long presses -->
@@ -102,9 +102,9 @@
<b>ActivateWindow(TVTimers)</b>
<!-- PVR -->
<red>ActivateWindow(TVChannels)</red>
- <green>ActivateWindow(MyVideos)</green>
- <yellow>ActivateWindow(MyMusic)</yellow>
- <blue>ActivateWindow(MyPictures)</blue>
+ <green>ActivateWindow(Videos)</green>
+ <yellow>ActivateWindow(Music)</yellow>
+ <blue>ActivateWindow(Pictures)</blue>
<!-- Multimedia keyboard keys -->
<browser_back>Back</browser_back>
<browser_forward/>
@@ -127,9 +127,9 @@
<rewind>Rewind</rewind>
<record/>
<launch_mail></launch_mail>
- <launch_media_select>ActivateWindow(MyMusic)</launch_media_select>
- <launch_app1_pc_icon>ActivateWindow(MyPrograms)</launch_app1_pc_icon>
- <launch_app2_pc_icon>ActivateWindow(MyPrograms)</launch_app2_pc_icon>
+ <launch_media_select>ActivateWindow(Music)</launch_media_select>
+ <launch_app1_pc_icon>ActivateWindow(Programs)</launch_app1_pc_icon>
+ <launch_app2_pc_icon>ActivateWindow(Programs)</launch_app2_pc_icon>
<launch_file_browser/>
<launch_media_center/>
<!-- ****************************************************** -->
@@ -257,7 +257,7 @@
<t>ShowTimerRule</t>
</keyboard>
</RadioGuide>
- <MyFiles>
+ <FileManager>
<keyboard>
<space>Highlight</space>
<delete>Delete</delete>
@@ -266,7 +266,7 @@
<play_pause mod="longpress">Highlight</play_pause>
<backspace mod="longpress">ActivateWindow(Home)</backspace>
</keyboard>
- </MyFiles>
+ </FileManager>
<MyMusicPlaylist>
<keyboard>
<n>Back</n>
@@ -284,21 +284,13 @@
<backspace mod="longpress">ActivateWindow(Home)</backspace>
</keyboard>
</MyMusicPlaylistEditor>
- <MyMusicFiles>
+ <Music>
<keyboard>
<n>Playlist</n>
<q>Queue</q>
- <delete>Delete</delete>
<backspace mod="longpress">ActivateWindow(Home)</backspace>
</keyboard>
- </MyMusicFiles>
- <MyMusicLibrary>
- <keyboard>
- <n>Playlist</n>
- <q>Queue</q>
- <backspace mod="longpress">ActivateWindow(Home)</backspace>
- </keyboard>
- </MyMusicLibrary>
+ </Music>
<FullscreenVideo>
<keyboard>
<f>FastForward</f>
@@ -411,21 +403,6 @@
<n>ActivateWindow(MusicPlaylist)</n>
</keyboard>
</MusicOSD>
- <VisualisationSettings>
- <keyboard>
- <f>FastForward</f>
- <r>Rewind</r>
- <period>SkipNext</period>
- <comma>SkipPrevious</comma>
- <m>Back</m>
- <i>Info</i>
- <o>CodecInfo</o>
- <p>ActivateWindow(VisualisationPresetList)</p>
- <v>Back</v>
- <text>Back</text>
- <n>ActivateWindow(MusicPlaylist)</n>
- </keyboard>
- </VisualisationSettings>
<VisualisationPresetList>
<keyboard>
<f>FastForward</f>
@@ -473,13 +450,13 @@
<r>NextResolution</r>
</keyboard>
</ScreenCalibration>
- <GUICalibration>
+ <ScreenCalibration>
<keyboard>
<return>NextCalibration</return>
<enter>NextCalibration</enter>
<d>ResetCalibration</d>
</keyboard>
- </GUICalibration>
+ </ScreenCalibration>
<VideoOSD>
<keyboard>
<m>Back</m>
@@ -526,22 +503,14 @@
<delete>Delete</delete>
</keyboard>
</VideoBookmarks>
- <MyVideoLibrary>
+ <Videos>
<keyboard>
<delete>Delete</delete>
<n>Playlist</n>
<w>ToggleWatched</w>
<backspace mod="longpress">ActivateWindow(Home)</backspace>
</keyboard>
- </MyVideoLibrary>
- <MyVideoFiles>
- <keyboard>
- <n>Playlist</n>
- <q>Queue</q>
- <w>ToggleWatched</w>
- <backspace mod="longpress">ActivateWindow(Home)</backspace>
- </keyboard>
- </MyVideoFiles>
+ </Videos>
<MyVideoPlaylist>
<keyboard>
<n>Back</n>
@@ -655,12 +624,12 @@
<browser_back>Close</browser_back>
</keyboard>
</PVROSDGuide>
- <MyTVSettings>
+ <PVRSettings>
<keyboard>
<backspace>PreviousMenu</backspace>
<browser_back>PreviousMenu</browser_back>
</keyboard>
- </MyTVSettings>
+ </PVRSettings>
<FileBrowser>
<keyboard>
<space>Highlight</space>
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index a0c8edf905..2220ae452e 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -19,7 +19,7 @@
<!-- </universalremote> -->
<!-- Note that the action can be a built-in function. -->
-<!-- eg <B>ActivateWindow(MyMusic)</B> -->
+<!-- eg <B>ActivateWindow(Music)</B> -->
<!-- would automatically go to My Music on the press of the B button. -->
<!-- An empty action removes the corresponding mapping from the default keymap -->
@@ -73,9 +73,9 @@
<volumeminus>VolumeDown</volumeminus>
<mute>Mute</mute>
<power>ShutDown()</power>
- <myvideo>ActivateWindow(MyVideos)</myvideo>
- <mymusic>ActivateWindow(MyMusic)</mymusic>
- <mypictures>ActivateWindow(MyPictures)</mypictures>
+ <myvideo>ActivateWindow(Videos)</myvideo>
+ <mymusic>ActivateWindow(Music)</mymusic>
+ <mypictures>ActivateWindow(Pictures)</mypictures>
<mytv>ActivateWindow(Videos,TvShows)</mytv>
<guide>ActivateWindow(TVGuide)</guide>
<livetv>ActivateWindow(TVChannels)</livetv>
@@ -83,9 +83,9 @@
<recordedtv>ActivateWindow(TVRecordings)</recordedtv>
<epgsearch>ActivateWindow(TVSearch)</epgsearch>
<red>ActivateWindow(TVChannels)</red>
- <green>ActivateWindow(MyVideos)</green>
- <yellow>ActivateWindow(MyMusic)</yellow>
- <blue>ActivateWindow(MyPictures)</blue>
+ <green>ActivateWindow(Videos)</green>
+ <yellow>ActivateWindow(Music)</yellow>
+ <blue>ActivateWindow(Pictures)</blue>
<zero>Number0</zero>
<one>Number1</one>
<two>JumpSMS2</two>
@@ -142,14 +142,14 @@
<blue>Blue</blue>
</remote>
</MyRadioTimers>
- <MyFiles>
+ <FileManager>
<remote>
<clear>Delete</clear>
<zero>Highlight</zero>
<star>Move</star>
<hash>Rename</hash>
</remote>
- </MyFiles>
+ </FileManager>
<MyMusicPlaylist>
<remote>
<clear>Delete</clear>
@@ -161,18 +161,12 @@
<zero>Queue</zero>
</remote>
</MyMusicPlaylistEditor>
- <MyMusicFiles>
+ <Music>
<remote>
<zero>Queue</zero>
<star>Queue</star>
</remote>
- </MyMusicFiles>
- <MyMusicLibrary>
- <remote>
- <zero>Queue</zero>
- <star>Queue</star>
- </remote>
- </MyMusicLibrary>
+ </Music>
<MyPictures>
<remote>
<clear>Delete</clear>
@@ -264,13 +258,6 @@
<info>CodecInfo</info>
</remote>
</MusicOSD>
- <VisualisationSettings>
- <remote>
- <menu>Back</menu>
- <contentsmenu>Back</contentsmenu>
- <rootmenu>Back</rootmenu>
- </remote>
- </VisualisationSettings>
<VisualisationPresetList>
<remote>
<menu>Back</menu>
@@ -305,12 +292,12 @@
<xbox>NextResolution</xbox>
</remote>
</ScreenCalibration>
- <GUICalibration>
+ <ScreenCalibration>
<remote>
<select>NextCalibration</select>
<zero>ResetCalibration</zero>
</remote>
- </GUICalibration>
+ </ScreenCalibration>
<VideoOSD>
<remote>
<menu>Back</menu>
@@ -366,18 +353,12 @@
<zero>Delete</zero>
</remote>
</VideoBookmarks>
- <MyVideoLibrary>
+ <Videos>
<remote>
<zero>Queue</zero>
<clear>Delete</clear>
</remote>
- </MyVideoLibrary>
- <MyVideoFiles>
- <remote>
- <zero>Queue</zero>
- <star>Queue</star>
- </remote>
- </MyVideoFiles>
+ </Videos>
<MyVideoPlaylist>
<remote>
<clear>Delete</clear>
@@ -409,11 +390,11 @@
<title>Back</title>
</remote>
</ContextMenu>
- <Scripts>
+ <Programs>
<remote>
<info>info</info>
</remote>
- </Scripts>
+ </Programs>
<NumericInput>
<remote>
<zero>Number0</zero>
@@ -474,11 +455,11 @@
<back>PreviousMenu</back>
</remote>
</SystemSettings>
- <NetworkSettings>
+ <ServiceSettings>
<remote>
<back>PreviousMenu</back>
</remote>
- </NetworkSettings>
+ </ServiceSettings>
<InterfaceSettings>
<remote>
<back>PreviousMenu</back>
@@ -680,16 +661,11 @@
<nine>number9</nine>
</remote>
</RadioGuide>
- <MyTVSettings>
+ <PVRSettings>
<remote>
<back>PreviousMenu</back>
</remote>
- </MyTVSettings>
- <AddonSettings>
- <remote>
- <clear>Delete</clear>
- </remote>
- </AddonSettings>
+ </PVRSettings>
<Addon>
<remote>
<red>Red</red>
diff --git a/system/keymaps/touchscreen.xml b/system/keymaps/touchscreen.xml
index 4d16457c2a..5124cdfe8f 100644
--- a/system/keymaps/touchscreen.xml
+++ b/system/keymaps/touchscreen.xml
@@ -15,13 +15,13 @@
<swipe direction="down" pointers="3">ActivateWindow(PlayerControls)</swipe>
</touch>
</global>
- <MyFiles>
+ <FileManager>
<touch>
<tap>Select</tap>
<swipe direction="left">Highlight</swipe>
<swipe direction="right">Highlight</swipe>
</touch>
- </MyFiles>
+ </FileManager>
<FullScreenVideo>
<touch>
<swipe direction="left">StepBack</swipe>
@@ -100,4 +100,4 @@
<swipe direction="down">ChannelDown</swipe>
</touch>
</FullScreenRadio>
-</keymap> \ No newline at end of file
+</keymap>