Skip to content

Commit

Permalink
Merge pull request #92 from PancakeBot/1.3.0
Browse files Browse the repository at this point in the history 
Final merge for beta release v1.3.0
  • Loading branch information
@techninja
techninja committed Feb 21, 2017
2 parents 7f18325 + 68e340f commit cf95760
Show file tree
Hide file tree
Showing 75 changed files with 10,852 additions and 4,840 deletions.
137 changes: 70 additions & 67 deletions .jshintrc
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,73 @@
{
"maxerr" : 50,
"globals": {
"Promise": true
},
"esversion" : 6,
"maxerr" : 50,
"bitwise" : true,
"camelcase" : true,
"curly" : false,
"eqeqeq" : true,
"forin" : false,
"freeze" : true,
"immed" : true,
"latedef" : "nofunc",
"newcap" : true,
"noarg" : true,
"noempty" : true,
"nonbsp" : true,
"nonew" : false,
"plusplus" : false,
"quotmark" : false,
"undef" : true,
"unused" : "strict",
"maxparams" : 5,
"maxdepth" : 4,
"maxstatements" : false,
"maxcomplexity" : false,
"maxlen" : 80,
"varstmt" : false,
"asi" : false,
"boss" : false,
"debug" : true,
"eqnull" : false,
"moz" : false,
"evil" : false,
"expr" : false,
"funcscope" : false,
"iterator" : false,
"lastsemic" : false,
"laxbreak" : false,
"laxcomma" : false,
"loopfunc" : false,
"multistr" : false,
"noyield" : false,
"notypeof" : false,
"proto" : false,
"scripturl" : false,
"shadow" : false,
"sub" : false,
"supernew" : false,
"validthis" : false,

"bitwise" : true,
"camelcase" : true,
"curly" : false,
"eqeqeq" : true,
"forin" : false,
"freeze" : true,
"immed" : true,
"latedef" : "nofunc",
"newcap" : true,
"noarg" : true,
"noempty" : true,
"nonbsp" : true,
"nonew" : false,
"plusplus" : false,
"quotmark" : false,
"undef" : true,
"unused" : "strict",
"maxparams" : 5,
"maxdepth" : 4,
"maxstatements" : false,
"maxcomplexity" : false,
"maxlen" : 80,
"varstmt" : false,
"asi" : false,
"boss" : false,
"debug" : true,
"eqnull" : false,
"moz" : false,
"evil" : false,
"expr" : false,
"funcscope" : false,
"iterator" : false,
"lastsemic" : false,
"laxbreak" : false,
"laxcomma" : false,
"loopfunc" : false,
"multistr" : false,
"noyield" : false,
"notypeof" : false,
"proto" : false,
"scripturl" : false,
"shadow" : false,
"sub" : false,
"supernew" : false,
"validthis" : false,

"browser" : false,
"browserify" : false,
"couch" : false,
"devel" : true,
"dojo" : false,
"jasmine" : false,
"jquery" : false,
"mocha" : true,
"mootools" : false,
"node" : true,
"nonstandard" : false,
"phantom" : false,
"prototypejs" : false,
"qunit" : false,
"rhino" : false,
"shelljs" : false,
"typed" : false,
"worker" : false,
"wsh" : false,
"yui" : false
"browser" : false,
"browserify" : false,
"couch" : false,
"devel" : true,
"dojo" : false,
"jasmine" : false,
"jquery" : false,
"mocha" : true,
"mootools" : false,
"node" : true,
"nonstandard" : false,
"phantom" : false,
"prototypejs" : false,
"qunit" : false,
"rhino" : false,
"shelljs" : false,
"typed" : false,
"worker" : false,
"wsh" : false,
"yui" : false
}
47 changes: 37 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,66 @@

[![Join the chat at https://gitter.im/PancakePainter/Lobby](https://badges.gitter.im/PancakePainter/Lobby.svg)](https://gitter.im/PancakePainter/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

### Download/Install [Latest release] - v1.2.0
* *Windows 7-10* ➤ [x32](https://github.com/PancakeBot/PancakePainter/releases/download/v1.2.0-Beta/Install_PancakePainter_Win_32bit_v1.2.0-beta.exe) / [x64](https://github.com/PancakeBot/PancakePainter/releases/download/v1.2.0-Beta/Install_PancakePainter_Win_64bit_v1.2.0-beta.exe)
* *Mac OSX 10.7+* ➤ [x64](https://github.com/PancakeBot/PancakePainter/releases/download/v1.2.0-Beta/PancakePainter_Mac_v1.2.0-Beta.zip)
* *Linux:* No build, can run from source.

#### Check the [latest release page](https://github.com/PancakeBot/PancakePainter/releases/latest) for feature notes, known issues, and other details.

![PancakePainter](https://cloud.githubusercontent.com/assets/320747/10681916/96629bc8-78e3-11e5-99e6-4f6c3e13cc86.png)

### Download/Install - v1.0.0
* *Windows 7-10* ➤ [32bit](https://github.com/PancakeBot/PancakePainter/releases/download/v1.0.0/Install_PancakePainter_Win_v1.0.0.exe)
* *Mac OSX 10.7+* ➤ [x64](https://github.com/PancakeBot/PancakePainter/releases/download/v1.0.0/PancakePainter_Mac_v1.0.0.zip)
* *Linux:* No build supported yet, can run from source. [Vote here @ #39](https://github.com/PancakeBot/PancakePainter/issues/39)
----

#### Check the [latest release page](https://github.com/PancakeBot/PancakePainter/releases/latest) for feature notes, known issues, and other details.
#### PancakeBot is proud to present the latest pre-release version of Pancake Painter!
Featuring a new automatic tracing functionality that makes drawing pancakes from
pre-existing art much easier. Take your favorite cartoon, logo or photo, and
turn them into tasty pancake art! Other new features include marquee selection
& print preview. Give it a try at it and tell us what you think! We always are
happy to hear your comments on how to improve the software and make your pancake
art experience even better!

![PancakePainter 1.3.0 Beta](https://cloud.githubusercontent.com/assets/320747/23157197/f7b6226c-f7ce-11e6-9cab-1eaacc071950.png)

### Download/Install ***[Pre-release]*** - v1.3.0 Beta
* *Windows 7-10* ➤ [x32](https://github.com/PancakeBot/PancakePainter/releases/download/v1.3.0-Beta/Install_PancakePainter_Win_32bit_v1.3.0-beta.exe) / [x64](https://github.com/PancakeBot/PancakePainter/releases/download/v1.3.0-Beta/Install_PancakePainter_Win_64bit_v1.3.0-beta.exe)
* *Mac OSX 10.7+* ➤ [x64](https://github.com/PancakeBot/PancakePainter/releases/download/v1.3.0-Beta/PancakePainter_Mac_v1.3.0-Beta.dmg)
* *Linux (requires [`autotrace`](http://packages.ubuntu.com/xenial/autotrace) system package)* ➤ [x64 Ubuntu/Debian DEB](https://github.com/PancakeBot/PancakePainter/releases/download/v1.3.0-Beta/PancakePainter_1.3.0_amd64.deb) / [x64 Redhat RPM](https://github.com/PancakeBot/PancakePainter/releases/download/v1.3.0-Beta/PancakePainter-1.3.0.x86_64.rpm)

----

### User Documentation
0. **Using the drawing tool:**
* Click and drag to draw pancake lines freehand
* Click single points to draw polygonal shapes, press right click or
ESC/Enter to complete drawing.
0. **Using the selection tool:**
* Click the center or near a line to select it.
* Click the center or near a line to select it, shift click to add to
selection.
* Alternate selection: Click and drag to create a selection marquee to fully
encompass any objects you'd like to select _(v1.3.0)_.
* Once selected, click and drag the corner handles to scale the object, or
the top rotation handle to rotate it.
* Click and drag points on the line to move them, shift-click to remove, or
click an area on the line without any points to add a new point.
* Click and drag the selected object anywhere else to move it to a new
position.
0. **Using the trace image import tool:**
* To import an image to trace by hand, click the image import icon, select
your image (in any standard web format, GIF, JPG, PNG), and it will be placed
on the canvas.
0. **Manual image trace import tool:**
* To import an image to trace by hand, click the image import icon, then
select the manual import icon on the left. Select your image (in any standard
web format, GIF, JPG, PNG), and it will be placed on the canvas.
* Once imported, you can move the image around and scale/rotate it as needed.
* When done, click outside the image, press ESC, or select the drawing
tool.
* To adjust the image position, just click the image import button again. To
choose a new image, press the Delete key when in edit mode then click import
again.
0. **Automatic image trace import tool _(v1.3.0)_:**
* Click the image import icon and select either of the two automatic trace
presets.
* Within the automatic trace window, adjust the settings to your liking.
* When complete, select how many copies you want & click the "Place" button.
* You now should have fills and strokes as if you had drawn them yourself.
0. **Using the fill tool:**
* The fill tool is used to visually fill an area with a specific shade, which
will then be used to create a zig-zag fill pattern used by the PancakeBot.
Expand Down
107 changes: 102 additions & 5 deletions build/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,23 @@ var path = require('path');
module.exports = function(grunt) {
// Load the plugins...
grunt.loadNpmTasks('grunt-electron');
if (process.platform === 'win32') {
grunt.loadNpmTasks('grunt-electron-installer');

// Load all platform specific tasks:
switch (process.platform) {
case 'win32':
grunt.loadNpmTasks('grunt-electron-installer');
break;

case 'darwin':
grunt.loadNpmTasks('grunt-appdmg');
break;

default:
grunt.loadNpmTasks('grunt-electron-installer-debian');
grunt.loadNpmTasks('grunt-electron-installer-redhat');
break;
}
//if (process.platform === 'darwin') grunt.loadNpmTasks('grunt-appdmg');


// Load the tasks in '/tasks'
grunt.loadTasks('tasks');
Expand All @@ -24,7 +37,7 @@ module.exports = function(grunt) {
'build/tasks',
'build/package.json',
'build/Gruntfile.js',
'node_modules/electron-*',
'node_modules/electron-prebuilt',
'node_modules/grunt*'
].join('|');

Expand All @@ -46,6 +59,9 @@ module.exports = function(grunt) {
'app-version': version,
overwrite: true,
prune: true,
'osx-sign': {
identity: 'Developer ID Application: StoreBound LLC (AEJ8NZZ3TC)'
},
'app-bundle-id': 'pancakepainter-main',
'helper-bundle-id': 'pancakepainter-helper'
}
Expand Down Expand Up @@ -74,6 +90,40 @@ module.exports = function(grunt) {
InternalName: appInfo.name
}
}
},
linbuild: {
options: {
name: appInfo.name,
dir: './',
out: 'build/dist',
icon: 'resources/app.png',
ignore: buildIgnore,
version: appInfo.electronVersion,
platform: 'linux',
arch: 'x64',
'app-version': appInfo.version,
overwrite: true,
prune: true
}
},
},
appdmg: {
options: {
basepath: 'build/dist/' + appInfo.name + '-darwin-x64',
title: 'Install ' + appInfo.releaseInfo.appName,
icon: '../../../resources/darwin/app.icns',
background: '../../../resources/darwin/dmg_back.png',
'icon-size': 80,
contents: [
{x: 448, y: 344, type: 'link', path: '/Applications'},
{x: 192, y: 344, type: 'file', path: appInfo.releaseInfo.appName +'.app'}
]
},
target: {
dest:
'build/dist/' +
appInfo.releaseInfo.appName +
'_Mac_v' + appInfo.version + '.dmg'
}
},
'create-windows-installer': {
Expand All @@ -94,9 +144,56 @@ module.exports = function(grunt) {
authors: 'PancakeBot Inc.'
}
},
'electron-installer-debian': {
options: {
name: appInfo.name,
productName: appInfo.releaseInfo.appName,
description: appInfo.description,
productDescription: appInfo.releaseInfo.description,
genericName: 'Robot Controller',
section: 'graphics',
priority: 'optional',
version: numericVersion,
revision: appInfo.version.split('-')[1],
categories: appInfo.releaseInfo.categories,
lintianOverrides: [
'changelog-file-missing-in-native-package',
'executable-not-elf-or-script',
'extra-license-file'
]
},
linux64: {
options: {
icon: 'resources/app.png',
arch: 'amd64'
},
src: 'build/dist/' + appInfo.name + '-linux-x64',
dest: 'build/dist/'
}
},
'electron-installer-redhat': {
options: {
name: appInfo.name,
productName: appInfo.releaseInfo.appName,
description: appInfo.description,
productDescription: appInfo.releaseInfo.description,
genericName: 'Robot Controller',
categories: appInfo.releaseInfo.categories,
version: numericVersion,
revision: appInfo.version.split('-')[1],
},
linux64: {
options: {
arch: 'x86_64',
icon: 'resources/app.png',
},
src: 'build/dist/' + appInfo.name + '-linux-x64',
dest: 'build/dist/'
}
},
});


// Default task(s).
grunt.registerTask('default', ['pre-build']);
grunt.registerTask('default', ['build']);
};
8 changes: 7 additions & 1 deletion build/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.1.0",
"license": "Apache-2.0",
"author": "techninja",
"description": "Build system for PancakePainter releases",
"dependencies": {
"fs-plus": "2.x",
"grunt": "~0.4.5",
Expand All @@ -17,6 +18,11 @@
},
"optionalDependencies": {
"grunt-appdmg": "^0.3.1",
"grunt-electron-installer": "^2.1.0"
"grunt-electron-installer": "^2.1.0",
"grunt-electron-installer-debian": "^0.3.0",
"grunt-electron-installer-redhat": "^0.3.0"
},
"scripts": {
"start": "grunt"
}
}

0 comments on commit cf95760

Please sign in to comment.