Merge remote-tracking branch 'upstream/master'

1 files changed, 29 insertions, 169 deletions

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>