diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-07 03:21:12 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-07 03:21:12 +0000 |
commit | 16e0c5730d1373848a30374e5bb5d1d230626b50 (patch) | |
tree | 66e25fd81700266a65ca649c0e7b7e3ca27c6e67 | |
parent | affea5fe9e54b32ecd9f30ed02dd093d7aaa34b0 (diff) | |
download | rockbox-16e0c5730d1373848a30374e5bb5d1d230626b50.tar.gz rockbox-16e0c5730d1373848a30374e5bb5d1d230626b50.zip |
Hotkey menu items have their own icon
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25866 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/bitmaps/native/default_icons.6x8x1.bmp | bin | 5174 -> 5334 bytes | |||
-rw-r--r-- | apps/bitmaps/native/default_icons.6x8x16.bmp | bin | 5174 -> 5334 bytes | |||
-rw-r--r-- | apps/bitmaps/native/default_icons.6x8x2.bmp | bin | 5174 -> 5334 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp | bin | 5174 -> 5334 bytes | |||
-rw-r--r-- | apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp | bin | 5174 -> 5334 bytes | |||
-rw-r--r-- | apps/gui/icon.h | 1 | ||||
-rw-r--r-- | apps/menu.c | 5 | ||||
-rw-r--r-- | apps/menu.h | 1 | ||||
-rw-r--r-- | apps/menus/playlist_menu.c | 3 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/onplay.c | 16 | ||||
-rw-r--r-- | apps/player/icons.c | 1 | ||||
-rw-r--r-- | icons/tango_small.bmp | bin | 13878 -> 14310 bytes | |||
-rw-r--r-- | icons/tango_small_mono.bmp | bin | 3190 -> 3286 bytes |
14 files changed, 21 insertions, 8 deletions
diff --git a/apps/bitmaps/native/default_icons.6x8x1.bmp b/apps/bitmaps/native/default_icons.6x8x1.bmp index 857b1e1d7b..0ff36743ad 100644 --- a/apps/bitmaps/native/default_icons.6x8x1.bmp +++ b/apps/bitmaps/native/default_icons.6x8x1.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp index dad29b2e50..0de8f85cf6 100644 --- a/apps/bitmaps/native/default_icons.6x8x16.bmp +++ b/apps/bitmaps/native/default_icons.6x8x16.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/native/default_icons.6x8x2.bmp b/apps/bitmaps/native/default_icons.6x8x2.bmp index 857b1e1d7b..0ff36743ad 100644 --- a/apps/bitmaps/native/default_icons.6x8x2.bmp +++ b/apps/bitmaps/native/default_icons.6x8x2.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp index 857b1e1d7b..0ff36743ad 100644 --- a/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp +++ b/apps/bitmaps/remote_native/remote_default_icons.6x8x1.bmp | |||
Binary files differ | |||
diff --git a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp b/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp index 857b1e1d7b..0ff36743ad 100644 --- a/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp +++ b/apps/bitmaps/remote_native/remote_default_icons.6x8x2.bmp | |||
Binary files differ | |||
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 9a58076509..c5db23ff9e 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -68,6 +68,7 @@ enum themable_icons { | |||
68 | Icon_file_view_menu, | 68 | Icon_file_view_menu, |
69 | Icon_EQ, | 69 | Icon_EQ, |
70 | Icon_Rockbox, | 70 | Icon_Rockbox, |
71 | Icon_Hotkey, | ||
71 | Icon_Last_Themeable, | 72 | Icon_Last_Themeable, |
72 | }; | 73 | }; |
73 | 74 | ||
diff --git a/apps/menu.c b/apps/menu.c index b640905c0f..a0af666cbb 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -153,6 +153,11 @@ static enum themable_icons menu_get_icon(int selected_item, void * data) | |||
153 | else if (menu->flags&MENU_DYNAMIC_DESC) | 153 | else if (menu->flags&MENU_DYNAMIC_DESC) |
154 | menu_icon = menu->menu_get_name_and_icon->icon_id; | 154 | menu_icon = menu->menu_get_name_and_icon->icon_id; |
155 | 155 | ||
156 | #ifdef HAVE_HOTKEY | ||
157 | if (hotkey_settable_menu && (menu->flags&MENU_FUNC_HOTKEYABLE)) | ||
158 | menu_icon = Icon_Hotkey; | ||
159 | #endif | ||
160 | |||
156 | if (menu_icon == Icon_NOICON) | 161 | if (menu_icon == Icon_NOICON) |
157 | { | 162 | { |
158 | switch (menu->flags&MENU_TYPE_MASK) | 163 | switch (menu->flags&MENU_TYPE_MASK) |
diff --git a/apps/menu.h b/apps/menu.h index b5bab90981..a7bd1c1a73 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -61,6 +61,7 @@ struct menu_func { | |||
61 | /* Flags for MT_FUNCTION_CALL */ | 61 | /* Flags for MT_FUNCTION_CALL */ |
62 | #define MENU_FUNC_USEPARAM 0x80 | 62 | #define MENU_FUNC_USEPARAM 0x80 |
63 | #define MENU_FUNC_CHECK_RETVAL 0x100 | 63 | #define MENU_FUNC_CHECK_RETVAL 0x100 |
64 | #define MENU_FUNC_HOTKEYABLE 0x200 | ||
64 | 65 | ||
65 | #define MENU_COUNT_MASK 0xFFF | 66 | #define MENU_COUNT_MASK 0xFFF |
66 | #define MENU_COUNT_SHIFT 12 | 67 | #define MENU_COUNT_SHIFT 12 |
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index aa4a0604ba..0d08a4f04f 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c | |||
@@ -68,7 +68,8 @@ static int playlist_view_(void) | |||
68 | 68 | ||
69 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), | 69 | MENUITEM_FUNCTION(create_playlist_item, 0, ID2P(LANG_CREATE_PLAYLIST), |
70 | (int(*)(void))create_playlist, NULL, NULL, Icon_NOICON); | 70 | (int(*)(void))create_playlist, NULL, NULL, Icon_NOICON); |
71 | MENUITEM_FUNCTION(view_cur_playlist, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | 71 | MENUITEM_FUNCTION(view_cur_playlist, MENU_FUNC_CHECK_RETVAL | MENU_FUNC_HOTKEYABLE, |
72 | ID2P(LANG_VIEW_DYNAMIC_PLAYLIST), | ||
72 | (int(*)(void))playlist_view_, NULL, NULL, Icon_NOICON); | 73 | (int(*)(void))playlist_view_, NULL, NULL, Icon_NOICON); |
73 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), | 74 | MENUITEM_FUNCTION(save_playlist, MENU_FUNC_USEPARAM, ID2P(LANG_SAVE_DYNAMIC_PLAYLIST), |
74 | (int(*)(void*))save_playlist_screen, | 75 | (int(*)(void*))save_playlist_screen, |
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 1007d2aeb0..26e6da40e4 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -442,7 +442,7 @@ MENUITEM_FUNCTION(hotkey_view, 0, ID2P(LANG_VIEW_HOTKEY), | |||
442 | MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), | 442 | MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), |
443 | (int(*)(void))reset_hotkey_settings, NULL, | 443 | (int(*)(void))reset_hotkey_settings, NULL, |
444 | NULL, Icon_NOICON); | 444 | NULL, Icon_NOICON); |
445 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, | 445 | MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_Hotkey, |
446 | &hotkey_view, &hotkey_reset); | 446 | &hotkey_view, &hotkey_reset); |
447 | #endif /*have_hotkey */ | 447 | #endif /*have_hotkey */ |
448 | /* HOTKEY MENU */ | 448 | /* HOTKEY MENU */ |
diff --git a/apps/onplay.c b/apps/onplay.c index 009b375871..82a8bddae7 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -270,7 +270,8 @@ static int treeplaylist_callback(int action, | |||
270 | const struct menu_item_ex *this_item); | 270 | const struct menu_item_ex *this_item); |
271 | 271 | ||
272 | /* insert items */ | 272 | /* insert items */ |
273 | MENUITEM_FUNCTION(i_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT), | 273 | MENUITEM_FUNCTION(i_pl_item, MENU_FUNC_USEPARAM | MENU_FUNC_HOTKEYABLE, |
274 | ID2P(LANG_INSERT), | ||
274 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT, | 275 | playlist_insert_func, (intptr_t*)PLAYLIST_INSERT, |
275 | NULL, Icon_Playlist); | 276 | NULL, Icon_Playlist); |
276 | MENUITEM_FUNCTION(i_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_FIRST), | 277 | MENUITEM_FUNCTION(i_first_pl_item, MENU_FUNC_USEPARAM, ID2P(LANG_INSERT_FIRST), |
@@ -959,10 +960,12 @@ MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET), | |||
959 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); | 960 | view_cue, NULL, view_cue_item_callback, Icon_NOICON); |
960 | 961 | ||
961 | /* CONTEXT_WPS items */ | 962 | /* CONTEXT_WPS items */ |
962 | MENUITEM_FUNCTION(browse_id3_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO), | 963 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_HOTKEYABLE, |
964 | ID2P(LANG_MENU_SHOW_ID3_INFO), | ||
963 | browse_id3, NULL, NULL, Icon_NOICON); | 965 | browse_id3, NULL, NULL, Icon_NOICON); |
964 | #ifdef HAVE_PITCHSCREEN | 966 | #ifdef HAVE_PITCHSCREEN |
965 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), | 967 | MENUITEM_FUNCTION(pitch_screen_item, MENU_FUNC_HOTKEYABLE, |
968 | ID2P(LANG_PITCH), | ||
966 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); | 969 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); |
967 | #endif | 970 | #endif |
968 | 971 | ||
@@ -976,9 +979,9 @@ MENUITEM_FUNCTION(clipboard_copy_item, 0, ID2P(LANG_COPY), | |||
976 | clipboard_copy, NULL, clipboard_callback, Icon_NOICON); | 979 | clipboard_copy, NULL, clipboard_callback, Icon_NOICON); |
977 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), | 980 | MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), |
978 | clipboard_paste, NULL, clipboard_callback, Icon_NOICON); | 981 | clipboard_paste, NULL, clipboard_callback, Icon_NOICON); |
979 | MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), | 982 | MENUITEM_FUNCTION(delete_file_item, MENU_FUNC_HOTKEYABLE, ID2P(LANG_DELETE), |
980 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 983 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); |
981 | MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), | 984 | MENUITEM_FUNCTION(delete_dir_item, MENU_FUNC_HOTKEYABLE, ID2P(LANG_DELETE_DIR), |
982 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); | 985 | delete_file_dir, NULL, clipboard_callback, Icon_NOICON); |
983 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), | 986 | MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), |
984 | create_dir, NULL, clipboard_callback, Icon_NOICON); | 987 | create_dir, NULL, clipboard_callback, Icon_NOICON); |
@@ -1000,7 +1003,8 @@ static bool onplay_load_plugin(void *param) | |||
1000 | return false; | 1003 | return false; |
1001 | } | 1004 | } |
1002 | 1005 | ||
1003 | MENUITEM_FUNCTION(list_viewers_item, 0, ID2P(LANG_ONPLAY_OPEN_WITH), | 1006 | MENUITEM_FUNCTION(list_viewers_item, MENU_FUNC_HOTKEYABLE, |
1007 | ID2P(LANG_ONPLAY_OPEN_WITH), | ||
1004 | list_viewers, NULL, clipboard_callback, Icon_NOICON); | 1008 | list_viewers, NULL, clipboard_callback, Icon_NOICON); |
1005 | MENUITEM_FUNCTION(properties_item, MENU_FUNC_USEPARAM, ID2P(LANG_PROPERTIES), | 1009 | MENUITEM_FUNCTION(properties_item, MENU_FUNC_USEPARAM, ID2P(LANG_PROPERTIES), |
1006 | onplay_load_plugin, (void *)"properties", | 1010 | onplay_load_plugin, (void *)"properties", |
diff --git a/apps/player/icons.c b/apps/player/icons.c index ce243ead55..dc7f747879 100644 --- a/apps/player/icons.c +++ b/apps/player/icons.c | |||
@@ -77,6 +77,7 @@ static const unsigned short icons[Icon_Last_Themeable] = { | |||
77 | [Icon_file_view_menu] = , | 77 | [Icon_file_view_menu] = , |
78 | [Icon_EQ] = , | 78 | [Icon_EQ] = , |
79 | [Icon_Rockbox] = , | 79 | [Icon_Rockbox] = , |
80 | [Icon_Hotkey] = , | ||
80 | */ | 81 | */ |
81 | }; | 82 | }; |
82 | 83 | ||
diff --git a/icons/tango_small.bmp b/icons/tango_small.bmp index d95172651f..e2cb1d8383 100644 --- a/icons/tango_small.bmp +++ b/icons/tango_small.bmp | |||
Binary files differ | |||
diff --git a/icons/tango_small_mono.bmp b/icons/tango_small_mono.bmp index b7c884a90d..9f448aacb5 100644 --- a/icons/tango_small_mono.bmp +++ b/icons/tango_small_mono.bmp | |||
Binary files differ | |||