embed pdfviewer reader

src/core/configmgr.cpp

@@ -25,7 +25,7 @@
 using namespace vnotex;
 
 #ifndef QT_NO_DEBUG
-#define VX_DEBUG_WEB
+// #define VX_DEBUG_WEB
 #endif
 
 const QString ConfigMgr::c_orgName = "VNote";

src/data/core/vnotex.json

@@ -482,7 +482,7 @@
         "pdf_viewer" : {
             "override_viewer_resource" : true,
             "viewer_resource" : {
-                "template" : "web/pdf-viewer-template.html",
+                "template" : "web/pdf.js/web/pdf-viewer-template.html",
                 "resources" : [
                     {
                         "name" : "built_in",
@@ -492,25 +492,28 @@
                             "web/js/eventemitter.js",
                             "web/js/utils.js",
                             "web/js/vxcore.js",
-                            "web/js/pdfviewercore.js"
+                            "web/pdf.js/pdfviewercore.js"
                         ]
                     },
                     {
                         "name" : "pdf.js",
                         "enabled" : true,
                         "scripts" : [
-                            "web/js/pdf.js/pdf.min.js",
-                            "web/js/pdf.js/pdf_viewer.js"
+                            "web/pdf.js/build/pdf.js",
+                            "web/pdf.js/web/viewer.js"
                         ],
                         "styles" : [
-                            "web/js/pdf.js/pdf_viewer.css"
+                            "web/pdf.js/web/viewer.css"
                         ]
                     },
                     {
                         "name" : "pdf_viewer",
                         "enabled" : true,
                         "scripts" : [
-                            "web/js/pdfviewer.js"
+                            "web/pdf.js/pdfviewer.js"
+                        ],
+                        "styles" : [
+                            "web/pdf.js/pdfviewer.css"
                         ]
                     }
                 ]

src/data/extra/extra.qrc

@@ -16,7 +16,6 @@
         <file>docs/zh_CN/features_tips.txt</file>
         <file>web/markdown-viewer-template.html</file>
         <file>web/markdown-export-template.html</file>
-        <file>web/pdf-viewer-template.html</file>
         <file>web/css/user.css</file>
         <file>web/css/globalstyles.css</file>
         <file>web/css/markdownit.css</file>
@@ -31,7 +30,6 @@
         <file>web/js/graphcache.js</file>
         <file>web/js/graphpreviewer.js</file>
         <file>web/js/markdownviewercore.js</file>
-        <file>web/js/pdfviewercore.js</file>
         <file>web/js/vxcore.js</file>
         <file>web/js/vxworker.js</file>
         <file>web/js/graphrenderer.js</file>
@@ -83,13 +81,252 @@
         <file>web/js/markjs.js</file>
         <file>web/js/mind-elixir/MindElixir.min.js</file>
         <file>web/js/mind-elixir/painter.js</file>
-        <file>web/js/pdf.js/pdf.worker.min.js</file>
-        <file>web/js/pdf.js/pdf.min.js</file>
-        <file>web/js/pdf.js/pdf_viewer.js</file>
-        <file>web/js/pdf.js/pdf_viewer.css</file>
-        <file>web/js/pdf.js/images/shadow.png</file>
-        <file>web/js/pdf.js/images/loading-icon.gif</file>
-        <file>web/js/pdfviewer.js</file>
+
+        <file>web/pdf.js/pdfviewer.js</file>
+        <file>web/pdf.js/pdfviewer.css</file>
+        <file>web/pdf.js/pdfviewercore.js</file>
+        <file>web/pdf.js/build/pdf.js</file>
+        <file>web/pdf.js/build/pdf.sandbox.js</file>
+        <file>web/pdf.js/build/pdf.worker.js</file>
+        <file>web/pdf.js/web/viewer.js</file>
+        <file>web/pdf.js/web/viewer.css</file>
+        <file>web/pdf.js/web/pdf-viewer-template.html</file>
+        <file>web/pdf.js/web/locale/locale.properties</file>
+        <file>web/pdf.js/web/locale/br/viewer.properties</file>
+        <file>web/pdf.js/web/locale/ca/viewer.properties</file>
+        <file>web/pdf.js/web/locale/de/viewer.properties</file>
+        <file>web/pdf.js/web/locale/en-CA/viewer.properties</file>
+        <file>web/pdf.js/web/locale/en-GB/viewer.properties</file>
+        <file>web/pdf.js/web/locale/en-US/viewer.properties</file>
+        <file>web/pdf.js/web/locale/eu/viewer.properties</file>
+        <file>web/pdf.js/web/locale/fr/viewer.properties</file>
+        <file>web/pdf.js/web/locale/ja/viewer.properties</file>
+        <file>web/pdf.js/web/locale/ru/viewer.properties</file>
+        <file>web/pdf.js/web/locale/uk/viewer.properties</file>
+        <file>web/pdf.js/web/locale/zh-CN/viewer.properties</file>
+        <file>web/pdf.js/web/locale/zh-TW/viewer.properties</file>
+        <file>web/pdf.js/web/images/annotation-check.svg</file>
+        <file>web/pdf.js/web/images/annotation-comment.svg</file>
+        <file>web/pdf.js/web/images/annotation-help.svg</file>
+        <file>web/pdf.js/web/images/annotation-insert.svg</file>
+        <file>web/pdf.js/web/images/annotation-key.svg</file>
+        <file>web/pdf.js/web/images/annotation-newparagraph.svg</file>
+        <file>web/pdf.js/web/images/annotation-noicon.svg</file>
+        <file>web/pdf.js/web/images/annotation-note.svg</file>
+        <file>web/pdf.js/web/images/annotation-paragraph.svg</file>
+        <file>web/pdf.js/web/images/cursor-editorInk.svg</file>
+        <file>web/pdf.js/web/images/findbarButton-next.svg</file>
+        <file>web/pdf.js/web/images/findbarButton-previous.svg</file>
+        <file>web/pdf.js/web/images/loading-dark.svg</file>
+        <file>web/pdf.js/web/images/loading-icon.gif</file>
+        <file>web/pdf.js/web/images/loading.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-documentProperties.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-firstPage.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-handTool.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-lastPage.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-rotateCcw.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-rotateCw.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-scrollHorizontal.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-scrollPage.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-scrollVertical.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-scrollWrapped.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-selectTool.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-spreadEven.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-spreadNone.svg</file>
+        <file>web/pdf.js/web/images/secondaryToolbarButton-spreadOdd.svg</file>
+        <file>web/pdf.js/web/images/shadow.png</file>
+        <file>web/pdf.js/web/images/toolbarButton-bookmark.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-currentOutlineItem.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-download.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-editorFreeText.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-editorInk.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-menuArrow.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-openFile.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-pageDown.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-pageUp.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-presentationMode.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-print.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-search.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-secondaryToolbarToggle.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-sidebarToggle.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-viewAttachments.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-viewLayers.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-viewOutline.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-viewThumbnail.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-zoomIn.svg</file>
+        <file>web/pdf.js/web/images/toolbarButton-zoomOut.svg</file>
+        <file>web/pdf.js/web/images/treeitem-collapsed.svg</file>
+        <file>web/pdf.js/web/images/treeitem-expanded.svg</file>
+        <file>web/pdf.js/web/cmaps/78-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78ms-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/78ms-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/83pv-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90ms-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90ms-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90msp-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90msp-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90pv-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/90pv-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Add-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Add-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Add-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Add-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-0.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-1.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-3.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-4.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-5.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-6.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-CNS1-UCS2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-0.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-1.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-3.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-4.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-5.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-GB1-UCS2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-0.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-1.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-3.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-4.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-5.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-6.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Japan1-UCS2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Korea1-0.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Korea1-1.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Korea1-2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Adobe-Korea1-UCS2.bcmap</file>
+        <file>web/pdf.js/web/cmaps/B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/B5pc-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/B5pc-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS1-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS1-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS2-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/CNS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETen-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETen-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETenms-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETenms-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETHK-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/ETHK-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Ext-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Ext-RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Ext-RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Ext-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GB-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GB-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GB-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GB-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBK-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBK-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBK2K-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBK2K-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBKp-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBKp-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBpc-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBpc-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBT-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBT-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBT-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBT-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBTpc-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/GBTpc-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Hankaku.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Hiragana.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKdla-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKdla-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKdlb-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKdlb-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKgccs-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKgccs-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKm314-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKm314-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKm471-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKm471-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKscs-B5-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/HKscs-B5-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Katakana.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-Johab-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-Johab-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCms-UHC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCms-UHC-HW-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCms-UHC-HW-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCms-UHC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCpc-EUC-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/KSCpc-EUC-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/LICENSE</file>
+        <file>web/pdf.js/web/cmaps/NWP-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/NWP-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/RKSJ-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/RKSJ-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/Roman.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UCS2-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UCS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF16-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF16-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF8-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniCNS-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UCS2-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UCS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF16-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF16-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF8-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniGB-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UCS2-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UCS2-HW-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UCS2-HW-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UCS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF16-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF16-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF8-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF16-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF16-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF8-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJIS2004-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISPro-UCS2-HW-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISPro-UCS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISPro-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISX0213-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISX0213-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISX02132004-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniJISX02132004-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UCS2-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UCS2-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF16-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF16-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF32-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF32-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF8-H.bcmap</file>
+        <file>web/pdf.js/web/cmaps/UniKS-UTF8-V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/V.bcmap</file>
+        <file>web/pdf.js/web/cmaps/WP-Symbol.bcmap</file>
+
         <file>dicts/en_US.aff</file>
         <file>dicts/en_US.dic</file>
         <file>themes/native/text-editor.theme</file>

src/data/extra/web/js/pdfviewercore.js

@@ -1,55 +0,0 @@
-class PdfViewerCore extends VXCore {
-    constructor() {
-        super();
-
-        const scriptFolderPath = Utils.parentFolder(document.currentScript.src);
-        this.workerSrc = scriptFolderPath + '/pdf.js/pdf.worker.min.js';
-    }
-
-    initOnLoad() {
-        this.container = document.getElementById('vx-viewer-container');
-    }
-
-    loadPdf(p_url) {
-        const eventBus = new pdfjsViewer.EventBus();
-
-        // (Optionally) enable hyperlinks within PDF files.
-        const pdfLinkService = new pdfjsViewer.PDFLinkService({
-            eventBus,
-        });
-
-        // (Optionally) enable find controller.
-        const pdfFindController = new pdfjsViewer.PDFFindController({
-            eventBus,
-            linkService: pdfLinkService,
-        });
-
-        const pdfViewer = new pdfjsViewer.PDFViewer({
-            container: this.container,
-            eventBus,
-            linkService: pdfLinkService,
-            findController: pdfFindController,
-        });
-        pdfLinkService.setViewer(pdfViewer);
-
-        eventBus.on("pagesinit", function () {
-            // We can use pdfViewer now, e.g. let's change default scale.
-            pdfViewer.currentScaleValue = "page-width";
-        });
-
-        // Loading document.
-        const loadingTask = pdfjsLib.getDocument({
-            url: p_url,
-            enableXfa: true,
-        });
-        (async function () {
-            const pdfDocument = await loadingTask.promise;
-            // Document loaded, specifying document for the viewer and
-            // the (optional) linkService.
-            pdfViewer.setDocument(pdfDocument);
-            pdfLinkService.setDocument(pdfDocument, null);
-        })();
-    }
-}
-
-window.vxcore = new PdfViewerCore();

src/data/extra/web/pdf-viewer-template.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>VNoteX PDF Viewer</title>
-
-    <!-- VX_STYLES_PLACEHOLDER -->
-
-    <style>
-        body {
-            margin: 0;
-            padding: 0;
-        }
-        #vx-viewer-container {
-          overflow: auto;
-          position: absolute;
-          width: 100%;
-          height: 100%;
-        }
-    </style>
-
-    <script type="text/javascript">
-        /* VX_GLOBAL_OPTIONS_PLACEHOLDER */
-    </script>
-
-    <!-- VX_SCRIPTS_PLACEHOLDER -->
-</head>
-<body>
-    <div id="vx-viewer-container">
-        <div id="vx-viewer" class="pdfViewer"></div>
-    </div>
-</body>
-</html>

src/data/extra/web/pdf.js/pdfviewer.css

@@ -0,0 +1,7 @@
+button#openFile, button#print, button#download, button#download + div.verticalToolbarSeparator {
+    display: none;
+}
+
+button#secondaryOpenFile, button#secondaryPrint, button#secondaryDownload, button#secondaryDownload + div.horizontalToolbarSeparator {
+    display: none;
+}

src/data/extra/web/pdf.js/pdfviewercore.js

@@ -0,0 +1,16 @@
+class PdfViewerCore extends VXCore {
+    constructor() {
+        super();
+
+        const scriptFolderPath = Utils.parentFolder(document.currentScript.src);
+        this.workerSrc = scriptFolderPath + '/build/pdf.worker.js';
+    }
+
+    initOnLoad() {
+    }
+
+    loadPdf(p_url) {
+    }
+}
+
+window.vxcore = new PdfViewerCore();

src/data/extra/web/pdf.js/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

src/data/extra/web/pdf.js/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

src/data/extra/web/pdf.js/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!<21>º]aX!!]`<60>21<32>>	<09>p<0B>z<EFBFBD>$]‚<06>"R‚d<E2809A>-Uƒ7<C692>*„
4„%<25>+ „Z „{<7B>/…%…<<3C>9K…b<E280A6>1]†.<2E>"‡‰`]‡,<2C>"]ˆ
+<EFBFBD>"]ˆh<CB86>"]‰F<E280B0>"]Š$<24>"]‹<02>"]‹`<60>"]Œ><3E>"]<5D><1C>"]<5D>z<EFBFBD>"]ŽX<C5BD>"]<5D>6<EFBFBD>"]<5D><14>"]<5D>r<EFBFBD>"]‘P<E28098>"]’.<2E>"]“<0C>"]“j<E2809C>"]”H<E2809D>"]•&<26>"]–<04>"]–b<E28093>"]—@<40>"]˜<1E>"]˜|<7C>"]™Z<E284A2>"]š8<C5A1>"]›<16>"]›t<E280BA>"]œR<C593>"]<5D>0<EFBFBD>"]ž<0E>"]žl<C5BE>"]ŸJ<C5B8>"] (<28>"]¡<06>"]¡d<C2A1>"]¢B<C2A2>"]£ <20>"X£~<7E>']¤W<C2A4>"]¥5<C2A5>"]¦<13>"]¦q<C2A6>"]§O<C2A7>"]¨-<2D>"]©<0B>"]©i<C2A9>"]ªG<C2AA>"]«%<25>"]¬<03>"]¬a<C2AC>"]­?<3F>"]®<1D>"]®{<7B>"]¯Y<C2AF>"]°7<C2B0>"]±<15>"]±s<C2B1>"]²Q<C2B2>"]³/<2F>"]´
<0A>"]´k<C2B4>"]µI<C2B5>"]¶'<27>"]·<05>"]·c<C2B7>"]¸A<C2B8>"]¹<1F>"]¹}<7D>"]º[<5B>"]»9