From b0d156d6bd39e6acd128683fe18f6ad3218edab0 Mon Sep 17 00:00:00 2001 From: Aloshi Date: Sat, 14 Sep 2013 11:14:21 -0500 Subject: [PATCH] Move GuiSettingsMenu to use NinePatch. --- CMakeLists.txt | 2 - data/ResourceUtil.cpp | 18 +- data/Resources.h | 6 - data/converted/bar_png.cpp | 290 ------------------------- data/converted/corner_png.cpp | 302 -------------------------- data/resources/bar.png | Bin 2825 -> 0 bytes data/resources/corner.png | Bin 2946 -> 0 bytes src/components/GuiSettingsMenu.cpp | 9 +- src/components/GuiSettingsMenu.h | 4 +- src/components/NinePatchComponent.cpp | 8 +- src/components/NinePatchComponent.h | 2 +- 11 files changed, 18 insertions(+), 623 deletions(-) delete mode 100644 data/converted/bar_png.cpp delete mode 100644 data/converted/corner_png.cpp delete mode 100644 data/resources/bar.png delete mode 100644 data/resources/corner.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 71906338b..d285202d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,8 +210,6 @@ set(ES_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/data/ResourceUtil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/ES_logo_16_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/ES_logo_32_png.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/bar_png.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/corner_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/button_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/frame_png.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/converted/textbox_png.cpp diff --git a/data/ResourceUtil.cpp b/data/ResourceUtil.cpp index 0fc679a8e..444074814 100644 --- a/data/ResourceUtil.cpp +++ b/data/ResourceUtil.cpp @@ -2,11 +2,9 @@ #include "Resources.h" -const size_t res2hNrOfFiles = 8; +const size_t res2hNrOfFiles = 6; const Res2hEntry res2hFiles[res2hNrOfFiles] = { - {":/bar.png", bar_png_size, bar_png_data}, {":/button.png", button_png_size, button_png_data}, - {":/corner.png", corner_png_size, corner_png_data}, {":/ES_logo_16.png", ES_logo_16_png_size, ES_logo_16_png_data}, {":/ES_logo_32.png", ES_logo_32_png_size, ES_logo_32_png_data}, {":/frame.png", frame_png_size, frame_png_data}, @@ -15,14 +13,12 @@ const Res2hEntry res2hFiles[res2hNrOfFiles] = { }; res2hMapType::value_type mapTemp[] = { - std::make_pair(":/bar.png", res2hFiles[0]), - std::make_pair(":/button.png", res2hFiles[1]), - std::make_pair(":/corner.png", res2hFiles[2]), - std::make_pair(":/ES_logo_16.png", res2hFiles[3]), - std::make_pair(":/ES_logo_32.png", res2hFiles[4]), - std::make_pair(":/frame.png", res2hFiles[5]), - std::make_pair(":/textbox.png", res2hFiles[6]), - std::make_pair(":/textbox_glow.png", res2hFiles[7]) + std::make_pair(":/button.png", res2hFiles[0]), + std::make_pair(":/ES_logo_16.png", res2hFiles[1]), + std::make_pair(":/ES_logo_32.png", res2hFiles[2]), + std::make_pair(":/frame.png", res2hFiles[3]), + std::make_pair(":/textbox.png", res2hFiles[4]), + std::make_pair(":/textbox_glow.png", res2hFiles[5]) }; res2hMapType res2hMap(mapTemp, mapTemp + sizeof mapTemp / sizeof mapTemp[0]); diff --git a/data/Resources.h b/data/Resources.h index 737619f54..000c14895 100644 --- a/data/Resources.h +++ b/data/Resources.h @@ -5,15 +5,9 @@ #include #include -extern const size_t bar_png_size; -extern const unsigned char bar_png_data[]; - extern const size_t button_png_size; extern const unsigned char button_png_data[]; -extern const size_t corner_png_size; -extern const unsigned char corner_png_data[]; - extern const size_t ES_logo_16_png_size; extern const unsigned char ES_logo_16_png_data[]; diff --git a/data/converted/bar_png.cpp b/data/converted/bar_png.cpp deleted file mode 100644 index 2ccc94d0a..000000000 --- a/data/converted/bar_png.cpp +++ /dev/null @@ -1,290 +0,0 @@ -//this file was auto-generated from "bar.png" by res2h - -#include "../Resources.h" - -const size_t bar_png_size = 2825; -const unsigned char bar_png_data[2825] = { - 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00, - 0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x10, - 0x00,0x00,0x00,0x10,0x08,0x06,0x00,0x00,0x00,0x1f, - 0xf3,0xff,0x61,0x00,0x00,0x00,0x09,0x70,0x48,0x59, - 0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01, - 0x00,0x9a,0x9c,0x18,0x00,0x00,0x0a,0x4f,0x69,0x43, - 0x43,0x50,0x50,0x68,0x6f,0x74,0x6f,0x73,0x68,0x6f, - 0x70,0x20,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66, - 0x69,0x6c,0x65,0x00,0x00,0x78,0xda,0x9d,0x53,0x67, - 0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b, - 0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x08,0x20,0x52, - 0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x09,0x10, - 0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45, - 0x45,0x04,0x1b,0xc8,0xa0,0x88,0x03,0x8e,0x8e,0x80, - 0x8c,0x15,0x51,0x2c,0x0c,0x8a,0x0a,0xd8,0x07,0xe4, - 0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1, - 0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5, - 0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x07,0xc0, - 0x08,0x0c,0x96,0x48,0x33,0x51,0x35,0x80,0x0c,0xa9, - 0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4, - 0x2e,0x40,0x81,0x0a,0x24,0x70,0x00,0x10,0x08,0xb3, - 0x64,0x21,0x73,0xfd,0x23,0x01,0x00,0xf8,0x7e,0x3c, - 0x3c,0x2b,0x22,0xc0,0x07,0xbe,0x00,0x01,0x78,0xd3, - 0x0b,0x08,0x00,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87, - 0xff,0x0f,0xea,0x42,0x99,0x5c,0x01,0x80,0x84,0x01, - 0xc0,0x74,0x91,0x38,0x4b,0x08,0x80,0x14,0x00,0x40, - 0x7a,0x8e,0x42,0xa6,0x00,0x40,0x46,0x01,0x80,0x9d, - 0x98,0x26,0x53,0x00,0xa0,0x04,0x00,0x60,0xcb,0x63, - 0x62,0xe3,0x00,0x50,0x2d,0x00,0x60,0x27,0x7f,0xe6, - 0xd3,0x00,0x80,0x9d,0xf8,0x99,0x7b,0x01,0x00,0x5b, - 0x94,0x21,0x15,0x01,0xa0,0x91,0x00,0x20,0x13,0x65, - 0x88,0x44,0x00,0x68,0x3b,0x00,0xac,0xcf,0x56,0x8a, - 0x45,0x00,0x58,0x30,0x00,0x14,0x66,0x4b,0xc4,0x39, - 0x00,0xd8,0x2d,0x00,0x30,0x49,0x57,0x66,0x48,0x00, - 0xb0,0xb7,0x00,0xc0,0xce,0x10,0x0b,0xb2,0x00,0x08, - 0x0c,0x00,0x30,0x51,0x88,0x85,0x29,0x00,0x04,0x7b, - 0x00,0x60,0xc8,0x23,0x23,0x78,0x00,0x84,0x99,0x00, - 0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7, - 0x2a,0x00,0x00,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39, - 0x45,0x81,0x5b,0x08,0x2d,0x71,0x07,0x57,0x57,0x2e, - 0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x02, - 0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81, - 0x34,0x0f,0xe0,0xf3,0xcc,0x00,0x00,0xa0,0x91,0x15, - 0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0x0e,0xae,0xce, - 0xce,0x36,0x8e,0xb6,0x0e,0x5f,0x2d,0xea,0xbf,0x06, - 0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70, - 0x40,0x00,0x00,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f, - 0xb3,0x1a,0x80,0x3b,0x06,0x80,0x6d,0xfe,0xa2,0x25, - 0xee,0x04,0x68,0x5e,0x0b,0xa0,0x75,0xf7,0x8b,0x66, - 0xb2,0x0f,0x40,0xb5,0x00,0xa0,0xe9,0xda,0x57,0xf3, - 0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9, - 0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61, - 0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd, - 0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2, - 0x24,0x81,0x32,0x5d,0x81,0x47,0x04,0xf8,0xe0,0xc2, - 0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x09,0x84,0x62, - 0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0x0b,0xff,0xfc,0x1d, - 0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3, - 0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5, - 0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64, - 0xe2,0xdf,0x2c,0xfb,0x03,0x3e,0xdf,0x35,0x00,0xb0, - 0x6a,0x3e,0x01,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x03, - 0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x00, - 0x00,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x08,0x03,0x80, - 0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47, - 0xa0,0x25,0x00,0x80,0x66,0x49,0x92,0x71,0x00,0x00, - 0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x08, - 0x00,0x00,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4, - 0xc1,0x18,0x2c,0xc0,0x06,0x1c,0xc1,0x05,0xdc,0xc1, - 0x0b,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42, - 0x10,0x42,0x0a,0x64,0x80,0x1c,0x72,0x60,0x29,0xac, - 0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f, - 0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70, - 0x0e,0x2e,0xc2,0x55,0xb8,0x0e,0x3d,0x70,0x0f,0xfa, - 0x61,0x08,0x9e,0xc1,0x28,0xbc,0x81,0x09,0x04,0x41, - 0xc8,0x08,0x13,0x61,0x21,0xda,0x88,0x01,0x62,0x8a, - 0x58,0x23,0x8e,0x08,0x17,0x99,0x85,0xf8,0x21,0xc1, - 0x48,0x04,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51, - 0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20, - 0x55,0x48,0x1d,0xf2,0x3d,0x72,0x02,0x39,0x87,0x5c, - 0x46,0xba,0x91,0x3b,0xc8,0x00,0x32,0x82,0xfc,0x86, - 0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0x0c, - 0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0x0b, - 0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0, - 0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab, - 0x68,0x0f,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8, - 0x18,0x07,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42, - 0xb1,0x38,0x2c,0x09,0x93,0x63,0xcb,0xb1,0x22,0xac, - 0x0c,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x03,0xbb,0x89, - 0xf5,0x63,0xcf,0xb1,0x77,0x04,0x12,0x81,0x45,0xc0, - 0x09,0x36,0x04,0x77,0x42,0x20,0x61,0x1e,0x41,0x48, - 0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24, - 0x34,0x11,0xda,0x09,0x37,0x09,0x03,0x84,0x51,0xc2, - 0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9, - 0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23, - 0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4, - 0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x02, - 0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e, - 0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23, - 0x93,0xc9,0xda,0x64,0x6b,0xb2,0x07,0x39,0x94,0x2c, - 0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33, - 0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0x0a,0x9d,0x62,0x40, - 0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a, - 0x19,0xe5,0x10,0xe5,0x34,0xe5,0x06,0x65,0x98,0x32, - 0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11, - 0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51, - 0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16, - 0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17, - 0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95, - 0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8, - 0x97,0xe8,0x03,0xf4,0x77,0x0c,0x0d,0x86,0x15,0x83, - 0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x07,0x18,0x67, - 0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b, - 0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99, - 0x0f,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15, - 0x91,0xca,0x0a,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a, - 0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0x0b,0x55, - 0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae, - 0x46,0x55,0x33,0x53,0xe3,0xa9,0x09,0xd4,0x96,0xab, - 0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9, - 0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4, - 0x7e,0x59,0xfd,0x89,0x06,0x59,0xc3,0x4c,0xc3,0x4f, - 0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20, - 0x0b,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0x0d,0xab, - 0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c, - 0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa, - 0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52, - 0xf3,0x94,0x66,0x3f,0x07,0xe3,0x98,0x71,0xf8,0x9c, - 0x74,0x4e,0x09,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a, - 0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c, - 0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58, - 0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae, - 0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81, - 0x0e,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f, - 0xce,0x05,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0x0a, - 0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b, - 0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee, - 0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde, - 0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd, - 0x6d,0xfa,0xa7,0xf5,0x47,0x0c,0x58,0x06,0xb3,0x0c, - 0x24,0x06,0xdb,0x0c,0xce,0x18,0x3c,0xc5,0x35,0x71, - 0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d, - 0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84, - 0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0x0f, - 0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d, - 0xc6,0xa3,0x26,0x06,0x26,0x21,0x26,0x4b,0x4d,0xea, - 0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b, - 0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6, - 0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7, - 0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c, - 0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6, - 0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5, - 0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25, - 0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93, - 0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9, - 0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x06,0xdb,0xae, - 0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7, - 0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d, - 0x8d,0xfd,0x3d,0x07,0x0d,0x87,0xd9,0x0e,0xab,0x1d, - 0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a, - 0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96, - 0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3, - 0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3, - 0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b, - 0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b, - 0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d, - 0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed, - 0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc, - 0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0, - 0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0x0b,0x9f, - 0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81, - 0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad, - 0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17, - 0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37, - 0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8, - 0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43, - 0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x00,0xa7, - 0x80,0x25,0x01,0x67,0x03,0x89,0x81,0x41,0x81,0x5b, - 0x02,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a, - 0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9, - 0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad, - 0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98, - 0xce,0x91,0xce,0x69,0x0e,0x85,0x50,0x7e,0xe8,0xd6, - 0xd0,0x07,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0x0c,0x27, - 0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58, - 0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73, - 0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31, - 0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e, - 0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e, - 0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b, - 0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf, - 0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0x0b,0xe3,0x7b, - 0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2, - 0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96, - 0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a, - 0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0x0a, - 0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1, - 0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a, - 0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5, - 0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc, - 0x4c,0x0d,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76, - 0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91, - 0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea, - 0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe, - 0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x07,0xc9,0x6b, - 0xb3,0x90,0xac,0x05,0x59,0x2d,0x0a,0xb6,0x42,0xa6, - 0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x07,0xb2,0x67,0x65, - 0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e, - 0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c, - 0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6, - 0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac, - 0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0x0a,0xe3,0x15, - 0x05,0x2b,0x86,0x56,0x06,0xac,0x3c,0xb8,0x8a,0xb6, - 0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e, - 0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82, - 0xc1,0xb5,0x01,0x6b,0xeb,0x0b,0x55,0x0a,0xe5,0x85, - 0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59, - 0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89, - 0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28, - 0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc, - 0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2, - 0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0x0e,0x96,0xaa, - 0x97,0xe6,0x97,0x0e,0x6e,0x0d,0xd9,0xda,0xb4,0x0d, - 0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97, - 0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf, - 0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f, - 0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2, - 0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b, - 0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd, - 0x3e,0xc9,0xbe,0xdb,0x55,0x01,0x55,0x4d,0xd5,0x66, - 0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89, - 0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d, - 0x71,0xed,0xc7,0x03,0xd2,0x03,0xfd,0x07,0x23,0x0e, - 0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52, - 0x8f,0xd6,0x2b,0xeb,0x47,0x0e,0xc7,0x1f,0xbe,0xfe, - 0x9d,0xef,0x77,0x2d,0x0d,0x36,0x0d,0x55,0x8d,0x9c, - 0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x09, - 0xdf,0xf7,0x1e,0x0d,0x3a,0xda,0x76,0x8c,0x7b,0xac, - 0xe1,0x07,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a, - 0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b, - 0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde, - 0x7a,0xfc,0x47,0xdb,0x1f,0x0f,0x9c,0x34,0x3c,0x59, - 0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3, - 0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e, - 0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63, - 0xce,0xdf,0x6a,0x0f,0x6f,0xef,0xba,0x10,0x74,0xe1, - 0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c, - 0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8, - 0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c, - 0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae, - 0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66, - 0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79, - 0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd, - 0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd, - 0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27, - 0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41, - 0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8, - 0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc, - 0x47,0xf7,0x06,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f, - 0x0f,0x43,0x05,0x8f,0x99,0x8f,0xcb,0x86,0x0d,0x86, - 0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd, - 0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17, - 0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8, - 0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2, - 0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb, - 0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78, - 0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc, - 0x77,0x1d,0xef,0xa3,0xdf,0x0f,0x4f,0xe4,0x7c,0x20, - 0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7, - 0xfb,0x93,0x19,0x93,0x93,0xff,0x04,0x03,0x98,0xf3, - 0xfc,0x63,0x33,0x2d,0xdb,0x00,0x00,0x00,0x04,0x67, - 0x41,0x4d,0x41,0x00,0x00,0xb1,0x8e,0x7c,0xfb,0x51, - 0x93,0x00,0x00,0x00,0x20,0x63,0x48,0x52,0x4d,0x00, - 0x00,0x7a,0x25,0x00,0x00,0x80,0x83,0x00,0x00,0xf9, - 0xff,0x00,0x00,0x80,0xe9,0x00,0x00,0x75,0x30,0x00, - 0x00,0xea,0x60,0x00,0x00,0x3a,0x98,0x00,0x00,0x17, - 0x6f,0x92,0x5f,0xc5,0x46,0x00,0x00,0x00,0x24,0x49, - 0x44,0x41,0x54,0x78,0xda,0x62,0xfc,0xff,0xff,0xff, - 0x7f,0x06,0x0a,0x00,0x13,0x03,0x85,0x60,0xd4,0x80, - 0x51,0x03,0x46,0x0d,0x18,0x2c,0x06,0x00,0x00,0x00, - 0x00,0xff,0xff,0x03,0x00,0x6b,0xca,0x04,0x1c,0xc4, - 0xc8,0x59,0x18,0x00,0x00,0x00,0x00,0x49,0x45,0x4e, - 0x44,0xae,0x42,0x60,0x82 -}; diff --git a/data/converted/corner_png.cpp b/data/converted/corner_png.cpp deleted file mode 100644 index 3ae6f5db2..000000000 --- a/data/converted/corner_png.cpp +++ /dev/null @@ -1,302 +0,0 @@ -//this file was auto-generated from "corner.png" by res2h - -#include "../Resources.h" - -const size_t corner_png_size = 2946; -const unsigned char corner_png_data[2946] = { - 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00, - 0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x10, - 0x00,0x00,0x00,0x10,0x08,0x06,0x00,0x00,0x00,0x1f, - 0xf3,0xff,0x61,0x00,0x00,0x00,0x09,0x70,0x48,0x59, - 0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01, - 0x00,0x9a,0x9c,0x18,0x00,0x00,0x0a,0x4f,0x69,0x43, - 0x43,0x50,0x50,0x68,0x6f,0x74,0x6f,0x73,0x68,0x6f, - 0x70,0x20,0x49,0x43,0x43,0x20,0x70,0x72,0x6f,0x66, - 0x69,0x6c,0x65,0x00,0x00,0x78,0xda,0x9d,0x53,0x67, - 0x54,0x53,0xe9,0x16,0x3d,0xf7,0xde,0xf4,0x42,0x4b, - 0x88,0x80,0x94,0x4b,0x6f,0x52,0x15,0x08,0x20,0x52, - 0x42,0x8b,0x80,0x14,0x91,0x26,0x2a,0x21,0x09,0x10, - 0x4a,0x88,0x21,0xa1,0xd9,0x15,0x51,0xc1,0x11,0x45, - 0x45,0x04,0x1b,0xc8,0xa0,0x88,0x03,0x8e,0x8e,0x80, - 0x8c,0x15,0x51,0x2c,0x0c,0x8a,0x0a,0xd8,0x07,0xe4, - 0x21,0xa2,0x8e,0x83,0xa3,0x88,0x8a,0xca,0xfb,0xe1, - 0x7b,0xa3,0x6b,0xd6,0xbc,0xf7,0xe6,0xcd,0xfe,0xb5, - 0xd7,0x3e,0xe7,0xac,0xf3,0x9d,0xb3,0xcf,0x07,0xc0, - 0x08,0x0c,0x96,0x48,0x33,0x51,0x35,0x80,0x0c,0xa9, - 0x42,0x1e,0x11,0xe0,0x83,0xc7,0xc4,0xc6,0xe1,0xe4, - 0x2e,0x40,0x81,0x0a,0x24,0x70,0x00,0x10,0x08,0xb3, - 0x64,0x21,0x73,0xfd,0x23,0x01,0x00,0xf8,0x7e,0x3c, - 0x3c,0x2b,0x22,0xc0,0x07,0xbe,0x00,0x01,0x78,0xd3, - 0x0b,0x08,0x00,0xc0,0x4d,0x9b,0xc0,0x30,0x1c,0x87, - 0xff,0x0f,0xea,0x42,0x99,0x5c,0x01,0x80,0x84,0x01, - 0xc0,0x74,0x91,0x38,0x4b,0x08,0x80,0x14,0x00,0x40, - 0x7a,0x8e,0x42,0xa6,0x00,0x40,0x46,0x01,0x80,0x9d, - 0x98,0x26,0x53,0x00,0xa0,0x04,0x00,0x60,0xcb,0x63, - 0x62,0xe3,0x00,0x50,0x2d,0x00,0x60,0x27,0x7f,0xe6, - 0xd3,0x00,0x80,0x9d,0xf8,0x99,0x7b,0x01,0x00,0x5b, - 0x94,0x21,0x15,0x01,0xa0,0x91,0x00,0x20,0x13,0x65, - 0x88,0x44,0x00,0x68,0x3b,0x00,0xac,0xcf,0x56,0x8a, - 0x45,0x00,0x58,0x30,0x00,0x14,0x66,0x4b,0xc4,0x39, - 0x00,0xd8,0x2d,0x00,0x30,0x49,0x57,0x66,0x48,0x00, - 0xb0,0xb7,0x00,0xc0,0xce,0x10,0x0b,0xb2,0x00,0x08, - 0x0c,0x00,0x30,0x51,0x88,0x85,0x29,0x00,0x04,0x7b, - 0x00,0x60,0xc8,0x23,0x23,0x78,0x00,0x84,0x99,0x00, - 0x14,0x46,0xf2,0x57,0x3c,0xf1,0x2b,0xae,0x10,0xe7, - 0x2a,0x00,0x00,0x78,0x99,0xb2,0x3c,0xb9,0x24,0x39, - 0x45,0x81,0x5b,0x08,0x2d,0x71,0x07,0x57,0x57,0x2e, - 0x1e,0x28,0xce,0x49,0x17,0x2b,0x14,0x36,0x61,0x02, - 0x61,0x9a,0x40,0x2e,0xc2,0x79,0x99,0x19,0x32,0x81, - 0x34,0x0f,0xe0,0xf3,0xcc,0x00,0x00,0xa0,0x91,0x15, - 0x11,0xe0,0x83,0xf3,0xfd,0x78,0xce,0x0e,0xae,0xce, - 0xce,0x36,0x8e,0xb6,0x0e,0x5f,0x2d,0xea,0xbf,0x06, - 0xff,0x22,0x62,0x62,0xe3,0xfe,0xe5,0xcf,0xab,0x70, - 0x40,0x00,0x00,0xe1,0x74,0x7e,0xd1,0xfe,0x2c,0x2f, - 0xb3,0x1a,0x80,0x3b,0x06,0x80,0x6d,0xfe,0xa2,0x25, - 0xee,0x04,0x68,0x5e,0x0b,0xa0,0x75,0xf7,0x8b,0x66, - 0xb2,0x0f,0x40,0xb5,0x00,0xa0,0xe9,0xda,0x57,0xf3, - 0x70,0xf8,0x7e,0x3c,0x3c,0x45,0xa1,0x90,0xb9,0xd9, - 0xd9,0xe5,0xe4,0xe4,0xd8,0x4a,0xc4,0x42,0x5b,0x61, - 0xca,0x57,0x7d,0xfe,0x67,0xc2,0x5f,0xc0,0x57,0xfd, - 0x6c,0xf9,0x7e,0x3c,0xfc,0xf7,0xf5,0xe0,0xbe,0xe2, - 0x24,0x81,0x32,0x5d,0x81,0x47,0x04,0xf8,0xe0,0xc2, - 0xcc,0xf4,0x4c,0xa5,0x1c,0xcf,0x92,0x09,0x84,0x62, - 0xdc,0xe6,0x8f,0x47,0xfc,0xb7,0x0b,0xff,0xfc,0x1d, - 0xd3,0x22,0xc4,0x49,0x62,0xb9,0x58,0x2a,0x14,0xe3, - 0x51,0x12,0x71,0x8e,0x44,0x9a,0x8c,0xf3,0x32,0xa5, - 0x22,0x89,0x42,0x92,0x29,0xc5,0x25,0xd2,0xff,0x64, - 0xe2,0xdf,0x2c,0xfb,0x03,0x3e,0xdf,0x35,0x00,0xb0, - 0x6a,0x3e,0x01,0x7b,0x91,0x2d,0xa8,0x5d,0x63,0x03, - 0xf6,0x4b,0x27,0x10,0x58,0x74,0xc0,0xe2,0xf7,0x00, - 0x00,0xf2,0xbb,0x6f,0xc1,0xd4,0x28,0x08,0x03,0x80, - 0x68,0x83,0xe1,0xcf,0x77,0xff,0xef,0x3f,0xfd,0x47, - 0xa0,0x25,0x00,0x80,0x66,0x49,0x92,0x71,0x00,0x00, - 0x5e,0x44,0x24,0x2e,0x54,0xca,0xb3,0x3f,0xc7,0x08, - 0x00,0x00,0x44,0xa0,0x81,0x2a,0xb0,0x41,0x1b,0xf4, - 0xc1,0x18,0x2c,0xc0,0x06,0x1c,0xc1,0x05,0xdc,0xc1, - 0x0b,0xfc,0x60,0x36,0x84,0x42,0x24,0xc4,0xc2,0x42, - 0x10,0x42,0x0a,0x64,0x80,0x1c,0x72,0x60,0x29,0xac, - 0x82,0x42,0x28,0x86,0xcd,0xb0,0x1d,0x2a,0x60,0x2f, - 0xd4,0x40,0x1d,0x34,0xc0,0x51,0x68,0x86,0x93,0x70, - 0x0e,0x2e,0xc2,0x55,0xb8,0x0e,0x3d,0x70,0x0f,0xfa, - 0x61,0x08,0x9e,0xc1,0x28,0xbc,0x81,0x09,0x04,0x41, - 0xc8,0x08,0x13,0x61,0x21,0xda,0x88,0x01,0x62,0x8a, - 0x58,0x23,0x8e,0x08,0x17,0x99,0x85,0xf8,0x21,0xc1, - 0x48,0x04,0x12,0x8b,0x24,0x20,0xc9,0x88,0x14,0x51, - 0x22,0x4b,0x91,0x35,0x48,0x31,0x52,0x8a,0x54,0x20, - 0x55,0x48,0x1d,0xf2,0x3d,0x72,0x02,0x39,0x87,0x5c, - 0x46,0xba,0x91,0x3b,0xc8,0x00,0x32,0x82,0xfc,0x86, - 0xbc,0x47,0x31,0x94,0x81,0xb2,0x51,0x3d,0xd4,0x0c, - 0xb5,0x43,0xb9,0xa8,0x37,0x1a,0x84,0x46,0xa2,0x0b, - 0xd0,0x64,0x74,0x31,0x9a,0x8f,0x16,0xa0,0x9b,0xd0, - 0x72,0xb4,0x1a,0x3d,0x8c,0x36,0xa1,0xe7,0xd0,0xab, - 0x68,0x0f,0xda,0x8f,0x3e,0x43,0xc7,0x30,0xc0,0xe8, - 0x18,0x07,0x33,0xc4,0x6c,0x30,0x2e,0xc6,0xc3,0x42, - 0xb1,0x38,0x2c,0x09,0x93,0x63,0xcb,0xb1,0x22,0xac, - 0x0c,0xab,0xc6,0x1a,0xb0,0x56,0xac,0x03,0xbb,0x89, - 0xf5,0x63,0xcf,0xb1,0x77,0x04,0x12,0x81,0x45,0xc0, - 0x09,0x36,0x04,0x77,0x42,0x20,0x61,0x1e,0x41,0x48, - 0x58,0x4c,0x58,0x4e,0xd8,0x48,0xa8,0x20,0x1c,0x24, - 0x34,0x11,0xda,0x09,0x37,0x09,0x03,0x84,0x51,0xc2, - 0x27,0x22,0x93,0xa8,0x4b,0xb4,0x26,0xba,0x11,0xf9, - 0xc4,0x18,0x62,0x32,0x31,0x87,0x58,0x48,0x2c,0x23, - 0xd6,0x12,0x8f,0x13,0x2f,0x10,0x7b,0x88,0x43,0xc4, - 0x37,0x24,0x12,0x89,0x43,0x32,0x27,0xb9,0x90,0x02, - 0x49,0xb1,0xa4,0x54,0xd2,0x12,0xd2,0x46,0xd2,0x6e, - 0x52,0x23,0xe9,0x2c,0xa9,0x9b,0x34,0x48,0x1a,0x23, - 0x93,0xc9,0xda,0x64,0x6b,0xb2,0x07,0x39,0x94,0x2c, - 0x20,0x2b,0xc8,0x85,0xe4,0x9d,0xe4,0xc3,0xe4,0x33, - 0xe4,0x1b,0xe4,0x21,0xf2,0x5b,0x0a,0x9d,0x62,0x40, - 0x71,0xa4,0xf8,0x53,0xe2,0x28,0x52,0xca,0x6a,0x4a, - 0x19,0xe5,0x10,0xe5,0x34,0xe5,0x06,0x65,0x98,0x32, - 0x41,0x55,0xa3,0x9a,0x52,0xdd,0xa8,0xa1,0x54,0x11, - 0x35,0x8f,0x5a,0x42,0xad,0xa1,0xb6,0x52,0xaf,0x51, - 0x87,0xa8,0x13,0x34,0x75,0x9a,0x39,0xcd,0x83,0x16, - 0x49,0x4b,0xa5,0xad,0xa2,0x95,0xd3,0x1a,0x68,0x17, - 0x68,0xf7,0x69,0xaf,0xe8,0x74,0xba,0x11,0xdd,0x95, - 0x1e,0x4e,0x97,0xd0,0x57,0xd2,0xcb,0xe9,0x47,0xe8, - 0x97,0xe8,0x03,0xf4,0x77,0x0c,0x0d,0x86,0x15,0x83, - 0xc7,0x88,0x67,0x28,0x19,0x9b,0x18,0x07,0x18,0x67, - 0x19,0x77,0x18,0xaf,0x98,0x4c,0xa6,0x19,0xd3,0x8b, - 0x19,0xc7,0x54,0x30,0x37,0x31,0xeb,0x98,0xe7,0x99, - 0x0f,0x99,0x6f,0x55,0x58,0x2a,0xb6,0x2a,0x7c,0x15, - 0x91,0xca,0x0a,0x95,0x4a,0x95,0x26,0x95,0x1b,0x2a, - 0x2f,0x54,0xa9,0xaa,0xa6,0xaa,0xde,0xaa,0x0b,0x55, - 0xf3,0x55,0xcb,0x54,0x8f,0xa9,0x5e,0x53,0x7d,0xae, - 0x46,0x55,0x33,0x53,0xe3,0xa9,0x09,0xd4,0x96,0xab, - 0x55,0xaa,0x9d,0x50,0xeb,0x53,0x1b,0x53,0x67,0xa9, - 0x3b,0xa8,0x87,0xaa,0x67,0xa8,0x6f,0x54,0x3f,0xa4, - 0x7e,0x59,0xfd,0x89,0x06,0x59,0xc3,0x4c,0xc3,0x4f, - 0x43,0xa4,0x51,0xa0,0xb1,0x5f,0xe3,0xbc,0xc6,0x20, - 0x0b,0x63,0x19,0xb3,0x78,0x2c,0x21,0x6b,0x0d,0xab, - 0x86,0x75,0x81,0x35,0xc4,0x26,0xb1,0xcd,0xd9,0x7c, - 0x76,0x2a,0xbb,0x98,0xfd,0x1d,0xbb,0x8b,0x3d,0xaa, - 0xa9,0xa1,0x39,0x43,0x33,0x4a,0x33,0x57,0xb3,0x52, - 0xf3,0x94,0x66,0x3f,0x07,0xe3,0x98,0x71,0xf8,0x9c, - 0x74,0x4e,0x09,0xe7,0x28,0xa7,0x97,0xf3,0x7e,0x8a, - 0xde,0x14,0xef,0x29,0xe2,0x29,0x1b,0xa6,0x34,0x4c, - 0xb9,0x31,0x65,0x5c,0x6b,0xaa,0x96,0x97,0x96,0x58, - 0xab,0x48,0xab,0x51,0xab,0x47,0xeb,0xbd,0x36,0xae, - 0xed,0xa7,0x9d,0xa6,0xbd,0x45,0xbb,0x59,0xfb,0x81, - 0x0e,0x41,0xc7,0x4a,0x27,0x5c,0x27,0x47,0x67,0x8f, - 0xce,0x05,0x9d,0xe7,0x53,0xd9,0x53,0xdd,0xa7,0x0a, - 0xa7,0x16,0x4d,0x3d,0x3a,0xf5,0xae,0x2e,0xaa,0x6b, - 0xa5,0x1b,0xa1,0xbb,0x44,0x77,0xbf,0x6e,0xa7,0xee, - 0x98,0x9e,0xbe,0x5e,0x80,0x9e,0x4c,0x6f,0xa7,0xde, - 0x79,0xbd,0xe7,0xfa,0x1c,0x7d,0x2f,0xfd,0x54,0xfd, - 0x6d,0xfa,0xa7,0xf5,0x47,0x0c,0x58,0x06,0xb3,0x0c, - 0x24,0x06,0xdb,0x0c,0xce,0x18,0x3c,0xc5,0x35,0x71, - 0x6f,0x3c,0x1d,0x2f,0xc7,0xdb,0xf1,0x51,0x43,0x5d, - 0xc3,0x40,0x43,0xa5,0x61,0x95,0x61,0x97,0xe1,0x84, - 0x91,0xb9,0xd1,0x3c,0xa3,0xd5,0x46,0x8d,0x46,0x0f, - 0x8c,0x69,0xc6,0x5c,0xe3,0x24,0xe3,0x6d,0xc6,0x6d, - 0xc6,0xa3,0x26,0x06,0x26,0x21,0x26,0x4b,0x4d,0xea, - 0x4d,0xee,0x9a,0x52,0x4d,0xb9,0xa6,0x29,0xa6,0x3b, - 0x4c,0x3b,0x4c,0xc7,0xcd,0xcc,0xcd,0xa2,0xcd,0xd6, - 0x99,0x35,0x9b,0x3d,0x31,0xd7,0x32,0xe7,0x9b,0xe7, - 0x9b,0xd7,0x9b,0xdf,0xb7,0x60,0x5a,0x78,0x5a,0x2c, - 0xb6,0xa8,0xb6,0xb8,0x65,0x49,0xb2,0xe4,0x5a,0xa6, - 0x59,0xee,0xb6,0xbc,0x6e,0x85,0x5a,0x39,0x59,0xa5, - 0x58,0x55,0x5a,0x5d,0xb3,0x46,0xad,0x9d,0xad,0x25, - 0xd6,0xbb,0xad,0xbb,0xa7,0x11,0xa7,0xb9,0x4e,0x93, - 0x4e,0xab,0x9e,0xd6,0x67,0xc3,0xb0,0xf1,0xb6,0xc9, - 0xb6,0xa9,0xb7,0x19,0xb0,0xe5,0xd8,0x06,0xdb,0xae, - 0xb6,0x6d,0xb6,0x7d,0x61,0x67,0x62,0x17,0x67,0xb7, - 0xc5,0xae,0xc3,0xee,0x93,0xbd,0x93,0x7d,0xba,0x7d, - 0x8d,0xfd,0x3d,0x07,0x0d,0x87,0xd9,0x0e,0xab,0x1d, - 0x5a,0x1d,0x7e,0x73,0xb4,0x72,0x14,0x3a,0x56,0x3a, - 0xde,0x9a,0xce,0x9c,0xee,0x3f,0x7d,0xc5,0xf4,0x96, - 0xe9,0x2f,0x67,0x58,0xcf,0x10,0xcf,0xd8,0x33,0xe3, - 0xb6,0x13,0xcb,0x29,0xc4,0x69,0x9d,0x53,0x9b,0xd3, - 0x47,0x67,0x17,0x67,0xb9,0x73,0x83,0xf3,0x88,0x8b, - 0x89,0x4b,0x82,0xcb,0x2e,0x97,0x3e,0x2e,0x9b,0x1b, - 0xc6,0xdd,0xc8,0xbd,0xe4,0x4a,0x74,0xf5,0x71,0x5d, - 0xe1,0x7a,0xd2,0xf5,0x9d,0x9b,0xb3,0x9b,0xc2,0xed, - 0xa8,0xdb,0xaf,0xee,0x36,0xee,0x69,0xee,0x87,0xdc, - 0x9f,0xcc,0x34,0x9f,0x29,0x9e,0x59,0x33,0x73,0xd0, - 0xc3,0xc8,0x43,0xe0,0x51,0xe5,0xd1,0x3f,0x0b,0x9f, - 0x95,0x30,0x6b,0xdf,0xac,0x7e,0x4f,0x43,0x4f,0x81, - 0x67,0xb5,0xe7,0x23,0x2f,0x63,0x2f,0x91,0x57,0xad, - 0xd7,0xb0,0xb7,0xa5,0x77,0xaa,0xf7,0x61,0xef,0x17, - 0x3e,0xf6,0x3e,0x72,0x9f,0xe3,0x3e,0xe3,0x3c,0x37, - 0xde,0x32,0xde,0x59,0x5f,0xcc,0x37,0xc0,0xb7,0xc8, - 0xb7,0xcb,0x4f,0xc3,0x6f,0x9e,0x5f,0x85,0xdf,0x43, - 0x7f,0x23,0xff,0x64,0xff,0x7a,0xff,0xd1,0x00,0xa7, - 0x80,0x25,0x01,0x67,0x03,0x89,0x81,0x41,0x81,0x5b, - 0x02,0xfb,0xf8,0x7a,0x7c,0x21,0xbf,0x8e,0x3f,0x3a, - 0xdb,0x65,0xf6,0xb2,0xd9,0xed,0x41,0x8c,0xa0,0xb9, - 0x41,0x15,0x41,0x8f,0x82,0xad,0x82,0xe5,0xc1,0xad, - 0x21,0x68,0xc8,0xec,0x90,0xad,0x21,0xf7,0xe7,0x98, - 0xce,0x91,0xce,0x69,0x0e,0x85,0x50,0x7e,0xe8,0xd6, - 0xd0,0x07,0x61,0xe6,0x61,0x8b,0xc3,0x7e,0x0c,0x27, - 0x85,0x87,0x85,0x57,0x86,0x3f,0x8e,0x70,0x88,0x58, - 0x1a,0xd1,0x31,0x97,0x35,0x77,0xd1,0xdc,0x43,0x73, - 0xdf,0x44,0xfa,0x44,0x96,0x44,0xde,0x9b,0x67,0x31, - 0x4f,0x39,0xaf,0x2d,0x4a,0x35,0x2a,0x3e,0xaa,0x2e, - 0x6a,0x3c,0xda,0x37,0xba,0x34,0xba,0x3f,0xc6,0x2e, - 0x66,0x59,0xcc,0xd5,0x58,0x9d,0x58,0x49,0x6c,0x4b, - 0x1c,0x39,0x2e,0x2a,0xae,0x36,0x6e,0x6c,0xbe,0xdf, - 0xfc,0xed,0xf3,0x87,0xe2,0x9d,0xe2,0x0b,0xe3,0x7b, - 0x17,0x98,0x2f,0xc8,0x5d,0x70,0x79,0xa1,0xce,0xc2, - 0xf4,0x85,0xa7,0x16,0xa9,0x2e,0x12,0x2c,0x3a,0x96, - 0x40,0x4c,0x88,0x4e,0x38,0x94,0xf0,0x41,0x10,0x2a, - 0xa8,0x16,0x8c,0x25,0xf2,0x13,0x77,0x25,0x8e,0x0a, - 0x79,0xc2,0x1d,0xc2,0x67,0x22,0x2f,0xd1,0x36,0xd1, - 0x88,0xd8,0x43,0x5c,0x2a,0x1e,0x4e,0xf2,0x48,0x2a, - 0x4d,0x7a,0x92,0xec,0x91,0xbc,0x35,0x79,0x24,0xc5, - 0x33,0xa5,0x2c,0xe5,0xb9,0x84,0x27,0xa9,0x90,0xbc, - 0x4c,0x0d,0x4c,0xdd,0x9b,0x3a,0x9e,0x16,0x9a,0x76, - 0x20,0x6d,0x32,0x3d,0x3a,0xbd,0x31,0x83,0x92,0x91, - 0x90,0x71,0x42,0xaa,0x21,0x4d,0x93,0xb6,0x67,0xea, - 0x67,0xe6,0x66,0x76,0xcb,0xac,0x65,0x85,0xb2,0xfe, - 0xc5,0x6e,0x8b,0xb7,0x2f,0x1e,0x95,0x07,0xc9,0x6b, - 0xb3,0x90,0xac,0x05,0x59,0x2d,0x0a,0xb6,0x42,0xa6, - 0xe8,0x54,0x5a,0x28,0xd7,0x2a,0x07,0xb2,0x67,0x65, - 0x57,0x66,0xbf,0xcd,0x89,0xca,0x39,0x96,0xab,0x9e, - 0x2b,0xcd,0xed,0xcc,0xb3,0xca,0xdb,0x90,0x37,0x9c, - 0xef,0x9f,0xff,0xed,0x12,0xc2,0x12,0xe1,0x92,0xb6, - 0xa5,0x86,0x4b,0x57,0x2d,0x1d,0x58,0xe6,0xbd,0xac, - 0x6a,0x39,0xb2,0x3c,0x71,0x79,0xdb,0x0a,0xe3,0x15, - 0x05,0x2b,0x86,0x56,0x06,0xac,0x3c,0xb8,0x8a,0xb6, - 0x2a,0x6d,0xd5,0x4f,0xab,0xed,0x57,0x97,0xae,0x7e, - 0xbd,0x26,0x7a,0x4d,0x6b,0x81,0x5e,0xc1,0xca,0x82, - 0xc1,0xb5,0x01,0x6b,0xeb,0x0b,0x55,0x0a,0xe5,0x85, - 0x7d,0xeb,0xdc,0xd7,0xed,0x5d,0x4f,0x58,0x2f,0x59, - 0xdf,0xb5,0x61,0xfa,0x86,0x9d,0x1b,0x3e,0x15,0x89, - 0x8a,0xae,0x14,0xdb,0x17,0x97,0x15,0x7f,0xd8,0x28, - 0xdc,0x78,0xe5,0x1b,0x87,0x6f,0xca,0xbf,0x99,0xdc, - 0x94,0xb4,0xa9,0xab,0xc4,0xb9,0x64,0xcf,0x66,0xd2, - 0x66,0xe9,0xe6,0xde,0x2d,0x9e,0x5b,0x0e,0x96,0xaa, - 0x97,0xe6,0x97,0x0e,0x6e,0x0d,0xd9,0xda,0xb4,0x0d, - 0xdf,0x56,0xb4,0xed,0xf5,0xf6,0x45,0xdb,0x2f,0x97, - 0xcd,0x28,0xdb,0xbb,0x83,0xb6,0x43,0xb9,0xa3,0xbf, - 0x3c,0xb8,0xbc,0x65,0xa7,0xc9,0xce,0xcd,0x3b,0x3f, - 0x54,0xa4,0x54,0xf4,0x54,0xfa,0x54,0x36,0xee,0xd2, - 0xdd,0xb5,0x61,0xd7,0xf8,0x6e,0xd1,0xee,0x1b,0x7b, - 0xbc,0xf6,0x34,0xec,0xd5,0xdb,0x5b,0xbc,0xf7,0xfd, - 0x3e,0xc9,0xbe,0xdb,0x55,0x01,0x55,0x4d,0xd5,0x66, - 0xd5,0x65,0xfb,0x49,0xfb,0xb3,0xf7,0x3f,0xae,0x89, - 0xaa,0xe9,0xf8,0x96,0xfb,0x6d,0x5d,0xad,0x4e,0x6d, - 0x71,0xed,0xc7,0x03,0xd2,0x03,0xfd,0x07,0x23,0x0e, - 0xb6,0xd7,0xb9,0xd4,0xd5,0x1d,0xd2,0x3d,0x54,0x52, - 0x8f,0xd6,0x2b,0xeb,0x47,0x0e,0xc7,0x1f,0xbe,0xfe, - 0x9d,0xef,0x77,0x2d,0x0d,0x36,0x0d,0x55,0x8d,0x9c, - 0xc6,0xe2,0x23,0x70,0x44,0x79,0xe4,0xe9,0xf7,0x09, - 0xdf,0xf7,0x1e,0x0d,0x3a,0xda,0x76,0x8c,0x7b,0xac, - 0xe1,0x07,0xd3,0x1f,0x76,0x1d,0x67,0x1d,0x2f,0x6a, - 0x42,0x9a,0xf2,0x9a,0x46,0x9b,0x53,0x9a,0xfb,0x5b, - 0x62,0x5b,0xba,0x4f,0xcc,0x3e,0xd1,0xd6,0xea,0xde, - 0x7a,0xfc,0x47,0xdb,0x1f,0x0f,0x9c,0x34,0x3c,0x59, - 0x79,0x4a,0xf3,0x54,0xc9,0x69,0xda,0xe9,0x82,0xd3, - 0x93,0x67,0xf2,0xcf,0x8c,0x9d,0x95,0x9d,0x7d,0x7e, - 0x2e,0xf9,0xdc,0x60,0xdb,0xa2,0xb6,0x7b,0xe7,0x63, - 0xce,0xdf,0x6a,0x0f,0x6f,0xef,0xba,0x10,0x74,0xe1, - 0xd2,0x45,0xff,0x8b,0xe7,0x3b,0xbc,0x3b,0xce,0x5c, - 0xf2,0xb8,0x74,0xf2,0xb2,0xdb,0xe5,0x13,0x57,0xb8, - 0x57,0x9a,0xaf,0x3a,0x5f,0x6d,0xea,0x74,0xea,0x3c, - 0xfe,0x93,0xd3,0x4f,0xc7,0xbb,0x9c,0xbb,0x9a,0xae, - 0xb9,0x5c,0x6b,0xb9,0xee,0x7a,0xbd,0xb5,0x7b,0x66, - 0xf7,0xe9,0x1b,0x9e,0x37,0xce,0xdd,0xf4,0xbd,0x79, - 0xf1,0x16,0xff,0xd6,0xd5,0x9e,0x39,0x3d,0xdd,0xbd, - 0xf3,0x7a,0x6f,0xf7,0xc5,0xf7,0xf5,0xdf,0x16,0xdd, - 0x7e,0x72,0x27,0xfd,0xce,0xcb,0xbb,0xd9,0x77,0x27, - 0xee,0xad,0xbc,0x4f,0xbc,0x5f,0xf4,0x40,0xed,0x41, - 0xd9,0x43,0xdd,0x87,0xd5,0x3f,0x5b,0xfe,0xdc,0xd8, - 0xef,0xdc,0x7f,0x6a,0xc0,0x77,0xa0,0xf3,0xd1,0xdc, - 0x47,0xf7,0x06,0x85,0x83,0xcf,0xfe,0x91,0xf5,0x8f, - 0x0f,0x43,0x05,0x8f,0x99,0x8f,0xcb,0x86,0x0d,0x86, - 0xeb,0x9e,0x38,0x3e,0x39,0x39,0xe2,0x3f,0x72,0xfd, - 0xe9,0xfc,0xa7,0x43,0xcf,0x64,0xcf,0x26,0x9e,0x17, - 0xfe,0xa2,0xfe,0xcb,0xae,0x17,0x16,0x2f,0x7e,0xf8, - 0xd5,0xeb,0xd7,0xce,0xd1,0x98,0xd1,0xa1,0x97,0xf2, - 0x97,0x93,0xbf,0x6d,0x7c,0xa5,0xfd,0xea,0xc0,0xeb, - 0x19,0xaf,0xdb,0xc6,0xc2,0xc6,0x1e,0xbe,0xc9,0x78, - 0x33,0x31,0x5e,0xf4,0x56,0xfb,0xed,0xc1,0x77,0xdc, - 0x77,0x1d,0xef,0xa3,0xdf,0x0f,0x4f,0xe4,0x7c,0x20, - 0x7f,0x28,0xff,0x68,0xf9,0xb1,0xf5,0x53,0xd0,0xa7, - 0xfb,0x93,0x19,0x93,0x93,0xff,0x04,0x03,0x98,0xf3, - 0xfc,0x63,0x33,0x2d,0xdb,0x00,0x00,0x00,0x04,0x67, - 0x41,0x4d,0x41,0x00,0x00,0xb1,0x8e,0x7c,0xfb,0x51, - 0x93,0x00,0x00,0x00,0x20,0x63,0x48,0x52,0x4d,0x00, - 0x00,0x7a,0x25,0x00,0x00,0x80,0x83,0x00,0x00,0xf9, - 0xff,0x00,0x00,0x80,0xe9,0x00,0x00,0x75,0x30,0x00, - 0x00,0xea,0x60,0x00,0x00,0x3a,0x98,0x00,0x00,0x17, - 0x6f,0x92,0x5f,0xc5,0x46,0x00,0x00,0x00,0x9d,0x49, - 0x44,0x41,0x54,0x78,0xda,0xa4,0x90,0x31,0x0a,0xc2, - 0x40,0x10,0x00,0x27,0x49,0x15,0x08,0x04,0xd2,0x5a, - 0x59,0x05,0xac,0x7c,0x80,0x20,0xa4,0xca,0x7b,0x04, - 0xc1,0x4f,0xf8,0x12,0x1f,0xe0,0x1b,0xfc,0x81,0x60, - 0x6b,0x65,0xe5,0x0f,0xc6,0xea,0x20,0x48,0x8c,0xc9, - 0xdd,0xc0,0xc2,0x35,0x33,0xdc,0x6e,0xa6,0xb2,0x80, - 0x3d,0xd0,0x03,0x3b,0xa0,0x04,0x36,0xa8,0xff,0xa6, - 0x56,0xcf,0xea,0xcb,0x11,0xa6,0xc4,0x42,0x3d,0xa8, - 0x6f,0x27,0xf8,0x25,0x37,0xea,0xd5,0x19,0x8c,0xc9, - 0x6b,0xf5,0xe1,0x4c,0xb2,0xaf,0x23,0xd6,0xc0,0x0d, - 0x68,0xe7,0x5e,0x35,0x1f,0xbc,0x0b,0xe0,0xb2,0x44, - 0x06,0x18,0x7e,0xfd,0x64,0x04,0x61,0x85,0x15,0x70, - 0x07,0x2a,0x16,0x12,0x56,0x38,0xc6,0xc8,0x00,0x99, - 0x5a,0x02,0x4f,0xa0,0x89,0x09,0xe4,0x40,0x17,0x2b, - 0x87,0x40,0x4f,0x02,0x39,0xb0,0x4d,0x0d,0xb4,0xa9, - 0x81,0x2a,0x25,0xf0,0x19,0x00,0x11,0x68,0x32,0x6a, - 0xb1,0xe9,0x64,0xd5,0x00,0x00,0x00,0x00,0x49,0x45, - 0x4e,0x44,0xae,0x42,0x60,0x82 -}; diff --git a/data/resources/bar.png b/data/resources/bar.png deleted file mode 100644 index a1a3ea86e508b24c409a7e96ba9d18bd0298daf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2825 zcmV+k3-KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0000aNkl6~00000NkvXXu0mjf4{KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0001;NklsNQ}wdz``{%+-|0_fIZLyJD>zMsQ;!`&+5w&ro=)$sBb6u zB{%BT8H~wm_2EpiuOrsL4QS_HH6OeS;Ic#p7=Ha^1Yw00a0e`0I$N-sI0#Bfc s3FJT*D~CW&0y(fv4Ya9&Dkbn401;?1YO(2L)c^nh07*qoM6N<$f@0Qhn*aa+ diff --git a/src/components/GuiSettingsMenu.cpp b/src/components/GuiSettingsMenu.cpp index 7e1102f65..67f30b2ae 100644 --- a/src/components/GuiSettingsMenu.cpp +++ b/src/components/GuiSettingsMenu.cpp @@ -5,7 +5,7 @@ GuiSettingsMenu::GuiSettingsMenu(Window* window) : GuiComponent(window), mList(window, Eigen::Vector2i(2, 4)), - mBox(mWindow, 0, 0, 0, 0), + mBox(mWindow, ":/frame.png", 0x444444FF), mDrawFramerateSwitch(window), mVolumeSlider(window, 0, 100, 1), mDisableSoundsSwitch(window, false), @@ -58,12 +58,7 @@ GuiSettingsMenu::GuiSettingsMenu(Window* window) : GuiComponent(window), mList.setPosition(Renderer::getScreenWidth() / 2 - mList.getSize().x() / 2, Renderer::getScreenHeight() / 2 - mList.getSize().y() / 2); //set up borders/background - mBox.setPosition(mList.getPosition()); - mBox.setSize(mList.getSize()); - mBox.setCornerImage(":/corner.png"); - mBox.setVerticalImage(":/bar.png"); - mBox.setHorizontalImage(":/bar.png"); - mBox.setBorderColor(0x333333FF); + mBox.fitTo(mList.getSize(), mList.getPosition(), Eigen::Vector2f(8, 8)); } GuiSettingsMenu::~GuiSettingsMenu() diff --git a/src/components/GuiSettingsMenu.h b/src/components/GuiSettingsMenu.h index 48ab6be11..f15fb965b 100644 --- a/src/components/GuiSettingsMenu.h +++ b/src/components/GuiSettingsMenu.h @@ -7,7 +7,7 @@ #include "SwitchComponent.h" #include "SliderComponent.h" #include "TextComponent.h" -#include "GuiBox.h" +#include "NinePatchComponent.h" class GuiSettingsMenu : public GuiComponent { @@ -23,7 +23,7 @@ private: ComponentListComponent mList; - GuiBox mBox; + NinePatchComponent mBox; SwitchComponent mDrawFramerateSwitch; SliderComponent mVolumeSlider; diff --git a/src/components/NinePatchComponent.cpp b/src/components/NinePatchComponent.cpp index 3828924f8..0557ab72b 100644 --- a/src/components/NinePatchComponent.cpp +++ b/src/components/NinePatchComponent.cpp @@ -165,10 +165,14 @@ Eigen::Vector2f NinePatchComponent::getCornerSize() const return Eigen::Vector2f(16, 16); } -void NinePatchComponent::fitTo(Eigen::Vector2f size) +void NinePatchComponent::fitTo(Eigen::Vector2f size, Eigen::Vector3f position, Eigen::Vector2f padding) { + size += padding; + position[0] -= padding.x() / 2; + position[1] -= padding.y() / 2; + setSize(size + Eigen::Vector2f(getCornerSize().x() * 2, getCornerSize().y() * 2)); - setPosition(-getCornerSize().x(), -getCornerSize().y()); + setPosition(-getCornerSize().x() + position.x(), -getCornerSize().y() + position.y()); } void NinePatchComponent::setImagePath(const std::string& path) diff --git a/src/components/NinePatchComponent.h b/src/components/NinePatchComponent.h index 41fa87dee..e3281b20b 100644 --- a/src/components/NinePatchComponent.h +++ b/src/components/NinePatchComponent.h @@ -12,7 +12,7 @@ public: void onSizeChanged() override; - void fitTo(Eigen::Vector2f size); + void fitTo(Eigen::Vector2f size, Eigen::Vector3f position = Eigen::Vector3f::Zero(), Eigen::Vector2f padding = Eigen::Vector2f::Zero()); void setImagePath(const std::string& path); void setEdgeColor(unsigned int edgeColor);