New Edit -> Duplicate action with shortcut

.gitignore

@@ -25,4 +25,4 @@ app/resources/locale/**/*.json
 ice-build/
 
 # WebStorm IDE project folder
-.idea
+.idea

app/index.html

@@ -23,7 +23,7 @@
 <!-- JS ENTRY POINT:                                                   -->
 <!--   Icestudio depends on many .js files. The main JS file, which is -->
 <!--   initially executed, is app.js                                   -->
-<!--  If you want to understand the icestudio code, first have a look  -->
+<!-- If you want to understand the icestudio code, first have a look   -->
 <!-- to this index.html and then continue with app.js                  -->
 <!----------------------------------------------------------------------->
 <!-- NW documentation:                                                 -->
@@ -78,9 +78,9 @@
       position:absolute;
       top:0;left:0;
       overflow:hidden;
-    z-index:0;
-    background-color:#7ccff4;
-    opacity:0.4;
+      z-index:0;
+      background-color:#7ccff4;
+      opacity:0.4;
     }
     .spinner-wrapper--container{
       position:absolute;

app/scripts/app.js

@@ -13,9 +13,9 @@
 
 //-- Global Icestudio
 //-- this is the core system with services, api and communications.
-//-- Group inside different object for eficiency model by V8 engine.
+//-- Group inside different object for efficiency model by V8 engine.
 //-- The global variable should be declared as "var" and not "let" 
-//-- because is accesible from popups windows
+//-- because it is accessible from popups windows
 var iceStudio = new Icestudio();
 
 //-- Global CONSOLE. Used for Debugging
@@ -26,7 +26,7 @@ var iceConsole = new IceLogger();
 angular
   .module("icestudio", ["ui.bootstrap", "ngRoute", "gettext"])
   .run(function (
-    profile,  //-- Icestudio profile file managment
+    profile,  //-- Icestudio profile file management
     project,
     common,
     tools,
@@ -156,7 +156,7 @@ angular
         "common.APIO_HOME_DIR: APIO folder: " + common.APIO_HOME_DIR
       );
       iceConsole.log(
-        "common.ENV_DIR: PYthon virtual environment: " + common.ENV_DIR
+        "common.ENV_DIR: Python virtual environment: " + common.ENV_DIR
       );
       iceConsole.log(
         "common.ENV_BIN_DIR: Executable files: " + common.ENV_BIN_DIR
@@ -187,14 +187,17 @@ angular
               )
             );
 
-            tools.checkToolchain( () => {}, //-- No callback 
-                                  false); //-- No error notifications
-
+            tools.checkToolchain(
+                () => {}, //-- No callback
+                false     //-- No error notifications
+            );
           });
         } else {
           profile.set("board", boards.selectBoard(profile.get("board")).name);
-          tools.checkToolchain( () => {}, //-- No callback 
-                                false); //-- No error notifications
+          tools.checkToolchain(
+              () => {}, //-- No callback
+              false     //-- No error notifications
+          );
         }
 
         $("html").attr("lang", profile.get("language"));
@@ -205,10 +208,10 @@ angular
         );
         project.updateTitle(gettextCatalog.getString("Untitled"));
       });
-     // setTimeout(function () {
-        $("#main-icestudio-wrapper").addClass("loaded");
-        $("#main-icestudio-load-wrapper").addClass("fade-loaded");
-        setTimeout(function () {
+      // setTimeout(function () {
+      $("#main-icestudio-wrapper").addClass("loaded");
+      $("#main-icestudio-load-wrapper").addClass("fade-loaded");
+      setTimeout(function () {
           $("#main-icestudio-load-wrapper").addClass("loaded");
           $("#main-icestudio-load-wrapper").removeClass("fade-loaded");
         }, 1000);
@@ -217,4 +220,3 @@ angular
 
     console.log("->DEBUG: app.js: END");
   });
-

app/scripts/controllers/menu.js

@@ -32,7 +32,7 @@ angular
       shortcuts,
       gettextCatalog,
 
-      //-- Accesing _package object
+      //-- Accessing _package object
       //-- Defined in module app/scripts/factories/window.js
       _package
     ) 
@@ -73,7 +73,7 @@ angular
   //-----------------------------------
 
   //-- Get the Window object
-  //-- The nw object is globaly available. It contains all the
+  //-- The nw object is globally available. It contains all the
   //-- NWjs APIs
   //-- More information:
   //--  https://nwjs.readthedocs.io/en/latest/ 
@@ -144,7 +144,7 @@ angular
   //-------------------------------------------------------------------------
   //-- Read the arguments passed to the app
   //-- If no arguments, nothing is done (just a blank project)
-  //-- Currenty there is only one argument to pass: The filename of the 
+  //-- Currently, there is only one argument to pass: The filename of the
   //--   icestudio design to open
   //-------------------------------------------------------------------------
 
@@ -179,9 +179,9 @@ angular
     filepath = params["filepath"];
   }
   //-- No argument through url
-  //-- Check if there was an argument comming from the command line
-  //-- If there are arguments is because it has been start by doble
-  //-- cliking on an .ice file
+  //-- Check if there was an argument coming from the command line
+  //-- If there are arguments is because it has been start by double
+  //-- clicking on an .ice file
   else {
 
     //-- Read the arguments from nw API
@@ -224,7 +224,7 @@ angular
     let hasNewVersion =
        lastversionReview === false || lastversionReview < _package.version;
 
-    //-- Display the version notes, if the option is enable or
+    //-- Display the version notes, if the option is enabled or
     //-- if this is a newer version
     if (versionW === "yes" || hasNewVersion) {
       $scope.openVersionInfoWindow();
@@ -288,9 +288,9 @@ angular
   $scope.newProject = () => {
 
     //-- Create a new blank icestudio window
-    //-- A non-existant file is passed as a parameters
-    //-- It let us distinguis if the new window was created because of
-    //-- a new file or it was the first window opened
+    //-- A non-existent file is passed as a parameters
+    //-- It let us distinguish if the new window was created because of
+    //-- a new file, or it was the first window opened
     utils.newWindow("Untitled.ice");
   };
 
@@ -303,7 +303,7 @@ angular
   $scope.openProjectDialog = function () {
 
     //-- Open the file Dialog
-    //-- The selecter is passed as a parameter
+    //-- The selector is passed as a parameter
     //-- The html element is located in the menu.html file
     utils.openDialog("#input-open-project", function (filepath) {
 
@@ -347,7 +347,7 @@ angular
           alertify.alert(
             gettextCatalog.getString("Save submodule"),
             gettextCatalog.getString(
-              'To save your design you need to lock the keylock and \
+              'To save your design you need to lock the padlock and \
               go to top level design.<br/><br/>If you want to export \
               this submodule to a file, execute "Save as" command to do it.'
             ),
@@ -407,9 +407,9 @@ angular
           alertify.confirm(
             gettextCatalog.getString("Export submodule"),
             gettextCatalog.getString(
-              'You are editing a submodule, if you save it, you save only \
+              'You are editing a submodule, if you save it, you\'ll save only \
               the submodule (in this situation "save as" works like \
-              "export module"), Do you like to continue?'
+              "export module"). Do you want to continue?'
             ),
             function () {
               $scope.doSaveProjectAs(localCallback);
@@ -617,7 +617,7 @@ angular
       }
 
       //---------------------------------------------------------------------
-      //-- CALLBACK FUNCIONTS for the EDIT MENU
+      //-- CALLBACK FUNCTIONS for the EDIT MENU
       //---------------------------------------------------------------------
       $scope.undoGraph = function () {
         graph.undo();
@@ -657,6 +657,10 @@ angular
         }
       };
 
+      $scope.duplicateSelected = function () {
+        graph.duplicateSelected();
+      };
+
       $scope.removeSelected = function () {
         graph.removeSelected();
       };
@@ -677,12 +681,6 @@ angular
         showToolBox();
       };  
 
-      /* redundant: patched via $scope - @mgesteiro
-      function removeSelected() {
-        project.removeSelected();  // <- this is justa a wrapper of graph.removeSelected()
-      }
-      */
-
       $scope.fitContent = function () {
         graph.fitContent();
       };
@@ -711,7 +709,7 @@ angular
           form.process(evt);
 
           //-- If there were errors, the form is not closed
-          //-- Return without clossing
+          //-- Return without closing
           if (evt.cancel) {
             return;
           } 
@@ -733,7 +731,7 @@ angular
             newLogfile.lastIndexOf(separator) + 1
           );
 
-          //-- If the file is valid..
+          //-- If the file is valid ...
           if (newLogfile === "" || hd.isValidPath(dirLFile)) {
 
             //-- Set the new file
@@ -844,7 +842,7 @@ angular
           let newPythonPath = form.values[0];
           let newPipPath = form.values[1];
 
-          //-- If there where no changes.. return
+          //-- If there where no changes ... return
           if ( newPythonPath === pythonEnv.python &&
                newPipPath === pythonEnv.pip) {
                  return;
@@ -907,7 +905,7 @@ angular
           //-- Read the new path
           let newExternalCollections = form.values[0];
 
-          //-- If there where no changes.. return
+          //-- If there where no changes ... return
           if (newExternalCollections === externalCollections) {
             return;
           }
@@ -1156,7 +1154,7 @@ angular
       // View/System Info Window
       //--
       $scope.showSystemInfo = function () {
-        //-- Write the iformation to the log file:
+        //-- Write the information to the log file:
         iceConsole.log("---------------------");
         iceConsole.log("  VIEW/System Info");
         iceConsole.log("--------------------");
@@ -1173,8 +1171,8 @@ angular
         iceConsole.log("\n\n");
 
         //-- Build the URL with all the parameters to pass to the window
-        //-- The encodeURIComponent() function the characteres so that the spaces and
-        //-- other special characteres can be place on the original URL
+        //-- The encodeURIComponent() function the characters so that the spaces and
+        //-- other special characters can be place on the original URL
         let URL =
           `resources/viewers/system/system.html?version=${common.ICESTUDIO_VERSION}` +
           `&base_dir=${encodeURIComponent(common.BASE_DIR)}---` +
@@ -1347,7 +1345,7 @@ angular
           alertify.alert(
             gettextCatalog.getString("Build"),
             gettextCatalog.getString(
-              "You can only build at top-level design. Inside submodules you only can <strong>Verify</strong>"
+              "You can only build at the top-level design. Inside submodules, you can only <strong>Verify</strong>"
             ),
             function () { }
           );
@@ -1372,7 +1370,7 @@ angular
           alertify.alert(
             gettextCatalog.getString("Upload"),
             gettextCatalog.getString(
-              "You can only upload  your design at top-level design. Inside submodules you only can <strong>Verify</strong>"
+              "You can only upload at the top-level design. Inside submodules, you can only <strong>Verify</strong>"
             ),
             function () { }
           );
@@ -1521,7 +1519,7 @@ angular
           'who start this project and was the main developer from 2016/Jan/28 to 2019/Oct',
           "</p>",
           '    <p>Thanks to the rest of <a class="action-open-url-external-browser" href="https://github.com/FPGAwars/icestudio">contributors</a></p>',
-          '    <p><span class="copyleft">&copy;</span> <a class="action-open-url-external-browser" href="http://fpgawars.github.io">FPGAwars</a> 2016-2022</p>',
+          '    <p><span class="copyleft">&copy;</span> <a class="action-open-url-external-browser" href="https://fpgawars.github.io">FPGAwars</a> 2016-2022</p>',
           '<img src="resources/images/fpgawars-logo.png">',
           "  </div>",
           "</div>",
@@ -1589,6 +1587,7 @@ angular
       shortcuts.method("copySelected", $scope.copySelected);
       shortcuts.method("pasteAndCloneSelected", $scope.pasteAndCloneSelected);
       shortcuts.method("pasteSelected", $scope.pasteSelected);
+      shortcuts.method("duplicateSelected", $scope.duplicateSelected);
       shortcuts.method("removeSelected", $scope.removeSelected);
       shortcuts.method("selectAll", $scope.selectAll);
       shortcuts.method("fitContent", $scope.fitContent);
@@ -1610,7 +1609,6 @@ angular
       // -- Show Floating toolbox
       shortcuts.method("showToolBox", $scope.showToolBox);
 
-      //shortcuts.method("removeSelected", removeSelected);  // moved alongside other EDIT menu options
       shortcuts.method("back", function () {
         if (graph.isEnabled()) {
           graph.removeSelected();
@@ -1821,7 +1819,7 @@ angular
           reName = new RegExp(parsedSearch.name, 'i'); // contains + case insensitive (less restrictive)
           if (optionCase === true && optionExact === false) { // contains + case sensitive
             reName = new RegExp (parsedSearch.name);
-          } else if (optionCase === false && optionExact === true) { // exact + case insensitive
+          } else if (optionCase === false && optionExact === true) { // exact + case-insensitive
             reName = new RegExp ("\\b"+parsedSearch.name+"\\b", 'i');
           } else if (optionCase === true && optionExact === true) { // exact + case sensitive (most restrictive)
             reName = new RegExp ("\\b"+parsedSearch.name+"\\b");
@@ -1944,7 +1942,7 @@ angular
         showToolBox();  // close toolbox 
       }); 
 
-      //-- dragabble toolbox 
+      //-- draggable toolbox
       $(document).on("mousedown", "#iceToolbox .title-bar", function () {
         mouseDownTB = true;
       });

app/scripts/services/graph.js

@@ -1320,6 +1320,23 @@ angular.module('icestudio')
                 }
             };
 
+            this.duplicateSelected = function() {
+                if (hasSelection()) {
+                    utils.duplicateSelected(selection, graph, function (object) {
+                        if (object.version === common.VERSION) {
+                            self.appendDesign(object.design, object.dependencies);
+                        }
+                    });
+                }
+            };
+
+            this.removeSelected = function () {
+                if (hasSelection()) {
+                    graph.removeCells(selection.models);
+                    selectionView.cancelSelection();
+                    updateWiresOnObstacles();
+                }
+            };
 
             this.selectAll = function () {
                 disableSelected();
@@ -1336,14 +1353,6 @@ angular.module('icestudio')
                 return selection && selection.length > 0;
             }
 
-            this.removeSelected = function () {
-                if (hasSelection()) {
-                    graph.removeCells(selection.models);
-                    selectionView.cancelSelection();
-                    updateWiresOnObstacles();
-                }
-            };
-
             function disableSelected() {
                 if (hasSelection()) {
                     selectionView.cancelSelection();

app/scripts/services/project.js

@@ -688,10 +688,6 @@ angular.module('icestudio')
       return block;
     }
 
-    this.removeSelected = function () {
-      graph.removeSelected();
-    };
-
     this.clear = function () {
       project = _default();
       graph.clearAll();