Merge pull request #68 from evolus/development

RC 1
evolus · Jul 24, 2016 · 536280b · 536280b
2 parents c7e14b5 + 3446494
commit 536280b
Show file tree

Hide file tree

Showing 469 changed files with 16,183 additions and 9,167 deletions.
diff --git a/app/app.xhtml b/app/app.xhtml
@@ -62,6 +62,7 @@
         <script type="text/javascript" src="pencil-core/document/xmlDocumentPersister.js"></script>
         <script type="text/javascript" src="pencil-core/document/persistentHooks.js"></script>
 
+        <script type="text/javascript" src="pencil-core/behavior/SVGTextLayout.js"></script>
         <script type="text/javascript" src="pencil-core/behavior/commonBehaviors.js"></script>
         <script type="text/javascript" src="pencil-core/behavior/commonFunctions.js"></script>
 

diff --git a/app/css/common.less b/app/css/common.less
@@ -18,6 +18,9 @@ body {
     right: 0px;
     top: 46%;
     text-align: center;
+    opacity: 0;
+    animation: pulsate 1s ease-out;
+    animation-iteration-count: infinite;
 }
 
 body[loaded] #appView {
@@ -28,10 +31,23 @@ body[loaded] #bootingIndicator {
 }
 
 @keyframes loading {
-    from {left: -200px; width: 30%;}
+    from {left: -100px; width: 30%;}
     50% {width: 30%;}
     70% {width: 70%;}
     80% { left: 50%;}
     95% {left: 120%;}
     to {left: 100%;}
 }
+@keyframes pulsate {
+    0% {
+      transform: scale(.7);
+      opacity: 0.0;
+    }
+    50% {
+      opacity: 1;
+    }
+    100% {
+      transform: scale(1.1);
+      opacity: 0;
+    }
+}
diff --git a/app/css/pencil.css b/app/css/pencil.css
@@ -4,6 +4,7 @@
 @import "bootstrap-fix.less";
 @import "../lib/font-awesome-4.4.0/less/font-awesome.less";
 */
+@import "../lib/mdi/css/materialdesignicons.min.css";
 .hbox {
   flex-direction: row;
   display: flex;
@@ -150,7 +151,6 @@ body {
   right: 0px;
   top: 46%;
   text-align: center;
-
   opacity: 0;
   animation: pulsate 1s ease-out;
   animation-iteration-count: infinite;
@@ -161,6 +161,40 @@ body[loaded] #appView {
 body[loaded] #bootingIndicator {
   display: none;
 }
+@keyframes loading {
+  from {
+    left: -100px;
+    width: 30%;
+  }
+  50% {
+    width: 30%;
+  }
+  70% {
+    width: 70%;
+  }
+  80% {
+    left: 50%;
+  }
+  95% {
+    left: 120%;
+  }
+  to {
+    left: 100%;
+  }
+}
+@keyframes pulsate {
+  0% {
+    transform: scale(0.7);
+    opacity: 0.0;
+  }
+  50% {
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1.1);
+    opacity: 0;
+  }
+}
 html {
   user-select: none;
   -o-user-select: none;
@@ -186,24 +220,3 @@ icon {
   -webkit-font-smoothing: antialiased;
   opacity: 0.54;
 }
-@keyframes loading {
-    from {left: -100px; width: 30%;}
-    50% {width: 30%;}
-    70% {width: 70%;}
-    80% { left: 50%;}
-    95% {left: 120%;}
-    to {left: 100%;}
-}
-@keyframes pulsate {
-    0% {
-      transform: scale(.7);
-      opacity: 0.0;
-    }
-    50% {
-      opacity: 1;
-    }
-    100% {
-      transform: scale(1.1);
-      opacity: 0;
-    }
-}
diff --git a/app/css/pencil.less b/app/css/pencil.less
@@ -4,6 +4,7 @@
 @import "bootstrap-fix.less";
 @import "../lib/font-awesome-4.4.0/less/font-awesome.less";
 */
+@import "../lib/mdi/css/materialdesignicons.min.css";
 
 @import "variables.less";
 @import "layout.less";

diff --git a/app/css/theme.css b/app/css/theme.css
@@ -156,6 +156,9 @@ input[type="number"] {
     border: 1px solid #CCC;
     border-radius: 4px;
 }
+input[type=number]::-webkit-inner-spin-button {
+    height: 2.4em;
+}
 textarea {
     font: inherit;
     font-size: 1em;

diff --git a/app/desktop.js b/app/desktop.js
@@ -10,6 +10,12 @@ module.exports = function () {
                                 "gnome": [{command: "gsettings", params: ["get", "org.gnome.desktop.interface", "font-name"]}],
                                 "ubuntu": [{command: "gsettings", params: ["get", "org.gnome.desktop.interface", "font-name"]}]
                             }
+
+    var defaultFamily = "Sans";
+    var defaultWeight = 400;
+    var defaultStyle = "normal";
+    var defaultSize = "10pt";
+
     var fontNameReader = function(registry, callback, index) {
         var child = spawn(registry.command, registry.params);
         var tmp = "";
@@ -24,10 +30,10 @@ module.exports = function () {
         if (fontName) {
             fontName = fontName.trim();
         }
-        var family = "sans-serif";
-        var weight = 400;
-        var style = "normal";
-        var size = "1em";
+        var family = defaultFamily;
+        var weight = defaultWeight;
+        var style = defaultStyle;
+        var size = defaultSize;
 
         if (fontName.match(/^'(.+)'$/)) fontName = RegExp.$1;
 
@@ -70,21 +76,21 @@ module.exports = function () {
             if (!fontRegistry) {
                 console.error("Coud not found font command registry for ", d);
                 callback({
-                    family: "sans-serif",
-                    weight: 400,
-                    style: "normal",
-                    size: "1em"
+                    family: defaultFamily,
+                    weight: defaultWeight,
+                    style: defaultStyle,
+                    size: defaultSize
                 });
             } else {
                 var fontNames = [];
                 var processFontName = function(finish) {
 
                     if (finish && fontNames.length == 0) {
                         callback({
-                            family: family,
-                            weight: weight,
-                            style: style,
-                            size: size
+                            family: defaultFamily,
+                            weight: defaultWeight,
+                            style: defaultStyle,
+                            size: defaultSize
                         });
                         return;
                     }
@@ -168,10 +174,10 @@ module.exports = function () {
         var handler = platformHandlers[platform];
         if (!handler) {
             callback({
-                family: "sans-serif",
-                weight: "400",
-                style: "normal",
-                size: "12pt"
+                family: defaultFamily,
+                weight: defaultWeight,
+                style: defaultStyle,
+                size: defaultSize
             });
             return;
         }

diff --git a/app/index.js b/app/index.js
@@ -72,6 +72,11 @@ function createWindow() {
         app.exit(0);
     });
 
+    if (process.platform == 'darwin') {
+        var {MacOSToolbar} = require('./views/toolbars/MacOSToolbar');
+        MacOSToolbar.createMacOSToolbar();
+    }
+
     mainWindow.webContents.on("will-navigate", handleRedirect);
     mainWindow.webContents.on("new-window", handleRedirect);
 

diff --git a/app/lib/mdi/css/materialdesignicons.min.css b/app/lib/mdi/css/materialdesignicons.min.css
diff --git a/app/lib/mdi/fonts/materialdesignicons-webfont.woff2 b/app/lib/mdi/fonts/materialdesignicons-webfont.woff2
diff --git a/app/lib/widget/Common.js b/app/lib/widget/Common.js
@@ -26,6 +26,10 @@ function __isSubClassOf(sub, base) {
     if (!sub.__base) return false;
     return sub.__base === base || __isSubClassOf(sub.__base, base);
 }
+function __isAssignableFrom(sub, base) {
+    return sub === base || __isSubClassOf(sub, base);
+}
+
 
 var less = require("less");
 
@@ -645,6 +649,7 @@ function BaseWidget(definitionNode) {
     Dom.addClass(node, "widget_" + this.constructor.name);
     this.__node = node;
     node.__widget = this;
+    node["__is_" + this.constructor.name] = true;
 
     var thiz = this;
     node.addEventListener("DOMNodeInsertedIntoDocument", function () {
@@ -759,6 +764,10 @@ BaseWidget.handleClosableEscapeKey = function (event) {
         Dom.cancelEvent(event);
     }
 };
+BaseWidget.getTopClosable = function (event) {
+    if (BaseWidget.closables.length == 0) return null;
+    return BaseWidget.closables[BaseWidget.closables.length - 1];
+};
 BaseWidget.handleGlobalMouseDown = function (event) {
     if (BaseWidget.closables.length == 0) return;
     var closable = BaseWidget.closables[BaseWidget.closables.length - 1];

diff --git a/app/package.json b/app/package.json
@@ -2,7 +2,7 @@
   "name": "Pencil",
   "productName": "Pencil",
   "description": "An open-source GUI prototyping tool that is available for ALL platforms.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-rc.1",
   "author": {
     "name": "Evolus",
     "url": "http://evolus.vn",