rename

umarcor · May 23, 2020 · 4fb94ee · 4fb94ee
1 parent ae7b3e0
commit 4fb94ee
Show file tree

Hide file tree

Showing 61 changed files with 209 additions and 331 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -254,7 +254,7 @@ All notable changes to this project will be documented in this file.
 - Verify/Build/Upload optimization: run only if changed
 - Show FPGA resources in upload command
 - Improve code/info blocks zoom
-- Update Icestudio logo
+- Update hwstudio logo
 
 
 ## [0.3.0-rc] - 2017-03-30
@@ -304,9 +304,9 @@ All notable changes to this project will be documented in this file.
 #### Create Windows installer
 - Uninstall previous version if required
 - Install Python 2.7 if required
-- Install Icestudio app
-- Install Icestudio shortcut
-- Register .ice files: open in Icestudio with double-click
+- Install hwstudio app
+- Install hwstudio shortcut
+- Register .ice files: open in hwstudio with double-click
 - Uninstaller: remove toolchain, profile or collections
 
 #### Add Board rules
@@ -346,7 +346,7 @@ All notable changes to this project will be documented in this file.
 - Add menu Select > Boards/Collections
 - Bugfix verilog compiler: self-connected wires
 - Apply zoom to Code/Info blocks content
-- Paste on multiple Icestudio windows (copy also wires)
+- Paste on multiple hwstudio windows (copy also wires)
 - Remember old port connections after Code block edition
 - Detect project board on load
 - Save profile when an attribute is set
@@ -376,7 +376,7 @@ Thanks to **Patripi** for the feedback and suggestions!
 - File > New: launch a new window
 - File > Open: launch a new window if required
 - File > Examples: launch a new window if required
-- Add argument to the application: eg: ./icestudio /path/to/project.ice
+- Add argument to the application: eg: ./hwstudio /path/to/project.ice
 - Show project changed state
 
 ### New project format 1.1
@@ -503,7 +503,7 @@ Thanks to **AlexTC** for the feedback and suggestions!
 - Add Hex 7 Segments CA (#81 by @C47D)
 - Support [Kefir I](http://fpgalibre.sourceforge.net/Kefir/index.html) board (@set-soft)
 - Add `default_nettype none` to generated verilog files
-- Add Icestudio headers to generated files
+- Add hwstudio headers to generated files
 - Add verilog header (.vh) files inclusion
 - Add File > Export testbench
 - Add File > Export GTKWave
@@ -601,7 +601,7 @@ Thanks to **AlexTC** for the feedback and suggestions!
 - Help menu: add documentation
 - Help menu: add source code
 - Help menu: add community forum
-- Help menu: add about Icestudio
+- Help menu: add about hwstudio
 - Basic blocks:
   - code: contains a verilog editor
   - input & output: contains a FPGA I/O pin selector

diff --git a/app/index.html b/app/index.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>Icestudio</title>
+  <title>Hardware Studio</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
   <link rel="stylesheet" href="node_modules/jointjs/dist/joint.css">
@@ -22,7 +22,7 @@
   <link rel="stylesheet" href="resources/viewers/markdown/css/github-markdown.css">
 </head>
 
-<body ng-app="icestudio">
+<body ng-app="hwstudio">
 
   <div ng-view></div>
   <script>

diff --git a/app/js/app.js b/app/js/app.js
@@ -5,7 +5,7 @@ var ICEpm = new IcePlugManager();
 
 
 angular
-  .module('icestudio', [
+  .module('hwstudio', [
     'ui.bootstrap',
     'ngRoute',
     'gettext'
@@ -20,7 +20,7 @@ angular
         .otherwise({
           redirectTo: '/'
         });
-    } 
+    }
   ])
   .run(function(profile,
                 project,
@@ -31,18 +31,18 @@ angular
                 collections,
                 gettextCatalog,
                 $timeout)
-   
+
                 {
- 
+
 
     $timeout(function(){
       $('body').addClass('waiting');
     }, 0);
       // Load boards
     boards.loadBoards();
-    // Load profile 
+    // Load profile
     utils.loadProfile(profile, function() {
-      // Load collections 
+      // Load collections
       collections.loadAllCollections() ;
       // Load language
       utils.loadLanguage(profile, function() {
@@ -55,9 +55,9 @@ angular
             alertify.success(gettextCatalog.getString('Board {{name}} selected',  { name: utils.bold(newBoard.info.label) }));
             // Check if the toolchain is installed
             tools.checkToolchain();
-          }); 
+          });
         }
-        else { 
+        else {
           // Initialize selected board
           profile.set('board', boards.selectBoard(profile.get('board')).name);
           // Check if the toolchain is installed

diff --git a/app/js/controllers/design.js b/app/js/controllers/design.js
@@ -2,7 +2,7 @@
 
 var subModuleActive = false;
 
-angular.module('icestudio')
+angular.module('hwstudio')
         .controller('DesignCtrl', function ($rootScope,
                 $scope,
                 project,

diff --git a/app/js/controllers/main.js b/app/js/controllers/main.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .controller('MainCtrl', function ($scope,
     gettextCatalog, tools, utils) {
 

diff --git a/app/js/controllers/menu.js b/app/js/controllers/menu.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .controller('MenuCtrl', function ($rootScope,
     $scope,
     $timeout,
@@ -51,10 +51,8 @@ angular.module('icestudio')
     });
     // Darwin fix for shortcuts
     if (process.platform === 'darwin') {
-      var mb = new gui.Menu({
-        type: 'menubar'
-      });
-      mb.createMacBuiltin('Icestudio');
+      var mb = new gui.Menu({ type: 'menubar' });
+      mb.createMacBuiltin('hwstudio');
       win.menu = mb;
     }
 
@@ -65,21 +63,21 @@ angular.module('icestudio')
     setTimeout(function () {
 
       // Parse GET url parmeters for window instance arguments
-      // all arguments will be embeded in icestudio_argv param
+      // all arguments will be embeded in hwstudio_argv param
       // that is a JSON string url encoded
 
       // https://developer.mozilla.org/es/docs/Web/JavaScript/Referencia/Objetos_globales/unescape
       // unescape is deprecated javascript function, should use decodeURI instead
 
 
       var queryStr = '';
-      if (window.location.search.indexOf('?icestudio_argv=') === 0) {
-        queryStr = '?icestudio_argv=' + atob(decodeURI(window.location.search.replace('?icestudio_argv=', ''))) + '&';
+      if (window.location.search.indexOf('?hwstudio_argv=') === 0) {
+        queryStr = '?hwstudio_argv=' + atob(decodeURI(window.location.search.replace('?hwstudio_argv=', ''))) + '&';
       } else {
 
         queryStr = decodeURI(window.location.search) + '&';
       }
-      var regex = new RegExp('.*?[&\\?]icestudio_argv=(.*?)&.*');
+      var regex = new RegExp('.*?[&\\?]hwstudio_argv=(.*?)&.*');
       var val = queryStr.replace(regex, '$1');
 
       var params = (val === queryStr) ? false : val;
@@ -611,7 +609,7 @@ angular.module('icestudio')
         height: 700,
         'min_width': 300,
         'min_height': 300,
-        icon: 'resources/images/icestudio-logo.png'
+        icon: 'resources/images/logo.png'
       });
     };
 
@@ -627,7 +625,7 @@ angular.module('icestudio')
           height: 700,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.warning(gettextCatalog.getString('{{board}} pinout not defined', {
@@ -661,7 +659,7 @@ angular.module('icestudio')
           height: 500,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.error(gettextCatalog.getString('{{board}} rules not defined', {
@@ -687,7 +685,7 @@ angular.module('icestudio')
           height: 700,
           'min_width': 300,
           'min_height': 300,
-          icon: 'resources/images/icestudio-logo.png'
+          icon: 'resources/images/logo.png'
         });
       } else {
         alertify.error(gettextCatalog.getString('Collection {{collection}} info not defined', {
@@ -706,7 +704,7 @@ angular.module('icestudio')
         height: 400,
         'min_width': 300,
         'min_height': 300,
-        icon: 'resources/images/icestudio-logo.png'
+        icon: 'resources/images/logo.png'
       });
     };
 

diff --git a/app/js/directives/menuboard.js b/app/js/directives/menuboard.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .directive('menuboard', function() {
     return {
       restrict: 'E',

diff --git a/app/js/directives/menutree.js b/app/js/directives/menutree.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .directive('menutree', function() {
     return {
       restrict: 'E',

diff --git a/app/js/factories/joint.js b/app/js/factories/joint.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('joint', function($window) {
     return $window.joint;
   });
diff --git a/app/js/factories/node.js b/app/js/factories/node.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('fastCopy', function() {
     return require('fast-copy');
   })

diff --git a/app/js/factories/window.js b/app/js/factories/window.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .factory('gui', function() {
     var gui = require('nw.gui');
     return gui;

diff --git a/app/js/graphics/joint.shapes.js b/app/js/graphics/joint.shapes.js
@@ -1144,7 +1144,7 @@ joint.shapes.ice.ConstantView = joint.shapes.ice.ModelView.extend({
     });
     this.inputSelector.on('paste', function (event) {
       var data = event.originalEvent.clipboardData.getData('text');
-      if (data.startsWith('{"icestudio":')) {
+      if (data.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         event.preventDefault();
       }
@@ -1356,7 +1356,7 @@ joint.shapes.ice.MemoryView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -1655,7 +1655,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -1809,7 +1809,7 @@ joint.shapes.ice.CodeView = joint.shapes.ice.ModelView.extend({
 
       }
       //    this.editor.resize();
-    
+
     }
 
     // Set ports width
@@ -2023,7 +2023,7 @@ joint.shapes.ice.InfoView = joint.shapes.ice.ModelView.extend({
       self.editor.renderer.$cursorLayer.element.style.opacity = 0;
     });
     this.editor.on('paste', function (e) {
-      if (e.text.startsWith('{"icestudio":')) {
+      if (e.text.startsWith('{"hwstudio":')) {
         // Prevent paste blocks
         e.text = '';
       }
@@ -2465,7 +2465,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
   },
 
   updateConnection: function (opt) {
-    
+
     opt = opt || {};
 
     // Necessary path finding
@@ -2499,7 +2499,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
       var markerBifurcations=false;
 
       for(var i=0,n=allWires.length;i<n;i++){
-     
+
         wireSource = allWires[i].get('source');
         cwireSource = currentWire.get('source');
         if ((wireSource.id === cwireSource.id) &&
@@ -2514,7 +2514,7 @@ joint.shapes.ice.WireView = joint.dia.LinkView.extend({
             markers: markerBifurcations
           });
         }
-     
+
     }
 
       var points = [];

diff --git a/app/js/services/blocks.js b/app/js/services/blocks.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('blocks', function (joint,
     utils,
     common,

diff --git a/app/js/services/boards.js b/app/js/services/boards.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('boards', function(utils,
                               common,
                               nodeFs,

diff --git a/app/js/services/collections.js b/app/js/services/collections.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('icestudio')
+angular.module('hwstudio')
   .service('collections', function (utils,
     common,
     profile,