diff options
| author | unknown <Martin@.(none)> | 2011-09-14 11:57:34 +0100 |
|---|---|---|
| committer | unknown <Martin@.(none)> | 2011-09-14 11:57:34 +0100 |
| commit | 03c4006c6d8a36f923ca8f2fa483a9fa5e1533f5 (patch) | |
| tree | 379320d98eed55454a59328f72975df2dd93940e /system | |
| parent | b20ee49f17c252842f84ef9f695ea7260b4c95f8 (diff) | |
| parent | c93ea68b5428a910914042f4429c3e8f9e7922d3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'system')
21 files changed, 583 insertions, 1749 deletions
diff --git a/system/keymaps/appcommand.xml b/system/keymaps/appcommand.xml index 468125b11d..aab40009cb 100644 --- a/system/keymaps/appcommand.xml +++ b/system/keymaps/appcommand.xml @@ -1,7 +1,7 @@ <keymap> <global> <appcommand> - <browser_back>ParentDir</browser_back> + <browser_back>Back</browser_back> <browser_forward/> <browser_refresh/> <browser_stop>Stop</browser_stop> @@ -23,6 +23,8 @@ <pause>Pause</pause> <fastforward>FastForward</fastforward> <rewind>Rewind</rewind> + <channelup>PageUp</channelup> + <channeldown>PageDown</channeldown> </appcommand> </global> </keymap> diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml index 5c5a9b19ab..44e77dc0fe 100644 --- a/system/keymaps/gamepad.xml +++ b/system/keymaps/gamepad.xml @@ -38,7 +38,7 @@ <global> <gamepad> <A>Select</A> - <B>ParentDir</B> + <B>Back</B> <X>FullScreen</X> <Y>Queue</Y> <white>ContextMenu</white> @@ -72,9 +72,7 @@ <MyMusicPlaylist> <gamepad> <Y>Delete</Y> - <black>Playlist</black> <!-- Close playlist --> - <back>Playlist</back> <!-- Close playlist --> - <B>Playlist</B> <!-- Close playlist --> + <black>Back</black> </gamepad> </MyMusicPlaylist> <MyMusicPlaylistEditor> @@ -113,18 +111,16 @@ </FullscreenVideo> <FullscreenInfo> <gamepad> - <B>Close</B> <start>OSD</start> <black>CodecInfo</black> - <white>Close</white> + <white>Back</white> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> <rightanalogtrigger>AnalogFastForward</rightanalogtrigger> </gamepad> </FullscreenInfo> <PlayerControls> <gamepad> - <back>Close</back> - <start>Close</start> + <start>Back</start> </gamepad> </PlayerControls> <Visualisation> @@ -146,8 +142,7 @@ </Visualisation> <MusicOSD> <gamepad> - <back>Close</back> - <start>Close</start> + <start>Back</start> <black>CodecInfo</black> <white>Info</white> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> @@ -156,19 +151,15 @@ </MusicOSD> <VisualisationSettings> <gamepad> - <B>Close</B> - <back>Close</back> - <start>Close</start> + <start>Back</start> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> <rightanalogtrigger>AnalogFastForward</rightanalogtrigger> </gamepad> </VisualisationSettings> <VisualisationPresetList> <gamepad> - <B>Close</B> - <back>Close</back> - <start>Close</start> - <Y>Close</Y> + <start>Back</start> + <Y>Back</Y> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> <rightanalogtrigger>AnalogFastForward</rightanalogtrigger> </gamepad> @@ -197,7 +188,6 @@ <A>NextCalibration</A> <black>ResetCalibration</black> <white>NextResolution</white> - <B>PreviousMenu</B> </gamepad> </ScreenCalibration> <GUICalibration> @@ -205,19 +195,11 @@ <leftthumbstick>AnalogMove</leftthumbstick> <A>NextCalibration</A> <black>ResetCalibration</black> - <B>PreviousMenu</B> </gamepad> </GUICalibration> - <SelectDialog> - <gamepad> - <back>Close</back> - </gamepad> - </SelectDialog> <VideoOSD> <gamepad> - <start>Close</start> - <back>PreviousMenu</back> - <B>PreviousMenu</B> + <start>Back</start> <black>CodecInfo</black> <white>Info</white> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> @@ -229,7 +211,6 @@ <Y>AspectRatio</Y> <B>Stop</B> <start>OSD</start> - <back>PreviousMenu</back> <white>Info</white> <black>CodecInfo</black> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> @@ -240,9 +221,7 @@ <gamepad> <X/> <Y>AspectRatio</Y> - <B>Close</B> - <back>Close</back> - <start>Close</start> + <start>Back</start> <black>CodecInfo</black> <white>Info</white> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> @@ -253,9 +232,7 @@ <gamepad> <X/> <Y>AspectRatio</Y> - <B>Close</B> - <back>Close</back> - <start>Close</start> + <start>Back</start> <black>CodecInfo</black> <white>Info</white> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> @@ -266,9 +243,7 @@ <gamepad> <X/> <Y>Delete</Y> - <B>Close</B> - <back>Close</back> - <start>Close</start> + <start>Back</start> <leftanalogtrigger>AnalogRewind</leftanalogtrigger> <rightanalogtrigger>AnalogFastForward</rightanalogtrigger> </gamepad> @@ -287,9 +262,7 @@ <MyVideoPlaylist> <gamepad> <Y>Delete</Y> - <black>Playlist</black> <!-- Close playlist --> - <back>Playlist</back> <!-- Close playlist --> - <B>Playlist</B> + <black>Back</black> </gamepad> </MyVideoPlaylist> <VirtualKeyboard> @@ -304,8 +277,7 @@ </VirtualKeyboard> <ContextMenu> <gamepad> - <white>Close</white> - <B>Close</B> + <white>Back</white> </gamepad> </ContextMenu> <Scripts> @@ -326,120 +298,20 @@ <start>Stop</start> <!-- Enter Password --> </gamepad> </GamepadInput> - <Weather> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </Weather> - <Settings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </Settings> - <AddonInformation> - <gamepad> - <b>Close</b> - </gamepad> - </AddonInformation> - <AddonSettings> - <gamepad> - <b>Close</b> - </gamepad> - </AddonSettings> - <TextViewer> - <gamepad> - <b>Close</b> - </gamepad> - </TextViewer> - <MyPicturesSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </MyPicturesSettings> - <MyProgramsSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </MyProgramsSettings> - <MyWeatherSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </MyWeatherSettings> - <MyMusicSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </MyMusicSettings> - <SystemSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </SystemSettings> - <MyVideosSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </MyVideosSettings> - <NetworkSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </NetworkSettings> - <AppearanceSettings> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </AppearanceSettings> - <Profiles> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </Profiles> - <systeminfo> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </systeminfo> - <shutdownmenu> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </shutdownmenu> - <submenu> - <gamepad> - <B>PreviousMenu</B> - </gamepad> - </submenu> - <MusicInformation> - <gamepad> - <B>Close</B> - </gamepad> - </MusicInformation> - <MovieInformation> - <gamepad> - <B>Close</B> - </gamepad> - </MovieInformation> <LockSettings> <gamepad> - <start>Close</start> - <B>PreviousMenu</B> - <back>PreviousMenu</back> + <start>Back</start> </gamepad> </LockSettings> <ProfileSettings> <gamepad> - <start>Close</start> - <B>PreviousMenu</B> - <back>PreviousMenu</back> + <start>Back</start> </gamepad> </ProfileSettings> <PictureInfo> <gamepad> <dpadleft>PreviousPicture</dpadleft> <dpadright>NextPicture</dpadright> - <black>Close</black> </gamepad> </PictureInfo> </keymap> diff --git a/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml index 3f22913ede..ebe3dab633 100644 --- a/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml +++ b/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml @@ -42,7 +42,7 @@ <joystick name="Alienware Alienware Dual Compatible Game Pad"> <button id="1">FullScreen</button> <!--square --> <button id="2">Select</button> <!--x --> - <button id="3">ParentDir</button> <!--circle --> + <button id="3">Back</button> <!--circle --> <button id="4">Queue</button> <!-- tri --> <button id="6">PreviousMenu</button> <!-- l1 --> <button id="7"></button> <!-- l2 --> diff --git a/system/keymaps/joystick.AppleRemote.xml b/system/keymaps/joystick.AppleRemote.xml index ccbc9cf4c7..3ce6d4d06d 100644 --- a/system/keymaps/joystick.AppleRemote.xml +++ b/system/keymaps/joystick.AppleRemote.xml @@ -35,7 +35,7 @@ <!-- left --> <button id="3">Left</button> <!-- right --> <button id="4">Right</button> <!-- center --> <button id="5">Select</button> - <!-- menu --> <button id="6">PreviousMenu</button> + <!-- menu --> <button id="6">Back</button> <!-- hold center--> <button id="7">Fullscreen</button> <!-- hold menu --> <button id="8">ContextMenu</button> @@ -87,36 +87,6 @@ <button id="8">ActivateWindow(shutdownmenu)</button> </joystick> </Home> - <Favourites> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </Favourites> - <MyPictures> - <joystick name="AppleRemote"> - <button id="6">ParentDir</button> - </joystick> - </MyPictures> - <MyMusicPlaylist> - <joystick name="AppleRemote"> - <button id="6">Playlist</button> - </joystick> - </MyMusicPlaylist> - <MyMusicPlaylistEditor> - <joystick name="AppleRemote"> - <button id="6">ParentDir</button> - </joystick> - </MyMusicPlaylistEditor> - <MyMusicFiles> - <joystick name="AppleRemote"> - <button id="6">ParentDir</button> - </joystick> - </MyMusicFiles> - <MyMusicLibrary> - <joystick name="AppleRemote"> - <button id="6">ParentDir</button> - </joystick> - </MyMusicLibrary> <FullscreenVideo> <joystick name="AppleRemote"> <button id="1">VolumeUp</button> @@ -141,16 +111,6 @@ <!-- FlickDown --> <button id="88">BigStepBack</button> </joystick> </FullscreenVideo> - <FullscreenInfo> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </FullscreenInfo> - <PlayerControls> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </PlayerControls> <Visualisation> <joystick name="AppleRemote"> <button id="1">VolumeUp</button> @@ -167,21 +127,6 @@ <!-- FlickRight --> <button id="86">SkipNext</button> </joystick> </Visualisation> - <MusicOSD> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </MusicOSD> - <VisualisationSettings> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </VisualisationSettings> - <VisualisationPresetList> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </VisualisationPresetList> <SlideShow> <joystick name="AppleRemote"> <button id="1">ZoomIn</button> @@ -202,15 +147,9 @@ <button id="5">NextCalibration</button> </joystick> </ScreenCalibration> - <SelectDialog> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </SelectDialog> <VideoOSD> <joystick name="AppleRemote"> - <button id="6">Close</button> - <button id="7">Close</button> + <button id="7">Back</button> </joystick> </VideoOSD> <VideoMenu> @@ -221,97 +160,24 @@ <button id="8"/> </joystick> </VideoMenu> - <OSDVideoSettings> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </OSDVideoSettings> - <OSDAudioSettings> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </OSDAudioSettings> - <VideoBookmarks> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </VideoBookmarks> <MyVideoLibrary> <joystick name="AppleRemote"> - <button id="6">ParentDir</button> <button id="7">Info</button> </joystick> </MyVideoLibrary> <MyVideoFiles> <joystick name="AppleRemote"> - <button id="6">ParentDir</button> <button id="7">Info</button> </joystick> </MyVideoFiles> - <MyVideoPlaylist> - <joystick name="AppleRemote"> - <button id="6">Playlist</button> - </joystick> - </MyVideoPlaylist> - <VirtualKeyboard> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </VirtualKeyboard> - <ContextMenu> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </ContextMenu> - <FileStackingDialog> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </FileStackingDialog> - <MusicInformation> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </MusicInformation> - <MovieInformation> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </MovieInformation> <PictureInfo> <joystick name="AppleRemote"> <button id="3">Left</button> <button id="4">Right</button> - <button id="6">Close</button> <!-- SwipeLeft --> <button id="80">Left</button> <!-- SwipeRight --> <button id="81">Right</button> <!-- FlickLeft --> <button id="85">Left</button> <!-- FlickRight --> <button id="86">Right</button> </joystick> </PictureInfo> - <AddonBrowser> - <joystick name="AppleRemote"> - <button id="6">ParentDir</button> - </joystick> - </AddonBrowser> - <AddonInformation> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </AddonInformation> - <AddonSettings> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </AddonSettings> - <TextViewer> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </TextViewer> - <NumericInput> - <joystick name="AppleRemote"> - <button id="6">Close</button> - </joystick> - </NumericInput> </keymap> diff --git a/system/keymaps/joystick.Harmony.xml b/system/keymaps/joystick.Harmony.xml index 9d72d5dbe6..a9f6baf343 100644 --- a/system/keymaps/joystick.Harmony.xml +++ b/system/keymaps/joystick.Harmony.xml @@ -57,7 +57,7 @@ <!-- Rew --> <button id="41">Rewind</button> <!-- Fwd --> <button id="42">FastForward</button> <!-- Pause --> <button id="26">Pause</button> - <!-- Prev --> <button id="32">ParentDir</button> + <!-- Prev --> <button id="32">Back</button> <!-- Guide --> <button id="65">FullScreen</button> <!-- Info --> <button id="31">Info</button> <!-- Exit --> <button id="51">PreviousMenu</button> @@ -79,7 +79,7 @@ <!-- 8 --> <button id="34">Number8</button> <!-- 9 --> <button id="43">Number9</button> <!-- 0 --> <button id="44">Number0</button> - <!-- * clear --> <button id="45">ParentDir</button> + <!-- * clear --> <button id="45">Back</button> <!-- # enter --> <button id="36">Select</button> <!-- Mute --> <button id="25">Mute</button> <!-- Aspect --> <button id="61">AspectRatio</button> @@ -127,7 +127,6 @@ </MyFiles> <MyMusicPlaylist> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Playlist</button> <!-- * clear --> <button id="45">Delete</button> <!-- Channel Up --> <button id="71">MoveItemUp</button> <!-- Channel Down --> <button id="72">MoveItemDown</button> @@ -175,12 +174,12 @@ </FullscreenVideo> <FullscreenInfo> <joystick name="Harmony"> - <!-- Info --> <button id="31">Close</button> + <!-- Info --> <button id="31">Back</button> </joystick> </FullscreenInfo> <PlayerControls> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </PlayerControls> <Visualisation> @@ -198,21 +197,18 @@ </Visualisation> <MusicOSD> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> + <!-- menu --> <button id="6">Back</button> <!-- Info --> <button id="31">CodecInfo</button> - <!-- Exit --> <button id="51">Close</button> </joystick> </MusicOSD> <VisualisationSettings> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> - <!-- Exit --> <button id="51">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </VisualisationSettings> <VisualisationPresetList> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> - <!-- Exit --> <button id="51">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </VisualisationPresetList> <SlideShow> @@ -248,44 +244,30 @@ <!-- # enter --> <button id="36">NextCalibration</button> </joystick> </GUICalibration> - <SelectDialog> - <joystick name="Harmony"> - <!-- Exit --> <button id="51">Close</button> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </SelectDialog> <VideoOSD> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> - <!-- Exit --> <button id="51">Close</button> - <!-- Prev --> <button id="32">PreviousMenu</button> + <!-- menu --> <button id="6">Back</button> </joystick> </VideoOSD> <VideoMenu> <joystick name="Harmony"> <!-- menu --> <button id="6">OSD</button> - <!-- Prev --> <button id="32">PreviousMenu</button> <!-- Info --> <button id="31">Info</button> </joystick> </VideoMenu> <OSDVideoSettings> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - <!-- menu --> <button id="6">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </OSDVideoSettings> <OSDAudioSettings> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - <!-- menu --> <button id="6">Close</button> - <!-- Exit --> <button id="51">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </OSDAudioSettings> <VideoBookmarks> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - <!-- menu --> <button id="6">Close</button> - <!-- Exit --> <button id="51">Close</button> + <!-- menu --> <button id="6">Back</button> <!-- * clear --> <button id="45">Delete</button> </joystick> </VideoBookmarks> @@ -320,7 +302,6 @@ </MyVideoFiles> <MyVideoPlaylist> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Playlist</button> <!-- Close playlist --> <!-- * clear --> <button id="45">Delete</button> <!-- Channel Up --> <button id="71">MoveItemUp</button> <!-- Channel Down --> <button id="72">MoveItemDown</button> @@ -345,16 +326,6 @@ <!-- Fwd --> <button id="42">CursorRight</button> </joystick> </VirtualKeyboard> - <ContextMenu> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </ContextMenu> - <FileStackingDialog> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </FileStackingDialog> <Scripts> <joystick name="Harmony"> <!-- Info --> <button id="31">info</button> @@ -375,121 +346,31 @@ <!-- Prev --> <button id="32">BackSpace</button> </joystick> </NumericInput> - <Weather> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </Weather> - <Settings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </Settings> - <MyPicturesSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </MyPicturesSettings> - <MyProgramsSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </MyProgramsSettings> - <MyWeatherSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </MyWeatherSettings> - <MyMusicSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </MyMusicSettings> - <SystemSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </SystemSettings> - <MyVideosSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </MyVideosSettings> - <NetworkSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </NetworkSettings> - <AppearanceSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </AppearanceSettings> - <Profiles> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </Profiles> - <systeminfo> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </systeminfo> - <shutdownmenu> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </shutdownmenu> - <submenu> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">PreviousMenu</button> - </joystick> - </submenu> <MusicInformation> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - <!-- menu --> <button id="6">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </MusicInformation> <MovieInformation> <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - <!-- menu --> <button id="6">Close</button> + <!-- menu --> <button id="6">Back</button> </joystick> </MovieInformation> <LockSettings> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> - <!-- Prev --> <button id="32">PreviousMenu</button> + <!-- menu --> <button id="6">Back</button> </joystick> </LockSettings> <ProfileSettings> <joystick name="Harmony"> - <!-- menu --> <button id="6">Close</button> - <!-- Prev --> <button id="32">PreviousMenu</button> + <!-- menu --> <button id="6">Back</button> </joystick> </ProfileSettings> <PictureInfo> <joystick name="Harmony"> <!-- Replay --> <button id="91">PreviousPicture</button> <!-- Skip --> <button id="92">NextPicture</button> - <!-- Info --> <button id="31">Close</button> - <!-- Prev --> <button id="32">Close</button> + <!-- Info --> <button id="31">Back</button> </joystick> </PictureInfo> - <AddonInformation> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </AddonInformation> - <AddonSettings> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </AddonSettings> - <TextViewer> - <joystick name="Harmony"> - <!-- Prev --> <button id="32">Close</button> - </joystick> - </TextViewer> </keymap> diff --git a/system/keymaps/joystick.Interact.AxisPad.xml b/system/keymaps/joystick.Interact.AxisPad.xml index 4f493cf45a..29364eb4d2 100644 --- a/system/keymaps/joystick.Interact.AxisPad.xml +++ b/system/keymaps/joystick.Interact.AxisPad.xml @@ -40,7 +40,7 @@ <altname>Interact AxisPad</altname> <button id="1">FullScreen</button> <!--square --> <button id="3">Select</button> <!--x --> - <button id="4">ParentDir</button> <!--circle --> + <button id="4">Back</button> <!--circle --> <button id="2">Queue</button> <!-- tri --> <button id="5">PreviousMenu</button> <!-- l1 --> <button id="7"></button> <!-- l2 --> diff --git a/system/keymaps/joystick.Logitech.RumblePad.2.xml b/system/keymaps/joystick.Logitech.RumblePad.2.xml index c639e9d060..7927a58e52 100644 --- a/system/keymaps/joystick.Logitech.RumblePad.2.xml +++ b/system/keymaps/joystick.Logitech.RumblePad.2.xml @@ -4,7 +4,7 @@ <altname>Logitech Cordless RumblePad 2</altname> <button id="1">FullScreen</button> <button id="2">Select</button> - <button id="3">PreviousMenu</button> + <button id="3">Back</button> <button id="7">FullScreen</button> <button id="8">ContextMenu</button> <button id="10">XBMC.ActivateWindow(Home)</button> @@ -32,31 +32,9 @@ </joystick> </Home> - <MyPictures> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">ParentDir</button> - </joystick> - </MyPictures> - - <MyMusicPlaylist> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Playlist</button> - </joystick> - </MyMusicPlaylist> - - <MyMusicPlaylistEditor> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Playlist</button> - </joystick> - </MyMusicPlaylistEditor> - <MyMusicFiles> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">ParentDir</button> <button id="4">Queue</button> </joystick> </MyMusicFiles> @@ -64,7 +42,6 @@ <MyMusicLibrary> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">ParentDir</button> <button id="4">Queue</button> </joystick> </MyMusicLibrary> @@ -86,20 +63,6 @@ </joystick> </FullscreenVideo> - <FullscreenInfo> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </FullscreenInfo> - - <PlayerControls> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </PlayerControls> - <Visualisation> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> @@ -117,27 +80,6 @@ </joystick> </Visualisation> - <MusicOSD> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </MusicOSD> - - <VisualisationSettings> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </VisualisationSettings> - - <VisualisationPresetList> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </VisualisationPresetList> - <SlideShow> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> @@ -160,45 +102,9 @@ </joystick> </ScreenCalibration> - <SelectDialog> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </SelectDialog> - - <VideoOSD> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </VideoOSD> - - <OSDVideoSettings> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </OSDVideoSettings> - - <OSDAudioSettings> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </OSDAudioSettings> - - <VideoBookmarks> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </VideoBookmarks> - <MyVideoLibrary> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">ParentDir</button> <button id="4">Queue</button> <button id="5">Info</button> </joystick> @@ -207,19 +113,11 @@ <MyVideoFiles> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">ParentDir</button> <button id="4">Queue</button> <button id="5">Info</button> </joystick> </MyVideoFiles> - <MyVideoPlaylist> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Playlist</button> - </joystick> - </MyVideoPlaylist> - <VirtualKeyboard> <joystick name="Logitech Logitech Cordless RumblePad 2"> <altname>Logitech Cordless RumblePad 2</altname> @@ -228,72 +126,9 @@ <button id="4">Shift</button> <button id="5">CursorLeft</button> <button id="6">CursorRight</button> - <button id="9">Close</button> + <button id="9">Back</button> <button id="10">Enter</button> </joystick> </VirtualKeyboard> - <ContextMenu> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </ContextMenu> - - <FileStackingDialog> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </FileStackingDialog> - - <MusicInformation> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </MusicInformation> - - <MovieInformation> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </MovieInformation> - - <PictureInfo> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </PictureInfo> - - <AddonInformation> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </AddonInformation> - - <AddonSettings> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </AddonSettings> - - <TextViewer> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </TextViewer> - - <NumericInput> - <joystick name="Logitech Logitech Cordless RumblePad 2"> - <altname>Logitech Cordless RumblePad 2</altname> - <button id="3">Close</button> - </joystick> - </NumericInput> - </keymap> diff --git a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml index faf9d3d08d..ee1769031d 100644 --- a/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml +++ b/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml @@ -38,7 +38,7 @@ <global> <joystick name="Xbox 360 Wireless Receiver"> <button id="1">Select</button> <!-- A --> - <button id="2">ParentDir</button> <!-- B --> + <button id="2">Back</button> <!-- B --> <button id="3"></button> <!-- X --> <button id="4"></button> <!-- Y --> <button id="5"></button> <!-- LB --> @@ -74,9 +74,7 @@ </MyFiles> <MyMusicPlaylist> <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Playlist</button> - <button id="3">Playlist</button> - <button id="17">Playlist</button> + <button id="3">Back</button> <button id="5">Delete</button> </joystick> </MyMusicPlaylist> @@ -111,9 +109,8 @@ </FullscreenVideo> <FullscreenInfo> <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> <button id="3">CodecInfo</button> - <button id="6">Close</button> + <button id="6">Back</button> <button id="9">OSD</button> <axis limit="0" id="3">AnalogRewind</axis> <axis limit="0" id="6">AnalogFastForward</axis> @@ -121,8 +118,7 @@ </FullscreenInfo> <PlayerControls> <joystick name="Xbox 360 Wireless Receiver"> - <button id="9">Close</button> - <button id="17">Close</button> + <button id="9">Back</button> </joystick> </PlayerControls> <Visualisation> @@ -143,25 +139,22 @@ </Visualisation> <MusicOSD> <joystick name="Xbox 360 Wireless Receiver"> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> <button id="3">CodecInfo</button> <button id="6">Info</button> </joystick> </MusicOSD> <VisualisationSettings> <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - <button id="3">Close</button> - <button id="9">Close</button> + <button id="3">Back</button> + <button id="9">Back</button> </joystick> </VisualisationSettings> <VisualisationPresetList> <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - <button id="3">Close</button> - <button id="5">Close</button> - <button id="9">Close</button> + <button id="3">Back</button> + <button id="5">Back</button> + <button id="9">Back</button> </joystick> </VisualisationPresetList> <SlideShow> @@ -184,7 +177,6 @@ <button id="1">NextCalibration</button> <button id="3">ResetCalibration</button> <button id="6">NextResolution</button> - <button id="2">PreviousMenu</button> </joystick> </ScreenCalibration> <GUICalibration> @@ -192,19 +184,11 @@ <button id="1">NextCalibration</button> <button id="3">ResetCalibration</button> <button id="6">NextResolution</button> - <button id="2">PreviousMenu</button> </joystick> </GUICalibration> - <SelectDialog> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="17">Close</button> - </joystick> - </SelectDialog> <VideoOSD> <joystick name="Xbox 360 Wireless Receiver"> - <button id="9">Close</button> - <button id="17">PreviousMenu</button> - <button id="2">PreviousMenu</button> + <button id="9">Back</button> </joystick> </VideoOSD> <VideoMenu> @@ -212,7 +196,6 @@ <button id="5">AspectRatio</button> <button id="2">Stop</button> <button id="9">OSD</button> - <button id="17">PreviousMenu</button> <button id="6">Info</button> <button id="3">CodecInfo</button> </joystick> @@ -221,27 +204,21 @@ <joystick name="Xbox 360 Wireless Receiver"> <button id="4"/> <button id="5">AspectRatio</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </OSDVideoSettings> <OSDAudioSettings> <joystick name="Xbox 360 Wireless Receiver"> <button id="4"/> <button id="5">AspectRatio</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </OSDAudioSettings> <VideoBookmarks> <joystick name="Xbox 360 Wireless Receiver"> <button id="4"/> <button id="5">Delete</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </VideoBookmarks> <MyVideoLibrary> @@ -258,9 +235,7 @@ <MyVideoPlaylist> <joystick name="Xbox 360 Wireless Receiver"> <button id="5">Delete</button> - <button id="3">Playlist</button> - <button id="17">Playlist</button> - <button id="2">Playlist</button> + <button id="3">Back</button> </joystick> </MyVideoPlaylist> <VirtualKeyboard> @@ -273,8 +248,7 @@ </VirtualKeyboard> <ContextMenu> <joystick name="Xbox 360 Wireless Receiver"> - <button id="6">Close</button> - <button id="2">Close</button> + <button id="6">Back</button> </joystick> </ContextMenu> <Scripts> @@ -293,113 +267,14 @@ <button id="9">Stop</button> <!-- Enter Password --> </joystick> </GamepadInput> - <Weather> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </Weather> - <Settings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </Settings> - <AddonInformation> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - </joystick> - </AddonInformation> - <AddonSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - </joystick> - </AddonSettings> - <TextViewer> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - </joystick> - </TextViewer> - <MyPicturesSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </MyPicturesSettings> - <MyProgramsSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </MyProgramsSettings> - <MyWeatherSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </MyWeatherSettings> - <MyMusicSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </MyMusicSettings> - <SystemSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </SystemSettings> - <MyVideosSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </MyVideosSettings> - <NetworkSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </NetworkSettings> - <AppearanceSettings> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </AppearanceSettings> - <Profiles> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </Profiles> - <systeminfo> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </systeminfo> - <shutdownmenu> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </shutdownmenu> - <submenu> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">PreviousMenu</button> - </joystick> - </submenu> - <MusicInformation> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - </joystick> - </MusicInformation> - <MovieInformation> - <joystick name="Xbox 360 Wireless Receiver"> - <button id="2">Close</button> - </joystick> - </MovieInformation> <LockSettings> <joystick name="Xbox 360 Wireless Receiver"> - <button id="9">Close</button> - <button id="2">PreviousMenu</button> - <button id="17">PreviousMenu</button> + <button id="9">Back</button> </joystick> </LockSettings> <ProfileSettings> <joystick name="Xbox 360 Wireless Receiver"> - <button id="9">Close</button> - <button id="2">PreviousMenu</button> - <button id="17">PreviousMenu</button> + <button id="9">Back</button> </joystick> </ProfileSettings> </keymap> diff --git a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml index 5902566d4a..a9b1bfc91b 100644 --- a/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml +++ b/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml @@ -41,7 +41,7 @@ <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> <button id="1">Select</button> - <button id="2">ParentDir</button> + <button id="2">Back</button> <button id="3"/> <button id="4">FullScreen</button> <button id="5">Queue</button> @@ -86,9 +86,7 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Playlist</button> - <button id="3">Playlist</button> - <button id="17">Playlist</button> + <button id="3">Back</button> <button id="5">Delete</button> </joystick> </MyMusicPlaylist> @@ -135,9 +133,8 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> <button id="3">CodecInfo</button> - <button id="6">Close</button> + <button id="6">Back</button> <button id="9">OSD</button> <axis limit="0" id="3">AnalogRewind</axis> <axis limit="0" id="6">AnalogFastForward</axis> @@ -148,8 +145,7 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="9">Close</button> - <button id="17">Close</button> + <button id="9">Back</button> </joystick> </PlayerControls> <Visualisation> @@ -176,8 +172,7 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> <button id="3">CodecInfo</button> <button id="6">Info</button> </joystick> @@ -187,9 +182,8 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - <button id="3">Close</button> - <button id="9">Close</button> + <button id="3">Back</button> + <button id="9">Back</button> </joystick> </VisualisationSettings> <VisualisationPresetList> @@ -197,10 +191,9 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - <button id="3">Close</button> - <button id="5">Close</button> - <button id="9">Close</button> + <button id="3">Back</button> + <button id="5">Back</button> + <button id="9">Back</button> </joystick> </VisualisationPresetList> <SlideShow> @@ -229,7 +222,6 @@ <button id="1">NextCalibration</button> <button id="3">ResetCalibration</button> <button id="6">NextResolution</button> - <button id="2">PreviousMenu</button> </joystick> </ScreenCalibration> <GUICalibration> @@ -240,25 +232,14 @@ <button id="1">NextCalibration</button> <button id="3">ResetCalibration</button> <button id="6">NextResolution</button> - <button id="2">PreviousMenu</button> </joystick> </GUICalibration> - <SelectDialog> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="17">Close</button> - </joystick> - </SelectDialog> <VideoOSD> <joystick name="Microsoft Xbox Controller S"> <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="9">Close</button> - <button id="17">PreviousMenu</button> - <button id="2">PreviousMenu</button> + <button id="9">Back</button> </joystick> </VideoOSD> <VideoMenu> @@ -269,7 +250,6 @@ <button id="5">AspectRatio</button> <button id="2">Stop</button> <button id="9">OSD</button> - <button id="17">PreviousMenu</button> <button id="6">Info</button> <button id="3">CodecInfo</button> </joystick> @@ -281,9 +261,7 @@ <altname>Microsoft X-Box pad (Japan)</altname> <button id="4"/> <button id="5">AspectRatio</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </OSDVideoSettings> <OSDAudioSettings> @@ -293,9 +271,7 @@ <altname>Microsoft X-Box pad (Japan)</altname> <button id="4"/> <button id="5">AspectRatio</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </OSDAudioSettings> <VideoBookmarks> @@ -305,9 +281,7 @@ <altname>Microsoft X-Box pad (Japan)</altname> <button id="4"/> <button id="5">Delete</button> - <button id="2">Close</button> - <button id="17">Close</button> - <button id="19">Close</button> + <button id="19">Back</button> </joystick> </VideoBookmarks> <MyVideoLibrary> @@ -333,9 +307,7 @@ <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> <button id="5">Delete</button> - <button id="3">Playlist</button> - <button id="17">Playlist</button> - <button id="2">Playlist</button> + <button id="3">Back</button> </joystick> </MyVideoPlaylist> <VirtualKeyboard> @@ -354,8 +326,7 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="6">Close</button> - <button id="2">Close</button> + <button id="6">Back</button> </joystick> </ContextMenu> <Scripts> @@ -383,166 +354,12 @@ <button id="9">Stop</button> <!-- Enter Password --> </joystick> </GamepadInput> - <Weather> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </Weather> - <Settings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </Settings> - <AddonInformation> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - </joystick> - </AddonInformation> - <AddonSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - </joystick> - </AddonSettings> - <TextViewer> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - </joystick> - </TextViewer> - <MyPicturesSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </MyPicturesSettings> - <MyProgramsSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </MyProgramsSettings> - <MyWeatherSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </MyWeatherSettings> - <MyMusicSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </MyMusicSettings> - <SystemSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </SystemSettings> - <MyVideosSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </MyVideosSettings> - <NetworkSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </NetworkSettings> - <AppearanceSettings> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </AppearanceSettings> - <Profiles> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </Profiles> - <systeminfo> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </systeminfo> - <shutdownmenu> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </shutdownmenu> - <submenu> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">PreviousMenu</button> - </joystick> - </submenu> - <MusicInformation> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - </joystick> - </MusicInformation> - <MovieInformation> - <joystick name="Microsoft Xbox Controller S"> - <altname>Mad Catz MicroCON</altname> - <altname>Logitech Xbox Cordless Controller</altname> - <altname>Microsoft X-Box pad (Japan)</altname> - <button id="2">Close</button> - </joystick> - </MovieInformation> <LockSettings> <joystick name="Microsoft Xbox Controller S"> <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="9">Close</button> - <button id="2">PreviousMenu</button> - <button id="17">PreviousMenu</button> + <button id="9">Back</button> </joystick> </LockSettings> <ProfileSettings> @@ -550,9 +367,7 @@ <altname>Mad Catz MicroCON</altname> <altname>Logitech Xbox Cordless Controller</altname> <altname>Microsoft X-Box pad (Japan)</altname> - <button id="9">Close</button> - <button id="2">PreviousMenu</button> - <button id="17">PreviousMenu</button> + <button id="9">Back</button> </joystick> </ProfileSettings> </keymap> diff --git a/system/keymaps/joystick.PS3.Remote.Keyboard.xml b/system/keymaps/joystick.PS3.Remote.Keyboard.xml index 2506c8635f..0cccbebb1d 100644 --- a/system/keymaps/joystick.PS3.Remote.Keyboard.xml +++ b/system/keymaps/joystick.PS3.Remote.Keyboard.xml @@ -41,7 +41,7 @@ <altname>MoSart PS3 Remote Keyboard</altname> <button id="1">Info</button> <button id="2">Select</button> - <button id="3">ParentDir</button> + <button id="3">Back</button> <button id="4">ContextMenu</button> <button id="5">SkipPrevious</button> <button id="6">SkipNext</button> @@ -82,19 +82,10 @@ <joystick name="PLAYSTATION(R)3 Remote Keyboard"> <altname>PS3 Remote Keyboard</altname> <altname>MoSart PS3 Remote Keyboard</altname> - <button id="4">Close</button> - <button id="3">Close</button> + <button id="4">Back</button> </joystick> </MusicOSD> - <FullscreenInfo> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </FullscreenInfo> - <FullscreenVideo> <joystick name="PLAYSTATION(R)3 Remote Keyboard"> <altname>PS3 Remote Keyboard</altname> @@ -116,200 +107,14 @@ <altname>PS3 Remote Keyboard</altname> <altname>MoSart PS3 Remote Keyboard</altname> <button id="1">Info</button> - <button id="3">Close</button> <button id="4">OSD</button> </joystick> </VideoOSD> - <OSDVideoSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </OSDVideoSettings> - - <OSDAudioSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </OSDAudioSettings> - - <ContextMenu> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </ContextMenu> - - <shutdownmenu> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </shutdownmenu> - - <submenu> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </submenu> - - <Settings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </Settings> - - <AddonInformation> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </AddonInformation> - - <AddonSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </AddonSettings> - - <TextViewer> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </TextViewer> - - <MyPicturesSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </MyPicturesSettings> - - <MyProgramsSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </MyProgramsSettings> - - <MyWeatherSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </MyWeatherSettings> - - <MyMusicSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </MyMusicSettings> - - <SystemSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </SystemSettings> - - <MyVideosSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </MyVideosSettings> - - <NetworkSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </NetworkSettings> - - <AppearanceSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="32">PreviousMenu</button> - </joystick> - </AppearanceSettings> - - <Profiles> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </Profiles> - - <systeminfo> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </systeminfo> - - <MusicInformation> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </MusicInformation> - - <MovieInformation> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </MovieInformation> - - <LockSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </LockSettings> - - <ProfileSettings> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">PreviousMenu</button> - </joystick> - </ProfileSettings> - <PictureInfo> <joystick name="PLAYSTATION(R)3 Remote Keyboard"> <altname>PS3 Remote Keyboard</altname> <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> <hat id="1" position="left">PreviousPicture</hat> <hat id="1" position="right">NextPicture</hat> </joystick> @@ -319,16 +124,9 @@ <joystick name="PLAYSTATION(R)3 Remote Keyboard"> <altname>PS3 Remote Keyboard</altname> <altname>MoSart PS3 Remote Keyboard</altname> - <button id="1">Close</button> + <button id="1">Back</button> <button id="4">OSD</button> </joystick> </FullscreenInfo> - <NumericInput> - <joystick name="PLAYSTATION(R)3 Remote Keyboard"> - <altname>PS3 Remote Keyboard</altname> - <altname>MoSart PS3 Remote Keyboard</altname> - <button id="3">Close</button> - </joystick> - </NumericInput> </keymap> diff --git a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml index 61ab9d1f2e..018b29a3fb 100644 --- a/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml +++ b/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml @@ -40,7 +40,7 @@ <altname>PS3 Controller</altname> <altname>Sony Computer Entertainment Wireless Controller</altname> <button id="15">Select</button> - <button id="14">ParentDir</button> + <button id="14">Back</button> <button id="16">FullScreen</button> <button id="13">Queue</button> <button id="11">PreviousMenu</button> diff --git a/system/keymaps/joystick.WiiRemote.xml b/system/keymaps/joystick.WiiRemote.xml index 21142bab3c..d6fa40927b 100644 --- a/system/keymaps/joystick.WiiRemote.xml +++ b/system/keymaps/joystick.WiiRemote.xml @@ -42,7 +42,7 @@ <button id="3">Left</button> <button id="4">Right</button> <button id="5">Select</button> - <button id="6">PreviousMenu</button> + <button id="6">Back</button> <button id="7">VolumeDown</button> <button id="8">XBMC.ActivateWindow(Home)</button> <button id="9">VolumeUp</button> @@ -59,7 +59,6 @@ </Home> <MyFiles> <joystick name="WiiRemote"> - <button id="6">ParentDir</button> <button id="7">Move</button> <button id="9">Copy</button> <button id="11">Highlight</button> @@ -67,7 +66,6 @@ </MyFiles> <MyMusicPlaylist> <joystick name="WiiRemote"> - <button id="6">Playlist</button> <button id="7">MoveItemUp</button> <button id="9">MoveItemDown</button> <button id="11">Delete</button> @@ -75,7 +73,6 @@ </MyMusicPlaylist> <MyMusicPlaylistEditor> <joystick name="WiiRemote"> - <button id="6">Playlist</button> <button id="7">MoveItemUp</button> <button id="9">MoveItemDown</button> <button id="11">Delete</button> @@ -83,13 +80,11 @@ </MyMusicPlaylistEditor> <MyMusicFiles> <joystick name="WiiRemote"> - <button id="6">ParentDir</button> <button id="11">Playlist</button> </joystick> </MyMusicFiles> <MyMusicLibrary> <joystick name="WiiRemote"> - <button id="6">ParentDir</button> <button id="11">Playlist</button> </joystick> </MyMusicLibrary> @@ -108,14 +103,8 @@ <FullscreenInfo> <joystick name="WiiRemote"> <button id="5">CodecInfo</button> - <button id="6">Close</button> </joystick> </FullscreenInfo> - <PlayerControls> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </PlayerControls> <Visualisation> <joystick name="WiiRemote"> <button id="1">Pause</button> @@ -131,23 +120,16 @@ </Visualisation> <MusicOSD> <joystick name="WiiRemote"> - <button id="6">Close</button> <button id="10">CodecInfo</button> <button id="11">Info</button> </joystick> </MusicOSD> <VisualisationSettings> <joystick name="WiiRemote"> - <button id="6">Close</button> <button id="10">XBMC.ActivateWindow(VisualisationPresetList)</button> <button id="11">XBMC.ActivateWindow(MusicPlaylist)</button> </joystick> </VisualisationSettings> - <VisualisationPresetList> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </VisualisationPresetList> <SlideShow> <joystick name="WiiRemote"> <button id="1">Pause</button> @@ -167,16 +149,6 @@ <button id="11">ResetResolution</button> </joystick> </ScreenCalibration> - <SelectDialog> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </SelectDialog> - <VideoOSD> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </VideoOSD> <VideoMenu> <joystick name="WiiRemote"> <button id="5">Select</button> @@ -184,37 +156,23 @@ <button id="11">AspectRatio</button> </joystick> </VideoMenu> - <OSDVideoSettings> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </OSDVideoSettings> - <OSDAudioSettings> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </OSDAudioSettings> <VideoBookmarks> <joystick name="WiiRemote"> - <button id="6">Close</button> <button id="11">Delete</button> </joystick> </VideoBookmarks> <MyVideoLibrary> <joystick name="WiiRemote"> - <button id="6">ParentDir</button> <button id="11">Playlist</button> </joystick> </MyVideoLibrary> <MyVideoFiles> <joystick name="WiiRemote"> - <button id="6">ParentDir</button> <button id="11">Playlist</button> </joystick> </MyVideoFiles> <MyVideoPlaylist> <joystick name="WiiRemote"> - <button id="6">Playlist</button> <button id="7">MoveItemDown</button> <button id="9">MoveItemUp</button> <button id="11">Delete</button> @@ -229,11 +187,6 @@ <button id="11">BackSpace</button> </joystick> </VirtualKeyboard> - <ContextMenu> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </ContextMenu> <Scripts> <joystick name="WiiRemote"> <button id="11">info</button> @@ -247,46 +200,10 @@ <button id="11">BackSpace</button> </joystick> </NumericInput> - <MusicInformation> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </MusicInformation> - <MovieInformation> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </MovieInformation> <PictureInfo> <joystick name="WiiRemote"> <button id="3">PreviousPicture</button> <button id="4">NextPicture</button> - <button id="6">Close</button> </joystick> </PictureInfo> - <MyPictures> - <joystick name="WiiRemote"> - <button id="6">ParentDir</button> - </joystick> - </MyPictures> - <AddonBrowser> - <joystick name="WiiRemote"> - <button id="6">ParentDir</button> - </joystick> - </AddonBrowser> - <AddonInformation> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </AddonInformation> - <AddonSettings> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </AddonSettings> - <TextViewer> - <joystick name="WiiRemote"> - <button id="6">Close</button> - </joystick> - </TextViewer> </keymap> diff --git a/system/keymaps/keyboard.nyxboard.xml b/system/keymaps/keyboard.nyxboard.xml index 7583e92a20..33e9ec8027 100644 --- a/system/keymaps/keyboard.nyxboard.xml +++ b/system/keymaps/keyboard.nyxboard.xml @@ -1,12 +1,35 @@ <keymap> <global> - <keyboard name="Motorola Nyxboard Hybrid"> + <appcommand name="Motorola Nyxboard Hybrid"> + <volume_mute>Mute</volume_mute> + <volume_down>VolumeDown</volume_down> + <volume_up>VolumeUp</volume_up> + <next_track>SkipNext</next_track> + <prev_track>SkipPrevious</prev_track> + <stop>Stop</stop> + <play_pause>Play</play_pause> + <play>Play</play> + <pause>Pause</pause> + <fastforward>FastForward</fastforward> + <rewind>Rewind</rewind> + </appcommand> + <mouse name="Motorola Nyxboard Hybrid"> + <leftclick>leftclick</leftclick> + <middleclick>middleclick</middleclick> + <rightclick>rightclick</rightclick> + <doubleclick>doubleclick</doubleclick> + <wheeldown>wheeldown</wheeldown> + <wheelup>wheelup</wheelup> + <mousedrag>mousedrag</mousedrag> + <mousemove>mousemove</mousemove> + </mouse> + <keyboard name="Motorola Nyxboard Hybrid"> <p>Play</p> <q>Queue</q> - <f>FastForward</f> - <r>Rewind</r> - <left>Right</left> - <right>Left</right> + <f mod="ctrl,shift">FastForward</f> + <b mod="ctrl,shift">Rewind</b> + <left>Left</left> + <right>Right</right> <up>Up</up> <down>Down</down> <left mod="ctrl">analogseekback</left> @@ -15,11 +38,13 @@ <pagedown>PageDown</pagedown> <return>Select</return> <enter>Select</enter> - <backspace>ParentDir</backspace> + <backspace>Back</backspace> + <key id='65446'>Back</key> <m>ActivateWindow(PlayerControls)</m> <s>ActivateWindow(shutdownmenu)</s> <escape>PreviousMenu</escape> <i>Info</i> + <f9>Info</f9> <menu>ContextMenu</menu> <c>ContextMenu</c> <space>Pause</space> @@ -54,16 +79,7 @@ <numpadeight>Number8</numpadeight> <numpadnine>Number9</numpadnine> <backslash>ToggleFullScreen</backslash> - <home>FirstPage</home> - <end>LastPage</end> - <!-- Multimedia keyboard keys --> - <browser_back>ParentDir</browser_back> - <browser_forward/> - <browser_refresh/> - <browser_stop/> - <browser_search/> - <browser_favorites>ActivateWindow(Favourites)</browser_favorites> - <browser_home>XBMC.ActivateWindow(Home)</browser_home> + <home>XBMC.ActivateWindow(Home)</home> <volume_mute>Mute</volume_mute> <volume_down>VolumeDown</volume_down> <volume_up>VolumeUp</volume_up> @@ -71,38 +87,16 @@ <prev_track>SkipPrevious</prev_track> <stop>Stop</stop> <play_pause>Pause</play_pause> - <launch_mail></launch_mail> - <launch_media_select>XBMC.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_file_browser/> - <launch_media_center/> - <!-- ****************************************************** --> - <!-- MS Media Center keyboard shortcuts sent by MCE remotes --> - <!-- See http://msdn.microsoft.com/en-us/library/bb189249.aspx --> - <p mod="ctrl,shift">Play</p> <!-- Play --> - <s mod="ctrl,shift">Stop</s> <!-- Stop --> - <p mod="ctrl">Pause</p> <!-- Pause --> - <f mod="ctrl,shift">FastForward</f> <!-- Fwd --> - <b mod="ctrl,shift">Rewind</b> <!-- Rew --> - <f mod="ctrl">SkipNext</f> <!-- Skip --> - <b mod="ctrl">SkipPrevious</b> <!-- Replay --> - <d mod="ctrl">Info</d> <!-- MCE Details --> - <f10>VolumeUp</f10> <!-- MCE Vol up --> - <f9>VolumeDown</f9> <!-- MCE Vol down --> - <f8>Mute</f8> <!-- MCE mute --> - <g mod="ctrl">OSD</g> <!-- MCE Guide --> - <m mod="ctrl">ActivateWindow(music)</m> <!-- MCE My music --> - <i mod="ctrl">ActivateWindow(pictures)</i> <!-- MCE My pictures --> - <e mod="ctrl">ActivateWindow(video)</e> <!-- MCE videos --> - <!-- MCE keypresses without an obvious use in XBMC --> - <o mod="ctrl">Notification(MCEKeypress, Recorded TV, 3)</o> - <t mod="ctrl">Notification(MCEKeypress, Live TV, 3)</t> - <t mod="ctrl,shift">Notification(MCEKeypress, My TV, 3)</t> - <a mod="ctrl">Notification(MCEKeypress, Radio, 3)</a> - <m mod="ctrl,shift">Notification(MCEKeypress, DVD menu, 3)</m> - <u mod="ctrl">Notification(MCEKeypress, DVD subtitle, 3)</u> - <a mod="ctrl,shift">Notification(MCEKeypress, DVD audio, 3)</a> + <!-- + <f3>RED</f3> + <f4>GREEN</f4> + <f5>YELLOW</f5> + <f6>BLUE</f6> + <f7>EPG</f7> + <f12>ActivateSearch</f12> + <f11>CloseSearch</f11> + --> + <f10>ContextMenu</f10> </keyboard> </global> <LoginScreen> @@ -113,6 +107,7 @@ <Home> <keyboard name="Motorola Nyxboard Hybrid"> <i>info</i> + <home>noop</home> <end>XBMC.ShutDown()</end> </keyboard> </Home> @@ -131,11 +126,10 @@ </MyFiles> <MyMusicPlaylist> <keyboard name="Motorola Nyxboard Hybrid"> - <space>Playlist</space> <!-- Close playlist --> + <space>Back</space> <delete>Delete</delete> <u>MoveItemUp</u> <d>MoveItemDown</d> - <backspace>Playlist</backspace> <!-- Close playlist --> </keyboard> </MyMusicPlaylist> <MyMusicPlaylistEditor> @@ -196,17 +190,15 @@ <f>FastForward</f> <r>Rewind</r> <period>StepForward</period> - <backspace>Close</backspace> <o>CodecInfo</o> - <i>Close</i> - <d mod="ctrl">Close</d> + <i>Back</i> + <d mod="ctrl">Back</d> <m>OSD</m> </keyboard> </FullscreenInfo> <PlayerControls> <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> - <m>close</m> + <m>Back</m> </keyboard> </PlayerControls> <Visualisation> @@ -233,12 +225,11 @@ </Visualisation> <MusicOSD> <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> <p>ActivateWindow(VisualisationPresetList)</p> @@ -248,31 +239,29 @@ </MusicOSD> <VisualisationSettings> <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> <p>ActivateWindow(VisualisationPresetList)</p> - <v>Close</v> + <v>Back</v> <n>ActivateWindow(MusicPlaylist)</n> </keyboard> </VisualisationSettings> <VisualisationPresetList> <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> - <p>Close</p> - <v>Close</v> + <p>Back</p> + <v>Back</v> <n>ActivateWindow(MusicPlaylist)</n> </keyboard> </VisualisationPresetList> @@ -295,7 +284,6 @@ <plus>ZoomIn</plus> <minus>ZoomOut</minus> <r>Rotate</r> - <backspace>PreviousMenu</backspace> </keyboard> </SlideShow> <ScreenCalibration> @@ -313,18 +301,10 @@ <d>ResetCalibration</d> </keyboard> </GUICalibration> - <SelectDialog> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> - </keyboard> - </SelectDialog> <VideoOSD> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> - <m>Close</m> - <g mod="ctrl">close</g> <!-- MCE Guide button --> + <m>Back</m> + <g mod="ctrl">Back</g> <!-- MCE Guide button --> <i>Info</i> <o>CodecInfo</o> </keyboard> @@ -343,29 +323,22 @@ <escape>Fullscreen</escape> <return>Select</return> <enter>Select</enter> <!-- backspace>Fullscreen</backspace --> - <backspace>PreviousMenu</backspace> </keyboard> </VideoMenu> <OSDVideoSettings> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> <i>Info</i> <o>CodecInfo</o> </keyboard> </OSDVideoSettings> <OSDAudioSettings> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> <i>Info</i> <o>CodecInfo</o> </keyboard> </OSDAudioSettings> <VideoBookmarks> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> <delete>Delete</delete> </keyboard> </VideoBookmarks> @@ -385,8 +358,7 @@ </MyVideoFiles> <MyVideoPlaylist> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Playlist</backspace> <!-- Close playlist --> - <space>Playlist</space> <!-- Close playlist --> + <space>Back</space> <delete>Delete</delete> <u>MoveItemUp</u> <d>MoveItemDown</d> @@ -399,163 +371,46 @@ </MyPictures> <ContextMenu> <keyboard name="Motorola Nyxboard Hybrid"> - <c>Close</c> - <menu>Close</menu> - <backspace>Close</backspace> + <c>Back</c> + <menu>Back</menu> </keyboard> </ContextMenu> - <FileStackingDialog> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </FileStackingDialog> <Scripts> <keyboard name="Motorola Nyxboard Hybrid"> <i>info</i> </keyboard> </Scripts> - <Weather> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - <key id='65446'>PreviousMenu</key> - </keyboard> - </Weather> - <Settings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </Settings> - <MyPicturesSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyPicturesSettings> - <MyProgramsSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyProgramsSettings> - <MyWeatherSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyWeatherSettings> - <MyMusicSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyMusicSettings> - <SystemSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </SystemSettings> - <MyVideosSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyVideosSettings> - <NetworkSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </NetworkSettings> - <AppearanceSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </AppearanceSettings> - <Profiles> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </Profiles> - <systeminfo> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </systeminfo> <shutdownmenu> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - <s>Close</s> + <s>Back</s> </keyboard> </shutdownmenu> - <submenu> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>PreviousMenu</backspace> - </keyboard> - </submenu> <MusicInformation> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <i>Close</i> - <d mod="ctrl">Close</d> - <key id='65446'>Close</key> + <i>Back</i> + <d mod="ctrl">Back</d> </keyboard> </MusicInformation> <MovieInformation> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <i>Close</i> - <key id='65446'>Close</key> + <i>Back</i> </keyboard> </MovieInformation> - <AddonInformation> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </AddonInformation> - <AddonSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </AddonSettings> - <TextViewer> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </TextViewer> - <LockSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> - <backspace>PreviousMenu</backspace> - </keyboard> - </LockSettings> - <ProfileSettings> - <keyboard name="Motorola Nyxboard Hybrid"> - <escape>Close</escape> - <backspace>PreviousMenu</backspace> - </keyboard> - </ProfileSettings> <PictureInfo> <keyboard name="Motorola Nyxboard Hybrid"> <period>NextPicture</period> <comma>PreviousPicture</comma> - <i>Close</i> - <d mod="ctrl">Close</d> - <o>Close</o> - <backspace>Close</backspace> + <i>Back</i> + <d mod="ctrl">Back</d> + <o>Back</o> <space>Pause</space> </keyboard> </PictureInfo> <Teletext> <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - <escape>Close</escape> - <v>Close</v> + <v>Back</v> </keyboard> </Teletext> - <Favourites> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </Favourites> - <NumericInput> - <keyboard name="Motorola Nyxboard Hybrid"> - <backspace>Close</backspace> - </keyboard> - </NumericInput> <FileBrowser> <keyboard name="Motorola Nyxboard Hybrid"> <space>Highlight</space> diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index 6f4820de94..6fdad1c05f 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -51,7 +51,8 @@ <pagedown>PageDown</pagedown> <return>Select</return> <enter>Select</enter> - <backspace>ParentDir</backspace> + <backspace>Back</backspace> + <key id='65446'>Back</key> <m>ActivateWindow(PlayerControls)</m> <s>ActivateWindow(shutdownmenu)</s> <escape>PreviousMenu</escape> @@ -67,6 +68,7 @@ <s mod="ctrl">Screenshot</s> <minus>VolumeDown</minus> <plus>VolumeUp</plus> + <equals>VolumeUp</equals> <zero>Number0</zero> <one>Number1</one> <two>Number2</two> @@ -93,7 +95,7 @@ <home>FirstPage</home> <end>LastPage</end> <!-- Multimedia keyboard keys --> - <browser_back>ParentDir</browser_back> + <browser_back>Back</browser_back> <browser_forward/> <browser_refresh/> <browser_stop/> @@ -167,11 +169,10 @@ </MyFiles> <MyMusicPlaylist> <keyboard> - <space>Playlist</space> <!-- Close playlist --> + <space>Back</space> <delete>Delete</delete> <u>MoveItemUp</u> <d>MoveItemDown</d> - <backspace>Playlist</backspace> <!-- Close playlist --> </keyboard> </MyMusicPlaylist> <MyMusicPlaylistEditor> @@ -211,6 +212,7 @@ <o>CodecInfo</o> <z>AspectRatio</z> <t>ShowSubtitles</t> + <t mod="ctrl">SubtitleAlign</t> <l>NextSubtitle</l> <left>StepBack</left> <right>StepForward</right> @@ -219,6 +221,8 @@ <a>AudioDelay</a> <escape>Fullscreen</escape> <v>XBMC.ActivateWindow(Teletext)</v> + <up mod="ctrl">SubtitleShiftUp</up> + <down mod="ctrl">SubtitleShiftDown</down> </keyboard> </FullscreenVideo> <VideoTimeSeek> @@ -232,17 +236,15 @@ <f>FastForward</f> <r>Rewind</r> <period>StepForward</period> - <backspace>Close</backspace> <o>CodecInfo</o> - <i>Close</i> - <d mod="ctrl">Close</d> + <i>Back</i> + <d mod="ctrl">Back</d> <m>OSD</m> </keyboard> </FullscreenInfo> <PlayerControls> <keyboard> - <escape>Close</escape> - <m>close</m> + <m>Back</m> </keyboard> </PlayerControls> <Visualisation> @@ -269,12 +271,11 @@ </Visualisation> <MusicOSD> <keyboard> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> <p>ActivateWindow(VisualisationPresetList)</p> @@ -284,31 +285,29 @@ </MusicOSD> <VisualisationSettings> <keyboard> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> <p>ActivateWindow(VisualisationPresetList)</p> - <v>Close</v> + <v>Back</v> <n>ActivateWindow(MusicPlaylist)</n> </keyboard> </VisualisationSettings> <VisualisationPresetList> <keyboard> - <escape>Close</escape> <f>FastForward</f> <r>Rewind</r> <period>SkipNext</period> <comma>SkipPrevious</comma> - <m>Close</m> + <m>Back</m> <i>Info</i> <o>CodecInfo</o> - <p>Close</p> - <v>Close</v> + <p>Back</p> + <v>Back</v> <n>ActivateWindow(MusicPlaylist)</n> </keyboard> </VisualisationPresetList> @@ -331,7 +330,6 @@ <plus>ZoomIn</plus> <minus>ZoomOut</minus> <r>Rotate</r> - <backspace>PreviousMenu</backspace> </keyboard> </SlideShow> <ScreenCalibration> @@ -349,18 +347,10 @@ <d>ResetCalibration</d> </keyboard> </GUICalibration> - <SelectDialog> - <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> - </keyboard> - </SelectDialog> <VideoOSD> <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> - <m>Close</m> - <g mod="ctrl">close</g> <!-- MCE Guide button --> + <m>Back</m> + <g mod="ctrl">Back</g> <!-- MCE Guide button --> <i>Info</i> <o>CodecInfo</o> </keyboard> @@ -379,29 +369,22 @@ <escape>Fullscreen</escape> <return>Select</return> <enter>Select</enter> <!-- backspace>Fullscreen</backspace --> - <backspace>PreviousMenu</backspace> </keyboard> </VideoMenu> <OSDVideoSettings> <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> <i>Info</i> <o>CodecInfo</o> </keyboard> </OSDVideoSettings> <OSDAudioSettings> <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> <i>Info</i> <o>CodecInfo</o> </keyboard> </OSDAudioSettings> <VideoBookmarks> <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> <delete>Delete</delete> </keyboard> </VideoBookmarks> @@ -421,8 +404,7 @@ </MyVideoFiles> <MyVideoPlaylist> <keyboard> - <backspace>Playlist</backspace> <!-- Close playlist --> - <space>Playlist</space> <!-- Close playlist --> + <space>Back</space> <delete>Delete</delete> <u>MoveItemUp</u> <d>MoveItemDown</d> @@ -435,163 +417,41 @@ </MyPictures> <ContextMenu> <keyboard> - <c>Close</c> - <menu>Close</menu> - <backspace>Close</backspace> + <c>Back</c> + <menu>Back</menu> </keyboard> </ContextMenu> - <FileStackingDialog> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </FileStackingDialog> <Scripts> <keyboard> <i>info</i> </keyboard> </Scripts> - <Weather> - <keyboard> - <backspace>PreviousMenu</backspace> - <key id='65446'>PreviousMenu</key> - </keyboard> - </Weather> - <Settings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </Settings> - <MyPicturesSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyPicturesSettings> - <MyProgramsSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyProgramsSettings> - <MyWeatherSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyWeatherSettings> - <MyMusicSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyMusicSettings> - <SystemSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </SystemSettings> - <MyVideosSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </MyVideosSettings> - <NetworkSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </NetworkSettings> - <AppearanceSettings> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </AppearanceSettings> - <Profiles> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </Profiles> - <systeminfo> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </systeminfo> - <shutdownmenu> - <keyboard> - <backspace>PreviousMenu</backspace> - <s>Close</s> - </keyboard> - </shutdownmenu> - <submenu> - <keyboard> - <backspace>PreviousMenu</backspace> - </keyboard> - </submenu> <MusicInformation> <keyboard> - <backspace>Close</backspace> - <i>Close</i> - <d mod="ctrl">Close</d> - <key id='65446'>Close</key> + <i>Back</i> + <d mod="ctrl">Back</d> </keyboard> </MusicInformation> <MovieInformation> <keyboard> - <backspace>Close</backspace> - <i>Close</i> - <key id='65446'>Close</key> + <i>Back</i> </keyboard> </MovieInformation> - <AddonInformation> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </AddonInformation> - <AddonSettings> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </AddonSettings> - <TextViewer> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </TextViewer> - <LockSettings> - <keyboard> - <escape>Close</escape> - <backspace>PreviousMenu</backspace> - </keyboard> - </LockSettings> - <ProfileSettings> - <keyboard> - <escape>Close</escape> - <backspace>PreviousMenu</backspace> - </keyboard> - </ProfileSettings> <PictureInfo> <keyboard> <period>NextPicture</period> <comma>PreviousPicture</comma> - <i>Close</i> - <d mod="ctrl">Close</d> - <o>Close</o> - <backspace>Close</backspace> + <i>Back</i> + <d mod="ctrl">Back</d> + <o>Back</o> <space>Pause</space> </keyboard> </PictureInfo> <Teletext> <keyboard> - <backspace>Close</backspace> - <escape>Close</escape> - <v>Close</v> + <v>Back</v> </keyboard> </Teletext> - <Favourites> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </Favourites> - <NumericInput> - <keyboard> - <backspace>Close</backspace> - </keyboard> - </NumericInput> <FileBrowser> <keyboard> <space>Highlight</space> diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml index fde69d5f86..a846383541 100644 --- a/system/keymaps/remote.xml +++ b/system/keymaps/remote.xml @@ -50,7 +50,7 @@ <enter>FullScreen</enter> <pageplus>PageUp</pageplus> <pageminus>PageDown</pageminus> - <back>ParentDir</back> + <back>Back</back> <menu>PreviousMenu</menu> <title>ContextMenu</title> <info>Info</info> @@ -100,7 +100,6 @@ </MyFiles> <MyMusicPlaylist> <remote> - <back>Playlist</back> <!-- Close playlist --> <clear>Delete</clear> <zero>Delete</zero> </remote> @@ -160,13 +159,13 @@ <FullscreenInfo> <remote> <title>CodecInfo</title> - <info>Close</info> + <info>Back</info> <menu>OSD</menu> </remote> </FullscreenInfo> <PlayerControls> <remote> - <menu>Close</menu> + <menu>Back</menu> </remote> </PlayerControls> <Visualisation> @@ -185,21 +184,19 @@ </Visualisation> <MusicOSD> <remote> - <menu>Close</menu> + <menu>Back</menu> <title>Info</title> <info>CodecInfo</info> </remote> </MusicOSD> <VisualisationSettings> <remote> - <menu>Close</menu> - <back>Close</back> + <menu>Back</menu> </remote> </VisualisationSettings> <VisualisationPresetList> <remote> - <menu>Close</menu> - <back>Close</back> + <menu>Back</menu> </remote> </VisualisationPresetList> <SlideShow> @@ -219,7 +216,6 @@ <skipminus>PreviousPicture</skipminus> <title>Info</title> <select>Rotate</select> - <back>PreviousMenu</back> </remote> </SlideShow> <ScreenCalibration> @@ -236,22 +232,15 @@ <zero>ResetCalibration</zero> </remote> </GUICalibration> - <SelectDialog> - <remote> - <back>Close</back> - </remote> - </SelectDialog> <VideoOSD> <remote> - <back>PreviousMenu</back> - <menu>Close</menu> - <start>Close</start> + <menu>Back</menu> + <start>Back</start> </remote> </VideoOSD> <VideoMenu> <remote> <menu>OSD</menu> - <back>PreviousMenu</back> <info>Info</info> <title>CodecInfo</title> <zero>Number0</zero> @@ -269,23 +258,20 @@ </VideoMenu> <OSDVideoSettings> <remote> - <back>Close</back> - <menu>Close</menu> - <start>Close</start> + <menu>Back</menu> + <start>Back</start> </remote> </OSDVideoSettings> <OSDAudioSettings> <remote> - <back>Close</back> - <menu>Close</menu> - <start>Close</start> + <menu>Back</menu> + <start>Back</start> </remote> </OSDAudioSettings> <VideoBookmarks> <remote> - <back>Close</back> - <menu>Close</menu> - <start>Close</start> + <menu>Back</menu> + <start>Back</start> <zero>Delete</zero> </remote> </VideoBookmarks> @@ -303,7 +289,6 @@ </MyVideoFiles> <MyVideoPlaylist> <remote> - <back>Playlist</back> <!-- Close playlist --> <clear>Delete</clear> <zero>Delete</zero> </remote> @@ -330,15 +315,9 @@ </VirtualKeyboard> <ContextMenu> <remote> - <title>Close</title> - <back>Close</back> + <title>Back</title> </remote> </ContextMenu> - <FileStackingDialog> - <remote> - <back>Close</back> - </remote> - </FileStackingDialog> <Scripts> <remote> <info>info</info> @@ -360,125 +339,31 @@ <back>BackSpace</back> </remote> </NumericInput> - <Weather> - <remote> - <back>PreviousMenu</back> - </remote> - </Weather> - <Settings> - <remote> - <back>PreviousMenu</back> - </remote> - </Settings> - <AddonBrowser> - <remote> - </remote> - </AddonBrowser> - <AddonInformation> - <remote> - <back>Close</back> - </remote> - </AddonInformation> - <AddonSettings> - <remote> - <back>Close</back> - </remote> - </AddonSettings> - <TextViewer> - <remote> - <back>Close</back> - </remote> - </TextViewer> - <MyPicturesSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyPicturesSettings> - <MyProgramsSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyProgramsSettings> - <MyWeatherSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyWeatherSettings> - <MyMusicSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyMusicSettings> - <SystemSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </SystemSettings> - <MyVideosSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyVideosSettings> - <NetworkSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </NetworkSettings> - <AppearanceSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </AppearanceSettings> - <Profiles> - <remote> - <back>PreviousMenu</back> - </remote> - </Profiles> - <systeminfo> - <remote> - <back>PreviousMenu</back> - </remote> - </systeminfo> - <shutdownmenu> - <remote> - <back>PreviousMenu</back> - </remote> - </shutdownmenu> - <submenu> - <remote> - <back>PreviousMenu</back> - </remote> - </submenu> <MusicInformation> <remote> - <back>Close</back> - <info>Close</info> + <info>Back</info> </remote> </MusicInformation> <MovieInformation> <remote> - <info>Close</info> - <back>Close</back> + <info>Back</info> </remote> </MovieInformation> <LockSettings> <remote> - <menu>Close</menu> - <back>PreviousMenu</back> + <menu>Back</menu> </remote> </LockSettings> <ProfileSettings> <remote> - <menu>Close</menu> - <back>PreviousMenu</back> + <menu>Back</menu> </remote> </ProfileSettings> <PictureInfo> <remote> <skipplus>NextPicture</skipplus> <skipminus>PreviousPicture</skipminus> - <info>Close</info> - <back>Close</back> + <info>Back</info> </remote> </PictureInfo> <Teletext> @@ -498,15 +383,9 @@ <yellow>Yellow</yellow> <blue>Blue</blue> <info>Info</info> - <back>Close</back> - <menu>Close</menu> - <start>Close</start> - <teletext>Close</teletext> + <menu>Back</menu> + <start>Back</start> + <teletext>Back</teletext> </remote> </Teletext> - <Favourites> - <remote> - <back>Close</back> - </remote> - </Favourites> </keymap> diff --git a/system/shaders/convolutionsep-4x4_d3d.fx b/system/shaders/convolutionsep-4x4_d3d.fx new file mode 100644 index 0000000000..9c55bc2b36 --- /dev/null +++ b/system/shaders/convolutionsep-4x4_d3d.fx @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2005-2011 Team XBMC + * http://www.xbmc.org + * + * 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 2, 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. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +texture g_Texture; +texture g_KernelTexture; +texture g_IntermediateTexture; +float2 g_StepXY_P0; +float2 g_StepXY_P1; + +sampler RGBSampler = + sampler_state { + Texture = <g_Texture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = POINT; + MagFilter = POINT; + }; + +sampler KernelSampler = + sampler_state + { + Texture = <g_KernelTexture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + }; + +sampler IntermediateSampler = + sampler_state { + Texture = <g_IntermediateTexture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = POINT; + MagFilter = POINT; + }; + +struct VS_OUTPUT +{ + float4 Position : POSITION; + float2 TextureUV : TEXCOORD0; +}; + +struct PS_OUTPUT +{ + float4 RGBColor : COLOR0; +}; + +half4 weight(float pos) +{ + half4 w; +#ifdef HAS_RGBA + w = tex1D(KernelSampler, pos); +#else + w = tex1D(KernelSampler, pos).bgra; +#endif + +#ifdef HAS_FLOAT_TEXTURE + return w; +#else + return w * 2.0 - 1.0; +#endif +} + +half3 pixel(sampler samp, float xpos, float ypos) +{ + return tex2D(samp, float2(xpos, ypos)).rgb; +} + +// Code for first pass - horizontal + +half3 getLine(float ypos, float4 xpos, half4 linetaps) +{ + return + pixel(RGBSampler, xpos.r, ypos) * linetaps.r + + pixel(RGBSampler, xpos.g, ypos) * linetaps.g + + pixel(RGBSampler, xpos.b, ypos) * linetaps.b + + pixel(RGBSampler, xpos.a, ypos) * linetaps.a; +} + +PS_OUTPUT CONVOLUTION4x4Horiz(VS_OUTPUT In) +{ + PS_OUTPUT OUT; + + float2 pos = In.TextureUV + g_StepXY_P0 * 0.5; + float2 f = frac(pos / g_StepXY_P0); + + half4 linetaps = weight(1.0 - f.x); + + // kernel generation code made sure taps add up to 1, no need to adjust here. + + float2 xystart; + xystart.x = (-1.0 - f.x) * g_StepXY_P0.x + In.TextureUV.x; + xystart.y = In.TextureUV.y; + + float4 xpos = float4( + xystart.x, + xystart.x + g_StepXY_P0.x, + xystart.x + g_StepXY_P0.x * 2.0, + xystart.x + g_StepXY_P0.x * 3.0); + + OUT.RGBColor.rgb = getLine(xystart.y, xpos, linetaps); + OUT.RGBColor.a = 1.0; + + return OUT; +} + +// Code for second pass - vertical + +half3 getRow(float xpos, float4 ypos, half4 columntaps) +{ + return + pixel(IntermediateSampler, xpos, ypos.r) * columntaps.r + + pixel(IntermediateSampler, xpos, ypos.g) * columntaps.g + + pixel(IntermediateSampler, xpos, ypos.b) * columntaps.b + + pixel(IntermediateSampler, xpos, ypos.a) * columntaps.a; +} + +PS_OUTPUT CONVOLUTION4x4Vert(VS_OUTPUT In) +{ + PS_OUTPUT OUT; + + float2 pos = In.TextureUV + g_StepXY_P1 * 0.5; + float2 f = frac(pos / g_StepXY_P1); + + half4 columntaps = weight(1.0 - f.y); + + // kernel generation code made sure taps add up to 1, no need to adjust here. + + float2 xystart; + xystart.x = In.TextureUV.x; + xystart.y = (-1.0 - f.y) * g_StepXY_P1.y + In.TextureUV.y; + + float4 ypos = float4( + xystart.y, + xystart.y + g_StepXY_P1.y, + xystart.y + g_StepXY_P1.y * 2.0, + xystart.y + g_StepXY_P1.y * 3.0); + + OUT.RGBColor.rgb = getRow(xystart.x, ypos, columntaps); + OUT.RGBColor.a = 1.0; + + return OUT; +} + +technique SCALER_T +{ + pass P0 + { + PixelShader = compile ps_3_0 CONVOLUTION4x4Horiz(); + ZEnable = False; + FillMode = Solid; + FogEnable = False; + } + pass P1 + { + PixelShader = compile ps_3_0 CONVOLUTION4x4Vert(); + ZEnable = False; + FillMode = Solid; + FogEnable = False; + } + +}; diff --git a/system/shaders/convolutionsep-6x6_d3d.fx b/system/shaders/convolutionsep-6x6_d3d.fx new file mode 100644 index 0000000000..07073e860e --- /dev/null +++ b/system/shaders/convolutionsep-6x6_d3d.fx @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2005-2011 Team XBMC + * http://www.xbmc.org + * + * 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 2, 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. + * + * You should have received a copy of the GNU General Public License + * along with XBMC; see the file COPYING. If not, write to + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * http://www.gnu.org/copyleft/gpl.html + * + */ + +texture g_Texture; +texture g_KernelTexture; +texture g_IntermediateTexture; +float2 g_StepXY_P0; +float2 g_StepXY_P1; + +sampler RGBSampler = + sampler_state { + Texture = <g_Texture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = POINT; + MagFilter = POINT; + }; + +sampler KernelSampler = + sampler_state + { + Texture = <g_KernelTexture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = LINEAR; + MagFilter = LINEAR; + }; + +sampler IntermediateSampler = + sampler_state { + Texture = <g_IntermediateTexture>; + AddressU = CLAMP; + AddressV = CLAMP; + MipFilter = LINEAR; + MinFilter = POINT; + MagFilter = POINT; + }; + +struct VS_OUTPUT +{ + float4 Position : POSITION; + float2 TextureUV : TEXCOORD0; +}; + +struct PS_OUTPUT +{ + float4 RGBColor : COLOR0; +}; + +half3 weight(float pos) +{ + half3 w; +#ifdef HAS_RGBA + w = tex1D(KernelSampler, pos).rgb; +#else + w = tex1D(KernelSampler, pos).bgr; +#endif + +#ifdef HAS_FLOAT_TEXTURE + return w; +#else + return w * 2.0 - 1.0; +#endif +} + +half3 pixel(sampler samp, float xpos, float ypos) +{ + return tex2D(samp, float2(xpos, ypos)).rgb; +} + +// Code for first pass - horizontal + +half3 getLine(float ypos, float3 xpos1, float3 xpos2, half3 linetaps1, half3 linetaps2) +{ + return + pixel(RGBSampler, xpos1.r, ypos) * linetaps1.r + + pixel(RGBSampler, xpos1.g, ypos) * linetaps2.r + + pixel(RGBSampler, xpos1.b, ypos) * linetaps1.g + + pixel(RGBSampler, xpos2.r, ypos) * linetaps2.g + + pixel(RGBSampler, xpos2.g, ypos) * linetaps1.b + + pixel(RGBSampler, xpos2.b, ypos) * linetaps2.b; +} + +PS_OUTPUT CONVOLUTION6x6Horiz(VS_OUTPUT In) +{ + PS_OUTPUT OUT; + + float2 pos = In.TextureUV + g_StepXY_P0 * 0.5; + float2 f = frac(pos / g_StepXY_P0); + + half3 linetaps1 = weight((1.0 - f.x) / 2.0); + half3 linetaps2 = weight((1.0 - f.x) / 2.0 + 0.5); + + // kernel generation code made sure taps add up to 1, no need to adjust here. + + float2 xystart; + xystart.x = (-2.0 - f.x) * g_StepXY_P0.x + In.TextureUV.x; + xystart.y = In.TextureUV.y; + + float3 xpos1 = float3( + xystart.x, + xystart.x + g_StepXY_P0.x, + xystart.x + g_StepXY_P0.x * 2.0); + float3 xpos2 = half3( + xystart.x + g_StepXY_P0.x * 3.0, + xystart.x + g_StepXY_P0.x * 4.0, + xystart.x + g_StepXY_P0.x * 5.0); + + OUT.RGBColor.rgb = getLine(xystart.y, xpos1, xpos2, linetaps1, linetaps2); + OUT.RGBColor.a = 1.0; + + return OUT; +} + +// Code for second pass - vertical + +half3 getRow(float xpos, float3 ypos1, float3 ypos2, half3 columntaps1, half3 columntaps2) +{ + return + pixel(IntermediateSampler, xpos, ypos1.r) * columntaps1.r + + pixel(IntermediateSampler, xpos, ypos1.g) * columntaps2.r + + pixel(IntermediateSampler, xpos, ypos1.b) * columntaps1.g + + pixel(IntermediateSampler, xpos, ypos2.r) * columntaps2.g + + pixel(IntermediateSampler, xpos, ypos2.g) * columntaps1.b + + pixel(IntermediateSampler, xpos, ypos2.b) * columntaps2.b; +} + +PS_OUTPUT CONVOLUTION6x6Vert(VS_OUTPUT In) +{ + PS_OUTPUT OUT; + + float2 pos = In.TextureUV + g_StepXY_P1 * 0.5; + float2 f = frac(pos / g_StepXY_P1); + + half3 columntaps1 = weight((1.0 - f.y) / 2.0); + half3 columntaps2 = weight((1.0 - f.y) / 2.0 + 0.5); + + // kernel generation code made sure taps add up to 1, no need to adjust here. + + float2 xystart; + xystart.x = In.TextureUV.x; + xystart.y = (-2.0 - f.y) * g_StepXY_P1.y + In.TextureUV.y; + + float3 ypos1 = float3( + xystart.y, + xystart.y + g_StepXY_P1.y, + xystart.y + g_StepXY_P1.y * 2.0); + float3 ypos2 = half3( + xystart.y + g_StepXY_P1.y * 3.0, + xystart.y + g_StepXY_P1.y * 4.0, + xystart.y + g_StepXY_P1.y * 5.0); + + OUT.RGBColor.rgb = getRow(xystart.x, ypos1, ypos2, columntaps1, columntaps2); + OUT.RGBColor.a = 1.0; + + return OUT; +} + +technique SCALER_T +{ + pass P0 + { + PixelShader = compile ps_3_0 CONVOLUTION6x6Horiz(); + ZEnable = False; + FillMode = Solid; + FogEnable = False; + } + pass P1 + { + PixelShader = compile ps_3_0 CONVOLUTION6x6Vert(); + ZEnable = False; + FillMode = Solid; + FogEnable = False; + } +}; diff --git a/system/shaders/guishader_frag_multi.glsl b/system/shaders/guishader_frag_multi.glsl index c712e3c2f7..a5a97b5e9e 100644 --- a/system/shaders/guishader_frag_multi.glsl +++ b/system/shaders/guishader_frag_multi.glsl @@ -28,5 +28,5 @@ varying vec4 m_cord1; // SM_MULTI shader void main () { - gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).bgra; + gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).rgba; } diff --git a/system/shaders/guishader_frag_multi_blendcolor.glsl b/system/shaders/guishader_frag_multi_blendcolor.glsl index e012a6bfc5..b311350ff9 100644 --- a/system/shaders/guishader_frag_multi_blendcolor.glsl +++ b/system/shaders/guishader_frag_multi_blendcolor.glsl @@ -29,5 +29,5 @@ varying lowp vec4 m_colour; // SM_MULTI shader void main () { - gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).bgra * m_colour; + gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).rgba * m_colour; } diff --git a/system/shaders/guishader_frag_texture.glsl b/system/shaders/guishader_frag_texture.glsl index 826369fe7b..16bb84e442 100644 --- a/system/shaders/guishader_frag_texture.glsl +++ b/system/shaders/guishader_frag_texture.glsl @@ -27,5 +27,5 @@ varying lowp vec4 m_colour; // SM_TEXTURE shader void main () { - gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).bgra * m_colour); + gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba * m_colour); } diff --git a/system/shaders/guishader_frag_texture_noblend.glsl b/system/shaders/guishader_frag_texture_noblend.glsl index 16438a38ac..ed050faee2 100644 --- a/system/shaders/guishader_frag_texture_noblend.glsl +++ b/system/shaders/guishader_frag_texture_noblend.glsl @@ -26,5 +26,5 @@ varying vec4 m_cord0; // SM_TEXTURE_NOBLEND shader void main () { - gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).bgra); + gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba); } |