From: Antoine ELIAS <antoine.elias@scilab-enterprises.com>
Date: Wed, 14 Feb 2018 14:05:07 +0000 (+0100)
Subject: Windows installer: add a shorcut for each mode + rename shorcuts
X-Git-Tag: 6.0.1~4
X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=ed07eb5047aba9b0616d3d378013372125a54258

Windows installer: add a shorcut for each mode + rename shorcuts

Change-Id: I18cde1df1e296b7042404d48ad575fac1f1bf474
---

diff --git a/scilab/tools/innosetup/en_US_scilab.isl b/scilab/tools/innosetup/en_US_scilab.isl
index d74c9e4..e003dbc 100644
--- a/scilab/tools/innosetup/en_US_scilab.isl
+++ b/scilab/tools/innosetup/en_US_scilab.isl
@@ -55,7 +55,9 @@ en_US.DescriptionModulesManager =Tools for management of extern modules
 en_US.DescriptionModuleJVM =Graphic User Interface
 en_US.DescriptionMPI =MPI ( based on Microsoft HPC Pack 2012 R2 )
 ;
-en_US.ConsoleIconName =Scilab Console
+en_US.NWNIIconName = Console
+en_US.NWIconName = Advanced Console
+en_US.GUIIconName = Desktop
 ;
 en_US.WebIconScilab =Scilab on the Web
 ;
diff --git a/scilab/tools/innosetup/icons.iss b/scilab/tools/innosetup/icons.iss
index ded432c..136d385 100644
--- a/scilab/tools/innosetup/icons.iss
+++ b/scilab/tools/innosetup/icons.iss
@@ -1,6 +1,7 @@
 ;
 ; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 ; Copyright (C) DIGITEO - 2010 - Allan CORNET
+; Copyright (C) ESI - 2018 - Antoine ELIAS
 ;
 ; Copyright (C) 2012 - 2016 - Scilab Enterprises
 ;
@@ -16,13 +17,18 @@
 ;
 ;-------------------------------------------------------------------------------
 
-Name: {commondesktop}\{#ScilabName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: not {#COMPN_JVM_MODULE};
-Name: {commondesktop}\{#ScilabName}; Filename: {app}\bin\WScilex.exe;WorkingDir: "%USERPROFILE%\Documents";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: {#COMPN_JVM_MODULE};
-;
-Name: {group}\{#ScilabName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Components: not {#COMPN_JVM_MODULE};
-Name: {group}\{#ScilabName}; Filename: {code:getExecNameForDesktop};WorkingDir: "%USERPROFILE%\Documents";Components: {#COMPN_JVM_MODULE};
+;no java
+Name: {commondesktop}\{#ScilabName}{cm:NWNIIconName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: not {#COMPN_JVM_MODULE};
+Name: {group}\{#ScilabName}{cm:NWNIIconName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Components: not {#COMPN_JVM_MODULE};
+
+;java
+;desktop
+Name: {commondesktop}\{#ScilabName}{cm:GUIIconName}; Filename: {app}\bin\WScilex.exe;WorkingDir: "%USERPROFILE%\Documents";Comment: "Start Scilab - The open source platform for numerical computation"; MinVersion: 4,4; Tasks: desktopicon;Components: {#COMPN_JVM_MODULE};
+;start menu
+Name: {group}\{#ScilabName}{cm:GUIIconName}; Filename: {app}\bin\WScilex.exe;WorkingDir: "%USERPROFILE%\Documents";Components: {#COMPN_JVM_MODULE};
+Name: {group}\{#ScilabName}{cm:NWIconName}; Filename: {app}\bin\WScilex-cli.exe;WorkingDir: "%USERPROFILE%\Documents";Components: {#COMPN_JVM_MODULE};
+Name: {group}\{#ScilabName}{cm:NWNIIconName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Components: {#COMPN_JVM_MODULE};
 
-Name: {group}\{cm:ConsoleIconName}; Filename: {app}\bin\Scilex.exe;WorkingDir: "%USERPROFILE%\Documents";Components: {#COMPN_JVM_MODULE};
 ;
 Name: "{group}\{cm:WebIconScilab}"; Filename: "{app}\scilabwebsite.url";