Skip to content

Commit

Permalink
Add more icons OZONE/XMB
Browse files Browse the repository at this point in the history
  • Loading branch information
@alfrix
alfrix committed Nov 8, 2018
1 parent 56b6ef9 commit 0b29a93
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 8 deletions.
51 changes: 43 additions & 8 deletions menu/drivers/ozone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ enum
OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB,
OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT,
OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT,
OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK,
OZONE_ENTRIES_ICONS_TEXTURE_LAST
};

Expand Down Expand Up @@ -892,6 +893,9 @@ switch (id)
case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START:
icon_name = "input_START.png";
break;
case OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK:
icon_name = "menu_check.png";
break;
}

fill_pathname_join(
Expand Down Expand Up @@ -974,12 +978,19 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
/* Menu icons */
case MENU_ENUM_LABEL_CONTENT_SETTINGS:
case MENU_ENUM_LABEL_UPDATE_ASSETS:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
case MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME:
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME:
return OZONE_ENTRIES_ICONS_TEXTURE_QUICKMENU;
case MENU_ENUM_LABEL_START_CORE:
case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
return OZONE_ENTRIES_ICONS_TEXTURE_RUN;
case MENU_ENUM_LABEL_CORE_LIST:
case MENU_ENUM_LABEL_CORE_SETTINGS:
case MENU_ENUM_LABEL_CORE_UPDATER_LIST:
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE:
return OZONE_ENTRIES_ICONS_TEXTURE_CORE;
case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
case MENU_ENUM_LABEL_SCAN_FILE:
Expand All @@ -999,6 +1010,8 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
case MENU_ENUM_LABEL_UPDATE_CG_SHADERS:
case MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS:
case MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS:
case MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE:
case MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS:
return OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS;
case MENU_ENUM_LABEL_INFORMATION:
case MENU_ENUM_LABEL_INFORMATION_LIST:
Expand Down Expand Up @@ -1051,9 +1064,11 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
case MENU_ENUM_LABEL_LATENCY_SETTINGS:
return OZONE_ENTRIES_ICONS_TEXTURE_LATENCY;
case MENU_ENUM_LABEL_SAVING_SETTINGS:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG:
case MENU_ENUM_LABEL_SAVE_NEW_CONFIG:
case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
case MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS:
return OZONE_ENTRIES_ICONS_TEXTURE_SAVING;
case MENU_ENUM_LABEL_LOGGING_SETTINGS:
return OZONE_ENTRIES_ICONS_TEXTURE_LOG;
Expand All @@ -1066,6 +1081,11 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
return OZONE_ENTRIES_ICONS_TEXTURE_STREAM;
case MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING:
case MENU_ENUM_LABEL_QUICK_MENU_STOP_RECORDING:
case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CORE:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_GAME:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR:
case MENU_ENUM_LABEL_CORE_DELETE:
return OZONE_ENTRIES_ICONS_TEXTURE_CLOSE;
case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
return OZONE_ENTRIES_ICONS_TEXTURE_OSD;
Expand All @@ -1090,6 +1110,9 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
return OZONE_ENTRIES_ICONS_TEXTURE_USER;
case MENU_ENUM_LABEL_DIRECTORY_SETTINGS:
case MENU_ENUM_LABEL_SCAN_DIRECTORY:
case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CONTENT_DIR:
case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR:
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT:
return OZONE_ENTRIES_ICONS_TEXTURE_FOLDER;
case MENU_ENUM_LABEL_PRIVACY_SETTINGS:
return OZONE_ENTRIES_ICONS_TEXTURE_PRIVACY;
Expand All @@ -1111,9 +1134,23 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
return OZONE_ENTRIES_ICONS_TEXTURE_RELOAD;
#endif
case MENU_ENUM_LABEL_REBOOT:
case MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG:
case MENU_ENUM_LABEL_CHEAT_RELOAD_CHEATS:
return OZONE_ENTRIES_ICONS_TEXTURE_RELOAD;
case MENU_ENUM_LABEL_SHUTDOWN:
return OZONE_ENTRIES_ICONS_TEXTURE_SHUTDOWN;
case MENU_ENUM_LABEL_CONFIGURATIONS:
case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS:
case MENU_ENUM_LABEL_REMAP_FILE_LOAD:
case MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE:
case MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE:
case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
case MENU_ENUM_LABEL_CHEAT_FILE_LOAD:
case MENU_ENUM_LABEL_CHEAT_FILE_LOAD_APPEND:
return OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE;
case MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES:
case MENU_ENUM_LABEL_SHADER_APPLY_CHANGES:
return OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK;
default:
break;
}
Expand Down Expand Up @@ -1147,8 +1184,10 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
return OZONE_ENTRIES_ICONS_TEXTURE_CURSOR;
case FILE_TYPE_PLAYLIST_ENTRY:
case MENU_SETTING_ACTION_RUN:
case MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS:
return OZONE_ENTRIES_ICONS_TEXTURE_RUN;
case MENU_SETTING_ACTION_CLOSE:
case MENU_SETTING_ACTION_DELETE_ENTRY:
return OZONE_ENTRIES_ICONS_TEXTURE_CLOSE;
case MENU_SETTING_ACTION_SAVESTATE:
return OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE;
Expand All @@ -1169,14 +1208,10 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
return OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS;
case MENU_SETTING_ACTION_SCREENSHOT:
return OZONE_ENTRIES_ICONS_TEXTURE_SCREENSHOT;
case MENU_SETTING_ACTION_DELETE_ENTRY:
return OZONE_ENTRIES_ICONS_TEXTURE_CLOSE;
case MENU_SETTING_ACTION_RESET:
return OZONE_ENTRIES_ICONS_TEXTURE_RELOAD;
case MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS:
return OZONE_ENTRIES_ICONS_TEXTURE_RESUME;
case MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS:
return OZONE_ENTRIES_ICONS_TEXTURE_RUN;

case MENU_SETTING_GROUP:
#ifdef HAVE_LAKKA_SWITCH
Expand Down Expand Up @@ -1209,7 +1244,7 @@ static unsigned ozone_entries_icon_get_id(ozone_handle_t *ozone,
if (get_badge_texture(new_id) != 0)
return get_badge_texture(new_id);
/* Should be replaced with placeholder badge icon. */
return OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING;
return OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS;
}
#endif

Expand Down
4 changes: 4 additions & 0 deletions menu/drivers/xmb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2429,6 +2429,10 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
case MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING:
case MENU_ENUM_LABEL_QUICK_MENU_STOP_RECORDING:
case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CORE:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_GAME:
case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR:
case MENU_ENUM_LABEL_CORE_DELETE:
return xmb->textures.list[XMB_TEXTURE_CLOSE];
case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
return xmb->textures.list[XMB_TEXTURE_OSD];
Expand Down

0 comments on commit 0b29a93

Please sign in to comment.