mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2330 from fr500/master

Browse Source 
Add new icon alternatives, add extra info to debug panel
This commit is contained in:
Twinaphex 2015-11-02 08:24:28 +01:00
commit fcb0c434ff
18 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
media/android/dark/res/mipmap-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
media/android/dark/res/mipmap-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
media/android/dark/res/mipmap-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
media/android/dark/res/mipmap-xxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
media/android/dark/res/mipmap-xxxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
media/android/dark/web_hi_res_512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
media/android/light/res/mipmap-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
media/android/light/res/mipmap-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
media/android/light/res/mipmap-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
media/android/light/res/mipmap-xxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
media/android/light/res/mipmap-xxxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
media/android/light/web_hi_res_512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
media/icon_dark.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 KiB

BIN
media/icon_light.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 KiB

BIN
media/invader_dark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
media/invader_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

2
media/rarch.rc
View File

@ -1,5 +1,5 @@
#include "../gfx/drivers_wm/win32_resource.h"
1 ICON "retroarch-16x16.ico"
1 ICON "icon_light.ico"
2 24 "rarch.manifest"
IDR_MENU MENU

103
menu/menu_displaylist.c
View File

@ -310,18 +310,17 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
/* Assume libretro directory exists and check if stat works */
ret = path_is_directory(settings->libretro_directory);
snprintf(tmp, sizeof(tmp), "Test 1: stat directory... %s", ret ? "passed" : "failed");
snprintf(tmp, sizeof(tmp), "- stat directory... %s", ret ? "passed" : "failed");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Try to create a "test" subdirectory on top of libretro directory */
fill_pathname_join(tmp, settings->libretro_directory, "test", PATH_MAX_LENGTH);
fill_pathname_join(tmp, settings->libretro_directory, ".retroarch", PATH_MAX_LENGTH);
ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "Test 2: create a directory... %s", ret ? "passed" : "failed");
snprintf(tmp, sizeof(tmp), "- create a directory... %s", ret ? "passed" : "failed");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_push(info->list, "", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
@ -329,34 +328,66 @@ static int menu_displaylist_parse_debug_info(menu_displaylist_info_t *info)
menu_entries_push(info->list, "Savefile Directory", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
ret = path_is_directory(global->dir.savefile);
snprintf(tmp, sizeof(tmp), "Directory exists: %s", ret ? "true" : "false");
snprintf(tmp, sizeof(tmp), "- directory name: %s", global->dir.savefile);
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "- directory exists: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if save directory is writable */
fill_pathname_join(tmp, global->dir.savefile, "test", PATH_MAX_LENGTH);
fill_pathname_join(tmp, global->dir.savefile, ".retroarch", PATH_MAX_LENGTH);
ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "Directory writable: %s", ret ? "true" : "false");
snprintf(tmp, sizeof(tmp), "- directory writable: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_push(info->list, "", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if state directory exists */
menu_entries_push(info->list, "Savestate Directory", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
ret = path_is_directory(global->dir.savestate);
snprintf(tmp, sizeof(tmp), "Directory exists: %s", ret ? "true" : "false");
snprintf(tmp, sizeof(tmp), "- directory name: %s", global->dir.savestate);
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "- directory exists: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if save directory is writable */
fill_pathname_join(tmp, global->dir.savestate, "test", PATH_MAX_LENGTH);
fill_pathname_join(tmp, global->dir.savestate, ".retroarch", PATH_MAX_LENGTH);
ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "Directory writable: %s", ret ? "true" : "false");
snprintf(tmp, sizeof(tmp), "- directory writable: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
menu_entries_push(info->list, "", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if system directory exists */
menu_entries_push(info->list, "System Directory", "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
ret = path_is_directory(settings->system_directory);
snprintf(tmp, sizeof(tmp), "- directory name: %s", settings->system_directory);
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), "- directory exists: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* Check if save directory is writable */
fill_pathname_join(tmp, settings->system_directory, ".retroarch", PATH_MAX_LENGTH);
ret = path_mkdir(tmp);
snprintf(tmp, sizeof(tmp), "- directory writable: %s", ret ? "true" : "false");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
return 0;
}
static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
{
int controller;
@ -1456,7 +1487,7 @@ static int deferred_push_video_shader_parameters_common(
}
#endif
int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
const char *info_label, unsigned parse_type, bool add_empty_entry)
{
enum setting_type precond;
@ -1468,7 +1499,7 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
if (!setting)
return -1;
switch (parse_type)
{
case PARSE_GROUP:
@ -1560,7 +1591,7 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
menu_entries_push(info->list, short_description,
name, menu_setting_set_flags(setting), 0, 0);
count++;
loop:
switch (parse_type)
{
@ -2612,53 +2643,53 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
info->need_push = true;
break;
case DISPLAYLIST_SETTINGS_ALL:
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_DRIVER_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_VIDEO_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_AUDIO_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_INPUT_SETTINGS), PARSE_ACTION, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_INPUT_HOTKEY_BINDS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_CORE_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_CONFIGURATION_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_SAVING_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_LOGGING_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_FRAME_THROTTLE_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_REWIND_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_RECORDING_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_OVERLAY_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_MENU_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_UI_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_NETWORK_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_PLAYLIST_SETTINGS), PARSE_ACTION, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_USER_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_DIRECTORY_SETTINGS), PARSE_ONLY_GROUP, false);
ret = menu_displaylist_parse_settings(menu, info,
ret = menu_displaylist_parse_settings(menu, info,
menu_hash_to_str(MENU_LABEL_VALUE_PRIVACY_SETTINGS), PARSE_ONLY_GROUP, false);
info->need_push = true;
break;