diff options
| author | Rainer Hochecker <fernetmenta@online.de> | 2016-07-31 16:12:11 +0200 |
|---|---|---|
| committer | Rainer Hochecker <fernetmenta@online.de> | 2016-07-31 16:15:57 +0200 |
| commit | f625dbfecd8687dee7d532391e29f23e990f3291 (patch) | |
| tree | a9c93a0c6518f30664ddd9010be713b147d59b0e | |
| parent | ae6a179e721bc72660fdf56981a87278292e1ad6 (diff) | |
Pictures: trigger picture info on ACTION_SHOW_INFO
| -rw-r--r-- | system/keymaps/gamepad.xml | 2 | ||||
| -rw-r--r-- | system/keymaps/joystick.xml | 2 | ||||
| -rw-r--r-- | system/keymaps/keyboard.xml | 2 | ||||
| -rw-r--r-- | system/keymaps/remote.xml | 2 | ||||
| -rw-r--r-- | xbmc/pictures/GUIWindowSlideShow.cpp | 2 | ||||
| -rw-r--r-- | xbmc/platform/darwin/DarwinUtils.mm | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/system/keymaps/gamepad.xml b/system/keymaps/gamepad.xml index 31029e8403..a9d1c65066 100644 --- a/system/keymaps/gamepad.xml +++ b/system/keymaps/gamepad.xml @@ -177,7 +177,7 @@ <B>Stop</B> <Y>Rotate</Y> <X>ZoomNormal</X> - <black>PlayerProcessInfo</black> + <black>Info</black> <white>Info</white> <righttrigger>NextPicture</righttrigger> <lefttrigger>PreviousPicture</lefttrigger> diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml index 4ea4cd3f6f..6b7aa92e6a 100644 --- a/system/keymaps/joystick.xml +++ b/system/keymaps/joystick.xml @@ -141,7 +141,7 @@ <b>Stop</b> <y>ZoomNormal</y> <leftbumper>Rotate</leftbumper> - <rightbumper>PlayerProcessInfo</rightbumper> + <rightbumper>Info</rightbumper> <up>ZoomIn</up> <down>ZoomOut</down> <left>PreviousPicture</left> diff --git a/system/keymaps/keyboard.xml b/system/keymaps/keyboard.xml index c6b4e7d23e..90517afa61 100644 --- a/system/keymaps/keyboard.xml +++ b/system/keymaps/keyboard.xml @@ -441,7 +441,7 @@ <eight>ZoomLevel8</eight> <nine>ZoomLevel9</nine> <i>Info</i> - <o>PlayerProcessInfo</o> + <o>Info</o> <period>NextPicture</period> <comma>PreviousPicture</comma> <plus>ZoomIn</plus> diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml index 2abcedc0d7..dedcc9bfd0 100644 --- a/system/keymaps/remote.xml +++ b/system/keymaps/remote.xml @@ -259,7 +259,7 @@ <seven>ZoomLevel7</seven> <eight>ZoomLevel8</eight> <nine>ZoomLevel9</nine> - <info>PlayerProcessInfo</info> + <info>Info</info> <skipplus>NextPicture</skipplus> <skipminus>PreviousPicture</skipminus> <title>Info</title> diff --git a/xbmc/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp index cb9faa83c1..c847bb4f6b 100644 --- a/xbmc/pictures/GUIWindowSlideShow.cpp +++ b/xbmc/pictures/GUIWindowSlideShow.cpp @@ -737,7 +737,7 @@ bool CGUIWindowSlideShow::OnAction(const CAction &action) { switch (action.GetID()) { - case ACTION_PLAYER_PROCESS_INFO: + case ACTION_SHOW_INFO: { CGUIDialogPictureInfo *pictureInfo = (CGUIDialogPictureInfo *)g_windowManager.GetWindow(WINDOW_DIALOG_PICTURE_INFO); if (pictureInfo) diff --git a/xbmc/platform/darwin/DarwinUtils.mm b/xbmc/platform/darwin/DarwinUtils.mm index 11be67a747..509cce5cc7 100644 --- a/xbmc/platform/darwin/DarwinUtils.mm +++ b/xbmc/platform/darwin/DarwinUtils.mm @@ -635,6 +635,7 @@ const std::string& CDarwinUtils::GetManufacturer(void) bool CDarwinUtils::IsAliasShortcut(const std::string& path, bool isdirectory) { bool ret = false; + #if defined(TARGET_DARWIN_OSX) CCocoaAutoPool pool; |