Merge branch 'development' into ui-test

evolus · Dec 30, 2022 · 135fb13 · 135fb13
2 parents acfdc0a + 3624dc7
commit 135fb13
Show file tree

Hide file tree

Showing 26 changed files with 7,467 additions and 649 deletions.
diff --git a/app/app.js b/app/app.js
@@ -13,9 +13,8 @@ const jimp          = require("jimp");
 const pkgInfo       = require("./package.json");
 const QueueHandler  = require("./pencil-core/common/QueueHandler");
 const sharedUtil    = require("./pencil-core/common/shared-util");
-
 const dialog        = remote.dialog;
-
+const freehand      = require("perfect-freehand");
 tmp.setGracefulCleanup();
 
 // webFrame.registerURLSchemeAsPrivileged("file");

diff --git a/build/background.png → app/build/background.png b/build/background.png → app/build/background.png
diff --git a/build/ep.icns → app/build/ep.icns b/build/ep.icns → app/build/ep.icns
diff --git a/build/ep.ico → app/build/ep.ico b/build/ep.ico → app/build/ep.ico
diff --git a/build/icon.icns → app/build/icon.icns b/build/icon.icns → app/build/icon.icns
diff --git a/build/icon.ico → app/build/icon.ico b/build/icon.ico → app/build/icon.ico
diff --git a/build/icon.png → app/build/icon.png b/build/icon.png → app/build/icon.png
diff --git a/build/icons/128x128.png → app/build/icons/128x128.png b/build/icons/128x128.png → app/build/icons/128x128.png
diff --git a/build/icons/16x16.png → app/build/icons/16x16.png b/build/icons/16x16.png → app/build/icons/16x16.png
diff --git a/build/icons/24x24.png → app/build/icons/24x24.png b/build/icons/24x24.png → app/build/icons/24x24.png
diff --git a/build/icons/256x256.png → app/build/icons/256x256.png b/build/icons/256x256.png → app/build/icons/256x256.png
diff --git a/build/icons/32x32.png → app/build/icons/32x32.png b/build/icons/32x32.png → app/build/icons/32x32.png
diff --git a/build/icons/48x48.png → app/build/icons/48x48.png b/build/icons/48x48.png → app/build/icons/48x48.png
diff --git a/build/icons/64x64.png → app/build/icons/64x64.png b/build/icons/64x64.png → app/build/icons/64x64.png
diff --git a/build/icons/96x96.png → app/build/icons/96x96.png b/build/icons/96x96.png → app/build/icons/96x96.png
diff --git a/build/installerHeader.bmp → app/build/installerHeader.bmp b/build/installerHeader.bmp → app/build/installerHeader.bmp
diff --git a/build/installerIcon.ico → app/build/installerIcon.ico b/build/installerIcon.ico → app/build/installerIcon.ico
diff --git a/app/index.js b/app/index.js
@@ -134,10 +134,6 @@ app.on('ready', function() {
             }
         });
 
-    }, function (error, scheme) {
-        if (error) {
-            console.log("ERROR REGISTERING", error);
-        }
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,10 +134,6 @@ app.on('ready', function() { @@
                 }
             });
-        }, function (error, scheme) {
-            if (error) {
-                console.log("ERROR REGISTERING", error);
-            }
         });
@@ Expand Down @@