add hotkeys for properties and pictureflow

Change-Id: I16b36dd02f1c2aa186d957c64ed7d239c4c91047

4 files changed, 34 insertions, 9 deletions

diff --git a/apps/onplay.c b/apps/onplay.c
index c52bd6101c..e44e81ee5d 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1860,12 +1860,20 @@ static struct hotkey_assignment hotkey_items[] = {
     { HOTKEY_INSERT_SHUFFLED,   LANG_INSERT_SHUFFLED,
             HOTKEY_FUNC(playlist_insert_shuffled, NULL),
             ONPLAY_RELOAD_DIR },
-    { HOTKEY_PLUGIN, LANG_OPEN_PLUGIN,
+    { HOTKEY_PLUGIN,            LANG_OPEN_PLUGIN,
             HOTKEY_FUNC(hotkey_run_plugin, NULL),
             ONPLAY_OK },
-    { HOTKEY_BOOKMARK,   LANG_BOOKMARK_MENU_CREATE,
+    { HOTKEY_BOOKMARK,          LANG_BOOKMARK_MENU_CREATE,
             HOTKEY_FUNC(bookmark_create_menu, NULL),
             ONPLAY_OK },
+    { HOTKEY_PROPERTIES,        LANG_PROPERTIES,
+            HOTKEY_FUNC(onplay_load_plugin, (void *)"properties"),
+            ONPLAY_RELOAD_DIR },
+#ifdef HAVE_TAGCACHE
+    { HOTKEY_PICTUREFLOW,       LANG_ONPLAY_PICTUREFLOW,
+            HOTKEY_FUNC(onplay_load_plugin, (void *)"pictureflow"),
+            ONPLAY_RELOAD_DIR },
+#endif
 };
 
 /* Return the language ID for this action */
diff --git a/apps/onplay.h b/apps/onplay.h
index 3a259d68e6..3121c918ac 100644
--- a/apps/onplay.h
+++ b/apps/onplay.h
@@ -39,14 +39,18 @@ int get_hotkey_lang_id(int action);
 enum hotkey_action {
     HOTKEY_OFF = 0,
     HOTKEY_VIEW_PLAYLIST,
+    HOTKEY_PROPERTIES,
+#ifdef HAVE_TAGCACHE
+    HOTKEY_PICTUREFLOW,
+#endif
     HOTKEY_SHOW_TRACK_INFO,
     HOTKEY_PITCHSCREEN,
     HOTKEY_OPEN_WITH,
     HOTKEY_DELETE,
+    HOTKEY_BOOKMARK,
+    HOTKEY_PLUGIN,
     HOTKEY_INSERT,
     HOTKEY_INSERT_SHUFFLED,
-    HOTKEY_PLUGIN,
-    HOTKEY_BOOKMARK,
 };
 #endif
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index fc526987e2..5fd7e0459b 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -2113,10 +2113,23 @@ const struct settings_list settings[] = {
         HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK, HOTKEY_PLUGIN),
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree,
         LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree",
-        "off,open with,delete,insert,insert shuffled",
-        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 5, HOTKEY_OFF,
-        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED),
+#ifdef HAVE_TAGCACHE
+        "off,properties,pictureflow,open with,delete,insert,insert shuffled",
+#else
+        "off,properties,open with,delete,insert,insert shuffled",
+#endif
+        UNIT_INT, hotkey_formatter, hotkey_getlang, NULL,
+#ifdef HAVE_TAGCACHE
+        7,
+#else
+        6,
+#endif
+        HOTKEY_OFF,HOTKEY_PROPERTIES,
+#ifdef HAVE_TAGCACHE
+        HOTKEY_PICTUREFLOW,
 #endif
+        HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED),
+#endif /* HAVE_HOTKEY */
 
     INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0,
                 "resume rewind", UNIT_SEC, 0, 60, 5,
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 66c1930e58..bf231de46c 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -148,8 +148,8 @@
     \opt{hotkey}{
     hotkey wps      & off, view playlist, show track info,
         pitchscreen, open with, delete  & N/A\\
-    \nopt{touchscreen}{hotkey tree     & off, open with, delete, insert,
-        insert shuffled                 & N/A\\}
+    \nopt{touchscreen}{hotkey tree      & off, properties, pictureflow, open with,
+        delete, insert, insert shuffled & N/A\\}
     }
     sort files      & alpha, oldest, newest, type & N/A\\
     sort dirs       & alpha, oldest, newest & N/A\\