diff options
-rw-r--r-- | apps/onplay.c | 12 | ||||
-rw-r--r-- | apps/onplay.h | 8 | ||||
-rw-r--r-- | apps/settings_list.c | 19 | ||||
-rw-r--r-- | manual/appendix/config_file_options.tex | 4 |
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[] = { | |||
1860 | { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, | 1860 | { HOTKEY_INSERT_SHUFFLED, LANG_INSERT_SHUFFLED, |
1861 | HOTKEY_FUNC(playlist_insert_shuffled, NULL), | 1861 | HOTKEY_FUNC(playlist_insert_shuffled, NULL), |
1862 | ONPLAY_RELOAD_DIR }, | 1862 | ONPLAY_RELOAD_DIR }, |
1863 | { HOTKEY_PLUGIN, LANG_OPEN_PLUGIN, | 1863 | { HOTKEY_PLUGIN, LANG_OPEN_PLUGIN, |
1864 | HOTKEY_FUNC(hotkey_run_plugin, NULL), | 1864 | HOTKEY_FUNC(hotkey_run_plugin, NULL), |
1865 | ONPLAY_OK }, | 1865 | ONPLAY_OK }, |
1866 | { HOTKEY_BOOKMARK, LANG_BOOKMARK_MENU_CREATE, | 1866 | { HOTKEY_BOOKMARK, LANG_BOOKMARK_MENU_CREATE, |
1867 | HOTKEY_FUNC(bookmark_create_menu, NULL), | 1867 | HOTKEY_FUNC(bookmark_create_menu, NULL), |
1868 | ONPLAY_OK }, | 1868 | ONPLAY_OK }, |
1869 | { HOTKEY_PROPERTIES, LANG_PROPERTIES, | ||
1870 | HOTKEY_FUNC(onplay_load_plugin, (void *)"properties"), | ||
1871 | ONPLAY_RELOAD_DIR }, | ||
1872 | #ifdef HAVE_TAGCACHE | ||
1873 | { HOTKEY_PICTUREFLOW, LANG_ONPLAY_PICTUREFLOW, | ||
1874 | HOTKEY_FUNC(onplay_load_plugin, (void *)"pictureflow"), | ||
1875 | ONPLAY_RELOAD_DIR }, | ||
1876 | #endif | ||
1869 | }; | 1877 | }; |
1870 | 1878 | ||
1871 | /* Return the language ID for this action */ | 1879 | /* 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); | |||
39 | enum hotkey_action { | 39 | enum hotkey_action { |
40 | HOTKEY_OFF = 0, | 40 | HOTKEY_OFF = 0, |
41 | HOTKEY_VIEW_PLAYLIST, | 41 | HOTKEY_VIEW_PLAYLIST, |
42 | HOTKEY_PROPERTIES, | ||
43 | #ifdef HAVE_TAGCACHE | ||
44 | HOTKEY_PICTUREFLOW, | ||
45 | #endif | ||
42 | HOTKEY_SHOW_TRACK_INFO, | 46 | HOTKEY_SHOW_TRACK_INFO, |
43 | HOTKEY_PITCHSCREEN, | 47 | HOTKEY_PITCHSCREEN, |
44 | HOTKEY_OPEN_WITH, | 48 | HOTKEY_OPEN_WITH, |
45 | HOTKEY_DELETE, | 49 | HOTKEY_DELETE, |
50 | HOTKEY_BOOKMARK, | ||
51 | HOTKEY_PLUGIN, | ||
46 | HOTKEY_INSERT, | 52 | HOTKEY_INSERT, |
47 | HOTKEY_INSERT_SHUFFLED, | 53 | HOTKEY_INSERT_SHUFFLED, |
48 | HOTKEY_PLUGIN, | ||
49 | HOTKEY_BOOKMARK, | ||
50 | }; | 54 | }; |
51 | #endif | 55 | #endif |
52 | 56 | ||
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[] = { | |||
2113 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK, HOTKEY_PLUGIN), | 2113 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_BOOKMARK, HOTKEY_PLUGIN), |
2114 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, | 2114 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, hotkey_tree, |
2115 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", | 2115 | LANG_HOTKEY_FILE_BROWSER, HOTKEY_OFF, "hotkey tree", |
2116 | "off,open with,delete,insert,insert shuffled", | 2116 | #ifdef HAVE_TAGCACHE |
2117 | UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, 5, HOTKEY_OFF, | 2117 | "off,properties,pictureflow,open with,delete,insert,insert shuffled", |
2118 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED), | 2118 | #else |
2119 | "off,properties,open with,delete,insert,insert shuffled", | ||
2120 | #endif | ||
2121 | UNIT_INT, hotkey_formatter, hotkey_getlang, NULL, | ||
2122 | #ifdef HAVE_TAGCACHE | ||
2123 | 7, | ||
2124 | #else | ||
2125 | 6, | ||
2126 | #endif | ||
2127 | HOTKEY_OFF,HOTKEY_PROPERTIES, | ||
2128 | #ifdef HAVE_TAGCACHE | ||
2129 | HOTKEY_PICTUREFLOW, | ||
2119 | #endif | 2130 | #endif |
2131 | HOTKEY_OPEN_WITH, HOTKEY_DELETE, HOTKEY_INSERT, HOTKEY_INSERT_SHUFFLED), | ||
2132 | #endif /* HAVE_HOTKEY */ | ||
2120 | 2133 | ||
2121 | INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0, | 2134 | INT_SETTING(F_TIME_SETTING, resume_rewind, LANG_RESUME_REWIND, 0, |
2122 | "resume rewind", UNIT_SEC, 0, 60, 5, | 2135 | "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 @@ | |||
148 | \opt{hotkey}{ | 148 | \opt{hotkey}{ |
149 | hotkey wps & off, view playlist, show track info, | 149 | hotkey wps & off, view playlist, show track info, |
150 | pitchscreen, open with, delete & N/A\\ | 150 | pitchscreen, open with, delete & N/A\\ |
151 | \nopt{touchscreen}{hotkey tree & off, open with, delete, insert, | 151 | \nopt{touchscreen}{hotkey tree & off, properties, pictureflow, open with, |
152 | insert shuffled & N/A\\} | 152 | delete, insert, insert shuffled & N/A\\} |
153 | } | 153 | } |
154 | sort files & alpha, oldest, newest, type & N/A\\ | 154 | sort files & alpha, oldest, newest, type & N/A\\ |
155 | sort dirs & alpha, oldest, newest & N/A\\ | 155 | sort dirs & alpha, oldest, newest & N/A\\ |