Merge pull request #2330 from fr500/master

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
media/icon_dark.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 361 KiB

BIN
media/icon_light.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 361 KiB

BIN
media/invader_dark.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
media/invader_light.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

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

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;