PdfReader and PdfWriter moved entirely to PdfFile

DesktopEditor/graphics/pro/js/drawingfile.json

@@ -39,7 +39,7 @@
 		"../../../raster/Jp2/openjpeg", "../../../raster/Jp2/openjpeg/openjpeg-2.4.0/src/lib/openjp2"
 	],
 	"define": [
-		"__linux__", "_LINUX", "UNIX", "FT2_BUILD_LIBRARY", "HAVE_FCNTL_H", "FT_CONFIG_OPTION_SYSTEM_ZLIB", "BUILDING_WASM_MODULE", "CMAP_USE_MEMORY", "U_COMMON_IMPLEMENTATION", "errno=0", "THREADMODEL=0", "DEBUGLVL=0", "HAVE_MBSTATE_T", "HAVE_STDINCLUDES", "HAS_WCHAR", "HAVE_VA_COPY", "LIBXML_READER_ENABLED", "LIBXML_PUSH_ENABLED", "LIBXML_HTML_ENABLED", "LIBXML_XPATH_ENABLED", "LIBXML_OUTPUT_ENABLED", "LIBXML_C14N_ENABLED", "LIBXML_SAX1_ENABLED", "LIBXML_TREE_ENABLED", "LIBXML_XPTR_ENABLED", "IN_LIBXML", "LIBXML_STATIC", "BUILD_ZLIB_AS_SOURCES", "DISABLE_PDF_CONVERTATION", "_ARM_ALIGN_", "_tcsnicmp=strncmp", "_lseek=lseek", "_getcwd=getcwd", "NO_CONSOLE_IO",
+		"__linux__", "_LINUX", "UNIX", "FT2_BUILD_LIBRARY", "HAVE_FCNTL_H", "FT_CONFIG_OPTION_SYSTEM_ZLIB", "BUILDING_WASM_MODULE", "CMAP_USE_MEMORY", "U_COMMON_IMPLEMENTATION", "errno=0", "THREADMODEL=0", "DEBUGLVL=0", "HAVE_MBSTATE_T", "HAVE_STDINCLUDES", "HAS_WCHAR", "HAVE_VA_COPY", "LIBXML_READER_ENABLED", "LIBXML_PUSH_ENABLED", "LIBXML_HTML_ENABLED", "LIBXML_XPATH_ENABLED", "LIBXML_OUTPUT_ENABLED", "LIBXML_C14N_ENABLED", "LIBXML_SAX1_ENABLED", "LIBXML_TREE_ENABLED", "LIBXML_XPTR_ENABLED", "IN_LIBXML", "LIBXML_STATIC", "BUILD_ZLIB_AS_SOURCES", "_ARM_ALIGN_", "_tcsnicmp=strncmp", "_lseek=lseek", "_getcwd=getcwd", "NO_CONSOLE_IO",
 		"USE_EXTERNAL_JPEG2000", "USE_JPIP", "OPJ_STATIC"
 	],
 	"compile_files_array": [

DesktopEditor/graphics/pro/js/qt/nativegraphics.pro

@@ -77,6 +77,7 @@ HEADERS += \
     ../../../MetafileToRenderer.h \
     ../../../MetafileToRendererCheck.h \
     ../../../MetafileToGraphicsRenderer.h \
+    ../../../FormField.h \
     ../../../structures.h \
     ../../../GraphicsRenderer.h \
     \
@@ -108,6 +109,7 @@ SOURCES += \
     ../../../Image.cpp \
     ../../../MetafileToRenderer.cpp \
     ../../../MetafileToGraphicsRenderer.cpp \
+    ../../../FormField.cpp \
     \
     ../../../../fontengine/ApplicationFonts.cpp \
     ../../../../fontengine/FontFile.cpp \
@@ -591,7 +593,7 @@ SOURCES += \
     $$DJVU_WRAPPER/GURL.cpp
 
 # PdfReader
-PDF_ROOT_DIR = $$PWD/../../../../../PdfReader
+PDF_ROOT_DIR = $$PWD/../../../../../PdfFile
 
 INCLUDEPATH += \
     $$PDF_ROOT_DIR/lib/goo \
@@ -619,9 +621,9 @@ SOURCES -= \
     $$PDF_ROOT_DIR/lib/xpdf/pdfinfo.cc
 
 SOURCES += \
-    $$PDF_ROOT_DIR/Src/RendererOutputDev.cpp \
+    $$PDF_ROOT_DIR/SrcReader/RendererOutputDev.cpp \
-    $$PDF_ROOT_DIR/Src/Adaptors.cpp \
+    $$PDF_ROOT_DIR/SrcReader/Adaptors.cpp \
-    $$PDF_ROOT_DIR/Src/GfxClip.cpp \
+    $$PDF_ROOT_DIR/SrcReader/GfxClip.cpp \
     $$PDF_ROOT_DIR/Resources/BaseFonts.cpp \
     $$PDF_ROOT_DIR/Resources/CMapMemory/cmap_memory.cpp \
     $$PDF_ROOT_DIR/PdfReader.cpp
@@ -643,10 +645,10 @@ HEADERS +=\
     $$PDF_ROOT_DIR/Resources/Fonts050000l.h \
     $$PDF_ROOT_DIR/Resources/BaseFonts.h \
     $$PDF_ROOT_DIR/Resources/CMapMemory/cmap_memory.h \
-    $$PDF_ROOT_DIR/Src/RendererOutputDev.h \
+    $$PDF_ROOT_DIR/SrcReader/RendererOutputDev.h \
-    $$PDF_ROOT_DIR/Src/Adaptors.h \
+    $$PDF_ROOT_DIR/SrcReader/Adaptors.h \
-    $$PDF_ROOT_DIR/Src/MemoryUtils.h \
+    $$PDF_ROOT_DIR/SrcReader/MemoryUtils.h \
-    $$PDF_ROOT_DIR/Src/GfxClip.h \
+    $$PDF_ROOT_DIR/SrcReader/GfxClip.h \
     $$PDF_ROOT_DIR/PdfReader.h
 
 HEADERS += $$CORE_ROOT_DIR/HtmlRenderer/include/HTMLRendererText.h

PdfFile/OnlineOfficeBinToPdf.h

@@ -33,7 +33,7 @@
 #define _PDF_WRITER_ONLINEOFFICEBINTOPDF_H
 
 #include <string>
-#include "../PdfFile.h"
+#include "PdfFile.h"
 
 namespace NSOnlineOfficeBinToPdf
 {

PdfFile/PdfFile.cpp

@@ -30,25 +30,25 @@
  *
  */
 #include "PdfFile.h"
-#include "Src/PdfWriter.h"
+#include "PdfWriter.h"
-#include "Src/OnlineOfficeBinToPdf.h"
+#include "OnlineOfficeBinToPdf.h"
-#include "Src/PdfReader.h"
+#include "PdfReader.h"
 
-#include "../PdfReader/Src/Adaptors.h"
+#include "SrcReader/Adaptors.h"
 #include "../DesktopEditor/common/File.h"
 #include "../DesktopEditor/common/Path.h"
 #include "../DesktopEditor/common/StringExt.h"
 
-#include "../PdfReader/lib/xpdf/PDFDoc.h"
+#include "lib/xpdf/PDFDoc.h"
-#include "../PdfReader/lib/xpdf/AcroForm.h"
+#include "lib/xpdf/AcroForm.h"
-#include "../PdfReader/lib/xpdf/TextString.h"
+#include "lib/xpdf/TextString.h"
 
-#include "../PdfWriter/Src/Objects.h"
+#include "SrcWriter/Objects.h"
-#include "../PdfWriter/Src/Document.h"
+#include "SrcWriter/Document.h"
-#include "../PdfWriter/Src/Pages.h"
+#include "SrcWriter/Pages.h"
-#include "../PdfWriter/Src/Catalog.h"
+#include "SrcWriter/Catalog.h"
-#include "../PdfWriter/Src/EncryptDictionary.h"
+#include "SrcWriter/EncryptDictionary.h"
-#include "../PdfWriter/Src/Info.h"
+#include "SrcWriter/Info.h"
 
 #define AddToObject(oVal)\
 {\

PdfFile/PdfFile.pro

@@ -29,61 +29,59 @@ LIBS += -lgdi32 \
 
 core_android:DEFINES += ANDROID
 
-PDFREADER_ROOT_DIR = $$PWD/../PdfReader
-
 INCLUDEPATH += \
-    $$PDFREADER_ROOT_DIR/lib/goo \
+    lib/goo \
-    $$PDFREADER_ROOT_DIR/lib/fofi \
+    lib/fofi \
-    $$PDFREADER_ROOT_DIR/lib/splash \
+    lib/splash \
-    $$PDFREADER_ROOT_DIR/lib
+    lib
 
-HEADERS += $$files($$PDFREADER_ROOT_DIR/lib/*.h, true)
+HEADERS += $$files(lib/*.h, true)
-SOURCES += $$files($$PDFREADER_ROOT_DIR/lib/*.c, true)
+SOURCES += $$files(lib/*.c, true)
-SOURCES += $$files($$PDFREADER_ROOT_DIR/lib/*.cc, true)
+SOURCES += $$files(lib/*.cc, true)
 
 SOURCES -= \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/HTMLGen.cc \
+    lib/xpdf/HTMLGen.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdftohtml.cc \
+    lib/xpdf/pdftohtml.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdftopng.cc \
+    lib/xpdf/pdftopng.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdftoppm.cc \
+    lib/xpdf/pdftoppm.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdftops.cc \
+    lib/xpdf/pdftops.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdftotext.cc \
+    lib/xpdf/pdftotext.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdfdetach.cc \
+    lib/xpdf/pdfdetach.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdffonts.cc \
+    lib/xpdf/pdffonts.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdfimages.cc \
+    lib/xpdf/pdfimages.cc \
-    $$PDFREADER_ROOT_DIR/lib/xpdf/pdfinfo.cc
+    lib/xpdf/pdfinfo.cc
 
 SOURCES += \
-    $$PDFREADER_ROOT_DIR/Src/RendererOutputDev.cpp \
+    SrcReader/RendererOutputDev.cpp \
-    $$PDFREADER_ROOT_DIR/Src/Adaptors.cpp \
+    SrcReader/Adaptors.cpp \
-    $$PDFREADER_ROOT_DIR/Src/GfxClip.cpp
+    SrcReader/GfxClip.cpp
 
 HEADERS += \
-    $$PDFREADER_ROOT_DIR/Src/RendererOutputDev.h \
+    SrcReader/RendererOutputDev.h \
-    $$PDFREADER_ROOT_DIR/Src/Adaptors.h \
+    SrcReader/Adaptors.h \
-    $$PDFREADER_ROOT_DIR/Src/MemoryUtils.h \
+    SrcReader/MemoryUtils.h \
-    $$PDFREADER_ROOT_DIR/Src/GfxClip.h
+    SrcReader/GfxClip.h
 
 # Base fonts
 HEADERS += \
-    $$PDFREADER_ROOT_DIR/Resources/Fontd050000l.h \
+    Resources/Fontd050000l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn019003l.h \
+    Resources/Fontn019003l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn019004l.h \
+    Resources/Fontn019004l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn019023l.h \
+    Resources/Fontn019023l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn019024l.h \
+    Resources/Fontn019024l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn021003l.h \
+    Resources/Fontn021003l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn021004l.h \
+    Resources/Fontn021004l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn021023l.h \
+    Resources/Fontn021023l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn021024l.h \
+    Resources/Fontn021024l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn022003l.h \
+    Resources/Fontn022003l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn022004l.h \
+    Resources/Fontn022004l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn022023l.h \
+    Resources/Fontn022023l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fontn022024l.h \
+    Resources/Fontn022024l.h \
-    $$PDFREADER_ROOT_DIR/Resources/Fonts050000l.h \
+    Resources/Fonts050000l.h \
-    $$PDFREADER_ROOT_DIR/Resources/BaseFonts.h
+    Resources/BaseFonts.h
 
 SOURCES += \
-    $$PDFREADER_ROOT_DIR/Resources/BaseFonts.cpp
+    Resources/BaseFonts.cpp
 
 CONFIG += use_external_jpeg2000
 use_external_jpeg2000 {
@@ -94,8 +92,8 @@ use_external_jpeg2000 {
     } else {
         DEFINES += USE_GRAPHICS_JPEG2000
     }
-    HEADERS += $$PDFREADER_ROOT_DIR/Src/JPXStream2.h
+    HEADERS += SrcReader/JPXStream2.h
-    SOURCES += $$PDFREADER_ROOT_DIR/Src/JPXStream2.cpp
+    SOURCES += SrcReader/JPXStream2.cpp
 }
 
 #CONFIG += build_viewer_module
@@ -133,74 +131,72 @@ core_windows {
 
 include($$PWD/../DesktopEditor/graphics/pro/freetype.pri)
 
-PDFWRITER_ROOT_DIR = $$PWD/../PdfWriter
-
 HEADERS += \
-    $$PDFWRITER_ROOT_DIR/Src/AcroForm.h \
+    SrcWriter/AcroForm.h \
-    $$PDFWRITER_ROOT_DIR/Src/Annotation.h \
+    SrcWriter/Annotation.h \
-    $$PDFWRITER_ROOT_DIR/Src/Catalog.h \
+    SrcWriter/Catalog.h \
-    $$PDFWRITER_ROOT_DIR/Src/Consts.h \
+    SrcWriter/Consts.h \
-    $$PDFWRITER_ROOT_DIR/Src/Destination.h \
+    SrcWriter/Destination.h \
-    $$PDFWRITER_ROOT_DIR/Src/Document.h \
+    SrcWriter/Document.h \
-    $$PDFWRITER_ROOT_DIR/Src/Encodings.h \
+    SrcWriter/Encodings.h \
-    $$PDFWRITER_ROOT_DIR/Src/Encrypt.h \
+    SrcWriter/Encrypt.h \
-    $$PDFWRITER_ROOT_DIR/Src/EncryptDictionary.h \
+    SrcWriter/EncryptDictionary.h \
-    $$PDFWRITER_ROOT_DIR/Src/Field.h \
+    SrcWriter/Field.h \
-    $$PDFWRITER_ROOT_DIR/Src/Font.h \
+    SrcWriter/Font.h \
-    $$PDFWRITER_ROOT_DIR/Src/Font14.h \
+    SrcWriter/Font14.h \
-    $$PDFWRITER_ROOT_DIR/Src/FontCidTT.h \
+    SrcWriter/FontCidTT.h \
-    $$PDFWRITER_ROOT_DIR/Src/FontTT.h \
+    SrcWriter/FontTT.h \
-    $$PDFWRITER_ROOT_DIR/Src/FontTTWriter.h \
+    SrcWriter/FontTTWriter.h \
-    $$PDFWRITER_ROOT_DIR/Src/GState.h \
+    SrcWriter/GState.h \
-    $$PDFWRITER_ROOT_DIR/Src/Image.h \
+    SrcWriter/Image.h \
-    $$PDFWRITER_ROOT_DIR/Src/Info.h \
+    SrcWriter/Info.h \
-    $$PDFWRITER_ROOT_DIR/Src/Objects.h \
+    SrcWriter/Objects.h \
-    $$PDFWRITER_ROOT_DIR/Src/Outline.h \
+    SrcWriter/Outline.h \
-    $$PDFWRITER_ROOT_DIR/Src/Pages.h \
+    SrcWriter/Pages.h \
-    $$PDFWRITER_ROOT_DIR/Src/Pattern.h \
+    SrcWriter/Pattern.h \
-    $$PDFWRITER_ROOT_DIR/Src/ResourcesDictionary.h \
+    SrcWriter/ResourcesDictionary.h \
-    $$PDFWRITER_ROOT_DIR/Src/Shading.h \
+    SrcWriter/Shading.h \
-    $$PDFWRITER_ROOT_DIR/Src/Streams.h \
+    SrcWriter/Streams.h \
-    $$PDFWRITER_ROOT_DIR/Src/Types.h \
+    SrcWriter/Types.h \
-    $$PDFWRITER_ROOT_DIR/Src/Utils.h \
+    SrcWriter/Utils.h \
-    $$PDFWRITER_ROOT_DIR/Src/Metadata.h \
+    SrcWriter/Metadata.h \
-    $$PDFWRITER_ROOT_DIR/Src/ICCProfile.h
+    SrcWriter/ICCProfile.h
 
 SOURCES += \
-    $$PDFWRITER_ROOT_DIR/Src/AcroForm.cpp \
+    SrcWriter/AcroForm.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Annotation.cpp \
+    SrcWriter/Annotation.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Catalog.cpp \
+    SrcWriter/Catalog.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Destination.cpp \
+    SrcWriter/Destination.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Document.cpp \
+    SrcWriter/Document.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Encrypt.cpp \
+    SrcWriter/Encrypt.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/EncryptDictionary.cpp \
+    SrcWriter/EncryptDictionary.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Field.cpp \
+    SrcWriter/Field.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Font.cpp \
+    SrcWriter/Font.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Font14.cpp \
+    SrcWriter/Font14.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/FontCidTT.cpp \
+    SrcWriter/FontCidTT.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/FontTT.cpp \
+    SrcWriter/FontTT.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/FontTTWriter.cpp \
+    SrcWriter/FontTTWriter.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/GState.cpp \
+    SrcWriter/GState.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Image.cpp \
+    SrcWriter/Image.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Info.cpp \
+    SrcWriter/Info.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Objects.cpp \
+    SrcWriter/Objects.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Outline.cpp \
+    SrcWriter/Outline.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Pages.cpp \
+    SrcWriter/Pages.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Pattern.cpp \
+    SrcWriter/Pattern.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/ResourcesDictionary.cpp \
+    SrcWriter/ResourcesDictionary.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Shading.cpp \
+    SrcWriter/Shading.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Streams.cpp \
+    SrcWriter/Streams.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Utils.cpp \
+    SrcWriter/Utils.cpp \
-    $$PDFWRITER_ROOT_DIR/Src/Metadata.cpp
+    SrcWriter/Metadata.cpp
 
 # PdfFile
 
 HEADERS += PdfFile.h \
-           Src/PdfWriter.h \
+           PdfWriter.h \
-           Src/PdfReader.h \
+           PdfReader.h \
-           Src/OnlineOfficeBinToPdf.h
+           OnlineOfficeBinToPdf.h
 
 SOURCES += PdfFile.cpp \
-           Src/PdfWriter.cpp \
+           PdfWriter.cpp \
-           Src/PdfReader.cpp \
+           PdfReader.cpp \
-           Src/OnlineOfficeBinToPdf.cpp
+           OnlineOfficeBinToPdf.cpp

PdfFile/PdfReader.cpp

@@ -34,26 +34,23 @@
 
 #include "PdfReader.h"
 
-#include "../../PdfReader/Src/Adaptors.h"
-#include "../../PdfReader/lib/xpdf/ErrorCodes.h"
-
 #include "../../DesktopEditor/graphics/IRenderer.h"
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/StringExt.h"
-
-#include "../../PdfReader/lib/xpdf/PDFDoc.h"
-#include "../../PdfReader/lib/xpdf/GlobalParams.h"
-#include "../../PdfReader/lib/xpdf/ErrorCodes.h"
-#include "../../PdfReader/lib/xpdf/TextString.h"
-#include "../../PdfReader/lib/xpdf/Lexer.h"
-#include "../../PdfReader/lib/xpdf/Parser.h"
-#include "../../PdfReader/Src/Adaptors.h"
-
 #include "../../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
-#include "../../PdfReader/lib/xpdf/Outline.h"
+
-#include "../../PdfReader/lib/xpdf/Link.h"
+#include "lib/xpdf/PDFDoc.h"
-#include "../../PdfReader/lib/xpdf/TextOutputDev.h"
+#include "lib/xpdf/GlobalParams.h"
-#include "../../PdfReader/lib/goo/GList.h"
+#include "lib/xpdf/ErrorCodes.h"
+#include "lib/xpdf/TextString.h"
+#include "lib/xpdf/Lexer.h"
+#include "lib/xpdf/Parser.h"
+#include "SrcReader/Adaptors.h"
+#include "lib/xpdf/Outline.h"
+#include "lib/xpdf/Link.h"
+#include "lib/xpdf/TextOutputDev.h"
+#include "lib/goo/GList.h"
+
 #include <vector>
 
 CPdfReader::CPdfReader(NSFonts::IApplicationFonts* pAppFonts)

PdfFile/PdfReader.h

@@ -34,7 +34,7 @@
 
 #include "../../DesktopEditor/graphics/pro/Fonts.h"
 #include "../../DesktopEditor/graphics/IRenderer.h"
-#include "../../PdfReader/Src/RendererOutputDev.h"
+#include "SrcReader/RendererOutputDev.h"
 
 class PDFDoc;
 class CPdfReader

PdfFile/PdfWriter.cpp

@@ -34,15 +34,15 @@
 
 #include "PdfWriter.h"
 
-#include "../../PdfWriter/Src/Document.h"
+#include "SrcWriter/Document.h"
-#include "../../PdfWriter/Src/Pages.h"
+#include "SrcWriter/Pages.h"
-#include "../../PdfWriter/Src/Image.h"
+#include "SrcWriter/Image.h"
-#include "../../PdfWriter/Src/Font.h"
+#include "SrcWriter/Font.h"
-#include "../../PdfWriter/Src/FontCidTT.h"
+#include "SrcWriter/FontCidTT.h"
-#include "../../PdfWriter/Src/FontTT.h"
+#include "SrcWriter/FontTT.h"
-#include "../../PdfWriter/Src/Annotation.h"
+#include "SrcWriter/Annotation.h"
-#include "../../PdfWriter/Src/Destination.h"
+#include "SrcWriter/Destination.h"
-#include "../../PdfWriter/Src/Field.h"
+#include "SrcWriter/Field.h"
 
 #include "../../DesktopEditor/graphics/Image.h"
 #include "../../DesktopEditor/graphics/structures.h"