Merge branch 'develop'

FPGAwars · Jan 20, 2017 · 3ee961d · 3ee961d
2 parents 73727fe + 388af86
commit 3ee961d
Show file tree

Hide file tree

Showing 150 changed files with 17,244 additions and 12,409 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ app/profile.json
 app/_cache
 app/_build
 app/resources/locale/**/*.json
+demo/*.v
diff --git a/.npmrc b/.npmrc
@@ -1,2 +1 @@
 loglevel="error"
-nwjs_build_type="normal"
diff --git a/README.md b/README.md
@@ -1,7 +1,8 @@
 <img src="./doc/images/icestudio-logo-label.png" align="center">
 
 [![License](http://img.shields.io/:license-gpl-blue.svg)](http://opensource.org/licenses/GPL-2.0)
-[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=stable)](http://icestudio.readthedocs.io/en/stable/)
+[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=latest)](http://icestudio.readthedocs.io/en/latest)
+[![Documentation Status](https://readthedocs.org/projects/icestudio/badge/?version=stable)](http://icestudio.readthedocs.io/en/stable)
 
 
 **Experimental** graphic editor for open FPGAs. Built on top of the [icestorm project](http://www.clifford.at/icestorm/).
@@ -17,25 +18,31 @@ Supported boards:
 * [icoBOARD 1.0](http://icoboard.org/about-icoboard.html)
 * [Kéfir I](http://fpgalibre.sourceforge.net/Kefir/)
 
-## Version 0.2.3
+Supported operating systems:
+
+* GNU/Linux
+* Windows
+* Mac OS X
+
+## Version 0.3.0-beta2 (latest)
 
 ### Installation
 
 1. Install [Python 2.7](https://www.python.org)
 
-2. Download the [release](https://github.com/FPGAwars/icestudio/releases), unzip and execute **icestudio**
+2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.3.0-beta2), unzip and execute **icestudio**
 
-**Documentation: http://icestudio.readthedocs.io**
+Documentation: http://icestudio.readthedocs.io/en/latest
 
-Supported on Linux, Windows and Mac OSX.
+NOTE: if you want to add blocks or examples, please contribute to [icestudio-blocks](https://github.com/FPGAwars/icestudio-blocks) or [icestudio-examples](https://github.com/FPGAwars/icestudio-examples).
 
-<img src="./doc/images/icestudio-0.2.3.png" width="700" align="center">
+<img src="./doc/images/icestudio-0.3.0-beta2.png" width="700" align="center">
 
 ## Development
 
-Install [Python 2.7](https://www.python.org/downloads/release/python-2711/)
+Install [Python 2.7](https://www.python.org/downloads/release/python-2711/) and [nodejs](https://github.com/nodejs/node).
 
-Install [nodejs](https://github.com/nodejs/node)
+Using [Atom](https://atom.io/) editor with [linter-jshint](https://atom.io/packages/linter-jshint).
 
 ##### Ubuntu
 
@@ -77,9 +84,9 @@ NOTE: in Mac OS X this command also generates a **dmg** package.
 |:----------:|:------------------------------------------:|
 | English    | ![Progress](http://progressed.io/bar/100)  |
 | Spanish    | ![Progress](http://progressed.io/bar/100)  |
-| French     | ![Progress](http://progressed.io/bar/84)   |
-| Basque     | ![Progress](http://progressed.io/bar/69)   |
-| Galician   | ![Progress](http://progressed.io/bar/67)   |
+| Basque     | ![Progress](http://progressed.io/bar/88)   |
+| French     | ![Progress](http://progressed.io/bar/72)   |
+| Galician   | ![Progress](http://progressed.io/bar/47)   |
 
 **Contribute**: add or update the [translations](https://github.com/FPGAwars/icestudio/tree/develop/app/resources/locale) by following the [next instructions](https://angular-gettext.rocketeer.be/dev-guide/translate/#poedit).
 
@@ -93,6 +100,17 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo
 
  We use the GitHub issues to schedule our new features and improvements.
 
+## Version 0.2.3 (stable)
+
+### Installation
+
+1. Install [Python 2.7](https://www.python.org)
+
+2. Download the [release](https://github.com/FPGAwars/icestudio/releases/tag/0.2.3), unzip and execute **icestudio**
+
+Documentation: http://icestudio.readthedocs.io/en/stable
+
+<img src="./doc/images/icestudio-0.2.3.png" width="700" align="center">
 
 ## Version 0.1
 
@@ -121,6 +139,11 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo
 
 ## Contributors
 
+* v0.3
+ * [Martoni](https://github.com/Martoni)
+ * [Carlos Díaz](https://github.com/C47D)
+ * [Lorea-Aldabaldetreku](https://github.com/Lorea-Aldabaldetreku)
+
 * v0.2
  * [Tomás Calvo](https://github.com/tocalvo)
  * [Juan González (Obijuan)](https://github.com/Obijuan)
@@ -129,12 +152,13 @@ There is a [Wishlist](https://github.com/FPGAwars/icestudio/wiki/Wishlist:-propo
  * [Salvador E. Tropea](https://github.com/set-soft)
  * [Democrito](https://github.com/Democrito)
  * [Martoni](https://github.com/Martoni)
+ * [Pascal Cotret](https://github.com/pcotret)
 * v0.1
  * [Miguel Sánchez de León Peque](https://github.com/Peque)
 
 ## Credits
 
-* v0.2: using [JointJS](https://github.com/clientIO/joint)
+* v0.3, v0.2: using [JointJS](https://github.com/clientIO/joint) and [AlertifyJS](https://github.com/MohammadYounes/AlertifyJS)
 * v0.1: using [AngularJS-Flowchart](https://github.com/codecapers/AngularJS-FlowChart)
 * Sponsored by [BQ](https://www.bq.com)
 

diff --git a/app/.jshintrc b/app/.jshintrc
@@ -0,0 +1,39 @@
+{
+  "node": true,
+  "browser": true,
+  "esnext": true,
+  "bitwise": true,
+  "camelcase": true,
+  "curly": true,
+  "eqeqeq": true,
+  "immed": true,
+  "indent": 2,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "quotmark": "single",
+  "undef": true,
+  "unused": true,
+  "strict": true,
+  "trailing": true,
+  "smarttabs": true,
+  "multistr": true,
+  "-W064": true,
+  "-W069": true,
+  "-W084": true,
+  "globals": {
+    "$": false,
+    "angular": false,
+    "console": false,
+    "alertify": false,
+    "joint": false,
+    "_": false,
+    "svgPanZoom": false,
+    "Backbone": false,
+    "async": false,
+    "gettext": false,
+    "ace": false,
+    "g": false,
+    "V": false
+  }
+}
diff --git a/app/bower.json b/app/bower.json
@@ -21,9 +21,7 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "^1.5.5",
-    "angular-translate": "^2.11.0",
-    "angular-translate-loader-static-files": "^2.11.0",
+    "angular": "^1.6.0",
     "angular-route": "^1.5.5",
     "jquery": "^2.0.3",
     "backbone": "^1.2.1",

diff --git a/app/index.html b/app/index.html
@@ -2,74 +2,74 @@
 <html>
 
 <head>
-    <title>Icestudio</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <!-- build:css styles/vendors.css -->
-    <!-- bower:css -->
-    <link rel="stylesheet" href="bower_components/joint/dist/joint.css" />
-    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="bower_components/select2/dist/css/select2.min.css" />
-    <link rel="stylesheet" href="bower_components/alertify-js/build/css/alertify.min.css">
-    <link rel="stylesheet" href="bower_components/alertify-js/build/css/themes/default.min.css">
-    <!-- endbower -->
-    <!-- endbuild -->
-    <!-- build:css styles/main.css -->
-    <link rel="stylesheet" href="styles/main.css" />
-    <link rel="stylesheet" href="styles/menu.css" />
-    <link rel="stylesheet" href="styles/project.css" />
-    <!-- endbuild -->
+  <title>Icestudio</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <!-- build:css styles/vendors.css -->
+  <!-- bower:css -->
+  <link rel="stylesheet" href="bower_components/joint/dist/joint.css">
+  <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="bower_components/select2/dist/css/select2.min.css">
+  <link rel="stylesheet" href="bower_components/alertify-js/build/css/alertify.min.css">
+  <link rel="stylesheet" href="bower_components/alertify-js/build/css/themes/default.min.css">
+  <!-- endbower -->
+  <!-- endbuild -->
+  <!-- build:css styles/main.css -->
+  <link rel="stylesheet" href="styles/main.css">
+  <link rel="stylesheet" href="styles/menu.css">
+  <link rel="stylesheet" href="styles/design.css">
+  <!-- endbuild -->
 </head>
 
 <body ng-app="icestudio">
-    <div ng-view></div>
-    <script>
-        window.$ = window.JQuery = window.jQuery = require('jquery');
-    </script>
-    <!-- build:js scripts/vendors.js -->
-    <!-- bower:js -->
-    <script src="bower_components/angular/angular.js"></script>
-    <script src="bower_components/angular-translate/angular-translate.js"></script>
-    <script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>
-    <script src="bower_components/angular-route/angular-route.js"></script>
-    <script src="bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="bower_components/jquery-resize/jquery.ba-resize.min.js"></script>
-    <script src="bower_components/underscore/underscore.js"></script>
-    <script src="bower_components/backbone/backbone.js"></script>
-    <script src="bower_components/lodash/lodash.js"></script>
-    <script src="bower_components/joint/dist/joint.js"></script>
-    <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
-    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
-    <script src="bower_components/select2/dist/js/select2.js"></script>
-    <script src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>
-    <script src="bower_components/ace-builds/src-min-noconflict/theme-chrome.js"></script>
-    <script src="bower_components/ace-builds/src-min-noconflict/mode-verilog.js"></script>
-    <script src="bower_components/async/dist/async.min.js"></script>
-    <script src="bower_components/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
-    <script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
-    <script src="bower_components/alertify-js/build/alertify.js"></script>
-    <!-- endbower -->
-    <!-- endbuild -->
-    <!-- build:js scripts/main.js -->
-    <script src="scripts/app.js"></script>
-    <script src="scripts/controllers/main.js"></script>
-    <script src="scripts/controllers/menu.js"></script>
-    <script src="scripts/controllers/project.js"></script>
-    <script src="scripts/factories/node.factory.js"></script>
-    <script src="scripts/factories/joint.factory.js"></script>
-    <script src="scripts/factories/window.factory.js"></script>
-    <script src="scripts/services/utils.service.js"></script>
-    <script src="scripts/services/common.service.js"></script>
-    <script src="scripts/services/graph.service.js"></script>
-    <script src="scripts/services/boards.service.js"></script>
-    <script src="scripts/services/resources.service.js"></script>
-    <script src="scripts/services/profile.service.js"></script>
-    <script src="scripts/services/tools.service.js"></script>
-    <script src="scripts/services/compiler.service.js"></script>
-    <script src="scripts/plugins/connectors/joint.connectors.js"></script>
-    <script src="scripts/plugins/routers/joint.routers.js"></script>
-    <script src="scripts/plugins/shapes/joint.shapes.js"></script>
-    <script src="scripts/plugins/ui/joint.ui.js"></script>
-    <!-- endbuild -->
+  <div ng-view></div>
+  <script>
+    window.$ = window.JQuery = window.jQuery = require('jquery');
+  </script>
+  <!-- build:js scripts/vendors.js -->
+  <!-- bower:js -->
+  <script src="bower_components/angular/angular.js"></script>
+  <script src="bower_components/angular-route/angular-route.js"></script>
+  <script src="bower_components/jquery/dist/jquery.min.js"></script>
+  <script src="bower_components/jquery-resize/jquery.ba-resize.min.js"></script>
+  <script src="bower_components/underscore/underscore.js"></script>
+  <script src="bower_components/backbone/backbone.js"></script>
+  <script src="bower_components/lodash/lodash.js"></script>
+  <script src="bower_components/joint/dist/joint.js"></script>
+  <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
+  <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
+  <script src="bower_components/select2/dist/js/select2.full.js"></script>
+  <script src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>
+  <script src="bower_components/ace-builds/src-min-noconflict/theme-chrome.js"></script>
+  <script src="bower_components/ace-builds/src-min-noconflict/mode-verilog.js"></script>
+  <script src="bower_components/async/dist/async.min.js"></script>
+  <script src="bower_components/svg-pan-zoom/dist/svg-pan-zoom.min.js"></script>
+  <script src="bower_components/angular-gettext/dist/angular-gettext.min.js"></script>
+  <script src="bower_components/alertify-js/build/alertify.js"></script>
+  <!-- endbower -->
+  <!-- endbuild -->
+  <!-- build:js scripts/main.js -->
+  <script src="scripts/app.js"></script>
+  <script src="scripts/controllers/design.js"></script>
+  <script src="scripts/controllers/main.js"></script>
+  <script src="scripts/controllers/menu.js"></script>
+  <script src="scripts/factories/joint.factory.js"></script>
+  <script src="scripts/factories/node.factory.js"></script>
+  <script src="scripts/factories/window.factory.js"></script>
+  <script src="scripts/plugins/connectors/joint.connectors.js"></script>
+  <script src="scripts/plugins/dia/joint.dia.command.js"></script>
+  <script src="scripts/plugins/routers/joint.routers.js"></script>
+  <script src="scripts/plugins/shapes/joint.shapes.js"></script>
+  <script src="scripts/plugins/ui/joint.ui.js"></script>
+  <script src="scripts/services/blocks.service.js"></script>
+  <script src="scripts/services/boards.service.js"></script>
+  <script src="scripts/services/compiler.service.js"></script>
+  <script src="scripts/services/graph.service.js"></script>
+  <script src="scripts/services/profile.service.js"></script>
+  <script src="scripts/services/project.service.js"></script>
+  <script src="scripts/services/resources.service.js"></script>
+  <script src="scripts/services/tools.service.js"></script>
+  <script src="scripts/services/utils.service.js"></script>
+  <!-- endbuild -->
 </body>
 
 </html>
diff --git a/app/package.json b/app/package.json
@@ -1,14 +1,15 @@
 {
   "name": "icestudio",
-  "version": "0.2.3",
+  "version": "0.3.0-beta2",
   "description": "Experimental graphic editor for open FPGAs",
   "author": "Jesús Arroyo Torrens <[email protected]>",
   "repository": "https://github.com/FPGAwars/icestudio",
   "license": "GPL-2.0",
   "main": "index.html",
+  "single-instance": false,
   "window": {
     "width": 900,
-    "height": 600,
+    "height": 620,
     "min_width": 800,
     "min_height": 200,
     "toolbar": false,
@@ -36,7 +37,9 @@
     "sha1": "^1.1.1",
     "ssh-exec": "^2.0.0",
     "sudo-prompt": "^6.2.0",
-    "tarball-extract": "0.0.3"
+    "svgo": "^0.7.1",
+    "tarball-extract": "0.0.3",
+    "unzip": "^0.1.11"
   },
   "readme": "../README.md",
   "keywords": [