Improve drivers notifications management

FPGAwars · Jan 11, 2018 · 4f138af · 4f138af
1 parent 608b5bc
commit 4f138af
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/app/scripts/services/common.js b/app/scripts/services/common.js
@@ -89,11 +89,11 @@ angular.module('icestudio')
     }
 
     this.showToolchain = function () {
-      return (this.selectedBoard && this.selectedBoard.info.interface !== 'GPIO') || true;
+      return (this.selectedBoard && this.selectedBoard.info.interface !== 'GPIO') || false;
     };
 
     this.showDrivers = function () {
-      return (this.selectedBoard && (this.selectedBoard.info.interface === 'FTDI' || this.selectedBoard.info.interface === 'Serial')) || true;
+      return (this.selectedBoard && (this.selectedBoard.info.interface === 'FTDI' || this.selectedBoard.info.interface === 'Serial')) || false;
     };
 
   });
diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -829,7 +829,7 @@ angular.module('icestudio')
 
     function apioInstallDrivers(callback) {
       if (common.WIN32) {
-        updateProgress('apio install drivers', 80);
+        updateProgress('apio install drivers', 90);
         utils.apioInstall('drivers', callback);
       }
       else {
@@ -855,20 +855,22 @@ angular.module('icestudio')
     }
 
     function setupDriversAlert() {
-      var message = gettextCatalog.getString('Click here to <b>setup the drivers</b>');
-      if (!infoAlert) {
-        setTimeout(function() {
-          infoAlert = alertify.message(message, 30);
-          infoAlert.callback = function(isClicked) {
-            infoAlert = null;
-            if (isClicked) {
-              if (resultAlert) {
-                resultAlert.dismiss(false);
+      if (common.showDrivers()) {
+        var message = gettextCatalog.getString('Click here to <b>setup the drivers</b>');
+        if (!infoAlert) {
+          setTimeout(function() {
+            infoAlert = alertify.message(message, 30);
+            infoAlert.callback = function(isClicked) {
+              infoAlert = null;
+              if (isClicked) {
+                if (resultAlert) {
+                  resultAlert.dismiss(false);
+                }
+                $rootScope.$broadcast('enableDrivers');
               }
-              $rootScope.$broadcast('enableDrivers');
-            }
-          };
-        }, 1000);
+            };
+          }, 1000);
+        }
       }
     }