diff --git a/data/converted/help_dpad_all_svg.cpp b/data/converted/help_dpad_all_svg.cpp
index eb6b5bbb2..9be1af6fa 100644
--- a/data/converted/help_dpad_all_svg.cpp
+++ b/data/converted/help_dpad_all_svg.cpp
@@ -2,8 +2,8 @@
#include "../Resources.h"
-const size_t help_dpad_all_svg_size = 1817;
-const unsigned char help_dpad_all_svg_data[1817] = {
+const size_t help_dpad_all_svg_size = 3523;
+const unsigned char help_dpad_all_svg_data[3523] = {
0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
@@ -43,147 +43,318 @@ const unsigned char help_dpad_all_svg_data[1817] = {
0x0a,0x09,0x20,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,
0x33,0x37,0x2e,0x30,0x36,0x31,0x70,0x78,0x22,0x20,
0x68,0x65,0x69,0x67,0x68,0x74,0x3d,0x22,0x33,0x37,
- 0x2e,0x30,0x36,0x70,0x78,0x22,0x20,0x76,0x69,0x65,
- 0x77,0x42,0x6f,0x78,0x3d,0x22,0x30,0x20,0x30,0x20,
- 0x33,0x37,0x2e,0x30,0x36,0x31,0x20,0x33,0x37,0x2e,
- 0x30,0x36,0x22,0x20,0x65,0x6e,0x61,0x62,0x6c,0x65,
- 0x2d,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,
- 0x64,0x3d,0x22,0x6e,0x65,0x77,0x20,0x30,0x20,0x30,
+ 0x2e,0x30,0x36,0x31,0x70,0x78,0x22,0x20,0x76,0x69,
+ 0x65,0x77,0x42,0x6f,0x78,0x3d,0x22,0x30,0x20,0x30,
0x20,0x33,0x37,0x2e,0x30,0x36,0x31,0x20,0x33,0x37,
- 0x2e,0x30,0x36,0x22,0x20,0x78,0x6d,0x6c,0x3a,0x73,
- 0x70,0x61,0x63,0x65,0x3d,0x22,0x70,0x72,0x65,0x73,
- 0x65,0x72,0x76,0x65,0x22,0x3e,0x0d,0x0a,0x3c,0x67,
- 0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,0x0d,0x0a,0x09,
- 0x09,0x3c,0x67,0x3e,0x0d,0x0a,0x09,0x09,0x09,0x3c,
- 0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,
- 0x22,0x6e,0x6f,0x6e,0x65,0x22,0x20,0x73,0x74,0x72,
- 0x6f,0x6b,0x65,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,
- 0x37,0x37,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,
- 0x2d,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x31,0x2e,
- 0x35,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,
- 0x6d,0x69,0x74,0x65,0x72,0x6c,0x69,0x6d,0x69,0x74,
- 0x3d,0x22,0x31,0x30,0x22,0x20,0x64,0x3d,0x22,0x4d,
- 0x33,0x33,0x2e,0x39,0x33,0x39,0x2c,0x31,0x32,0x2e,
- 0x36,0x30,0x34,0x68,0x2d,0x39,0x2e,0x34,0x38,0x32,
- 0x56,0x33,0x2e,0x31,0x32,0x31,0x0d,0x0a,0x09,0x09,
- 0x09,0x09,0x63,0x30,0x2c,0x30,0x2c,0x30,0x2d,0x32,
- 0x2e,0x33,0x37,0x31,0x2d,0x32,0x2e,0x33,0x37,0x31,
- 0x2d,0x32,0x2e,0x33,0x37,0x31,0x68,0x2d,0x37,0x2e,
- 0x31,0x31,0x31,0x63,0x30,0x2c,0x30,0x2d,0x32,0x2e,
- 0x33,0x36,0x39,0x2c,0x30,0x2d,0x32,0x2e,0x33,0x36,
- 0x39,0x2c,0x32,0x2e,0x33,0x37,0x31,0x76,0x39,0x2e,
- 0x34,0x38,0x32,0x48,0x33,0x2e,0x31,0x32,0x31,0x63,
- 0x30,0x2c,0x30,0x2d,0x32,0x2e,0x33,0x37,0x31,0x2c,
- 0x30,0x2d,0x32,0x2e,0x33,0x37,0x31,0x2c,0x32,0x2e,
- 0x33,0x37,0x76,0x37,0x2e,0x31,0x31,0x31,0x63,0x30,
- 0x2c,0x30,0x2c,0x30,0x2c,0x32,0x2e,0x33,0x37,0x31,
- 0x2c,0x32,0x2e,0x33,0x37,0x31,0x2c,0x32,0x2e,0x33,
- 0x37,0x31,0x0d,0x0a,0x09,0x09,0x09,0x09,0x68,0x39,
- 0x2e,0x34,0x38,0x34,0x76,0x39,0x2e,0x34,0x38,0x32,
- 0x63,0x30,0x2c,0x30,0x2c,0x30,0x2c,0x32,0x2e,0x33,
- 0x37,0x31,0x2c,0x32,0x2e,0x33,0x36,0x39,0x2c,0x32,
- 0x2e,0x33,0x37,0x31,0x68,0x37,0x2e,0x31,0x31,0x31,
- 0x63,0x30,0x2c,0x30,0x2c,0x32,0x2e,0x33,0x37,0x31,
- 0x2c,0x30,0x2c,0x32,0x2e,0x33,0x37,0x31,0x2d,0x32,
- 0x2e,0x33,0x37,0x31,0x76,0x2d,0x39,0x2e,0x34,0x38,
- 0x32,0x68,0x39,0x2e,0x34,0x38,0x32,0x63,0x30,0x2c,
- 0x30,0x2c,0x32,0x2e,0x33,0x37,0x31,0x2c,0x30,0x2c,
- 0x32,0x2e,0x33,0x37,0x31,0x2d,0x32,0x2e,0x33,0x37,
- 0x31,0x76,0x2d,0x37,0x2e,0x31,0x31,0x31,0x0d,0x0a,
- 0x09,0x09,0x09,0x09,0x43,0x33,0x36,0x2e,0x33,0x31,
- 0x31,0x2c,0x31,0x34,0x2e,0x39,0x37,0x34,0x2c,0x33,
- 0x36,0x2e,0x33,0x31,0x31,0x2c,0x31,0x32,0x2e,0x36,
- 0x30,0x34,0x2c,0x33,0x33,0x2e,0x39,0x33,0x39,0x2c,
- 0x31,0x32,0x2e,0x36,0x30,0x34,0x7a,0x22,0x2f,0x3e,
- 0x0d,0x0a,0x09,0x09,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,
- 0x09,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x70,
- 0x61,0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,
- 0x6e,0x6f,0x6e,0x65,0x22,0x20,0x73,0x74,0x72,0x6f,
- 0x6b,0x65,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,
- 0x37,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,
- 0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x31,0x2e,0x35,
- 0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,0x6d,
- 0x69,0x74,0x65,0x72,0x6c,0x69,0x6d,0x69,0x74,0x3d,
- 0x22,0x31,0x30,0x22,0x20,0x64,0x3d,0x22,0x4d,0x31,
- 0x38,0x2e,0x35,0x33,0x31,0x2c,0x32,0x31,0x2e,0x34,
- 0x33,0x31,0x63,0x31,0x2e,0x36,0x30,0x32,0x2c,0x30,
- 0x2c,0x32,0x2e,0x39,0x2d,0x31,0x2e,0x32,0x39,0x39,
- 0x2c,0x32,0x2e,0x39,0x2d,0x32,0x2e,0x39,0x30,0x31,
- 0x0d,0x0a,0x09,0x09,0x63,0x30,0x2d,0x31,0x2e,0x36,
- 0x30,0x32,0x2d,0x31,0x2e,0x32,0x39,0x39,0x2d,0x32,
- 0x2e,0x39,0x2d,0x32,0x2e,0x39,0x2d,0x32,0x2e,0x39,
- 0x63,0x2d,0x31,0x2e,0x36,0x30,0x34,0x2c,0x30,0x2d,
- 0x32,0x2e,0x39,0x2c,0x31,0x2e,0x32,0x39,0x39,0x2d,
- 0x32,0x2e,0x39,0x2c,0x32,0x2e,0x39,0x43,0x31,0x35,
- 0x2e,0x36,0x33,0x31,0x2c,0x32,0x30,0x2e,0x31,0x33,
- 0x32,0x2c,0x31,0x36,0x2e,0x39,0x32,0x38,0x2c,0x32,
- 0x31,0x2e,0x34,0x33,0x31,0x2c,0x31,0x38,0x2e,0x35,
- 0x33,0x31,0x2c,0x32,0x31,0x2e,0x34,0x33,0x31,0x7a,
- 0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,0x70,0x61,0x74,
- 0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,0x23,0x37,
- 0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x73,0x74,0x72,
- 0x6f,0x6b,0x65,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,
- 0x37,0x37,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,
- 0x2d,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x31,0x2e,
- 0x35,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,
- 0x6c,0x69,0x6e,0x65,0x6a,0x6f,0x69,0x6e,0x3d,0x22,
- 0x72,0x6f,0x75,0x6e,0x64,0x22,0x20,0x73,0x74,0x72,
- 0x6f,0x6b,0x65,0x2d,0x6d,0x69,0x74,0x65,0x72,0x6c,
- 0x69,0x6d,0x69,0x74,0x3d,0x22,0x31,0x30,0x22,0x20,
- 0x64,0x3d,0x22,0x4d,0x31,0x38,0x2e,0x35,0x33,0x2c,
- 0x33,0x2e,0x31,0x38,0x33,0x0d,0x0a,0x09,0x09,0x6c,
- 0x2d,0x33,0x2e,0x30,0x30,0x35,0x2c,0x34,0x2e,0x36,
- 0x38,0x34,0x68,0x36,0x2e,0x30,0x31,0x31,0x4c,0x31,
- 0x38,0x2e,0x35,0x33,0x2c,0x33,0x2e,0x31,0x38,0x33,
- 0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,0x70,0x61,
- 0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,0x23,
- 0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x73,0x74,
- 0x72,0x6f,0x6b,0x65,0x3d,0x22,0x23,0x37,0x37,0x37,
- 0x37,0x37,0x37,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,
- 0x65,0x2d,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x31,
- 0x2e,0x35,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,
- 0x2d,0x6c,0x69,0x6e,0x65,0x6a,0x6f,0x69,0x6e,0x3d,
- 0x22,0x72,0x6f,0x75,0x6e,0x64,0x22,0x20,0x73,0x74,
- 0x72,0x6f,0x6b,0x65,0x2d,0x6d,0x69,0x74,0x65,0x72,
- 0x6c,0x69,0x6d,0x69,0x74,0x3d,0x22,0x31,0x30,0x22,
- 0x20,0x64,0x3d,0x22,0x4d,0x33,0x2e,0x31,0x32,0x35,
- 0x2c,0x31,0x38,0x2e,0x35,0x33,0x0d,0x0a,0x09,0x09,
- 0x6c,0x34,0x2e,0x36,0x38,0x34,0x2c,0x33,0x2e,0x30,
- 0x30,0x34,0x76,0x2d,0x36,0x2e,0x30,0x31,0x4c,0x33,
- 0x2e,0x31,0x32,0x35,0x2c,0x31,0x38,0x2e,0x35,0x33,
- 0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,0x70,0x61,
- 0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,0x23,
- 0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x73,0x74,
- 0x72,0x6f,0x6b,0x65,0x3d,0x22,0x23,0x37,0x37,0x37,
- 0x37,0x37,0x37,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,
- 0x65,0x2d,0x77,0x69,0x64,0x74,0x68,0x3d,0x22,0x31,
- 0x2e,0x35,0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,
- 0x2d,0x6c,0x69,0x6e,0x65,0x6a,0x6f,0x69,0x6e,0x3d,
- 0x22,0x72,0x6f,0x75,0x6e,0x64,0x22,0x20,0x73,0x74,
- 0x72,0x6f,0x6b,0x65,0x2d,0x6d,0x69,0x74,0x65,0x72,
- 0x6c,0x69,0x6d,0x69,0x74,0x3d,0x22,0x31,0x30,0x22,
- 0x20,0x64,0x3d,0x22,0x4d,0x33,0x33,0x2e,0x38,0x37,
- 0x39,0x2c,0x31,0x38,0x2e,0x35,0x32,0x39,0x0d,0x0a,
- 0x09,0x09,0x6c,0x2d,0x34,0x2e,0x36,0x38,0x34,0x2d,
- 0x33,0x2e,0x30,0x30,0x35,0x76,0x36,0x2e,0x30,0x31,
- 0x4c,0x33,0x33,0x2e,0x38,0x37,0x39,0x2c,0x31,0x38,
- 0x2e,0x35,0x32,0x39,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,
+ 0x2e,0x30,0x36,0x31,0x22,0x20,0x65,0x6e,0x61,0x62,
+ 0x6c,0x65,0x2d,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,
+ 0x75,0x6e,0x64,0x3d,0x22,0x6e,0x65,0x77,0x20,0x30,
+ 0x20,0x30,0x20,0x33,0x37,0x2e,0x30,0x36,0x31,0x20,
+ 0x33,0x37,0x2e,0x30,0x36,0x31,0x22,0x20,0x78,0x6d,
+ 0x6c,0x3a,0x73,0x70,0x61,0x63,0x65,0x3d,0x22,0x70,
+ 0x72,0x65,0x73,0x65,0x72,0x76,0x65,0x22,0x3e,0x0d,
+ 0x0a,0x3c,0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,
+ 0x0d,0x0a,0x09,0x09,0x3c,0x67,0x3e,0x0d,0x0a,0x09,
+ 0x09,0x09,0x3c,0x67,0x3e,0x0d,0x0a,0x09,0x09,0x09,
0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,
0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,
- 0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x3d,0x22,
- 0x23,0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x73,
- 0x74,0x72,0x6f,0x6b,0x65,0x2d,0x77,0x69,0x64,0x74,
- 0x68,0x3d,0x22,0x31,0x2e,0x35,0x22,0x20,0x73,0x74,
- 0x72,0x6f,0x6b,0x65,0x2d,0x6c,0x69,0x6e,0x65,0x6a,
- 0x6f,0x69,0x6e,0x3d,0x22,0x72,0x6f,0x75,0x6e,0x64,
- 0x22,0x20,0x73,0x74,0x72,0x6f,0x6b,0x65,0x2d,0x6d,
- 0x69,0x74,0x65,0x72,0x6c,0x69,0x6d,0x69,0x74,0x3d,
- 0x22,0x31,0x30,0x22,0x20,0x64,0x3d,0x22,0x4d,0x31,
+ 0x22,0x20,0x64,0x3d,0x22,0x4d,0x32,0x32,0x2e,0x30,
+ 0x38,0x35,0x2c,0x33,0x37,0x2e,0x30,0x35,0x38,0x68,
+ 0x2d,0x37,0x2e,0x31,0x31,0x31,0x63,0x2d,0x32,0x2e,
+ 0x32,0x38,0x39,0x2c,0x30,0x2d,0x33,0x2e,0x31,0x31,
+ 0x39,0x2d,0x31,0x2e,0x38,0x36,0x36,0x2d,0x33,0x2e,
+ 0x31,0x31,0x39,0x2d,0x33,0x2e,0x31,0x32,0x31,0x76,
+ 0x2d,0x38,0x2e,0x37,0x33,0x32,0x48,0x33,0x2e,0x31,
+ 0x32,0x31,0x43,0x30,0x2e,0x38,0x33,0x31,0x2c,0x32,
+ 0x35,0x2e,0x32,0x30,0x35,0x2c,0x30,0x2c,0x32,0x33,
+ 0x2e,0x33,0x33,0x39,0x2c,0x30,0x2c,0x32,0x32,0x2e,
+ 0x30,0x38,0x34,0x0d,0x0a,0x09,0x09,0x09,0x09,0x09,
+ 0x76,0x2d,0x37,0x2e,0x31,0x31,0x63,0x30,0x2d,0x32,
+ 0x2e,0x32,0x38,0x39,0x2c,0x31,0x2e,0x38,0x36,0x37,
+ 0x2d,0x33,0x2e,0x31,0x32,0x2c,0x33,0x2e,0x31,0x32,
+ 0x31,0x2d,0x33,0x2e,0x31,0x32,0x68,0x38,0x2e,0x37,
+ 0x33,0x34,0x56,0x33,0x2e,0x31,0x32,0x31,0x63,0x30,
+ 0x2d,0x32,0x2e,0x32,0x39,0x2c,0x31,0x2e,0x38,0x36,
+ 0x35,0x2d,0x33,0x2e,0x31,0x32,0x31,0x2c,0x33,0x2e,
+ 0x31,0x31,0x39,0x2d,0x33,0x2e,0x31,0x32,0x31,0x68,
+ 0x37,0x2e,0x31,0x31,0x31,0x63,0x32,0x2e,0x32,0x39,
+ 0x2c,0x30,0x2c,0x33,0x2e,0x31,0x32,0x31,0x2c,0x31,
+ 0x2e,0x38,0x36,0x37,0x2c,0x33,0x2e,0x31,0x32,0x31,
+ 0x2c,0x33,0x2e,0x31,0x32,0x31,0x76,0x38,0x2e,0x37,
+ 0x33,0x33,0x0d,0x0a,0x09,0x09,0x09,0x09,0x09,0x68,
+ 0x38,0x2e,0x37,0x33,0x31,0x63,0x31,0x2e,0x32,0x30,
+ 0x31,0x2c,0x30,0x2c,0x32,0x2e,0x31,0x35,0x34,0x2c,
+ 0x30,0x2e,0x35,0x32,0x35,0x2c,0x32,0x2e,0x36,0x38,
+ 0x34,0x2c,0x31,0x2e,0x34,0x38,0x63,0x30,0x2e,0x32,
+ 0x30,0x37,0x2c,0x30,0x2e,0x33,0x37,0x35,0x2c,0x30,
+ 0x2e,0x34,0x35,0x36,0x2c,0x31,0x2e,0x31,0x31,0x32,
+ 0x2c,0x30,0x2e,0x34,0x32,0x39,0x2c,0x31,0x2e,0x36,
+ 0x33,0x39,0x68,0x30,0x2e,0x30,0x30,0x38,0x76,0x37,
+ 0x2e,0x31,0x31,0x63,0x30,0x2c,0x32,0x2e,0x32,0x39,
+ 0x2d,0x31,0x2e,0x38,0x36,0x36,0x2c,0x33,0x2e,0x31,
+ 0x32,0x31,0x2d,0x33,0x2e,0x31,0x32,0x31,0x2c,0x33,
+ 0x2e,0x31,0x32,0x31,0x68,0x2d,0x38,0x2e,0x37,0x33,
+ 0x31,0x0d,0x0a,0x09,0x09,0x09,0x09,0x09,0x76,0x38,
+ 0x2e,0x37,0x33,0x32,0x43,0x32,0x35,0x2e,0x32,0x30,
+ 0x36,0x2c,0x33,0x36,0x2e,0x32,0x32,0x37,0x2c,0x32,
+ 0x33,0x2e,0x33,0x34,0x2c,0x33,0x37,0x2e,0x30,0x35,
+ 0x38,0x2c,0x32,0x32,0x2e,0x30,0x38,0x35,0x2c,0x33,
+ 0x37,0x2e,0x30,0x35,0x38,0x7a,0x20,0x4d,0x33,0x2e,
+ 0x31,0x32,0x31,0x2c,0x31,0x33,0x2e,0x33,0x35,0x33,
+ 0x43,0x32,0x2e,0x37,0x34,0x35,0x2c,0x31,0x33,0x2e,
+ 0x33,0x35,0x39,0x2c,0x31,0x2e,0x35,0x2c,0x31,0x33,
+ 0x2e,0x34,0x39,0x32,0x2c,0x31,0x2e,0x35,0x2c,0x31,
+ 0x34,0x2e,0x39,0x37,0x33,0x76,0x37,0x2e,0x31,0x31,
+ 0x0d,0x0a,0x09,0x09,0x09,0x09,0x09,0x63,0x30,0x2e,
+ 0x30,0x30,0x36,0x2c,0x30,0x2e,0x33,0x37,0x36,0x2c,
+ 0x30,0x2e,0x31,0x33,0x39,0x2c,0x31,0x2e,0x36,0x32,
+ 0x31,0x2c,0x31,0x2e,0x36,0x32,0x31,0x2c,0x31,0x2e,
+ 0x36,0x32,0x31,0x68,0x31,0x30,0x2e,0x32,0x33,0x33,
+ 0x76,0x31,0x30,0x2e,0x32,0x33,0x32,0x63,0x30,0x2e,
+ 0x30,0x30,0x35,0x2c,0x30,0x2e,0x33,0x37,0x36,0x2c,
+ 0x30,0x2e,0x31,0x33,0x39,0x2c,0x31,0x2e,0x36,0x32,
+ 0x31,0x2c,0x31,0x2e,0x36,0x31,0x39,0x2c,0x31,0x2e,
+ 0x36,0x32,0x31,0x68,0x37,0x2e,0x31,0x30,0x38,0x0d,
+ 0x0a,0x09,0x09,0x09,0x09,0x09,0x63,0x30,0x2e,0x33,
+ 0x38,0x34,0x2d,0x30,0x2e,0x30,0x30,0x36,0x2c,0x31,
+ 0x2e,0x36,0x32,0x34,0x2d,0x30,0x2e,0x31,0x34,0x32,
+ 0x2c,0x31,0x2e,0x36,0x32,0x34,0x2d,0x31,0x2e,0x36,
+ 0x32,0x31,0x56,0x32,0x33,0x2e,0x37,0x30,0x35,0x68,
+ 0x31,0x30,0x2e,0x32,0x33,0x31,0x63,0x30,0x2e,0x33,
+ 0x37,0x36,0x2d,0x30,0x2e,0x30,0x30,0x36,0x2c,0x31,
+ 0x2e,0x36,0x32,0x31,0x2d,0x30,0x2e,0x31,0x34,0x2c,
+ 0x31,0x2e,0x36,0x32,0x31,0x2d,0x31,0x2e,0x36,0x32,
+ 0x31,0x76,0x2d,0x37,0x2e,0x31,0x32,0x31,0x0d,0x0a,
+ 0x09,0x09,0x09,0x09,0x09,0x63,0x2d,0x30,0x2e,0x30,
+ 0x30,0x35,0x2d,0x30,0x2e,0x32,0x38,0x37,0x2d,0x30,
+ 0x2e,0x31,0x31,0x32,0x2d,0x31,0x2e,0x36,0x30,0x39,
+ 0x2d,0x31,0x2e,0x36,0x32,0x2d,0x31,0x2e,0x36,0x30,
+ 0x39,0x48,0x32,0x33,0x2e,0x37,0x30,0x37,0x56,0x33,
+ 0x2e,0x31,0x32,0x31,0x43,0x32,0x33,0x2e,0x37,0x30,
+ 0x31,0x2c,0x32,0x2e,0x37,0x34,0x35,0x2c,0x32,0x33,
+ 0x2e,0x35,0x36,0x38,0x2c,0x31,0x2e,0x35,0x2c,0x32,
+ 0x32,0x2e,0x30,0x38,0x36,0x2c,0x31,0x2e,0x35,0x68,
+ 0x2d,0x37,0x2e,0x31,0x31,0x31,0x0d,0x0a,0x09,0x09,
+ 0x09,0x09,0x09,0x63,0x2d,0x30,0x2e,0x33,0x37,0x36,
+ 0x2c,0x30,0x2e,0x30,0x30,0x36,0x2d,0x31,0x2e,0x36,
+ 0x31,0x39,0x2c,0x30,0x2e,0x31,0x33,0x39,0x2d,0x31,
+ 0x2e,0x36,0x31,0x39,0x2c,0x31,0x2e,0x36,0x32,0x31,
+ 0x76,0x31,0x30,0x2e,0x32,0x33,0x32,0x48,0x33,0x2e,
+ 0x31,0x32,0x31,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,
+ 0x09,0x09,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x09,0x09,
+ 0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x2f,0x67,
+ 0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,0x0d,0x0a,0x09,
+ 0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,
+ 0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,
+ 0x22,0x20,0x64,0x3d,0x22,0x4d,0x31,0x38,0x2e,0x35,
+ 0x33,0x31,0x2c,0x32,0x32,0x2e,0x31,0x38,0x31,0x63,
+ 0x2d,0x32,0x2e,0x30,0x31,0x32,0x2c,0x30,0x2d,0x33,
+ 0x2e,0x36,0x34,0x39,0x2d,0x31,0x2e,0x36,0x33,0x38,
+ 0x2d,0x33,0x2e,0x36,0x34,0x39,0x2d,0x33,0x2e,0x36,
+ 0x35,0x31,0x63,0x30,0x2d,0x32,0x2e,0x30,0x31,0x33,
+ 0x2c,0x31,0x2e,0x36,0x33,0x37,0x2d,0x33,0x2e,0x36,
+ 0x35,0x2c,0x33,0x2e,0x36,0x34,0x39,0x2d,0x33,0x2e,
+ 0x36,0x35,0x0d,0x0a,0x09,0x09,0x09,0x63,0x32,0x2e,
+ 0x30,0x31,0x33,0x2c,0x30,0x2c,0x33,0x2e,0x36,0x35,
+ 0x2c,0x31,0x2e,0x36,0x33,0x38,0x2c,0x33,0x2e,0x36,
+ 0x35,0x2c,0x33,0x2e,0x36,0x35,0x43,0x32,0x32,0x2e,
+ 0x31,0x38,0x31,0x2c,0x32,0x30,0x2e,0x35,0x34,0x34,
+ 0x2c,0x32,0x30,0x2e,0x35,0x34,0x33,0x2c,0x32,0x32,
+ 0x2e,0x31,0x38,0x31,0x2c,0x31,0x38,0x2e,0x35,0x33,
+ 0x31,0x2c,0x32,0x32,0x2e,0x31,0x38,0x31,0x7a,0x20,
+ 0x4d,0x31,0x38,0x2e,0x35,0x33,0x31,0x2c,0x31,0x36,
+ 0x2e,0x33,0x38,0x63,0x2d,0x31,0x2e,0x31,0x38,0x35,
+ 0x2c,0x30,0x2d,0x32,0x2e,0x31,0x34,0x39,0x2c,0x30,
+ 0x2e,0x39,0x36,0x35,0x2d,0x32,0x2e,0x31,0x34,0x39,
+ 0x2c,0x32,0x2e,0x31,0x35,0x0d,0x0a,0x09,0x09,0x09,
+ 0x63,0x30,0x2c,0x31,0x2e,0x31,0x38,0x37,0x2c,0x30,
+ 0x2e,0x39,0x36,0x34,0x2c,0x32,0x2e,0x31,0x35,0x31,
+ 0x2c,0x32,0x2e,0x31,0x34,0x39,0x2c,0x32,0x2e,0x31,
+ 0x35,0x31,0x63,0x31,0x2e,0x31,0x38,0x36,0x2c,0x30,
+ 0x2c,0x32,0x2e,0x31,0x35,0x2d,0x30,0x2e,0x39,0x36,
+ 0x35,0x2c,0x32,0x2e,0x31,0x35,0x2d,0x32,0x2e,0x31,
+ 0x35,0x31,0x43,0x32,0x30,0x2e,0x36,0x38,0x31,0x2c,
+ 0x31,0x37,0x2e,0x33,0x34,0x34,0x2c,0x31,0x39,0x2e,
+ 0x37,0x31,0x36,0x2c,0x31,0x36,0x2e,0x33,0x38,0x2c,
+ 0x31,0x38,0x2e,0x35,0x33,0x31,0x2c,0x31,0x36,0x2e,
+ 0x33,0x38,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,
+ 0x2f,0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,0x0d,
+ 0x0a,0x09,0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,
+ 0x69,0x6c,0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,
+ 0x37,0x37,0x22,0x20,0x64,0x3d,0x22,0x4d,0x31,0x38,
+ 0x2e,0x35,0x33,0x2c,0x33,0x2e,0x31,0x38,0x33,0x6c,
+ 0x2d,0x33,0x2e,0x30,0x30,0x35,0x2c,0x34,0x2e,0x36,
+ 0x38,0x34,0x68,0x36,0x2e,0x30,0x31,0x32,0x4c,0x31,
+ 0x38,0x2e,0x35,0x33,0x2c,0x33,0x2e,0x31,0x38,0x33,
+ 0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x09,0x3c,0x70,
+ 0x61,0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,
+ 0x23,0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x64,
+ 0x3d,0x22,0x4d,0x32,0x31,0x2e,0x35,0x33,0x36,0x2c,
+ 0x38,0x2e,0x36,0x31,0x37,0x68,0x2d,0x36,0x2e,0x30,
+ 0x31,0x32,0x63,0x2d,0x30,0x2e,0x32,0x37,0x34,0x2c,
+ 0x30,0x2d,0x30,0x2e,0x35,0x32,0x36,0x2d,0x30,0x2e,
+ 0x31,0x35,0x2d,0x30,0x2e,0x36,0x35,0x38,0x2d,0x30,
+ 0x2e,0x33,0x39,0x63,0x2d,0x30,0x2e,0x31,0x33,0x31,
+ 0x2d,0x30,0x2e,0x32,0x34,0x31,0x2d,0x30,0x2e,0x31,
+ 0x32,0x31,0x2d,0x30,0x2e,0x35,0x33,0x34,0x2c,0x30,
+ 0x2e,0x30,0x32,0x37,0x2d,0x30,0x2e,0x37,0x36,0x35,
+ 0x6c,0x33,0x2e,0x30,0x30,0x35,0x2d,0x34,0x2e,0x36,
+ 0x38,0x34,0x0d,0x0a,0x09,0x09,0x09,0x63,0x30,0x2e,
+ 0x32,0x37,0x36,0x2d,0x30,0x2e,0x34,0x33,0x31,0x2c,
+ 0x30,0x2e,0x39,0x38,0x37,0x2d,0x30,0x2e,0x34,0x33,
+ 0x2c,0x31,0x2e,0x32,0x36,0x32,0x2c,0x30,0x6c,0x33,
+ 0x2e,0x30,0x30,0x37,0x2c,0x34,0x2e,0x36,0x38,0x34,
+ 0x63,0x30,0x2e,0x31,0x34,0x38,0x2c,0x30,0x2e,0x32,
+ 0x33,0x31,0x2c,0x30,0x2e,0x31,0x35,0x39,0x2c,0x30,
+ 0x2e,0x35,0x32,0x34,0x2c,0x30,0x2e,0x30,0x32,0x37,
+ 0x2c,0x30,0x2e,0x37,0x36,0x35,0x43,0x32,0x32,0x2e,
+ 0x30,0x36,0x33,0x2c,0x38,0x2e,0x34,0x36,0x37,0x2c,
+ 0x32,0x31,0x2e,0x38,0x31,0x31,0x2c,0x38,0x2e,0x36,
+ 0x31,0x37,0x2c,0x32,0x31,0x2e,0x35,0x33,0x36,0x2c,
+ 0x38,0x2e,0x36,0x31,0x37,0x7a,0x0d,0x0a,0x09,0x09,
+ 0x09,0x20,0x4d,0x31,0x36,0x2e,0x38,0x39,0x37,0x2c,
+ 0x37,0x2e,0x31,0x31,0x37,0x68,0x33,0x2e,0x32,0x36,
+ 0x37,0x4c,0x31,0x38,0x2e,0x35,0x33,0x2c,0x34,0x2e,
+ 0x35,0x37,0x32,0x4c,0x31,0x36,0x2e,0x38,0x39,0x37,
+ 0x2c,0x37,0x2e,0x31,0x31,0x37,0x7a,0x22,0x2f,0x3e,
+ 0x0d,0x0a,0x09,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x09,
+ 0x3c,0x67,0x3e,0x0d,0x0a,0x09,0x09,0x3c,0x70,0x61,
+ 0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,0x22,0x23,
+ 0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,0x64,0x3d,
+ 0x22,0x4d,0x33,0x2e,0x31,0x32,0x35,0x2c,0x31,0x38,
+ 0x2e,0x35,0x33,0x6c,0x34,0x2e,0x36,0x38,0x34,0x2c,
+ 0x33,0x2e,0x30,0x30,0x34,0x76,0x2d,0x36,0x2e,0x30,
+ 0x31,0x4c,0x33,0x2e,0x31,0x32,0x35,0x2c,0x31,0x38,
+ 0x2e,0x35,0x33,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,
+ 0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,
+ 0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,
+ 0x22,0x20,0x64,0x3d,0x22,0x4d,0x37,0x2e,0x38,0x30,
+ 0x39,0x2c,0x32,0x32,0x2e,0x32,0x38,0x34,0x63,0x2d,
+ 0x30,0x2e,0x31,0x34,0x31,0x2c,0x30,0x2d,0x30,0x2e,
+ 0x32,0x38,0x32,0x2d,0x30,0x2e,0x30,0x34,0x2d,0x30,
+ 0x2e,0x34,0x30,0x35,0x2d,0x30,0x2e,0x31,0x31,0x39,
+ 0x4c,0x32,0x2e,0x37,0x32,0x2c,0x31,0x39,0x2e,0x31,
+ 0x36,0x31,0x63,0x2d,0x30,0x2e,0x32,0x31,0x35,0x2d,
+ 0x30,0x2e,0x31,0x33,0x37,0x2d,0x30,0x2e,0x33,0x34,
+ 0x35,0x2d,0x30,0x2e,0x33,0x37,0x35,0x2d,0x30,0x2e,
+ 0x33,0x34,0x35,0x2d,0x30,0x2e,0x36,0x33,0x31,0x0d,
+ 0x0a,0x09,0x09,0x09,0x73,0x30,0x2e,0x31,0x33,0x2d,
+ 0x30,0x2e,0x34,0x39,0x33,0x2c,0x30,0x2e,0x33,0x34,
+ 0x35,0x2d,0x30,0x2e,0x36,0x33,0x31,0x6c,0x34,0x2e,
+ 0x36,0x38,0x34,0x2d,0x33,0x2e,0x30,0x30,0x36,0x63,
+ 0x30,0x2e,0x32,0x33,0x2d,0x30,0x2e,0x31,0x34,0x37,
+ 0x2c,0x30,0x2e,0x35,0x32,0x34,0x2d,0x30,0x2e,0x31,
+ 0x35,0x39,0x2c,0x30,0x2e,0x37,0x36,0x35,0x2d,0x30,
+ 0x2e,0x30,0x32,0x37,0x63,0x30,0x2e,0x32,0x34,0x2c,
+ 0x30,0x2e,0x31,0x33,0x31,0x2c,0x30,0x2e,0x33,0x39,
+ 0x2c,0x30,0x2e,0x33,0x38,0x34,0x2c,0x30,0x2e,0x33,
+ 0x39,0x2c,0x30,0x2e,0x36,0x35,0x38,0x76,0x36,0x2e,
+ 0x30,0x31,0x0d,0x0a,0x09,0x09,0x09,0x63,0x30,0x2c,
+ 0x30,0x2e,0x32,0x37,0x34,0x2d,0x30,0x2e,0x31,0x34,
+ 0x39,0x2c,0x30,0x2e,0x35,0x32,0x36,0x2d,0x30,0x2e,
+ 0x33,0x39,0x2c,0x30,0x2e,0x36,0x35,0x38,0x43,0x38,
+ 0x2e,0x30,0x35,0x36,0x2c,0x32,0x32,0x2e,0x32,0x35,
+ 0x34,0x2c,0x37,0x2e,0x39,0x33,0x32,0x2c,0x32,0x32,
+ 0x2e,0x32,0x38,0x34,0x2c,0x37,0x2e,0x38,0x30,0x39,
+ 0x2c,0x32,0x32,0x2e,0x32,0x38,0x34,0x7a,0x20,0x4d,
+ 0x34,0x2e,0x35,0x31,0x34,0x2c,0x31,0x38,0x2e,0x35,
+ 0x33,0x6c,0x32,0x2e,0x35,0x34,0x35,0x2c,0x31,0x2e,
+ 0x36,0x33,0x32,0x76,0x2d,0x33,0x2e,0x32,0x36,0x35,
+ 0x4c,0x34,0x2e,0x35,0x31,0x34,0x2c,0x31,0x38,0x2e,
+ 0x35,0x33,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,
+ 0x2f,0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,0x0d,
+ 0x0a,0x09,0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,
+ 0x69,0x6c,0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,
+ 0x37,0x37,0x22,0x20,0x64,0x3d,0x22,0x4d,0x33,0x33,
+ 0x2e,0x38,0x37,0x39,0x2c,0x31,0x38,0x2e,0x35,0x32,
+ 0x39,0x6c,0x2d,0x34,0x2e,0x36,0x38,0x35,0x2d,0x33,
+ 0x2e,0x30,0x30,0x35,0x76,0x36,0x2e,0x30,0x31,0x4c,
+ 0x33,0x33,0x2e,0x38,0x37,0x39,0x2c,0x31,0x38,0x2e,
+ 0x35,0x32,0x39,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,
+ 0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,
+ 0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,
+ 0x22,0x20,0x64,0x3d,0x22,0x4d,0x32,0x39,0x2e,0x31,
+ 0x39,0x35,0x2c,0x32,0x32,0x2e,0x32,0x38,0x34,0x63,
+ 0x2d,0x30,0x2e,0x31,0x32,0x34,0x2c,0x30,0x2d,0x30,
+ 0x2e,0x32,0x34,0x37,0x2d,0x30,0x2e,0x30,0x33,0x2d,
+ 0x30,0x2e,0x33,0x35,0x39,0x2d,0x30,0x2e,0x30,0x39,
+ 0x32,0x63,0x2d,0x30,0x2e,0x32,0x34,0x31,0x2d,0x30,
+ 0x2e,0x31,0x33,0x32,0x2d,0x30,0x2e,0x33,0x39,0x31,
+ 0x2d,0x30,0x2e,0x33,0x38,0x34,0x2d,0x30,0x2e,0x33,
+ 0x39,0x31,0x2d,0x30,0x2e,0x36,0x35,0x38,0x76,0x2d,
+ 0x36,0x2e,0x30,0x31,0x0d,0x0a,0x09,0x09,0x09,0x63,
+ 0x30,0x2d,0x30,0x2e,0x32,0x37,0x34,0x2c,0x30,0x2e,
+ 0x31,0x34,0x39,0x2d,0x30,0x2e,0x35,0x32,0x36,0x2c,
+ 0x30,0x2e,0x33,0x39,0x31,0x2d,0x30,0x2e,0x36,0x35,
+ 0x38,0x63,0x30,0x2e,0x32,0x33,0x39,0x2d,0x30,0x2e,
+ 0x31,0x33,0x32,0x2c,0x30,0x2e,0x35,0x33,0x32,0x2d,
+ 0x30,0x2e,0x31,0x32,0x33,0x2c,0x30,0x2e,0x37,0x36,
+ 0x35,0x2c,0x30,0x2e,0x30,0x32,0x37,0x6c,0x34,0x2e,
+ 0x36,0x38,0x35,0x2c,0x33,0x2e,0x30,0x30,0x35,0x63,
+ 0x30,0x2e,0x32,0x31,0x35,0x2c,0x30,0x2e,0x31,0x33,
+ 0x38,0x2c,0x30,0x2e,0x33,0x34,0x35,0x2c,0x30,0x2e,
+ 0x33,0x37,0x36,0x2c,0x30,0x2e,0x33,0x34,0x35,0x2c,
+ 0x30,0x2e,0x36,0x33,0x31,0x0d,0x0a,0x09,0x09,0x09,
+ 0x73,0x2d,0x30,0x2e,0x31,0x33,0x2c,0x30,0x2e,0x34,
+ 0x39,0x33,0x2d,0x30,0x2e,0x33,0x34,0x35,0x2c,0x30,
+ 0x2e,0x36,0x33,0x31,0x4c,0x32,0x39,0x2e,0x36,0x2c,
+ 0x32,0x32,0x2e,0x31,0x36,0x35,0x43,0x32,0x39,0x2e,
+ 0x34,0x37,0x37,0x2c,0x32,0x32,0x2e,0x32,0x34,0x34,
+ 0x2c,0x32,0x39,0x2e,0x33,0x33,0x35,0x2c,0x32,0x32,
+ 0x2e,0x32,0x38,0x34,0x2c,0x32,0x39,0x2e,0x31,0x39,
+ 0x35,0x2c,0x32,0x32,0x2e,0x32,0x38,0x34,0x7a,0x20,
+ 0x4d,0x32,0x39,0x2e,0x39,0x34,0x35,0x2c,0x31,0x36,
+ 0x2e,0x38,0x39,0x36,0x76,0x33,0x2e,0x32,0x36,0x36,
+ 0x6c,0x32,0x2e,0x35,0x34,0x36,0x2d,0x31,0x2e,0x36,
+ 0x33,0x33,0x0d,0x0a,0x09,0x09,0x09,0x4c,0x32,0x39,
+ 0x2e,0x39,0x34,0x35,0x2c,0x31,0x36,0x2e,0x38,0x39,
+ 0x36,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x3c,0x2f,
+ 0x67,0x3e,0x0d,0x0a,0x09,0x3c,0x67,0x3e,0x0d,0x0a,
+ 0x09,0x09,0x3c,0x70,0x61,0x74,0x68,0x20,0x66,0x69,
+ 0x6c,0x6c,0x3d,0x22,0x23,0x37,0x37,0x37,0x37,0x37,
+ 0x37,0x22,0x20,0x64,0x3d,0x22,0x4d,0x31,0x38,0x2e,
+ 0x35,0x33,0x2c,0x33,0x33,0x2e,0x38,0x37,0x36,0x6c,
+ 0x33,0x2e,0x30,0x30,0x37,0x2d,0x34,0x2e,0x36,0x38,
+ 0x34,0x68,0x2d,0x36,0x2e,0x30,0x31,0x32,0x4c,0x31,
0x38,0x2e,0x35,0x33,0x2c,0x33,0x33,0x2e,0x38,0x37,
- 0x36,0x0d,0x0a,0x09,0x09,0x6c,0x33,0x2e,0x30,0x30,
- 0x36,0x2d,0x34,0x2e,0x36,0x38,0x34,0x68,0x2d,0x36,
- 0x2e,0x30,0x31,0x31,0x4c,0x31,0x38,0x2e,0x35,0x33,
- 0x2c,0x33,0x33,0x2e,0x38,0x37,0x36,0x7a,0x22,0x2f,
- 0x3e,0x0d,0x0a,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x3c,
- 0x2f,0x73,0x76,0x67,0x3e,0x0d,0x0a
+ 0x36,0x7a,0x22,0x2f,0x3e,0x0d,0x0a,0x09,0x09,0x3c,
+ 0x70,0x61,0x74,0x68,0x20,0x66,0x69,0x6c,0x6c,0x3d,
+ 0x22,0x23,0x37,0x37,0x37,0x37,0x37,0x37,0x22,0x20,
+ 0x64,0x3d,0x22,0x4d,0x31,0x38,0x2e,0x35,0x33,0x2c,
+ 0x33,0x34,0x2e,0x36,0x32,0x36,0x4c,0x31,0x38,0x2e,
+ 0x35,0x33,0x2c,0x33,0x34,0x2e,0x36,0x32,0x36,0x63,
+ 0x2d,0x30,0x2e,0x32,0x35,0x35,0x2c,0x30,0x2d,0x30,
+ 0x2e,0x34,0x39,0x33,0x2d,0x30,0x2e,0x31,0x33,0x2d,
+ 0x30,0x2e,0x36,0x33,0x31,0x2d,0x30,0x2e,0x33,0x34,
+ 0x35,0x6c,0x2d,0x33,0x2e,0x30,0x30,0x35,0x2d,0x34,
+ 0x2e,0x36,0x38,0x34,0x0d,0x0a,0x09,0x09,0x09,0x63,
+ 0x2d,0x30,0x2e,0x31,0x34,0x38,0x2d,0x30,0x2e,0x32,
+ 0x33,0x31,0x2d,0x30,0x2e,0x31,0x35,0x38,0x2d,0x30,
+ 0x2e,0x35,0x32,0x34,0x2d,0x30,0x2e,0x30,0x32,0x37,
+ 0x2d,0x30,0x2e,0x37,0x36,0x35,0x63,0x30,0x2e,0x31,
+ 0x33,0x32,0x2d,0x30,0x2e,0x32,0x34,0x31,0x2c,0x30,
+ 0x2e,0x33,0x38,0x34,0x2d,0x30,0x2e,0x33,0x39,0x31,
+ 0x2c,0x30,0x2e,0x36,0x35,0x38,0x2d,0x30,0x2e,0x33,
+ 0x39,0x31,0x68,0x36,0x2e,0x30,0x31,0x32,0x63,0x30,
+ 0x2e,0x32,0x37,0x34,0x2c,0x30,0x2c,0x30,0x2e,0x35,
+ 0x32,0x36,0x2c,0x30,0x2e,0x31,0x34,0x39,0x2c,0x30,
+ 0x2e,0x36,0x35,0x38,0x2c,0x30,0x2e,0x33,0x39,0x31,
+ 0x0d,0x0a,0x09,0x09,0x09,0x63,0x30,0x2e,0x31,0x33,
+ 0x32,0x2c,0x30,0x2e,0x32,0x34,0x2c,0x30,0x2e,0x31,
+ 0x32,0x31,0x2c,0x30,0x2e,0x35,0x33,0x34,0x2d,0x30,
+ 0x2e,0x30,0x32,0x37,0x2c,0x30,0x2e,0x37,0x36,0x35,
+ 0x6c,0x2d,0x33,0x2e,0x30,0x30,0x37,0x2c,0x34,0x2e,
+ 0x36,0x38,0x34,0x43,0x31,0x39,0x2e,0x30,0x32,0x33,
+ 0x2c,0x33,0x34,0x2e,0x34,0x39,0x36,0x2c,0x31,0x38,
+ 0x2e,0x37,0x38,0x35,0x2c,0x33,0x34,0x2e,0x36,0x32,
+ 0x36,0x2c,0x31,0x38,0x2e,0x35,0x33,0x2c,0x33,0x34,
+ 0x2e,0x36,0x32,0x36,0x7a,0x20,0x4d,0x31,0x36,0x2e,
+ 0x38,0x39,0x37,0x2c,0x32,0x39,0x2e,0x39,0x34,0x32,
+ 0x6c,0x31,0x2e,0x36,0x33,0x33,0x2c,0x32,0x2e,0x35,
+ 0x34,0x35,0x0d,0x0a,0x09,0x09,0x09,0x6c,0x31,0x2e,
+ 0x36,0x33,0x34,0x2d,0x32,0x2e,0x35,0x34,0x35,0x48,
+ 0x31,0x36,0x2e,0x38,0x39,0x37,0x7a,0x22,0x2f,0x3e,
+ 0x0d,0x0a,0x09,0x3c,0x2f,0x67,0x3e,0x0d,0x0a,0x3c,
+ 0x2f,0x67,0x3e,0x0d,0x0a,0x3c,0x2f,0x73,0x76,0x67,
+ 0x3e,0x0d,0x0a
};
diff --git a/data/resources/help/dpad_all.svg b/data/resources/help/dpad_all.svg
index b0f43af65..c34f6241e 100644
--- a/data/resources/help/dpad_all.svg
+++ b/data/resources/help/dpad_all.svg
@@ -2,25 +2,52 @@
diff --git a/src/Settings.cpp b/src/Settings.cpp
index 66840bad5..f0f750529 100644
--- a/src/Settings.cpp
+++ b/src/Settings.cpp
@@ -38,6 +38,7 @@ void Settings::setDefaults()
mBoolMap["Debug"] = false;
mBoolMap["DebugGrid"] = false;
+ mBoolMap["DebugText"] = false;
mIntMap["DimTime"] = 120*1000;
mIntMap["ScraperResizeWidth"] = 400;
diff --git a/src/Window.cpp b/src/Window.cpp
index b1318b67b..e69a1c1bb 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -106,9 +106,15 @@ void Window::input(InputConfig* config, Input input)
{
if(config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_g && SDL_GetModState() & KMOD_LCTRL && Settings::getInstance()->getBool("Debug"))
{
- // toggle debug grid
+ // toggle debug grid with Ctrl-G
Settings::getInstance()->setBool("DebugGrid", !Settings::getInstance()->getBool("DebugGrid"));
- }else if(config->isMappedTo("mastervolup", input))
+ }
+ else if(config->getDeviceId() == DEVICE_KEYBOARD && input.value && input.id == SDLK_t && SDL_GetModState() & KMOD_LCTRL && Settings::getInstance()->getBool("Debug"))
+ {
+ // toggle TextComponent debug view with Ctrl-T
+ Settings::getInstance()->setBool("DebugText", !Settings::getInstance()->getBool("DebugText"));
+ }
+ else if(config->isMappedTo("mastervolup", input))
{
VolumeControl::getInstance()->setVolume(VolumeControl::getInstance()->getVolume() + 5);
}
diff --git a/src/components/TextComponent.cpp b/src/components/TextComponent.cpp
index 21cab7b26..191ffedd6 100644
--- a/src/components/TextComponent.cpp
+++ b/src/components/TextComponent.cpp
@@ -4,6 +4,7 @@
#include "../Window.h"
#include "../ThemeData.h"
#include "../Util.h"
+#include "../Settings.h"
TextComponent::TextComponent(Window* window) : GuiComponent(window),
mFont(Font::get(FONT_SIZE_MEDIUM)), mColor(0x000000FF), mAutoCalcExtent(true, true), mAlignment(ALIGN_LEFT)
@@ -91,9 +92,21 @@ void TextComponent::render(const Eigen::Affine3f& parentTrans)
break;
}
+ if(Settings::getInstance()->getBool("DebugText"))
+ {
+ // draw the "textbox" area, what we are aligned within
+ Renderer::setMatrix(trans);
+ Renderer::drawRect(0.f, 0.f, mSize.x(), mSize.y(), 0xFF000033);
+ }
+
trans.translate(off);
trans = roundMatrix(trans);
Renderer::setMatrix(trans);
+
+ // draw the text area, where the text actually is going
+ if(Settings::getInstance()->getBool("DebugText"))
+ Renderer::drawRect(0.0f, 0.0f, mTextCache->metrics.size.x(), mTextCache->metrics.size.y(), 0x00000033);
+
mFont->renderTextCache(mTextCache.get());
}
@@ -179,7 +192,7 @@ void TextComponent::applyTheme(const std::shared_ptr& theme, const st
setAlignment(ALIGN_LEFT);
else if(str == "center")
setAlignment(ALIGN_CENTER);
- else if(str == "ALIGN_RIGHT")
+ else if(str == "right")
setAlignment(ALIGN_RIGHT);
else
LOG(LogError) << "Unknown text alignment string: " << str;
diff --git a/src/platform.cpp b/src/platform.cpp
index be7752d91..2220143f7 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -1,6 +1,7 @@
#include "platform.h"
#include
#include
+#include
std::string sHomePathOverride;
@@ -8,6 +9,8 @@ void setHomePathOverride(const std::string& path)
{
// make it use generic directory separators
sHomePathOverride = boost::filesystem::path(path).generic_string();
+
+ std::cout << "Using home path: " << sHomePathOverride;
}
std::string getHomePath()
diff --git a/src/views/gamelist/DetailedGameListView.cpp b/src/views/gamelist/DetailedGameListView.cpp
index 2c5f31696..395a7350c 100644
--- a/src/views/gamelist/DetailedGameListView.cpp
+++ b/src/views/gamelist/DetailedGameListView.cpp
@@ -88,7 +88,7 @@ void DetailedGameListView::onThemeChanged(const std::shared_ptr& them
for(unsigned int i = 0; i < labels.size(); i++)
{
- labels[i]->applyTheme(theme, getName(), lblElements[i], ALL ^ ThemeFlags::TEXT);
+ labels[i]->applyTheme(theme, getName(), lblElements[i], ALL);
}