xselect --> show_window 81/1181/2
Allan CORNET [Wed, 30 Jun 2010 09:49:01 +0000 (11:49 +0200)]
Change-Id: Ia4f7f58889b4289474efd80362117c3e38487ebd

16 files changed:
scilab/modules/graphics/help/en_US/Graphics.xml
scilab/modules/graphics/help/fr_FR/Graphics.xml
scilab/modules/graphics/help/pt_BR/Graphics.xml
scilab/modules/scicos/demos/dialogs_play.sci
scilab/modules/scicos/macros/scicos_auto/scicos.sci
scilab/modules/scicos/macros/scicos_menus/XcosMenuOpen.sci
scilab/modules/scicos/macros/scicos_menus/XcosMenuUpToMain.sci
scilab/modules/scicos/macros/scicos_scicos/Window_.sci
scilab/modules/scicos/macros/scicos_scicos/cosclick.sci
scilab/modules/scicos/macros/scicos_scicos/do_icon_edit.sci
scilab/modules/scicos/macros/scicos_scicos/do_palettes.sci
scilab/modules/scicos/macros/scicos_scicos/do_xsetech.sci
scilab/modules/scicos/macros/scicos_scicos/hilite_path.sci
scilab/modules/scicos/macros/scicos_scicos/window_read_size.sci
scilab/modules/scicos/macros/scicos_scicos/window_set_size.sci
scilab/modules/scicos_blocks/macros/PDE/IHM_EDP.sci

index e5a03f8..572d7bf 100644 (file)
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><link linkend="xselect">xselect</link></term>
+        <term><link linkend="show_window">show_window</link></term>
         <listitem>
           <para>Raise the current graphics window</para>
         </listitem>
index 3fa5fb9..d1bcafc 100644 (file)
       </varlistentry>
 
       <varlistentry>
-        <term><link linkend="xselect">xselect</link></term>
+        <term><link linkend="show_window">show_window</link></term>
 
         <listitem>
           <para>met une fenêtre graphique au premier plan</para>
index e5831c2..e456276 100644 (file)
       </varlistentry>
 
       <varlistentry>
-        <term>xselect</term>
+        <term>show_window</term>
 
         <listitem>
           <para>restaura a janela de gráficos corrente</para>
index e18eba1..5ed603f 100644 (file)
@@ -100,7 +100,7 @@ endfunction
 function [btn,xc,yc,win,Cmenu]=xclick();
 // Copyright INRIA
   global %PT
-  xselect()
+  show_window()
   str=readline()
 //  disp(str)
   rep=evstr('list('+str+')')
index f684561..2463f0f 100644 (file)
@@ -353,7 +353,7 @@ return
        enable_undo = gh_current_window.user_data(3) ;
        scs_m_save  = gh_current_window.user_data(4) ;
        nc_save     = gh_current_window.user_data(5) ;
-       xselect();
+       show_window();
      end
 
   else //** diagram is NOT open
index 2cabfd0..9181774 100644 (file)
@@ -50,7 +50,7 @@ function XcosMenuOpen()
 
   inactive_windows = close_inactive_windows(inactive_windows, super_path);
 
-  xselect();
+  show_window();
 
   [ok, scs_m, %cpr, edited] = do_load(); //** this is the function that really load the diagram
 
index 2ef2c40..aecc8f2 100644 (file)
@@ -27,7 +27,7 @@ function XcosMenuUpToMain()
     //%diagram_path_objective=[] stands for up to main
       Scicos_commands=['%diagram_path_objective=[];%scicos_navig=1';
                       'Cmenu=[];%scicos_navig=[]';
-                      'xselect()'
+                      'show_window()'
                      ]
   else
       messagebox('This is already the main diagram;','modal')
index 1661c02..cd33e17 100644 (file)
@@ -28,7 +28,7 @@ function Window_()
     edited=or(params<>scs_m.props)
     
     if or(scs_m.props.wpar<>params.wpar) then
-      xset('alufunction',3);clf();xselect();xset('alufunction',6);
+      xset('alufunction',3);clf();show_window();xset('alufunction',6);
       window_set_size()
 
       scs_m.props.wpar=params.wpar
index 6ff37af..e1fd3bc 100644 (file)
@@ -116,7 +116,7 @@ function [btn, %pt, win, Cmenu ] = cosclick(flag)
     //**----------------------------------------------------------------------------
 
     Scicos_commands = ['%diagram_path_objective='+sci2exp(pathh)+';%scicos_navig=1';
-                      cmd+';%win=curwin;%pt='+sci2exp(%pt)+';xselect();%scicos_navig=[]';
+                      cmd+';%win=curwin;%pt='+sci2exp(%pt)+';show_window();%scicos_navig=[]';
                      ]
     return ; //** EXIT POINT for the indirect command (to be explored)
   
index 0348e76..eeefbb6 100644 (file)
@@ -53,7 +53,7 @@ function scs_m = do_icon_edit(%pt,scs_m)
 
   //Create the edition window  
   win=max(winsid())+1;
-  fig=scf(win);xselect();
+  fig=scf(win);show_window();
   fig.axes_size=fig.axes_size*sz(1)/sz(2);
   fig.auto_resize='off';
   ax=gca();
index 977d3b6..04fceff 100644 (file)
@@ -92,7 +92,7 @@ function [palettes,windows] = do_palettes(palettes, windows)
   delmenu(curwin,_("&?"))
   
   toolbar(curwin, "off"); //** by Vincent C.
-  xselect(); //** rise the current graphics window 
+  show_window(); //** rise the current graphics window 
  
   //**-------------------------------------------------------
 
index 4449535..915a537 100644 (file)
@@ -20,7 +20,7 @@
 //
 
 function do_xsetech(wdm)
-xset('alufunction',3);clf();xselect();
+xset('alufunction',3);clf();show_window();
 
 f_xsetech(wdm)
 
index fe7929c..b3bc1c9 100644 (file)
@@ -27,7 +27,7 @@ function hilite_path(path,mess,with_intermediates)
   global   Scicos_commands
 
   Scicos_commands=['%diagram_path_objective='+sci2exp(path(1:$-1))+';%scicos_navig=1';
-                  'Cmenu=[];xselect();%scicos_navig=[];']
+                  'Cmenu=[];show_window();%scicos_navig=[];']
 
   if argn(2)<3 then with_intermediates=%f,end
   if argn(2)<2 then mess=' ',end
index 543252b..b9ebf35 100644 (file)
@@ -41,6 +41,6 @@ function window_read_size(gh_window)
   
   gh_window.viewport = [scs_m.props.wpar(7), scs_m.props.wpar(8)]
                
-  xselect(); //** put the current window in foreground
+  show_window(); //** put the current window in foreground
 
 endfunction
index 42a9d1f..77a9290 100644 (file)
@@ -99,6 +99,6 @@ function window_set_size(gh_window, viewport)
   end 
  
   gh_curwin.viewport = [%XSHIFT, %YSHIFT];
-  xselect(); //** put the current window in foreground
+  show_window(); //** put the current window in foreground
 endfunction
 
index 3421552..99fc672 100644 (file)
@@ -75,7 +75,7 @@ function [ok,a_domaine,b_domaine,discr,signe,choix,type_meth,degre,Nbr_maillage,
   m4=uimenu(f,'label', 'Documentation', 'callback', "help()");
   m5=uimenu(f,'label', 'Quitter', 'callback', "do_quitter()");
   //create two items in the menu "windows"
-  //m11=uimenu(m,'label', 'new model', 'callback',"xselect()");
+  //m11=uimenu(m,'label', 'new model', 'callback',"show_window()");
   //m12=uimenu(m11,'label', 'clear  window', 'callback',"xbasc()");
 
   // Titre