* Bug 14897 fixed: xinfo() actual removal 33/20033/4
Samuel GOUGEON [Sun, 20 May 2018 13:36:47 +0000 (15:36 +0200)]
  http://bugzilla.scilab.org/14897

  Anticipates the merge => master of https://codereview.scilab.org/19923

Change-Id: I8e7c8ef5959098b3454ee1f4e96221706eaa9b78

scilab/CHANGES.md
scilab/modules/graphics/help/en_US/text/xinfo.xml [deleted file]
scilab/modules/graphics/help/fr_FR/text/xinfo.xml [deleted file]
scilab/modules/graphics/help/ja_JP/text/xinfo.xml [deleted file]
scilab/modules/graphics/help/pt_BR/text/xinfo.xml [deleted file]
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/xinfo.sci [deleted file]
scilab/modules/helptools/data/configuration/scilab_macros.txt

index 25c57e9..8e0365b 100644 (file)
@@ -192,6 +192,7 @@ Removed Functions
 * `xgetech` was obsolete and has been removed. Please use `gca` instead.
 * `fac3d` was obsolete since Scilab 4 and has been removed. Please use `plot3d` instead.
 * `fac3d1` was obsolete since Scilab 4 and has been removed. Please use `plot3d1` instead.
+* `xinfo` was obsolete and has been removed. Please use `gcf().info_message` instead.
 
 
 Known issues
diff --git a/scilab/modules/graphics/help/en_US/text/xinfo.xml b/scilab/modules/graphics/help/en_US/text/xinfo.xml
deleted file mode 100644 (file)
index eaeeb8e..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * 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.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
-          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
-          xml:lang="en" xml:id="xinfo">
-    <refnamediv>
-        <refname>xinfo</refname>
-        <refpurpose>Sets the text displayed in the current window status bar <emphasis role="bold">(obsolete)</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Syntax</title>
-        <synopsis>xinfo(text)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>text</term>
-                <listitem>
-                    <para>string displayed in the status bar</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-      <warning>
-        <literal>xinfo()</literal> is obsolete and will be removed from Scilab 6.1. Please use
-        <literal>gcf().info_message</literal> instead.
-      </warning>
-        <para>
-            <literal>xinfo</literal> sets the text displayed in the status bar (panel at the bottom
-            of windows) of the current window. It is a the equivalent of setting the
-          <link linkend="figure_properties">info_message</link> property for the current graphic
-          window (given by <link linkend="gcf">gcf</link>)
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-f = scf(100001);
-xinfo("Figure ID: " + string(f.figure_id));
- ]]></programlisting>
-    </refsection>
-    <refsection role="history">
-        <title>History</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.2</revnumber>
-                <revdescription>
-                   xinfo() is tagged obsolete to be removed from Scilab 6.1. Please use
-                   gcf().info_message instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/fr_FR/text/xinfo.xml b/scilab/modules/graphics/help/fr_FR/text/xinfo.xml
deleted file mode 100644 (file)
index 620795d..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
-          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
-          xml:lang="fr" xml:id="xinfo">
-    <refnamediv>
-        <refname>xinfo</refname>
-        <refpurpose>
-          Change le texte affiché dans la barre d'état de la fenêtre courante
-           <emphasis role="bold">(obsolète)</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Séquence d'appel</title>
-        <synopsis>xinfo(texte)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Paramètres</title>
-        <variablelist>
-            <varlistentry>
-                <term>texte</term>
-                <listitem>
-                    <para>chaîne de caractères affichée dans la barre d'état
-                    </para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-      <warning>
-        <literal>xinfo()</literal> est obsolète et sera retirée de Scilab 6.1. SVP utiliser
-        <literal>gcf().info_message</literal> à la place.
-      </warning>
-        <para>
-            <literal>xinfo</literal> change le texte qui est affiché dans la barre d'état
-            (le panneau dans le bas des fenêtres) de la fenêtre courante. Cette fonction est
-            l'équivalent de modifier la propriété <link linkend="figure_properties">info_message</link>
-            de la fenêtre graphique courante (donné par <link linkend="gcf">gcf</link>).
-        </para>
-    </refsection>
-    <refsection>
-      <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-f = scf(100001);
-xinfo("ID figure : " + string(f.figure_id));
-     ]]></programlisting>
-    </refsection>
-    <refsection role="history">
-        <title>Historique</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.2</revnumber>
-                <revdescription>
-                   xinfo() est déclarée obsolète pour être retirée de Scilab 6.1. SVP utiliser
-                   gcf().info_message à la place.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/graphics/help/ja_JP/text/xinfo.xml b/scilab/modules/graphics/help/ja_JP/text/xinfo.xml
deleted file mode 100644 (file)
index 71c98a9..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-
- * Copyright (C) INRIA
-
- *
-
-
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * 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.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
-
- *
-
- -->
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML"
-          xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org"
-          xml:lang="ja" xml:id="xinfo">
-
-    <refnamediv>
-
-        <refname>xinfo</refname>
-
-        <refpurpose>
-
-            カレントのウィンドウステータスバーに表示するテキストを設定する
-            <emphasis role="bold">(obsolete)</emphasis>
-
-        </refpurpose>
-
-    </refnamediv>
-
-    <refsynopsisdiv>
-
-        <title>呼び出し手順</title>
-
-        <synopsis>xinfo(text)</synopsis>
-
-    </refsynopsisdiv>
-
-    <refsection>
-
-        <title>引数</title>
-
-        <variablelist>
-
-            <varlistentry>
-
-                <term>text</term>
-
-                <listitem>
-
-                    <para>ステータスバーに表示される文字列</para>
-
-                </listitem>
-
-            </varlistentry>
-
-        </variablelist>
-
-    </refsection>
-
-    <refsection>
-
-        <title>説明</title>
-        <warning>
-          <literal>xinfo()</literal> is obsolete and will be removed from Scilab 6.1. Please use
-          <literal>gcf().info_message</literal> instead.
-        </warning>
-        <para>
-
-            <literal>xinfo</literal> は文字列 <literal>text</literal> をカレントの
-
-            グラフィックウインドウのメッセージサブウインドウに描画します.
-
-        </para>
-
-    </refsection>
-
-    <refsection>
-
-        <title>例</title>
-
-        <programlisting role="example"><![CDATA[
-
-f = scf(100001);
-
-xinfo("ID figure : " + string(f.figure_id));
-
-     ]]></programlisting>
-
-    </refsection>
-    <refsection role="history">
-        <title>履歴</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.2</revnumber>
-                <revdescription>
-                   xinfo() is tagged obsolete to be removed from Scilab 6.1. Please use
-                   gcf().info_message instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
-
diff --git a/scilab/modules/graphics/help/pt_BR/text/xinfo.xml b/scilab/modules/graphics/help/pt_BR/text/xinfo.xml
deleted file mode 100644 (file)
index 03f45f3..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- *
- * Copyright (C) 2012 - 2016 - Scilab Enterprises
- *
- * 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.
- * This file was originally licensed under the terms of the CeCILL v2.1,
- * and continues to be available under such terms.
- * For more information, see the COPYING file which you should have received
- * along with this program.
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml"
-          xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook"
-          xmlns:scilab="http://www.scilab.org" xml:id="xinfo" xml:lang="pt">
-    <refnamediv>
-        <refname>xinfo</refname>
-        <refpurpose>
-          Define o texto exibido na barra de status da atual janela
-           <emphasis role="bold">(obsolete)</emphasis>
-        </refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>xinfo(texto)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Parâmetros</title>
-        <variablelist>
-            <varlistentry>
-                <term>texto</term>
-                <listitem>
-                    <para>cadeia de caracteres exibida na barra de status</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <warning>
-          <literal>xinfo()</literal> is obsolete and will be removed from Scilab 6.1. Please use
-          <literal>gcf().info_message</literal> instead.
-        </warning>
-        <para>
-            <literal>xinfo</literal> define o texto exhibido na barra de status (painel na parte inferior das janelas) da atual janela.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemples</title>
-        <programlisting role="example"><![CDATA[
-f = scf(100001);
-xinfo("ID figure : " + string(f.figure_id));
-     ]]></programlisting>
-    </refsection>
-    <refsection role="history">
-        <title>Histórico</title>
-        <revhistory>
-            <revision>
-                <revnumber>6.0.2</revnumber>
-                <revdescription>
-                   xinfo() is tagged obsolete to be removed from Scilab 6.1. Please use
-                   gcf().info_message instead.
-                </revdescription>
-            </revision>
-        </revhistory>
-    </refsection>
-</refentry>
index 8dab729..415b272 100644 (file)
@@ -3665,7 +3665,6 @@ msgstr ""
 # File: modules/graphics/macros/plot3d3.sci, line: 19
 # File: modules/graphics/macros/plotframe.sci, line: 28
 # File: modules/graphics/macros/title.sci, line: 17
-# File: modules/graphics/macros/xinfo.sci, line: 19
 # File: modules/graphics/macros/xlabel.sci, line: 17
 # File: modules/graphics/macros/xsave.sci, line: 14
 # File: modules/graphics/macros/ylabel.sci, line: 17
diff --git a/scilab/modules/graphics/macros/xinfo.sci b/scilab/modules/graphics/macros/xinfo.sci
deleted file mode 100644 (file)
index 6280e34..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2007 - INRIA - Jean-Baptiste Silvy
-// Copyright (C) 2012 - 2016 - Scilab Enterprises
-//
-// 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.
-// This file was originally licensed under the terms of the CeCILL v2.1,
-// and continues to be available under such terms.
-// For more information, see the COPYING file which you should have received
-// along with this program.
-
-function xinfo( newMessage )
-    // xinfo function
-    // Set the text of the message bar of the current figure
-
-    warnobsolete("gcf().info_message", "6.1");
-
-    if argn(2)<1 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): At least %d expected.\n"), "xinfo", 1));
-    end
-
-    curFig = gcf() ;
-    curFig.info_message = newMessage ;
-
-endfunction