Please enter the page properties:
@@ -42,8 +45,8 @@
-
-
+
+
diff --git a/app/views/collections/AboutCollectionDialog.js b/app/views/collections/AboutCollectionDialog.js
index f8ddd93e..9a248f2a 100644
--- a/app/views/collections/AboutCollectionDialog.js
+++ b/app/views/collections/AboutCollectionDialog.js
@@ -3,6 +3,9 @@ function AboutCollectionDialog(collection) {
this.title = function () {
return collection.displayName;
};
+ this.subTitle = function () {
+ return collection.description || "Information about this shape collection";
+ };
//this.title = collection.displayName;
var node = Dom.newDOMElement({
@@ -33,7 +36,8 @@ function AboutCollectionDialog(collection) {
_children :[
{
_name: "h4",
- _text: "More Information: "
+ _text: "More Information:",
+ "class": "MoreInfor"
},
{
_name: "a",
diff --git a/app/views/collections/AboutCollectionDialog.xhtml b/app/views/collections/AboutCollectionDialog.xhtml
index d8d1e66e..511b224d 100644
--- a/app/views/collections/AboutCollectionDialog.xhtml
+++ b/app/views/collections/AboutCollectionDialog.xhtml
@@ -22,6 +22,9 @@
padding: 0em;
margin-top: 0.2em;
}
+ @aboutContent h4.MoreInfor {
+ margin-right: 5px;
+ }
diff --git a/app/views/collections/CollectionBrowserDialog.js b/app/views/collections/CollectionBrowserDialog.js
index 56197c4d..622c59ea 100644
--- a/app/views/collections/CollectionBrowserDialog.js
+++ b/app/views/collections/CollectionBrowserDialog.js
@@ -3,7 +3,8 @@ function CollectionBrowserDialog (collectionPanel, managerDialog) {
this.collectionPanel = collectionPanel;
this.managerDialog = managerDialog;
- this.title = "Browse Collections";
+ this.title = "Collection Repository";
+ this.subTitle = "Browse the user-contributed collection repository."
this.collectionRepeater.populator = function (collection, binding) {
binding.collectionTitle.innerHTML = Dom.htmlEncode(collection.displayName);
@@ -69,6 +70,8 @@ CollectionBrowserDialog.prototype.handleItemClick = function (control) {
view.setAttribute("installed", "true");
thiz.managerDialog.loadCollectionList();
+ thiz.collectionPanel.reload(newCollection.id);
+
}
});
} else if (control._role == "button-uninstall") {
diff --git a/app/views/collections/CollectionBrowserDialog.xhtml b/app/views/collections/CollectionBrowserDialog.xhtml
index 1fccf351..60dde43d 100644
--- a/app/views/collections/CollectionBrowserDialog.xhtml
+++ b/app/views/collections/CollectionBrowserDialog.xhtml
@@ -15,8 +15,8 @@
flex-wrap: wrap;
overflow: auto;
width: 56em;
- min-height: 50em;
- max-height: 50em;
+ min-height: 40em;
+ max-height: 40em;
padding: 0em 1em 1em 0em;
}
@collectionContainer[loaded] @bootingIndicator {
diff --git a/app/views/collections/CollectionManagementDialog.js b/app/views/collections/CollectionManagementDialog.js
index 88eacc61..2e136cee 100644
--- a/app/views/collections/CollectionManagementDialog.js
+++ b/app/views/collections/CollectionManagementDialog.js
@@ -3,6 +3,7 @@ function CollectionManagementDialog (collectionPanel) {
this.collectionPanel = collectionPanel;
this.title = "Manage Collections";
+ this.subTitle = "Browse the list of collections installed in this system.";
this.loadCollectionList();
@@ -17,6 +18,77 @@ function CollectionManagementDialog (collectionPanel) {
node.setAttribute("selected", "true");
};
}, false);
+
+ this.collectionContainer.addEventListener("mouseover",function (event) {
+ var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
+ if (node) {
+ if (this.activeNode) {
+ this.activeNode.removeAttribute("active");
+ this.activeNode = null;
+ }
+ this.activeNode = node;
+ node.setAttribute("active","true");
+ }
+ }, false);
+
+ var thiz = this;
+ this.collectionContainer.addEventListener("dblclick",function (event) {
+ var top = Dom.findUpwardForNodeWithData(event.target, "_collection");
+ var visible = CollectionManager.isCollectionVisible (top._collection);
+ if (!visible) {
+ CollectionManager.setCollectionVisible (top._collection, true) ;
+ }
+ thiz.collectionPanel.reload(top._collection.id);
+ thiz.close();
+ }, false);
+
+ this.bind("dragstart", function (ev) {
+ var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
+ if (!node) return;
+ ev.dataTransfer.setData("collectionId", node._collection.id);
+ ev.dataTransfer.setData("dragType", "collection");
+ if (this.currentDraggedObject) this.currentDraggedObject.removeAttribute("dragged");
+ this.currentDraggedObject = node;
+ this.currentDraggedObject.setAttribute("dragged", "true");
+ }, this.collectionContainer);
+
+ this.bind("dragover", function (ev) {
+ if (event.dataTransfer.getData("dragType") != "collection") return;
+ if (this.hoverNode) {
+ this.hoverNode.removeAttribute("hover");
+ this.hoverNode = null;
+ }
+ var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
+ if (node) {
+ node.setAttribute("hover", "true");
+ this.hoverNode = node;
+ }
+
+ }, this.collectionContainer);
+
+ this.bind("drop", function (ev) {
+ if (event.dataTransfer.getData("dragType") != "collection") return;
+ if (this.hoverNode) {
+ this.hoverNode.removeAttribute("hover");
+ this.hoverNode = null;
+ }
+ var node = Dom.findUpwardForNodeWithData(event.target, "_collection");
+ if (!node) return;
+ var draggedCollectionId = ev.dataTransfer.getData("collectionId");
+ var targetCollectionId = node._collection.id;
+ if (node._collection.id != draggedCollectionId) {
+ CollectionManager.reorderCollections(draggedCollectionId, targetCollectionId);
+ thiz.loadCollectionList();
+ thiz.collectionPanel.reload();
+ }
+ node.removeAttribute("hover");
+ }, this.collectionContainer);
+
+ this.bind("dragend", function (event) {
+ if (this.currentDraggedObject) this.currentDraggedObject.removeAttribute("dragged");
+ this.currentDraggedObject = null;
+ }, this.collectionContainer);
+
}
__extend(Dialog, CollectionManagementDialog);
@@ -138,6 +210,8 @@ CollectionManagementDialog.prototype.createCollectionView = function (collection
view._id = collection.displayName;
view._collection = collection;
view.setAttribute("selected", "false");
+ view.setAttribute("draggable", "true");
+
return view;
}
@@ -148,6 +222,7 @@ CollectionManagementDialog.prototype.loadCollectionList = function () {
this.collectionContainer.appendChild(this.createCollectionView(collections[i]));
}
}
+
CollectionManagementDialog.prototype.getDialogActions = function () {
var thiz = this;
return [
@@ -157,6 +232,7 @@ CollectionManagementDialog.prototype.getDialogActions = function () {
run: function () {
CollectionManager.installNewCollection(function (err, collection) {
if (!err && collection) {
+ thiz.collectionPanel.reload(collection.id);
NotificationPopup.show("Collection was installed successfully.");
thiz.loadCollectionList();
}
diff --git a/app/views/collections/CollectionManagementDialog.xhtml b/app/views/collections/CollectionManagementDialog.xhtml
index dfa119ad..9a5537c9 100644
--- a/app/views/collections/CollectionManagementDialog.xhtml
+++ b/app/views/collections/CollectionManagementDialog.xhtml
@@ -1,5 +1,20 @@
- Dialog Title
+
+ Dialog Title
+
+
close
diff --git a/app/views/common/PageListView.js b/app/views/common/PageListView.js
index 7fa88a71..2b359d8b 100644
--- a/app/views/common/PageListView.js
+++ b/app/views/common/PageListView.js
@@ -327,10 +327,7 @@ PageListView.prototype.renderPages = function() {
var pageThumbnailView = new PageThumbnailView();
pageThumbnailView.node()._index = i;
- var childrenListMenu = new ChildPageListMenu(page, function (selectedPage) {
- thiz.activatePage(selectedPage);
- });
- pageThumbnailView.setPage(page, childrenListMenu);
+ pageThumbnailView.setPage(page);
this.pageListContainer.appendChild(pageThumbnailView.node());
pageThumbnailView.setAttribute("draggable", "true");
diff --git a/app/views/common/PageThumbnailView.js b/app/views/common/PageThumbnailView.js
index 2593cdb5..b346c522 100644
--- a/app/views/common/PageThumbnailView.js
+++ b/app/views/common/PageThumbnailView.js
@@ -23,8 +23,16 @@ function PageThumbnailView() {
this.pageThumbnail.style.visibility = "hidden";
this.bind("click",function (event) {
- if (!this.childMenu) return;
+ if (this.childMenu && this.childMenu._visible) {
+ this.childMenu.hide();
+ this.childMenu._visible = false;
+ return;
+ }
+ if (!this.childMenu) {
+ this.childMenu = new ChildPageListMenu(this.page);
+ }
this.childMenu.showMenu(this.pageActionButton,"left-inside", "top", 0, 0, true);
+ this.childMenu._visible = true;
event.stopPropagation();
}, this.pageActionButton);
}
@@ -33,7 +41,7 @@ __extend(BaseTemplatedWidget, PageThumbnailView);
PageThumbnailView.prototype.setPage = function (page, childMenu) {
if (!page) return;
this.page = page;
- this.childMenu = childMenu;
+ // this.childMenu = childMenu;
this._updateUI();
};
PageThumbnailView.prototype._updateUI = function () {
@@ -41,7 +49,7 @@ PageThumbnailView.prototype._updateUI = function () {
if (!this.page.children || this.page.children.length == 0) this.pageActionButton.style.visibility = "hidden";
if (this.page.thumbPath) this.pageThumbnail.src = this.page.thumbPath + "?time=" + (new Date().getTime());
this.pageTitle.innerHTML = this.page.name;
- this.node().setAttribute("title", this.page.id);
+ this.node().setAttribute("title", this.page.name);
};
PageThumbnailView.prototype.selectPage = function (active) {
diff --git a/app/views/common/PageThumbnailView.xhtml b/app/views/common/PageThumbnailView.xhtml
index 372e363f..91504389 100644
--- a/app/views/common/PageThumbnailView.xhtml
+++ b/app/views/common/PageThumbnailView.xhtml
@@ -41,13 +41,13 @@
align-items: center;
}
@footer > * {
- font-size: 0.85em;
+ font-size: 1em;
}
@pageTitle {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
- font-size: 0.8em;
+ font-size: 0.9em;
}
@pageTitle[selected="true"] {
color: #336699;
@@ -60,7 +60,7 @@
border-radius: 50%;
height: auto;
line-height: 1em;
- margin-right: -0.4em;
+ margin-right: -0.5em;
}
@footer button i {
line-height: 1em;
diff --git a/app/views/common/Popup.js b/app/views/common/Popup.js
index 2ac3e23b..5a66e4af 100644
--- a/app/views/common/Popup.js
+++ b/app/views/common/Popup.js
@@ -217,7 +217,8 @@ Popup.prototype._showImpl = function (anchor, hAlign, vAlign, hPadding, vPadding
x += w/2;
x = Math.max(rect.left + rect.width, x);
if (x == 0 && w > screenW) {
- this.popupContainer.style.width = screenW + "px";
+ x = rect.left + rect.width;
+ this.popupContainer.style.width = ((screenW -x) * 0.9) + "px";
this.popupContainer.style.overflow = "auto";
}
}
@@ -238,7 +239,8 @@ Popup.prototype._showImpl = function (anchor, hAlign, vAlign, hPadding, vPadding
y = Math.min(rect.top + rect.height, y);
y = Math.max(0, y);
if (y == 0 && h > screenH) {
- this.popupContainer.style.height = screenH + "px";
+ y = rect.top + rect.height;
+ this.popupContainer.style.height = ((screenH - y) * 0.9) + "px";
this.popupContainer.style.overflow = "auto";
}
}
@@ -293,3 +295,6 @@ Popup.prototype.detach = function () {
this.popupContainer.parentNode.removeChild(this.popupContainer);
}
};
+Popup.hasShowPopup = function () {
+ return BaseWidget.closables.length;
+};
diff --git a/app/views/common/ProgressiveJobDialog.js b/app/views/common/ProgressiveJobDialog.js
index 71589912..e0d8c84c 100644
--- a/app/views/common/ProgressiveJobDialog.js
+++ b/app/views/common/ProgressiveJobDialog.js
@@ -8,6 +8,7 @@ ProgressiveJobDialog.prototype.setup = function (options) {
this.options = options || {};
this.starter = this.options.starter;
this.title = this.options.title || "Progress";
+ this.subTitle = this.options.subTitle || "Please wait while Pencil is excuting job";
var thiz = this;
var listener = {
diff --git a/app/views/common/PromptDialog.js b/app/views/common/PromptDialog.js
index 76fa8125..2200a4ab 100644
--- a/app/views/common/PromptDialog.js
+++ b/app/views/common/PromptDialog.js
@@ -10,10 +10,22 @@ PromptDialog.prototype.setup = function (options) {
}
if (options.title) this.title = options.title;
if (options.message) this.message.innerHTML = options.message;
- if (options.value) this.valueInput.value = options.value;
+ if (options.value != undefined) {
+ this.valueInput.value = options.value;
+ }
+
+ if (typeof(options.value) == "number" || typeof(options.defaultValue) == "number") {
+ this.valueInput.setAttribute("type", "number");
+ this.valueInput.style.width = "6em";
+ }
+
this.callback = options.callback;
-};
+ window.setTimeout(function () {
+ this.valueInput.focus();
+ this.valueInput.select();
+ }.bind(this), 200);
+};
PromptDialog.prototype.getDialogActions = function () {
var thiz = this;
return [
diff --git a/app/views/common/PromptDialog.xhtml b/app/views/common/PromptDialog.xhtml
index a88e0a57..e4d45ebe 100644
--- a/app/views/common/PromptDialog.xhtml
+++ b/app/views/common/PromptDialog.xhtml
@@ -3,6 +3,6 @@
Please enter the value
-
+
diff --git a/app/views/common/ToolBar.js b/app/views/common/ToolBar.js
index e5b28d0b..6c404414 100644
--- a/app/views/common/ToolBar.js
+++ b/app/views/common/ToolBar.js
@@ -8,7 +8,12 @@ ToolBar.prototype.setup = function() {
if (this.registerCommands) this.registerCommands();
Dom.doOnAllChildRecursively(this.commandContainer, function (n) {
if (!n.getAttribute || !n.getAttribute("command")) return;
- var command = n.getAttribute("command");
- UICommandManager.installControl(command, n);
+ var commandKey = n.getAttribute("command");
+ UICommandManager.installControl(commandKey, n);
+ var command = UICommandManager.getCommand(commandKey);
+ if (command) {
+ var title = command.label + " " + (command.shortcutLabel || command.shortcut);
+ n.setAttribute("title", title);
+ }
});
};
diff --git a/app/views/common/UICommandManager.js b/app/views/common/UICommandManager.js
index 863fff4f..bdfff62c 100644
--- a/app/views/common/UICommandManager.js
+++ b/app/views/common/UICommandManager.js
@@ -5,12 +5,12 @@ UICommandManager.commands = [];
UICommandManager.map = {};
UICommandManager.keyMap = {};
-UICommandManager.mapKey = function (name, keyCode, pcName, macName) {
+UICommandManager.mapKey = function (name, keyCode, pcName, macName, macKeyCode) {
var key = {
name: name,
- keyCode: keyCode,
+ keyCode: IS_MAC ? (macKeyCode || keyCode) : keyCode,
pcName: pcName,
- macName: macName || pcName
+ macName: macName || pcName,
};
UICommandManager.keyMap[name] = key;
@@ -38,7 +38,7 @@ UICommandManager.mapKey("RIGHT", 39, "Right Arrow");
UICommandManager.mapKey("DOWN", 40, "Down Arrow");
UICommandManager.mapKey("PRINTSCREEN", 44, "Print Screen");
UICommandManager.mapKey("INSERT", 45, "Insert");
-UICommandManager.mapKey("DELETE", 46, "Delete");
+UICommandManager.mapKey("DELETE", 46, "Delete", "Delete", 8);
UICommandManager.mapKey("0", 48, "0");
UICommandManager.mapKey("1", 49, "1");
UICommandManager.mapKey("2", 50, "2");
@@ -178,6 +178,7 @@ UICommandManager.installControl = function (commandKey, control) {
}, false);
};
UICommandManager.invalidateCommand = function (command) {
+ console.log("invalidateCommand:", command);
if (!command.controls) return;
var valid = command.isValid ? command.isValid() : !command.disabled;
for (var i = 0; i < command.controls.length; i ++) {
@@ -193,7 +194,7 @@ UICommandManager.invalidateCommands = function () {
}
};
UICommandManager.parseShortcut = function (command) {
- const RE = /^(Ctrl\+)?(Alt\+)?(Shift\+)?([a-z0-9_]+)$/i;
+ const RE = /^(Ctrl\+)?(Alt\+)?(Shift\+)?(Cmd\+)?([a-z0-9_]+)$/i;
command.parsedShortcut = null;
if (!command.shortcut || !command.shortcut.match(RE)) return;
@@ -201,18 +202,20 @@ UICommandManager.parseShortcut = function (command) {
var shortcut = {
ctrl: RegExp.$1 ? true : false,
alt: RegExp.$2 ? true : false,
- shift: RegExp.$3 ? true : false
+ shift: RegExp.$3 ? true : false,
+ command: RegExp.$4 ? true : false
};
- var keyName = RegExp.$4.toUpperCase();
+ var keyName = RegExp.$5.toUpperCase();
var key = UICommandManager.keyMap[keyName];
if (!key) return;
shortcut.key = key;
shortcut.displayName = "";
- if (shortcut.ctrl) shortcut.displayName += (IS_MAC ? "⌘" : "Ctrl+");
+ if (shortcut.ctrl) shortcut.displayName += (IS_MAC ? (shortcut.command ? "^" : "⌘") : "Ctrl+");
if (shortcut.alt) shortcut.displayName += (IS_MAC ? "⌥" : "Alt+");
if (shortcut.shift) shortcut.displayName += (IS_MAC ? "⇪" : "Shift+");
+ if (shortcut.command) shortcut.displayName += "⌘";
shortcut.displayName += IS_MAC ? key.macName : key.pcName;
@@ -227,13 +230,11 @@ UICommandManager.isValidFunction = function (event) {
return UICommandManager.isApplicable(this, UICommandManager.currentFocusedElement) && (!this._isValid || this._isValid());
};
UICommandManager.handleKeyEvent = function (event) {
- var eventCtrlKey = IS_MAC ? event.metaKey : event.ctrlKey;
-
- if (eventCtrlKey && event.altKey && event.shiftKey && event.keyCode == 80) {
+ if ((IS_MAC ? event.metaKey : event.ctrlKey) && event.altKey && event.shiftKey && event.keyCode == 80) {
Pencil.app.mainWindow.openDevTools();
}
- if (Dialog.hasOpenDialog()) return;
+ if (Dialog.hasOpenDialog() || Popup.hasShowPopup()) return;
for (var i = 0; i < UICommandManager.commands.length; i ++) {
var command = UICommandManager.commands[i];
@@ -243,10 +244,14 @@ UICommandManager.handleKeyEvent = function (event) {
continue;
}
- if (eventCtrlKey == command.parsedShortcut.ctrl
+ var eventCmdKey = command.parsedShortcut.command ? event.metaKey : false;
+ var eventCtrlKey = !command.parsedShortcut.command && IS_MAC ? event.metaKey : event.ctrlKey;
+ if (eventCmdKey == command.parsedShortcut.command
+ && eventCtrlKey == command.parsedShortcut.ctrl
&& event.altKey == command.parsedShortcut.alt
&& event.shiftKey == command.parsedShortcut.shift
&& event.keyCode == command.parsedShortcut.key.keyCode) {
+
command.run(event);
event.preventDefault();
return;
diff --git a/app/views/editors/AlignEditor.xhtml b/app/views/editors/AlignEditor.xhtml
index 20694900..d232d890 100644
--- a/app/views/editors/AlignEditor.xhtml
+++ b/app/views/editors/AlignEditor.xhtml
@@ -28,12 +28,12 @@
overflow: hidden;
text-overflow: ellipsis;
}
- @horzCombo button {
+ @horzCombo {
border-right: none !important;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
- @vertCombo button {
+ @vertCombo {
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
}
diff --git a/app/views/editors/ColorEditor.xhtml b/app/views/editors/ColorEditor.xhtml
index 7f02296d..2c42c982 100644
--- a/app/views/editors/ColorEditor.xhtml
+++ b/app/views/editors/ColorEditor.xhtml
@@ -3,9 +3,9 @@
-
-
-
+
+
+
diff --git a/app/views/editors/ColorPropertyEditor.js b/app/views/editors/ColorPropertyEditor.js
index 715cf8b3..34b8e9bc 100644
--- a/app/views/editors/ColorPropertyEditor.js
+++ b/app/views/editors/ColorPropertyEditor.js
@@ -1,7 +1,6 @@
function ColorPropertyEditor() {
PropertyEditor.call(this);
this.bind("p:PopupHidden", function () {
- // this.selectorContainer.removePopup();
}, this.selectorContainer);
var thiz = this;
this.selectorContainer.shouldCloseOnBlur = function(event) {
@@ -31,8 +30,19 @@ ColorPropertyEditor.prototype.setup = function () {
thiz.onValueChanged(thiz.selector);
}, false);
+ this.selector.addEventListener("p:CloseColorSelector", function (event) {
+ if (thiz.selectorContainer.isVisible()) {
+ thiz.selectorContainer.hide();
+ return;
+ }
+ }, false);
+
this.colorText.addEventListener("change", function(event) {
var val = thiz.colorText.value;
+ if (val == "") {
+ thiz.colorText.value = thiz.color.toRGBString();
+ return;
+ }
var uppercaseVal = val.toRGBString ? val.toRGBString().toUpperCase() : (val.toUpperCase ? val.toUpperCase() : val);
// Translate standard HTML color strings:
if (uppercaseVal[0] != "#") {
@@ -104,8 +114,8 @@ ColorPropertyEditor.prototype.setValue = function (color) {
ColorPropertyEditor.prototype.onValueChanged = function (element) {
if (element != this.colorText) {
this.colorText.value = this.color.toRGBString();
- this.colorText.style.backgroundColor = this.color.toRGBString();
}
+ this.colorText.style.backgroundColor = this.color.toRGBString();
if (element) {
this.fireChangeEvent();
}
diff --git a/app/views/editors/ColorSelector.js b/app/views/editors/ColorSelector.js
index 94f23e9c..05e0129d 100644
--- a/app/views/editors/ColorSelector.js
+++ b/app/views/editors/ColorSelector.js
@@ -20,6 +20,10 @@ function ColorSelector() {
// wheel selector event handler
this.htmlCodeInput.addEventListener("change", function(event) {
var val = thiz.htmlCodeInput.value;
+ if (val == "") {
+ thiz.htmlCodeInput.value = thiz.color.toRGBString() || "";
+ return;
+ }
var uppercaseVal = val.toRGBString ? val.toRGBString().toUpperCase() : (val.toUpperCase ? val.toUpperCase() : val);
// Translate standard HTML color strings:
if (uppercaseVal[0] != "#") {
@@ -100,7 +104,9 @@ function ColorSelector() {
}, false);
- this.bright.addEventListener("change", function(event) {
+ this.bright.addEventListener("input", function(event) {
+ if (!thiz.bright.value) thiz.bright.value = 0;
+
var hsv = thiz.color.getHSV();
var a = thiz.color.a;
@@ -109,7 +115,9 @@ function ColorSelector() {
thiz.onValueChanged(thiz.bright);
}, false);
- this.hue.addEventListener("change", function(event) {
+ this.hue.addEventListener("input", function(event) {
+ if (!thiz.hue.value) thiz.hue.value = 0;
+
var hsv = thiz.color.getHSV();
var a = thiz.color.a;
@@ -117,7 +125,9 @@ function ColorSelector() {
thiz.color.a = a;
thiz.onValueChanged(thiz.hue);
}, false);
- this.sat.addEventListener("change", function(event) {
+ this.sat.addEventListener("input", function(event) {
+ if (!thiz.sat.value) thiz.sat.value = 0;
+
var hsv = thiz.color.getHSV();
var a = thiz.color.a;
@@ -154,11 +164,8 @@ function ColorSelector() {
thiz.color = Color.fromHSV(h, s, value);
thiz.color.a = a;
thiz.onValueChanged(thiz.wheelImage);
+ thiz.clearSelectedColor(thiz.recentlyUsedColor);
}, false);
- // this.clearSatButton.addEventListener("command", function(event) {
- // thiz.sat.value = 0;
- // thiz._handleHueSatNumberChange(true);
- // }, false)
if (this.hasAttribute("color")) {
this.setColor(Color.fromString(this.getAttribute("color")));
@@ -166,10 +173,6 @@ function ColorSelector() {
this.setColor(new Color());
}
- // grid selector event handler
- // this.gridSelectorContainer.addEventListener("mouseover", function (event) {
- // this.hoverCell(event.originalTarget);
- // }, false);
this.gridSelectorContainer.addEventListener("click", function (event) {
var colorCell = Dom.findUpward(event.target, function (n) {
return n.hasAttribute("color");
@@ -177,6 +180,7 @@ function ColorSelector() {
if (!colorCell) return;
thiz.updatingColor = false;
thiz.selectColorCell(colorCell);
+ thiz._emitCloseEvent();
}, false);
this.recentlyUsedColor.addEventListener("click", function (event) {
@@ -185,6 +189,7 @@ function ColorSelector() {
});
if (!colorCell) return;
thiz.selectColorCell(colorCell, true);
+ thiz._emitCloseEvent();
}, false);
}
__extend(BaseTemplatedWidget, ColorSelector);
@@ -268,14 +273,31 @@ ColorSelector.prototype._emitChangeEvent = function () {
event.initEvent("ValueChange", false, false);
this.dispatchEvent(event);
};
+ColorSelector.prototype._emitCloseEvent = function () {
+ Dom.emitEvent("p:CloseColorSelector", this.node(), {});
+};
ColorSelector.prototype._changHS = function (hue, sat) {
this.hue.value = hue;
this.sat.value = sat;
this._emitChangeEvent();
};
ColorSelector.prototype.setColor = function (color) {
+ this.selectedCell = null;
this.color = color;
this.onValueChanged();
+ if (!this.selectedCell) {
+ var uppercaseVal = this.color.toRGBString().toUpperCase();
+ Dom.doOnAllChildRecursively(this.recentlyUsedColor, function (n) {
+ if (n.getAttribute) {
+ if (n.getAttribute("color") == uppercaseVal) {
+ n.setAttribute("selected", "true");
+ this.selectedCell = n;
+ } else {
+ n.removeAttribute("selected");
+ }
+ }
+ });
+ }
};
ColorSelector.prototype.setGridSelectorColor = function () {
if (!this._initialized) this.initializeGridSelector();
@@ -284,7 +306,7 @@ ColorSelector.prototype.setGridSelectorColor = function () {
var thiz = this;
Dom.doOnAllChildRecursively(this.gridSelectorContainer, function (n) {
- if (thiz.isColorCell(n)) {
+ if (n.getAttribute) {
if (n.getAttribute("color") == uppercaseVal) {
n.setAttribute("selected", "true");
thiz.selectedCell = n;
@@ -293,10 +315,8 @@ ColorSelector.prototype.setGridSelectorColor = function () {
}
}
});
-
};
ColorSelector.prototype.initializeGridSelector = function () {
-
if (this._initialized) return;
this._initialized = true;
@@ -310,8 +330,6 @@ ColorSelector.prototype.initializeGridSelector = function () {
if (this._timer) clearInterval(this._timer);
this._timer = setInterval(function () {
var colors = Config.get("gridcolorpicker.recentlyUsedColors");
- //debug("color: " + [colors, thiz._lastColors]);
- //debug("color: " + colors);
if (colors != thiz._lastUsedColors) {
thiz._lastUsedColors = colors;
@@ -348,11 +366,7 @@ ColorSelector.prototype.updateRecentlyUsedColors = function () {
var colors = this.recentlyUsedColors.join(",");
Config.set("gridcolorpicker.recentlyUsedColors", colors);
this.updatingColor = false;
- Dom.doOnAllChildren(this.recentlyUsedColors, function (n) {
- if (thiz.isColorCell(n)) {
- n.removeAttribute("selected");
- }
- });
+ this.clearSelectedColor(this.recentlyUsedColor);
};
ColorSelector.prototype.reloadRecentlyUsedColors = function () {
var thiz = this;
@@ -377,10 +391,12 @@ ColorSelector.prototype.reloadRecentlyUsedColors = function () {
e[i].setAttribute("color", color);
e[i].setAttribute("style", "background-color: " + color);
}
- Dom.doOnAllChildren(this.recentlyUsedColors, function (n) {
- if (thiz.isColorCell(n)) {
- n.removeAttribute("selected");
- }
+
+ this.clearSelectedColor(this.recentlyUsedColor);
+};
+ColorSelector.prototype.clearSelectedColor = function (parentNode) {
+ Dom.doOnAllChildren(parentNode, function (n) {
+ if (n.removeAttribute) n.removeAttribute("selected");
});
};
ColorSelector.prototype.selectColorCell = function (cell, selectFromRecentlyUsedColors) {
@@ -441,5 +457,6 @@ ColorSelector.prototype.onValueChanged = function (source) {
this.updateRecentlyUsedColors();
}
this.invalidateUI(source);
+ this.clearSelectedColor(this.recentlyUsedColor);
this._emitChangeEvent();
};
diff --git a/app/views/editors/ColorSelector.xhtml b/app/views/editors/ColorSelector.xhtml
index 7bc19f12..a41adbf4 100644
--- a/app/views/editors/ColorSelector.xhtml
+++ b/app/views/editors/ColorSelector.xhtml
@@ -49,10 +49,11 @@
@hue,
@sat,
@bright {
- width: 3em;
+ width: 3.5em;
}
@brightnessContainer {
padding-top: 1em;
+ align-items: center;
}
@brightnessContainer > * + * {
margin-left: 0.5em;
@@ -218,7 +219,7 @@
-
+
diff --git a/app/views/editors/ComboManager.js b/app/views/editors/ComboManager.js
index 955946b8..a1312371 100644
--- a/app/views/editors/ComboManager.js
+++ b/app/views/editors/ComboManager.js
@@ -1,14 +1,22 @@
function ComboManager() {
BaseTemplatedWidget.call(this);
+ this.button = this.node();
this.renderer = ComboManager.DEFAULT_RENDERER;
this.bind("click", function () {
if (this.popup.isVisible()) {
+ if (thiz.selectingIndex) {
+ thiz.selectItem(thiz.items[thiz.selectingIndex], true);
+ return;
+ }
this.popup.close();
return;
}
this.button.setAttribute("active", true);
this.popup.show(this.button, "left-inside", "bottom", 0, 5);
}, this.button);
+ var thiz = this;
+ this.bind("keydown", this.handleKeyDown, this.button);
+ this.bind("keypress", this.handleKeyPress, this.button);
this.bind("click", this.onItemClick, this.list);
this.bind("p:PopupShown", function () {
thiz.ensureSelectedItemVisible();
@@ -19,7 +27,6 @@ function ComboManager() {
// this.popup.removePopup();
// this.popup.popupContainer.scrollTop = 0;
}, this.popup);
- var thiz = this;
this.popup.shouldCloseOnBlur = function (event) {
var found = Dom.findUpward(event.target, function (node) {
return node == thiz.button;
@@ -47,20 +54,27 @@ ComboManager.prototype.ensureSelectedItemVisible = function() {
var node = this.list.childNodes[i];
var data = Dom.findUpwardForData(node, "_data");
if (comparer(this.selectedItem, data)) {
- var oT = Dom.getOffsetTop(node);
- var oH = node.offsetHeight;
- var pT = Dom.getOffsetTop(this.list.parentNode) + 10;
- var pH = this.list.parentNode.offsetHeight - 20;
-
- if (oT < pT) {
- this.popup.popupContainer.scrollTop = Math.max(0, this.popup.popupContainer.scrollTop - (pT - oT));
- } else if (oT + oH > pT + pH) {
- this.popup.popupContainer.scrollTop = Math.max(0, this.popup.popupContainer.scrollTop + (oT + oH - pT - pH));
- }
- break;
+ node.setAttribute("selected", "true");
+ this.scrollTo(i);
+ this.selectingIndex = i;
+ } else {
+ node.removeAttribute("selected");
}
}
}
+ComboManager.prototype.scrollTo = function(index) {
+ var node = this.list.childNodes[index];
+ var oT = Dom.getOffsetTop(node);
+ var oH = node.offsetHeight;
+ var pT = Dom.getOffsetTop(this.list.parentNode) + 10;
+ var pH = this.list.parentNode.offsetHeight - 20;
+
+ if (oT < pT) {
+ this.popup.popupContainer.scrollTop = Math.max(0, this.popup.popupContainer.scrollTop - (pT - oT));
+ } else if (oT + oH > pT + pH) {
+ this.popup.popupContainer.scrollTop = Math.max(0, this.popup.popupContainer.scrollTop + (oT + oH - pT - pH));
+ }
+}
ComboManager.prototype.setItems = function (items) {
var first = null;
this.items = items;
@@ -126,14 +140,21 @@ ComboManager.prototype.selectItem = function (item, fromUserAction, whenMatched)
this.selectedItem = item;
if (fromUserAction) {
Dom.emitEvent("p:ItemSelected", this.node(), {});
- this.popup.hide();
+ if (this.popup.isVisible()) {
+ this.popup.hide();
+ }
}
for (var i = 0; i < this.list.childNodes.length; i ++) {
var c = this.list.childNodes[i];
if (c.setAttribute) {
var item = Dom.findUpwardForData(c, "_data");
- c.setAttribute("selected", comparer(item, this.selectedItem) ? "true" : "false");
+ var selected = comparer(item, this.selectedItem);
+ c.setAttribute("selected", selected);
+ if (selected) {
+ this.selectingIndex = i;
+ this.selectedNode = c;
+ }
}
}
return matched;
@@ -149,3 +170,58 @@ ComboManager.prototype.setDisabled = function (disabled) {
this.button.removeAttribute("disabled");
}
};
+ComboManager.prototype.handleKeyDown = function (event) {
+ if (event.keyCode == DOM_VK_UP || event.keyCode == DOM_VK_DOWN) {
+ if (this.selectedNode) {
+ this.selectedNode.removeAttribute("selected");
+ }
+ if (this.selectingIndex) {
+ this.list.childNodes[this.selectingIndex].removeAttribute("selected");
+ }
+ if (event.keyCode == DOM_VK_UP) {
+ this.selectingIndex--;
+ if (this.selectingIndex < 0) {
+ this.selectingIndex = this.items.length -1;
+ }
+ } else if (event.keyCode == DOM_VK_DOWN){
+ this.selectingIndex++;
+ if (this.selectingIndex > this.items.length -1) {
+ this.selectingIndex = 0;
+ }
+ }
+ this.list.childNodes[this.selectingIndex].setAttribute("selected", "true");
+ this.scrollTo(this.selectingIndex);
+ }
+};
+ComboManager.prototype.handleKeyPress = function (event) {
+ var keyCode = event.keyCode;
+ if (
+ (keyCode > 47 && keyCode < 58)
+ || (keyCode > 64 && keyCode < 91)
+ || (keyCode > 95 && keyCode < 122)
+ ) {
+ let now = new Date().getTime();
+ let delta = now - (this.lastKeyPressTime || 0);
+ if (!this.prefix || delta > 1000) {
+ this.prefix = String.fromCharCode(event.charCode);
+ } else {
+ this.prefix += String.fromCharCode(event.charCode);
+ }
+
+ this.lastKeyPressTime = now;
+
+ var found = false;
+ for (var i = 0; i < this.list.childNodes.length; i ++) {
+ var node = this.list.childNodes[i];
+ if (!found && node.textContent && node.textContent.trim().toLowerCase().indexOf(this.prefix.trim().toLowerCase()) == 0) {
+ this.selectingIndex = i;
+ node.setAttribute("selected", "true");
+ this.scrollTo(this.selectingIndex);
+ found = true;
+ } else {
+ node.removeAttribute("selected");
+ }
+ }
+
+ }
+};
diff --git a/app/views/editors/ComboManager.xhtml b/app/views/editors/ComboManager.xhtml
index 545c5c88..bd352b11 100644
--- a/app/views/editors/ComboManager.xhtml
+++ b/app/views/editors/ComboManager.xhtml
@@ -1,18 +1,13 @@
-
+
+ expand_more
+
+
+
+
+
diff --git a/app/views/editors/FontEditor.js b/app/views/editors/FontEditor.js
index 2d6c5af9..09401789 100644
--- a/app/views/editors/FontEditor.js
+++ b/app/views/editors/FontEditor.js
@@ -41,15 +41,29 @@ FontEditor.prototype.setup = function () {
});
this.pixelFontSize.addEventListener("click", function(event) {
- if (!thiz.font || OnScreenTextEditor.isEditing) return;
+ if (!thiz.font || OnScreenTextEditor.isEditing || thiz.pixelFontSize.value == "" || thiz.pixelFontSize.value < 5) return;
thiz.fireChangeEvent();
}, false);
this.pixelFontSize.addEventListener("keyup", function(event) {
if (event.keyCode == 13 || event.keyCode == 10) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
+ if (!thiz.font || OnScreenTextEditor.isEditing) return;
+ if (thiz.pixelFontSize.value == "" || thiz.pixelFontSize.value < 5) {
+ thiz.pixelFontSize.value = 5;
+ }
thiz.fireChangeEvent();
}
}, false);
+ this.pixelFontSize.addEventListener("wheel", function(event) {
+ if (!thiz.font || OnScreenTextEditor.isEditing || thiz.pixelFontSize.value == "" || thiz.pixelFontSize.value < 5) return;
+ thiz.fireChangeEvent();
+ });
+ this.pixelFontSize.addEventListener("change", function(event) {
+ if (!thiz.font || OnScreenTextEditor.isEditing) return;
+ if (thiz.pixelFontSize.value == "" || thiz.pixelFontSize.value < 5) {
+ thiz.pixelFontSize.value = 5;
+ }
+ thiz.fireChangeEvent();
+ }, false);
this.boldButton.addEventListener("click", function(event) {
if (!thiz.font || OnScreenTextEditor.isEditing) return;
@@ -76,20 +90,6 @@ FontEditor.prototype.setup = function () {
thiz.fireChangeEvent();
}, false);
-
- /*
- this.underlineButton.addEventListener("command", function(event) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
- thiz.font.decor = thiz.underlineButton.checked ? "underline" : "none";
- thiz.fireEvent();
- }, false);
-
- this.strikeButton.addEventListener("command", function(event) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
- thiz.font.strike = thiz.strikeButton.checked ? "strikethrough" : "none";
- thiz.fireEvent();
- }, false);*/
-
};
@@ -112,6 +112,7 @@ FontEditor.prototype.setValue = function (font) {
//
if (this.font.size.match(/^([0-9]+)[^0-9]*$/)) {
this.pixelFontSize.value = RegExp.$1;
+ this.fontSize = RegExp.$1;
}
if (this.font.weight == "bold") {
@@ -133,6 +134,6 @@ FontEditor.prototype.getValue = function () {
font.size = this.pixelFontSize.value + "px";
font.weight = (this.boldButton.getAttribute("checked") == "true") ? "bold" : "normal";
font.style = (this.italicButton.getAttribute("checked") == "true") ? "italic" : "normal";
-
+ this.fontSize = this.pixelFontSize.value;
return font;
};
diff --git a/app/views/editors/FontEditor.xhtml b/app/views/editors/FontEditor.xhtml
index cde7d183..a1d11d05 100644
--- a/app/views/editors/FontEditor.xhtml
+++ b/app/views/editors/FontEditor.xhtml
@@ -9,15 +9,15 @@
border-top-right-radius: 0px !important;
border-bottom-right-radius: 0px !important;
}
- @fontCombo button {
+ @fontCombo {
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
}
@pixelFontSize {
- width: 5ex;
+ width: 3.8em;
}
- @fontCombo button {
- width: 2em;
+ @fontCombo {
+ flex-basis: 2em;
}
@fontCombo .AnonId_buttonDisplay {
width: 100%;
@@ -26,7 +26,7 @@
}
-
+
diff --git a/app/views/editors/OnMenuEditor.js b/app/views/editors/OnMenuEditor.js
index fa6b0c74..3e0200de 100644
--- a/app/views/editors/OnMenuEditor.js
+++ b/app/views/editors/OnMenuEditor.js
@@ -128,6 +128,10 @@ OnMenuEditor.prototype.generateMenuItems = function () {
}
linkItem.subItems.push({
label: "Notthing",
+ type: "Selection",
+ isChecked: function() {
+ return targetPageId ? false : true;
+ },
handleAction: function () {
thiz.targetObject.setMetadata("RelatedPage", "");
}
diff --git a/app/views/editors/OnScreenTextEditor.js b/app/views/editors/OnScreenTextEditor.js
index c9ba03db..ba6e368e 100644
--- a/app/views/editors/OnScreenTextEditor.js
+++ b/app/views/editors/OnScreenTextEditor.js
@@ -193,7 +193,6 @@ OnScreenTextEditor.prototype.handleTextBlur = function (event) {
}, 100);
};
OnScreenTextEditor.prototype.handleKeyPress = function (event) {
- console.log("event.keyCode == DOM_VK_ESCAPE", event.keyCode, DOM_VK_ESCAPE);
if (event.keyCode == DOM_VK_RETURN && !event.shiftKey && !event.accelKey && !event.ctrlKey) {
this.commitChange(event);
} else if (event.keyCode == DOM_VK_ESCAPE) {
diff --git a/app/views/editors/SharedColorEditor.js b/app/views/editors/SharedColorEditor.js
index 39e2010a..56ea0137 100644
--- a/app/views/editors/SharedColorEditor.js
+++ b/app/views/editors/SharedColorEditor.js
@@ -43,6 +43,12 @@ SharedColorEditor.prototype.setup = function () {
thiz.color = thiz.selector.getColor();
thiz._applyValue();
}, false);
+ this.selector.addEventListener("p:CloseColorSelector", function (event) {
+ if (thiz.selectorContainer.isVisible()) {
+ thiz.selectorContainer.hide();
+ return;
+ }
+ }, false);
};
diff --git a/app/views/editors/SharedColorEditor.xhtml b/app/views/editors/SharedColorEditor.xhtml
index 98d5de35..10d85526 100644
--- a/app/views/editors/SharedColorEditor.xhtml
+++ b/app/views/editors/SharedColorEditor.xhtml
@@ -20,6 +20,7 @@
box-sizing: border-box;
border: solid 2px transparent;
+ text-shadow: 1px 1px 0px #FFF;
}
body .SharedColorEditorPopup {
z-index: 9999;
diff --git a/app/views/editors/SharedFontEditor.js b/app/views/editors/SharedFontEditor.js
index 3bb5ebef..1499e39c 100644
--- a/app/views/editors/SharedFontEditor.js
+++ b/app/views/editors/SharedFontEditor.js
@@ -6,9 +6,6 @@ __extend(BaseTemplatedWidget, SharedFontEditor);
SharedFontEditor.PROPERTY_NAME = "textFont";
SharedFontEditor.prototype.setup = function () {
- //grab control references
- /*this.underlineButton = document.getElementById("edUnderlineButton");
- this.strikeButton = document.getElementById("edStrikeButton");*/
this.fontCombo.setDisabled(true);
this.pixelFontSize.disabled = true;
this.boldButton.disabled = true;
@@ -25,17 +22,28 @@ SharedFontEditor.prototype.setup = function () {
});
this.pixelFontSize.addEventListener("click", function(event) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
+ if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing || thiz.pixelFontSize.value == "") return;
thiz.font.size = thiz.pixelFontSize.value + "px";
thiz._applyValue();
}, false);
+ this.pixelFontSize.addEventListener("wheel", function(event) {
+ if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing || thiz.pixelFontSize.value == "") return;
+ thiz.font.size = thiz.pixelFontSize.value + "px";
+ thiz._applyValue();
+ });
this.pixelFontSize.addEventListener("keyup", function(event) {
if (event.keyCode == 13 || event.keyCode == 10) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
+ if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing || thiz.pixelFontSize.value == "") return;
+ thiz.pixelFontSize.value = Math.max(5, parseInt(thiz.pixelFontSize.value, 10));
thiz.font.size = thiz.pixelFontSize.value + "px";
thiz._applyValue();
}
}, false);
+ this.pixelFontSize.addEventListener("change", function(event) {
+ if (thiz.pixelFontSize.value == "") {
+ thiz.pixelFontSize.value = 5;
+ }
+ }, false);
this.boldButton.addEventListener("click", function(event) {
if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
@@ -72,19 +80,6 @@ SharedFontEditor.prototype.setup = function () {
thiz.beginFormatPainter();
}, false);
- /*
- this.underlineButton.addEventListener("command", function(event) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
- thiz.font.decor = thiz.underlineButton.checked ? "underline" : "none";
- thiz._applyValue();
- }, false);
-
- this.strikeButton.addEventListener("command", function(event) {
- if (!thiz.target || !thiz.font || OnScreenTextEditor.isEditing) return;
- thiz.font.strike = thiz.strikeButton.checked ? "strikethrough" : "none";
- thiz._applyValue();
- }, false);*/
-
Pencil.formatPainterButton = this.formatPainterButton;
};
SharedFontEditor.prototype.reloadFontItems = function () {
@@ -115,7 +110,6 @@ SharedFontEditor.prototype.beginFormatPainter = function () {
SharedFontEditor.prototype.isDisabled = function () {
return this.disabledEditor;
};
-
SharedFontEditor.prototype._applyValue = function () {
var thiz = this;
Pencil.activeCanvas.run(function() {
@@ -129,7 +123,7 @@ SharedFontEditor.prototype.attach = function (target) {
this.detach();
return;
}
- //
+
this.fontCombo.setDisabled(false);
this.pixelFontSize.disabled = false;
this.boldButton.disabled = false;
@@ -137,9 +131,7 @@ SharedFontEditor.prototype.attach = function (target) {
var formatPainter = Pencil.activeCanvas && target && (target.constructor == Group || target.constructor == Shape);
this.formatPainterButton.disabled = !formatPainter;
this.disabledEditor = false;
- // /*this.underlineButton.disabled = false;
- // this.strikeButton.disabled = false;*/
- //
+
// //set the value
var matched = this.fontCombo.selectItem(this.font);
@@ -155,7 +147,7 @@ SharedFontEditor.prototype.attach = function (target) {
}
}
}
- //
+
if (this.font.size.match(/^([0-9]+)[^0-9]*$/)) {
this.pixelFontSize.value = RegExp.$1;
}
@@ -171,9 +163,6 @@ SharedFontEditor.prototype.attach = function (target) {
} else {
this.italicButton.removeAttribute("checked");
}
-
- /*this.underlineButton.checked = (this.font.decor == "underline");
- this.strikeButton.checked = (this.font.decor == "strikethrough");*/
};
SharedFontEditor.prototype.detach = function () {
this.fontCombo.setDisabled(true);
@@ -182,8 +171,6 @@ SharedFontEditor.prototype.detach = function () {
this.italicButton.disabled = true;
this.formatPainterButton.disabled = true;
this.disabledEditor = true;
- /*this.underlineButton.disabled = true;
- this.strikeButton.disabled = true;*/
this.target = null;
this.font = null;
diff --git a/app/views/editors/SharedFontEditor.xhtml b/app/views/editors/SharedFontEditor.xhtml
index 89017f37..4ee5b3f3 100644
--- a/app/views/editors/SharedFontEditor.xhtml
+++ b/app/views/editors/SharedFontEditor.xhtml
@@ -1,8 +1,5 @@
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/app/views/editors/SharedGeomtryEditor.js b/app/views/editors/SharedGeomtryEditor.js
index d6dcb7a8..99a95a93 100644
--- a/app/views/editors/SharedGeomtryEditor.js
+++ b/app/views/editors/SharedGeomtryEditor.js
@@ -19,12 +19,12 @@ SharedGeomtryEditor.prototype.setup = function () {
this.container.addEventListener("click", function (event) {
thiz.handleCommandEvent();
}, false);
- this.container.addEventListener("change", function (event) {
+ this.container.addEventListener("input", function (event) {
thiz.handleCommandEvent();
}, false);
this.container.addEventListener("keypress", function (event) {
- if (event.keyCode == KeyEvent.DOM_VK_UP || event.keyCode == KeyEvent.DOM_VK_DOWN) {
+ if (event.keyCode == DOM_VK_UP || event.keyCode == DOM_VK_DOWN) {
event.stopPropagation();
}
}, false);
diff --git a/app/views/editors/SharedGeomtryEditor.xhtml b/app/views/editors/SharedGeomtryEditor.xhtml
index ed318849..15e9fd5b 100644
--- a/app/views/editors/SharedGeomtryEditor.xhtml
+++ b/app/views/editors/SharedGeomtryEditor.xhtml
@@ -1,38 +1,21 @@
-
+
-
-
-
- :
-
-
- x
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/app/views/editors/SharedPropertyEditor.js b/app/views/editors/SharedPropertyEditor.js
index 041a1968..d7e5364c 100644
--- a/app/views/editors/SharedPropertyEditor.js
+++ b/app/views/editors/SharedPropertyEditor.js
@@ -124,6 +124,7 @@ SharedPropertyEditor.prototype.attach = function (target) {
{
_name: "div",
"class": "Label Property",
+ "flex": "2",
_text: propName + ":"
}
]
@@ -136,7 +137,7 @@ SharedPropertyEditor.prototype.attach = function (target) {
var editorWidget = new constructeur();
editorWrapper.appendChild(editorWidget.node());
- editorWidget.setAttribute("flex", "1");
+ editorWidget.setAttribute("flex", "3");
if (editorWidget.setTypeMeta) {
editorWidget.setTypeMeta(property.meta);
}
diff --git a/app/views/editors/SharedPropertyEditor.xhtml b/app/views/editors/SharedPropertyEditor.xhtml
index 7a7ae4a9..3969529b 100644
--- a/app/views/editors/SharedPropertyEditor.xhtml
+++ b/app/views/editors/SharedPropertyEditor.xhtml
@@ -33,9 +33,11 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- width: 6em;
font-size: 0.9em;
}
+ @propertyContainer > .Group > .Wrapper > * {
+ flex-basis: 2em;
+ }
@propertyContainer input[type='text'],
@propertyContainer input[type='number'],
@@ -48,7 +50,6 @@
}
@propertyContainer button {
min-width: 1.8em;
- border: solid 1px rgba(0, 0, 0, 0.2);
}
@propertyContainer button > i {
font-size: 1.4em;
diff --git a/app/views/editors/StrokeEditor.js b/app/views/editors/StrokeEditor.js
index 0baeade6..4ca5b52e 100644
--- a/app/views/editors/StrokeEditor.js
+++ b/app/views/editors/StrokeEditor.js
@@ -64,7 +64,8 @@ StrokeEditor.prototype.setup = function () {
this.styleCombo.addEventListener("p:ItemSelected", function (event) {
thiz.fireChangeEvent();
}, false);
- this.strokeWidth.addEventListener("change", function (event) {
+ this.strokeWidth.addEventListener("input", function (event) {
+ if (thiz.strokeWidth.value == "") thiz.strokeWidth.value = 1;
thiz.fireChangeEvent();
}, false);
@@ -72,10 +73,6 @@ StrokeEditor.prototype.setup = function () {
StrokeEditor.prototype.setValue = function (stroke) {
this.strokeWidth.value = stroke.w;
- // if (stroke.array) {
- // this.styleCombo.selectItem(stroke.array);
- // }
-
var item = null;
for (var i = 0; i < this.items.length; i++) {
if (this.items[i].value == stroke.array) {
diff --git a/app/views/editors/StrokeEditor.xhtml b/app/views/editors/StrokeEditor.xhtml
index 51c6c5c0..d02f44b5 100644
--- a/app/views/editors/StrokeEditor.xhtml
+++ b/app/views/editors/StrokeEditor.xhtml
@@ -1,29 +1,20 @@
-
+
-
-
-
-
-
-
+
+
diff --git a/app/views/editors/StrokeStyleEditor.xhtml b/app/views/editors/StrokeStyleEditor.xhtml
index 79ec07a3..0b68fe7b 100644
--- a/app/views/editors/StrokeStyleEditor.xhtml
+++ b/app/views/editors/StrokeStyleEditor.xhtml
@@ -13,7 +13,7 @@
@styleCombo {
width: 6ex;
}
- @styleCombo button {
+ @styleCombo {
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-right: none;
@@ -24,6 +24,6 @@
display: block;
}
-
-
+
+
diff --git a/app/views/menus/CanvasMenu.js b/app/views/menus/CanvasMenu.js
index 24b37ca9..efb69767 100644
--- a/app/views/menus/CanvasMenu.js
+++ b/app/views/menus/CanvasMenu.js
@@ -103,7 +103,7 @@ CanvasMenu.prototype.setup = function () {
UICommandManager.register({
key: "unGroupCommand",
label: "Ungroup",
- shortcut: "Ctrl+Alt+G",
+ shortcut: "Ctrl+Shift+G",
isAvailable: function () {
return Pencil.activeCanvas && Pencil.activeCanvas.currentController &&
(Pencil.activeCanvas.currentController instanceof Group);
@@ -132,7 +132,7 @@ CanvasMenu.prototype.setup = function () {
});
UICommandManager.register({
key: "addSelectedToMyCollectionsCommand",
- label: "Add to My Collections",
+ label: "Add to My Collections...",
isAvailable: function () {
return Pencil.activeCanvas && Pencil.activeCanvas.currentController &&
(Pencil.activeCanvas.currentController instanceof Shape || Pencil.activeCanvas.currentController instanceof Group);
diff --git a/app/views/menus/ChildPageListMenu.js b/app/views/menus/ChildPageListMenu.js
index 2b7a73e1..0736e017 100644
--- a/app/views/menus/ChildPageListMenu.js
+++ b/app/views/menus/ChildPageListMenu.js
@@ -21,7 +21,8 @@ ChildPageListMenu.prototype.setup = function () {
key: key,
label: page.name,
run: function () {
- thiz.onDone(page);
+ // thiz.onDone(page);
+ ApplicationPane._instance.activatePage(page);
},
};
return items;
@@ -33,7 +34,8 @@ ChildPageListMenu.prototype.setup = function () {
key: key,
label: page.name,
run: function () {
- thiz.onDone(page);
+ ApplicationPane._instance.activatePage(page);
+ // thiz.onDone(page);
},
type: "SubMenu",
subItems: subItems
diff --git a/app/views/menus/MainMenu.js b/app/views/menus/MainMenu.js
index 9021f262..889d5afa 100644
--- a/app/views/menus/MainMenu.js
+++ b/app/views/menus/MainMenu.js
@@ -174,4 +174,15 @@ MainMenu.prototype.setup = function () {
dialog.open();
}
});
+ this.separator();
+ this.register({
+ key: "exitApplicationCommand",
+ label: "Exit",
+ isValid: function () { return true; },
+ run: function () {
+ let remote = require("electron").remote;
+ let currentWindow = remote.getCurrentWindow();
+ currentWindow.close();
+ }
+ });
}
diff --git a/app/views/menus/PageMenu.js b/app/views/menus/PageMenu.js
index f362ee35..27b84043 100644
--- a/app/views/menus/PageMenu.js
+++ b/app/views/menus/PageMenu.js
@@ -172,6 +172,7 @@ PageMenu.prototype.setup = function () {
},
});
UICommandManager.getCommand("exportPageAsPNGButton").isEnabled = function () {return thiz.page};
+ UICommandManager.getCommand("exportPageAsPNGButton").page = thiz.page;
this.register(UICommandManager.getCommand("exportPageAsPNGButton"));
this.separator();
diff --git a/app/views/toolbars/AlignmentToolbar.js b/app/views/toolbars/AlignmentToolbar.js
index ef9ffa0c..a2ed8717 100644
--- a/app/views/toolbars/AlignmentToolbar.js
+++ b/app/views/toolbars/AlignmentToolbar.js
@@ -7,8 +7,9 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignLeftCommand",
watchEvents: "p:TargetChanged",
- label: "Align Left",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignLeft; },
+ label: "Align left",
+ shortcut: "L",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignLeft; },
run: function () {
Pencil.activeCanvas.currentController.alignLeft();
}
@@ -16,8 +17,9 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignCenterCommand",
watchEvents: "p:TargetChanged",
- label: "Align Center",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignCenter; },
+ shortcut: "C",
+ label: "Align center horizontally",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignCenter; },
run: function () {
Pencil.activeCanvas.currentController.alignCenter();
}
@@ -25,8 +27,9 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignRightCommand",
watchEvents: "p:TargetChanged",
- label: "Align Right",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignRight; },
+ label: "Align right",
+ shortcut: "R",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignRight; },
run: function () {
Pencil.activeCanvas.currentController.alignRight();
}
@@ -34,8 +37,9 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignTopCommand",
watchEvents: "p:TargetChanged",
- label: "Align Top",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignTop; },
+ label: "Align top",
+ shortcut: "T",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignTop; },
run: function () {
Pencil.activeCanvas.currentController.alignTop();
}
@@ -44,8 +48,9 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignMiddleCommand",
watchEvents: "p:TargetChanged",
- label: "Align Middle",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignMiddle; },
+ label: "Align middle vertically",
+ shortcut: "M",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignMiddle; },
run: function () {
Pencil.activeCanvas.currentController.alignMiddle();
}
@@ -53,11 +58,12 @@ AlignmentToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "alignBottomCommand",
watchEvents: "p:TargetChanged",
- label: "Align Bottom",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignBottom; },
+ label: "Align bottom",
+ shortcut: "B",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.alignBottom; },
run: function () {
Pencil.activeCanvas.currentController.alignBottom();
}
});
-
+
};
diff --git a/app/views/toolbars/AlignmentToolbar.xhtml b/app/views/toolbars/AlignmentToolbar.xhtml
index da9dae60..2d0672a3 100644
--- a/app/views/toolbars/AlignmentToolbar.xhtml
+++ b/app/views/toolbars/AlignmentToolbar.xhtml
@@ -2,11 +2,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/views/toolbars/EditToolbar.js b/app/views/toolbars/EditToolbar.js
index 8cd4ad72..7640cf3c 100644
--- a/app/views/toolbars/EditToolbar.js
+++ b/app/views/toolbars/EditToolbar.js
@@ -9,7 +9,8 @@ EditToolbar.prototype.registerCommands = function () {
watchEvents: "p:TargetChanged",
label: "Cut",
icon: "content_cut",
- isValid: function () { return Pencil.activeCanvas.currentController; },
+ shortcut: "Ctrl+X",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController; },
run: function () {
Pencil.activeCanvas.doCopy();
Pencil.activeCanvas.deleteSelected();
@@ -20,16 +21,19 @@ EditToolbar.prototype.registerCommands = function () {
watchEvents: "p:TargetChanged",
label: "Copy",
icon: "content_copy",
- isValid: function () { return Pencil.activeCanvas.currentController; },
+ shortcut: "Ctrl+C",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController; },
run: function () {
Pencil.activeCanvas.doCopy();
}
});
UICommandManager.register({
key: "pasteCommand",
+ watchEvents: "p:CanvasActived",
label: "Paste",
icon: "content_paste",
- isValid: function () { return true; /*FIXME: check for clipboard content*/ },
+ shortcut: "Ctrl+V",
+ isValid: function () { return Pencil.activeCanvas && clipboard.availableFormats() ; /*FIXED: check for clipboard content*/ },
run: function () {
Pencil.activeCanvas.doPaste();
}
diff --git a/app/views/toolbars/FileToolbar.js b/app/views/toolbars/FileToolbar.js
index ec1c5491..23f7b53c 100644
--- a/app/views/toolbars/FileToolbar.js
+++ b/app/views/toolbars/FileToolbar.js
@@ -44,7 +44,7 @@ FileToolbar.prototype.registerCommands = function () {
ApplicationPane._instance.showStartupPane();
});
},
- shortcut: "Ctrl+W"
+ shortcut: "Ctrl+Shift+W"
});
UICommandManager.register({
key: "saveAsDocumentCommand",
@@ -83,7 +83,9 @@ FileToolbar.prototype.registerCommands = function () {
label: "Export page as PNG...",
isValid: function () { return true; },
run: function () {
- Pencil.controller.rasterizeCurrentPage();
+ if (this.page) {
+ Pencil.controller.rasterizeCurrentPage(this.page);
+ }
},
shortcut: "Ctrl+E"
});
diff --git a/app/views/toolbars/SizeToolbar.js b/app/views/toolbars/SizeToolbar.js
index fed954a0..3aea723b 100644
--- a/app/views/toolbars/SizeToolbar.js
+++ b/app/views/toolbars/SizeToolbar.js
@@ -7,8 +7,9 @@ SizeToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "makeSameWidthCommand",
watchEvents: "p:TargetChanged",
- label: "Make Same Width",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameWidth; },
+ label: "Make same width",
+ shortcut: "W",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameWidth; },
run: function () {
Pencil.activeCanvas.currentController.makeSameWidth();
}
@@ -17,8 +18,29 @@ SizeToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "makeSameHeightCommand",
watchEvents: "p:TargetChanged",
- label: "Make Same Height",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameMinHeight; },
+ label: "Make same height",
+ shortcut: "H",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameHeight; },
+ run: function () {
+ Pencil.activeCanvas.currentController.makeSameHeight();
+ }
+ });
+ UICommandManager.register({
+ key: "makeSameMinWidthCommand",
+ watchEvents: "p:TargetChanged",
+ label: "Make same min width",
+ shortcut: "Ctrl+W",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameMinWidth; },
+ run: function () {
+ Pencil.activeCanvas.currentController.makeSameMinWidth();
+ }
+ });
+ UICommandManager.register({
+ key: "makeSameMinHeightCommand",
+ watchEvents: "p:TargetChanged",
+ label: "Make same min height",
+ shortcut: "Ctrl+H",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameMinHeight; },
run: function () {
Pencil.activeCanvas.currentController.makeSameMinHeight();
}
@@ -26,8 +48,9 @@ SizeToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "makeSameHorizontalSpaceCommand",
watchEvents: "p:TargetChanged",
- label: "Make Same Horizontal Space",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameHorizontalSpace; },
+ label: "Make same horizontal gap",
+ shortcut: "O",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameHorizontalSpace; },
run: function () {
Pencil.activeCanvas.currentController.makeSameHorizontalSpace();
}
@@ -35,8 +58,9 @@ SizeToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "makeSameVerticalSpaceCommand",
watchEvents: "p:TargetChanged",
- label: "Make Same Vertical Space",
- isValid: function () { return Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameVerticalSpace; },
+ shortcut: "V",
+ label: "Make same vertical gap",
+ isValid: function () { return Pencil.activeCanvas && Pencil.activeCanvas.currentController && Pencil.activeCanvas.currentController.makeSameVerticalSpace; },
run: function () {
Pencil.activeCanvas.currentController.makeSameVerticalSpace();
}
diff --git a/app/views/toolbars/SizeToolbar.xhtml b/app/views/toolbars/SizeToolbar.xhtml
index c9ad991f..6ff48d29 100644
--- a/app/views/toolbars/SizeToolbar.xhtml
+++ b/app/views/toolbars/SizeToolbar.xhtml
@@ -3,10 +3,10 @@
-
-
-
-
+
+
+
+
diff --git a/app/views/toolbars/ZoomToolbar.js b/app/views/toolbars/ZoomToolbar.js
index 8a4104ac..05bb69a9 100644
--- a/app/views/toolbars/ZoomToolbar.js
+++ b/app/views/toolbars/ZoomToolbar.js
@@ -9,6 +9,9 @@ ZoomToolbar.prototype.registerCommands = function () {
label: "Zoom in",
icon: "zoom_in",
shortcut: "Ctrl+EQUALS",
+ watchEvents: "p:CanvasActived",
+ isValid: function () {return Pencil.activeCanvas},
+ shortcutLabel: "Ctrl+=",
run: function () {
Pencil.activeCanvas.zoomTo(Pencil.activeCanvas.zoom * 1.25);
}
@@ -16,19 +19,40 @@ ZoomToolbar.prototype.registerCommands = function () {
UICommandManager.register({
key: "zoomOutCommand",
shortcut: "Ctrl+SUBTRACT",
+ shortcutLabel: "Ctrl+-",
label: "Zoom out",
icon: "zoom_out",
+ watchEvents: "p:CanvasActived",
+ isValid: function () {return Pencil.activeCanvas},
run: function () {
Pencil.activeCanvas.zoomTo(Pencil.activeCanvas.zoom / 1.25);
}
});
UICommandManager.register({
key: "zoom1Command",
- shortcut: "Ctrl+1",
+ shortcut: "Ctrl+0",
label: "Actual size",
icon: "fullscreen",
+ watchEvents: "p:CanvasActived",
+ isValid: function () {return Pencil.activeCanvas},
run: function () {
Pencil.activeCanvas.zoomTo(1);
}
});
+ UICommandManager.register({
+ key: "toggleScreenCommand",
+ shortcut: IS_MAC ? "Ctrl+Cmd+F" : "F11", // use different key for MAC intendedly
+ label: "Toggle fullscreen mode",
+ run: function () {
+ ApplicationPane._instance.toggleFullscreen();
+ }
+ });
+ UICommandManager.register({
+ key: "toggleLeftPaneCommand",
+ shortcut: "BACK_QUOTE",
+ label: "Toggle left pane",
+ run: function () {
+ ApplicationPane._instance.toggleLeftPane();
+ }
+ });
};
diff --git a/app/views/toolbars/ZoomToolbar.xhtml b/app/views/toolbars/ZoomToolbar.xhtml
index 846ba164..b550e000 100644
--- a/app/views/toolbars/ZoomToolbar.xhtml
+++ b/app/views/toolbars/ZoomToolbar.xhtml
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/app/views/tools/NPatchDialog.js b/app/views/tools/NPatchDialog.js
index e0df83c2..81f5550b 100644
--- a/app/views/tools/NPatchDialog.js
+++ b/app/views/tools/NPatchDialog.js
@@ -270,11 +270,6 @@ Walker.prototype.step = function (alpha) {
}
};
-function Point(x, y) {
- this.x = x;
- this.y = y;
-}
-
function test() {
var cases = [
["#off", "#on"],
diff --git a/app/views/tools/SettingDialog.js b/app/views/tools/SettingDialog.js
index e99aad47..b28d3796 100644
--- a/app/views/tools/SettingDialog.js
+++ b/app/views/tools/SettingDialog.js
@@ -27,7 +27,7 @@ function SettingDialog() {
}
}, this.settingTabPane);
- this.bind("change", function (event) {
+ this.bind("input", function (event) {
var node = Dom.findUpward(event.target, function (n) {
return n.getAttribute && n.getAttribute("configName");
});
@@ -39,61 +39,40 @@ function SettingDialog() {
node.value = "5";
}
}
- if (node.type == "number" || node.type == "text") {
- if (configName == "external.editor.bitmap.path")
- {
- if (node.value == "" ) node.value = "/usr/bin/gimp";
-
- }
- if (configName == "external.editor.vector.path") {
+ Config.set(configName, node.value);
+ this.setPreferenceItems();
+ }, this.textboxGridSize);
- if (node.value == "" ) node.value = "/usr/bin/inkscape";
+ this.bind("change", function (event) {
+ var node = Dom.findUpward(event.target, function (n) {
+ return n.getAttribute && n.getAttribute("configName");
+ });
+ if (!node) return;
+ var configName = node.getAttribute("configName");
+ if (configName == "edit.gridSize") {
+ if (node.value == "" || parseInt(node.value) == 0) {
+ node.value = "1";
+ }
+ }
+ if (configName == "view.undoLevel") {
+ if (node.value == "") {
+ node.value = "0";
}
+ }
+ if (node.type == "number" || node.type == "text") {
+ // if (configName == "external.editor.bitmap.path") {
+ // if (node.value == "" ) node.value = "/usr/bin/gimp";
+ // }
+ // if (configName == "external.editor.vector.path") {
+ // if (node.value == "" ) node.value = "/usr/bin/inkscape";
+ // }
+
Config.set(configName, node.value);
this.setPreferenceItems();
}
}, this.settingTabPane);
- // this.bind("click", function (event) {
- // var checked = this.checkboxEnableGrid.checked;
- // if (checked) {
- // Dom.removeClass(this.textboxGridSize.parentNode, "Disabled");
- // } else {
- // Dom.addClass(this.textboxGridSize.parentNode, "Disabled");
- // }
- // }, this.checkboxEnableGrid);
- //
- // this.bind("click", function (event) {
- // var checked = this.enableSnapping.checked;
- // this.enableSnappingBackground.disabled = !this.enableSnapping.checked;
- // if (checked) {
- // Dom.removeClass(this.enableSnappingBackground.parentNode, "Disabled");
- // } else {
- // Dom.addClass(this.enableSnappingBackground.parentNode, "Disabled");
- // }
- // }, this.enableSnapping);
- //
- // this.bind("click", function (event) {
- // var checked = this.undoEnabled.checked;
- // if (checked) {
- // Dom.removeClass(this.textboxUndoLevel.parentNode, "Disabled");
- // } else {
- // Dom.addClass(this.textboxUndoLevel.parentNode, "Disabled");
- // }
- // }, this.undoEnabled);
-
- // this.bind("click", function (event) {
- // var checked = this.checkboxScaleImage.checked;
- // if (checked) {
- // Dom.removeClass(this.textboxClipartBrowserScaleWidth.parentNode, "Disabled");
- // Dom.removeClass(this.textboxClipartBrowserScaleHeight.parentNode, "Disabled");
- // } else {
- // Dom.addClass(this.textboxClipartBrowserScaleWidth.parentNode, "Disabled");
- // Dom.addClass(this.textboxClipartBrowserScaleHeight.parentNode, "Disabled");
- // }
- // }, this.checkboxScaleImage);
-
this.bind("input", function (event) {
this.setPreferenceItems();
}, this.preferenceNameInput);
diff --git a/appveyor.yml b/appveyor.yml
index ea794a5c..971be9fb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.0.0-beta.1+{build}
+version: 3.0.0-beta.2+{build}
platform:
- x64
@@ -16,10 +16,10 @@ init:
- git config --global core.autocrlf input
install:
- - ps: Install-Product node 5 x64
+ - ps: Install-Product node 6 x64
- git reset --hard HEAD
- npm install npm -g
- - npm install electron-builder@3.26.1
+ - npm install electron-builder@4.2.6
- npm prune
- npm install
diff --git a/certs/sca.code2.crt b/certs/sca.code2.crt
deleted file mode 100644
index f09c30e7..00000000
--- a/certs/sca.code2.crt
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQbDvSft08lJ6Vjiips8dXoDANBgkqhkiG9w0BAQsFADB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTUxMjE2MDEwMDA1WhcN
-MzAxMjE2MDEwMDA1WjB1MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g
-THRkLjEpMCcGA1UECxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
-IzAhBgNVBAMTGlN0YXJ0Q29tIENsYXNzIDIgT2JqZWN0IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuRQEWPeyxYYsCDJgrQgmwIF3uWgZ2RUrHRhp
-5NoalgWXLmR5Gqk9UTNa0Hdq9AKTQcOOunAbq9h7dG+Y6Ne5qT5odqSJoCKsF9Yp
-+Lu4YZ/SB9BmDjBHICtwAh7+cwkccTS14n6prKin8Y46QAZ2ksr3eGzvWAVzfX+D
-UOmiVQLjAK6Wp8bCZHvj+FhAlS5Ne7/dggDeSVWnMyPm2k/5YKOTVXExJJaAlYkm
-yH1OiC3soTkkGb6aJjGJPHiaiNJ4pjkySX5l2p4DQ7K1/J6ft5Vw9PuqwmYrF0Vi
-Gnn38kzB2d9UI9Q+dFmHUbV+cnr+FoGl6CiUDd5ZIF1HMrb8hwIDAQABo4IBWjCC
-AVYwDgYDVR0PAQH/BAQDAgEGMBMGA1UdJQQMMAoGCCsGAQUFBwMDMBIGA1UdEwEB
-/wQIMAYBAf8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNz
-bC5jb20vc2ZzY2EuY3JsMGYGCCsGAQUFBwEBBFowWDAkBggrBgEFBQcwAYYYaHR0
-cDovL29jc3Auc3RhcnRzc2wuY29tMDAGCCsGAQUFBzAChiRodHRwOi8vYWlhLnN0
-YXJ0c3NsLmNvbS9jZXJ0cy9jYS5jcnQwHQYDVR0OBBYEFD5ik5rXxxnuPo9JEIVV
-FSDjlIQcMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQQa7yMD8GA1UdIAQ4
-MDYwNAYEVR0gADAsMCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN0YXJ0c3NsLmNv
-bS9wb2xpY3kwDQYJKoZIhvcNAQELBQADggIBAGOlPNWzbSco2Ou6U68wC+pKXRLV
-+ZrKcPpMY4zXTVR+RupS54WhJCManab2P1ncPlHTbRMbPjfHnyj0sIdpvwcV49n0
-nizMF3MBxaKJEnBBEfHs9Krgjc4qKjR2nOywlzxJ0M27RthR5XjyjQ1ofHlOisYg
-MzcyKyMT7YYpxxoC0wTgAh0DNmE5Q/GKFOaDd3S5gTqrR9AQzGaC3IxCKBFtcwvk
-51W98lNRtMbm+oJze5T+dL2wIhyWK58sEIl2paAVfAfWGH3umYL46scLn8BXDFch
-N1Jgrg07DqY6gxCqSdubPhVHZInuVagktWmrnS6N9V/vVLz+OaX4Mkas8n1J1RIR
-+GV8ZQVmTM49l6L+fpv/h95MWLhQOcXanbIY/2cdNEuz5AkhfvDNTQnLxYEMIyMO
-tW2QIwwZdz92vMTU17G9goxXYjSm09yw+iBniH9G/xGz39BV3bwa8ZtKHzDoZ54H
-T6JT2AraDhrWTwFXv8Xrvv2cir+k0h5bIWlDtImH7Jm152edb77f5JI8JrPf6jxc
-UrhNH4xHxe2kGs8ERA39oYlT0dKQIb0obTN6FOF63hBRFFhGB7NuX2FeFjJsZFCk
-oJkpsEauObb7Rh+C02+fnHfoi6ivKwUC9BOsWlI4xn7GMe27niL6k7wpK0L6MTG5
-/6gxwosqaMA1aukw
------END CERTIFICATE-----
diff --git a/package.json b/package.json
index db519053..1e990d9c 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
{
"name": "Pencil",
"devDependencies": {
- "electron-builder": "3.26.1",
- "electron-prebuilt": "^0.37.5",
+ "electron-builder": "4.2.6",
+ "electron-prebuilt": "1.2.2",
"rimraf": "^2.5.2"
},
"build": {
"app-bundle-id": "vn.evolus.pencil",
"app-category-type": "public.app-category.graphics-design",
- "iconUrl": "https://raw.githubusercontent.com/mbrainiac/pencil/master/build/icon.ico",
+ "iconUrl": "https://raw.githubusercontent.com/evolus/pencil/master/build/icon.ico",
"productName": "Pencil",
"osx": {
"contents": [
@@ -26,8 +26,8 @@
]
},
"linux": {
- "description": "An open-source GUI prototyping tool that's available for ALL platforms.",
- "synopsis": "An open-source GUI prototyping tool that's available for ALL platforms.",
+ "description": "An open-source GUI prototyping tool that is available for ALL platforms.",
+ "synopsis": "An open-source GUI prototyping tool that is available for ALL platforms.",
"maintainer": "Nguyen Tien Dzung
",
"vendor": "Evolus",
"target": ["deb", "rpm", "tar.gz"],
@@ -36,7 +36,7 @@
"win": {
"authors": "Evolus",
"owners": "Evolus",
- "description": "An open-source GUI prototyping tool that's available for ALL platforms.",
+ "description": "An open-source GUI prototyping tool that is available for ALL platforms.",
"copyright": "Copyright © 2008-2016 Evolus. All rights reserved."
},
"download": {
@@ -46,15 +46,15 @@
"scripts": {
"postinstall": "install-app-deps",
"install-app-deps": "node ./node_modules/electron-builder/out/install-app-deps.js",
- "start": "./node_modules/.bin/electron ./app --disable-gpu",
+ "start": "./node_modules/.bin/electron ./app",
"start:dev": "./node_modules/.bin/electron ./app --enable-dev --disable-gpu",
"clean": "rimraf dist",
"pack": "build",
"dist": "build",
"release": "build",
- "dist:linux": "./node_modules/.bin/build --platform linux --arch x64",
- "dist:win32": "./node_modules/.bin/build --platform win32 --arch x64",
- "dist:darwin": "./node_modules/.bin/build --platform darwin"
+ "dist:linux": "./node_modules/.bin/build --linux --x64",
+ "dist:win32": "./node_modules/.bin/build --windows --x64",
+ "dist:darwin": "./node_modules/.bin/build --osx"
},
"private": true
}