From b48fd55607b87732fe2eaf8ae4bc8571bd88b152 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Sun, 20 Jun 2021 20:13:46 +0300 Subject: [PATCH] Refactoring --- DesktopEditor/common/TrackingImages.h | 42 ------- DesktopEditor/fontengine/ApplicationFonts.cpp | 4 + DesktopEditor/fontengine/FontsAssistant.cpp | 118 ------------------ DesktopEditor/fontengine/FontsAssistant.h | 72 ----------- DesktopEditor/graphics/pro/graphics.pro | 6 +- 5 files changed, 6 insertions(+), 236 deletions(-) delete mode 100644 DesktopEditor/common/TrackingImages.h delete mode 100644 DesktopEditor/fontengine/FontsAssistant.cpp delete mode 100644 DesktopEditor/fontengine/FontsAssistant.h diff --git a/DesktopEditor/common/TrackingImages.h b/DesktopEditor/common/TrackingImages.h deleted file mode 100644 index cac6fe7828..0000000000 --- a/DesktopEditor/common/TrackingImages.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ - -#ifndef _TRACKING_IMAGES_H_ -#define _TRACKING_IMAGES_H_ - -static const BYTE c_resource_image_rotate[1764] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,48,255,255,255,141,255,255,255,203,255,255,255,229,255,255,255,252,255,255,255,229,255,255,255,203,255,255,255,141,255,255,255,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,36,255,255,255,174,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,174,255,255,255,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,77,255,255,255,239,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,239,255,255,255,77,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,77,255,255,255,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,255,255,255,77,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,36,255,255,255,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,211,211,211,255,154,154,154,255,137,137,137,255,124,124,124,255,137,137,137,255,170,170,170,255,224,224,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,255,255,255,36,0,0,0,0,0,0,0,0,255,255,255,183,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,178,178,178,255,124,124,124,255,182,182,182,255,211,211,211,255,235,235,235,255,211,211,211,255,182,182,182,255,124,124,124,255,178,178,178,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,183,0,0,0,0,255,255,255,51,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,244,255,124,124,124,255,178,178,178,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,51,255,255,255,142,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,244,255,124,124,124,255,224,224,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,141,255,255,255,203,255,255,255,255,255,255,255,255,255,255,255,255,170,170,170,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,182,182,182,255,170,170,170,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,203,255,255,255,229,255,255,255,255,255,255,255,255,198,198,198,255,134,134,134,255,154,154,154,255,255,255,255,255,255,255,255,255,255,255,255,255,182,182,182,255,124,124,124,255,182,182,182,255,255,255,255,255,255,255,255,255,255,255,255,255,211,211,211,255,137,137,137,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,239,255,255,255,252,255,255,255,255,198,198,198,255,124,124,124,255,124,124,124,255,124,124,124,255,154,154,154,255,255,255,255,255,255,255,255,255,124,124,124,255,255,255,255,255,124,124,124,255,255,255,255,255,255,255,255,255,255,255,255,255,235,235,235,255,124,124,124,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,239,255,255,255,255,255,255,255,255,255,255,255,255,137,137,137,255,244,244,244,255,255,255,255,255,255,255,255,255,255,255,255,255,182,182,182,255,124,124,124,255,182,182,182,255,255,255,255,255,255,255,255,255,255,255,255,255,211,211,211,255,137,137,137,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,239,255,255,255,203,255,255,255,255,255,255,255,255,255,255,255,255,170,170,170,255,182,182,182,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,182,182,182,255,170,170,170,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,203,255,255,255,142,255,255,255,255,255,255,255,255,255,255,255,255,226,226,226,255,124,124,124,255,244,244,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,244,255,124,124,124,255,224,224,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,141,255,255,255,51,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,178,178,178,255,124,124,124,255,244,244,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,244,244,255,124,124,124,255,178,178,178,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,51,0,0,0,0,255,255,255,183,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,178,178,178,255,124,124,124,255,182,182,182,255,211,211,211,255,235,235,235,255,211,211,211,255,182,182,182,255,124,124,124,255,178,178,178,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,183,0,0,0,0,0,0,0,0,255,255,255,36,255,255,255,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,224,224,224,255,170,170,170,255,137,137,137,255,124,124,124,255,137,137,137,255,170,170,170,255,224,224,224,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,255,255,255,36,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,77,255,255,255,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,255,255,255,77,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,77,255,255,255,244,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,244,255,255,255,77,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,36,255,255,255,174,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,174,255,255,255,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,48,255,255,255,141,255,255,255,203,255,255,255,239,255,255,255,255,255,255,255,239,255,255,255,203,255,255,255,141,255,255,255,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - -static const BYTE c_resource_image_rotate2[6400] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,55,255,255,255,120,255,255,255,172,255,255,255,211,255,255,255,237,255,255,255,250,255,255,255,250,255,255,255,237,255,255,255,211,255,255,255,172,255,255,255,120,255,255,255,55,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,28,255,255,255,135,255,255,255,227,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,227,255,255,255,135,255,255,255,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,19,255,255,255,151,255,255,255,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,151,255,255,255,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,88,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,10,255,255,255,180,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,180,255,255,255,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,177,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,177,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,237,237,255,203,203,203,255,175,175,175,255,159,159,159,255,150,150,150,255,150,150,150,255,159,159,159,255,175,175,175,255,203,203,203,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,88,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,172,172,172,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,172,172,172,255,228,228,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,19,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,192,192,192,255,147,147,147,255,147,147,147,255,155,155,155,255,192,192,192,255,223,223,223,255,243,243,243,255,252,252,252,255,249,249,249,255,237,237,237,255,223,223,223,255,192,192,192,255,155,155,155,255,147,147,147,255,147,147,147,255,192,192,192,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,170,170,170,255,147,147,147,255,150,150,150,255,203,203,203,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,203,203,203,255,150,150,150,255,147,147,147,255,170,170,170,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,28,255,255,255,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,159,159,159,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,237,237,255,159,159,159,255,147,147,147,255,170,170,170,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,28,0,0,0,0,0,0,0,0,255,255,255,135,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243,243,243,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243,243,243,255,159,159,159,255,147,147,147,255,189,189,189,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,135,0,0,0,0,255,255,255,3,255,255,255,227,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,231,231,231,255,150,150,150,255,147,147,147,255,228,228,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,227,255,255,255,3,255,255,255,55,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,196,196,196,255,147,147,147,255,172,172,172,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,55,255,255,255,120,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,255,255,255,255,255,255,255,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,155,155,155,255,147,147,147,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,120,255,255,255,172,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,147,147,147,255,147,147,147,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,147,147,147,255,203,203,203,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,172,255,255,255,211,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,192,192,192,255,155,155,155,255,155,155,155,255,192,192,192,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,223,223,223,255,147,147,147,255,174,174,174,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,211,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,196,196,196,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243,243,243,255,147,147,147,255,159,159,159,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,250,255,255,255,255,255,255,255,255,228,228,228,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,155,155,155,255,147,147,147,255,231,231,231,255,231,231,231,255,147,147,147,255,155,155,155,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,147,147,147,255,150,150,150,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,150,150,150,255,147,147,147,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,155,155,155,255,147,147,147,255,231,231,231,255,231,231,231,255,147,147,147,255,155,155,155,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,147,147,147,255,150,150,150,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,159,159,159,255,147,147,147,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,196,196,196,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243,243,243,255,147,147,147,255,159,159,159,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,211,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,175,175,175,255,147,147,147,255,220,220,220,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,192,192,192,255,155,155,155,255,155,155,155,255,192,192,192,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,223,223,223,255,147,147,147,255,174,174,174,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,211,255,255,255,172,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,203,203,203,255,147,147,147,255,189,189,189,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,147,147,147,255,203,203,203,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,172,255,255,255,120,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,237,237,255,147,147,147,255,155,155,155,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,155,155,155,255,147,147,147,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,120,255,255,255,56,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,172,172,172,255,147,147,147,255,196,196,196,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,196,196,196,255,147,147,147,255,172,172,172,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,55,255,255,255,3,255,255,255,227,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,147,147,147,255,150,150,150,255,231,231,231,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,231,231,231,255,150,150,150,255,147,147,147,255,228,228,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,227,255,255,255,3,0,0,0,0,255,255,255,135,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,189,189,189,255,147,147,147,255,159,159,159,255,243,243,243,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,243,243,243,255,159,159,159,255,147,147,147,255,189,189,189,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,135,0,0,0,0,0,0,0,0,255,255,255,28,255,255,255,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,170,170,170,255,147,147,147,255,159,159,159,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,237,237,255,159,159,159,255,147,147,147,255,170,170,170,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,28,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,170,170,170,255,147,147,147,255,150,150,150,255,196,196,196,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,249,249,249,255,196,196,196,255,150,150,150,255,147,147,147,255,170,170,170,255,249,249,249,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,19,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,252,252,252,255,192,192,192,255,147,147,147,255,147,147,147,255,155,155,155,255,192,192,192,255,223,223,223,255,243,243,243,255,252,252,252,255,252,252,252,255,243,243,243,255,223,223,223,255,192,192,192,255,155,155,155,255,147,147,147,255,147,147,147,255,192,192,192,255,252,252,252,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,88,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,228,255,172,172,172,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,147,147,147,255,172,172,172,255,228,228,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,237,237,255,203,203,203,255,175,175,175,255,155,155,155,255,150,150,150,255,150,150,150,255,155,155,155,255,175,175,175,255,203,203,203,255,237,237,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,177,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,177,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,10,255,255,255,182,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,180,255,255,255,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,151,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,151,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,88,255,255,255,237,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,237,255,255,255,88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,19,255,255,255,151,255,255,255,250,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,255,255,255,151,255,255,255,19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,28,255,255,255,135,255,255,255,227,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,227,255,255,255,135,255,255,255,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,255,255,255,3,255,255,255,55,255,255,255,120,255,255,255,172,255,255,255,211,255,255,255,237,255,255,255,250,255,255,255,250,255,255,255,237,255,255,255,211,255,255,255,172,255,255,255,120,255,255,255,55,255,255,255,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; - -static const BYTE c_resource_image_table_outline[676] = {187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,187,187,187,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,250,250,250,255,143,143,143,255,187,187,187,255,246,246,246,255,246,246,246,255,247,247,247,255,247,247,247,255,247,247,247,255,196,104,55,255,247,247,247,255,247,247,247,255,247,247,247,255,247,247,247,255,247,247,247,255,143,143,143,255,187,187,187,255,242,242,242,255,242,242,242,255,242,242,242,255,243,243,243,255,196,104,55,255,196,104,55,255,196,104,55,255,243,243,243,255,243,243,243,255,243,243,243,255,243,243,243,255,143,143,143,255,187,187,187,255,238,238,238,255,238,238,238,255,238,238,238,255,238,238,238,255,238,238,238,255,196,104,55,255,238,238,238,255,238,238,238,255,238,238,238,255,238,238,238,255,238,238,238,255,143,143,143,255,187,187,187,255,232,232,232,255,232,232,232,255,196,104,55,255,233,233,233,255,233,233,233,255,196,104,55,255,233,233,233,255,233,233,233,255,196,104,55,255,233,233,233,255,233,233,233,255,143,143,143,255,187,187,187,255,227,227,227,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,196,104,55,255,228,228,228,255,143,143,143,255,187,187,187,255,232,232,232,255,232,232,232,255,196,104,55,255,232,232,232,255,232,232,232,255,196,104,55,255,232,232,232,255,232,232,232,255,196,104,55,255,232,232,232,255,232,232,232,255,143,143,143,255,187,187,187,255,237,237,237,255,237,237,237,255,237,237,237,255,237,237,237,255,237,237,237,255,196,104,55,255,237,237,237,255,236,236,236,255,236,236,236,255,236,236,236,255,236,236,236,255,143,143,143,255,187,187,187,255,242,242,242,255,242,242,242,255,242,242,242,255,242,242,242,255,196,104,55,255,196,104,55,255,196,104,55,255,241,241,241,255,241,241,241,255,241,241,241,255,241,241,241,255,143,143,143,255,187,187,187,255,245,245,245,255,245,245,245,255,245,245,245,255,245,245,245,255,245,245,245,255,196,104,55,255,245,245,245,255,245,245,245,255,245,245,245,255,245,245,245,255,245,245,245,255,143,143,143,255,187,187,187,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,249,249,249,255,248,248,248,255,143,143,143,255,187,187,187,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255,143,143,143,255}; - -#endif // _TRACKING_IMAGES_H_ diff --git a/DesktopEditor/fontengine/ApplicationFonts.cpp b/DesktopEditor/fontengine/ApplicationFonts.cpp index d07048a513..b0c5fa12a7 100644 --- a/DesktopEditor/fontengine/ApplicationFonts.cpp +++ b/DesktopEditor/fontengine/ApplicationFonts.cpp @@ -1620,6 +1620,10 @@ void CApplicationFonts::Initialize(bool bIsCheckSelection) m_oList.LoadFromFolder(L"/system/fonts"); #endif +#if defined(_IOS) + m_oList.LoadFromFolder(L"/System/Library/Fonts"); +#endif + m_oCache.m_pApplicationFontStreams = &m_oStreams; } diff --git a/DesktopEditor/fontengine/FontsAssistant.cpp b/DesktopEditor/fontengine/FontsAssistant.cpp deleted file mode 100644 index 8b77f471fb..0000000000 --- a/DesktopEditor/fontengine/FontsAssistant.cpp +++ /dev/null @@ -1,118 +0,0 @@ -/* -* (c) Copyright Ascensio System SIA 2010-2020 -* -* This program is a free software product. You can redistribute it and/or -* modify it under the terms of the GNU Affero General Public License (AGPL) -* version 3 as published by the Free Software Foundation. In accordance with -* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect -* that Ascensio System SIA expressly excludes the warranty of non-infringement -* of any third-party rights. -* -* This program is distributed WITHOUT ANY WARRANTY; without even the implied -* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For -* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html -* -* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha -* street, Riga, Latvia, EU, LV-1050. -* -* The interactive user interfaces in modified source and object code versions -* of the Program must display Appropriate Legal Notices, as required under -* Section 5 of the GNU AGPL version 3. -* -* Pursuant to Section 7(b) of the License you must retain the original Product -* logo when distributing the program. Pursuant to Section 7(e) we decline to -* grant you any rights under trademark law for use of our trademarks. -* -* All the Product's GUI elements, including illustrations and icon sets, as -* well as technical writing content are licensed under the terms of the -* Creative Commons Attribution-ShareAlike 4.0 International. See the License -* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -* -*/ - -#include "FontsAssistant.h" -#include "ApplicationFontsWorker.h" - -namespace ASC -{ - CFontsAssistant::CFontsAssistant(const std::vector& arFontsPaths, const std::wstring& sDataFontsPath) - { - m_arFontsPaths = arFontsPaths; - m_sDataFontsPath = sDataFontsPath; - } - - void CFontsAssistant::AddExcludeFont(const std::wstring& sFontName) { - m_arExcludeFonts.push_back(sFontName); - } - - std::wstring CFontsAssistant::GetSystemFontPath() - { - #if defined(_IOS) || defined(_MAC) - return std::wstring(L"/System/Library/Fonts"); - #elif defined(__ANDROID__) - return std::wstring(L"/system/fonts"); - #endif - return std::wstring(L""); - } - - NSFonts::IApplicationFonts* CFontsAssistant::Load() - { - CApplicationFontsWorker oFontsWorker; - - oFontsWorker.m_bIsUseOpenType = true; - oFontsWorker.m_bIsUseSystemFonts = true; - oFontsWorker.m_bIsNeedThumbnails = false; - oFontsWorker.m_sDirectory = m_sDataFontsPath; - - for (size_t i = 0; i < m_arFontsPaths.size(); ++i) - { - oFontsWorker.m_arAdditionalFolders.push_back(m_arFontsPaths[i]); - } - - if (!GetSystemFontPath().empty()) - { - oFontsWorker.m_arAdditionalFolders.push_back(GetSystemFontPath()); - } - - NSFonts::IApplicationFonts* pAppFonts = oFontsWorker.Check(); - - m_arAvailableFonts = oFontsWorker.GetFontNamesWithExcludes(pAppFonts, m_arExcludeFonts); - m_sScriptData = oFontsWorker.GetAllFonts(); - - return pAppFonts; - } - - void CFontsAssistant::Check() - { - CApplicationFontsWorker worker; - - worker.m_bIsUseOpenType = true; - worker.m_bIsUseSystemFonts = true; - worker.m_bIsNeedThumbnails = false; - worker.m_sDirectory = m_sDataFontsPath; - - for (size_t i = 0; i < m_arFontsPaths.size(); ++i) - { - worker.m_arAdditionalFolders.push_back(m_arFontsPaths[i]); - } - - if (!GetSystemFontPath().empty()) - { - worker.m_arAdditionalFolders.push_back(GetSystemFontPath()); - } - - NSFonts::IApplicationFonts* appFonts = worker.Check(); - - RELEASEINTERFACE(appFonts); - } - - std::vector CFontsAssistant::GetAvailableFonts() - { - return m_arAvailableFonts; - } - - std::string CFontsAssistant::GetScriptData() - { - return m_sScriptData; - } -} diff --git a/DesktopEditor/fontengine/FontsAssistant.h b/DesktopEditor/fontengine/FontsAssistant.h deleted file mode 100644 index 9e35685088..0000000000 --- a/DesktopEditor/fontengine/FontsAssistant.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2020 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ - -#ifndef FONTS_ASSISTANT_H -#define FONTS_ASSISTANT_H - -#include -#include - -#include "../../../core/DesktopEditor/graphics/pro/Fonts.h" - -#include "../../Common/kernel_config.h" - -namespace ASC -{ - class GRAPHICS_DECL CFontsAssistant - { - public: - CFontsAssistant(const std::vector& arFontsPaths, const std::wstring& sDataFontsPath); - - void Check(); - NSFonts::IApplicationFonts* Load(); - - std::vector GetAvailableFonts(); - std::string GetScriptData(); - - void AddExcludeFont(const std::wstring& sFontName); - - private: - static std::wstring GetSystemFontPath(); - - private: - std::vector m_arFontsPaths; - std::wstring m_sDataFontsPath; - - std::vector m_arAvailableFonts; - std::string m_sScriptData; - - std::vector m_arExcludeFonts; - }; -} - -#endif /* FONTS_ASSISTANT_H */ diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro index bfe0442a1f..66bb29a4f4 100644 --- a/DesktopEditor/graphics/pro/graphics.pro +++ b/DesktopEditor/graphics/pro/graphics.pro @@ -462,12 +462,10 @@ SOURCES += \ $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/skew.cpp HEADERS += \ - ./../../fontengine/ApplicationFontsWorker.h \ - ./../../fontengine/FontsAssistant.h + ./../../fontengine/ApplicationFontsWorker.h SOURCES += \ - ./../../fontengine/ApplicationFontsWorker.cpp \ - ./../../fontengine/FontsAssistant.cpp + ./../../fontengine/ApplicationFontsWorker.cpp core_ios {