Merge pull request #802 from rdbyk/balisc_1

Last Tweaks for Balisc 1
rdbyk · Feb 16, 2019 · 826726f · 826726f
2 parents e5e4797 + b548310
commit 826726f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/scilab/modules/core/src/cpp/InitScilab.cpp b/scilab/modules/core/src/cpp/InitScilab.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - Scilab Enterprises - Antoine ELIAS
  * Copyright (C) 2013 - Scilab Enterprises - Cedric DELAMARRE
  * Copyright (C) 2012 - 2016 - Scilab Enterprises
- * Copyright (C) 2017 - 2018 Dirk Reusch, Kybernetik Dr. Reusch
+ * Copyright (C) 2017 - 2019 Dirk Reusch, Kybernetik Dr. Reusch
  *
  * This file is hereby licensed under the terms of the GNU GPL v2.0,
  * pursuant to article 5.3.4 of the CeCILL v.2.1.
@@ -1207,7 +1207,7 @@ static void Add_io(void)
 
 static void Add_balisc(void)
 {
-    Add_Double_Constant(L"%balisc", 0);
+    Add_Double_Constant(L"%balisc", 1);
 }
 
 static void Add_Poly_Constant(const std::wstring& _szName, const std::wstring& _szPolyVar, int _iRank, types::Double * _pdbl)

diff --git a/scilab/modules/gui/etc/main_menubar.xml b/scilab/modules/gui/etc/main_menubar.xml
@@ -144,8 +144,8 @@
         </submenu>
         <separator/>
         <submenu label="&amp;Links">
-            <submenu label="Scilab &amp;Web Site">
-                <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openScilabWebSite" type="3"/>
+            <submenu label="Balisc &amp;Web Site">
+                <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openBaliscWebSite" type="3"/>
             </submenu>
             <separator/>
             <submenu label="Scilab &amp;Online Help">
@@ -175,12 +175,14 @@
                 <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openBugzilla" type="3"/>
             </submenu>
         </submenu>
+<!--
         <separator/>
         <submenu label="&amp;Scilab Enterprises">
             <callback instruction="org.scilab.modules.gui.bridge.CallScilabBridge.openSE" type="3"/>
         </submenu>
+-->
         <separator/>
-        <submenu label="&amp;About Scilab..." accelerator="shift F1">
+        <submenu label="&amp;About Balisc..." accelerator="shift F1">
             <callback instruction="about()" type="0"/>
         </submenu>
     </menu>

diff --git a/scilab/modules/gui/images/icons/aboutscilab.png b/scilab/modules/gui/images/icons/aboutscilab.png
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
@@ -622,8 +622,8 @@ public void run() {
     /**
      * Open a Browser on Scilab Web Site
      */
-    public static void openScilabWebSite() {
-        WebBrowser.openUrl("http://www.scilab.org/");
+    public static void openBaliscWebSite() {
+        WebBrowser.openUrl("https://github.com/rdbyk/balisc/");
     }
 
     /**

diff --git a/scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp b/scilab/modules/ui_data/src/cpp/BrowseVarManager.cpp
@@ -292,7 +292,8 @@ void SetBrowseVarData()
 /*--------------------------------------------------------------------------*/
 static std::set<string> createScilabDefaultVariablesSet()
 {
-    string arr[] = { "home",
+    string arr[] = { "%balisc",
+                     "home",
                      "PWD",
                      "%tk",
                      "%pvm",
@@ -332,7 +333,7 @@ static std::set<string> createScilabDefaultVariablesSet()
                    };
     int i = 0;
 
-#define NBELEMENT 37
+#define NBELEMENT 38
     std::set<string> ScilabDefaultVariables;
 
     for (i = 0; i < NBELEMENT; i++)