Merge remote-tracking branch 'origin/master' into gsoc2012-interactions 60/8460/1
Sylvestre Ledru [Wed, 1 Aug 2012 08:48:53 +0000 (10:48 +0200)]
Change-Id: I00b3af8333d85e80755517a59369d144542e1126

1  2 
scilab/CHANGES_5.4.X
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/graphics_menubar.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java

@@@ -1,9 -1,3 +1,17 @@@
 +
 +
 +* Interactive point-and-click curve editor, now the user can select/unselect
 +  hide/unhide and delete curves, copy, cut and paste selected curves between figures,
 +  now figures can be copied as an image to system clipboard(only under Windows).
 +
++* History
++
++* Native datatips
++
++* Modifications of data
++
++* Graphic editor
++
              Changes between version 5.4.0-beta-1 and 5.4.0-beta-2 of Scilab
              ===============================================================
  
Simple merge
Simple merge
      </submenu>
      <separator/>
      <submenu label="&amp;Start datatip manager" icon="datatips">
 -      <callback instruction='datatipManagerMode([SCILAB_FIGURE_ID],"on");' type="0"/>
 +      <callback instruction='org.scilab.modules.gui.datatip.DatatipManagerMode.setDatatipManagerModeButtonOn' type="3"/>
      </submenu>
      <submenu label="Stop datatip manager">
 -      <callback instruction='datatipManagerMode([SCILAB_FIGURE_ID],"off");' type="0"/>
 +      <callback instruction='org.scilab.modules.gui.datatip.DatatipManagerMode.setDatatipManagerModeButtonOff' type="3"/>
      </submenu>
 +
 +    <submenu label="Start curve data modify" icon="data_modify">
 +      <callback instruction='useeditor([SCILAB_FIGURE_ID], %t);' type="0"/>
 +    </submenu>
 +    <submenu label="Stop curve data modify">
 +      <callback instruction='useeditor([SCILAB_FIGURE_ID], %f);' type="0"/>
 +    </submenu>
 +
 +    <submenu label="Scilab Graphic Editor - GED">
 +      <submenu label="&amp;Quick Editor">
 +        <callback instruction="org.scilab.modules.gui.ged.StartGED.quickGED" type="3"/>
 +      </submenu>
 +    </submenu>
 +
    </menu>
-   
    <!--
    <menu label="&amp;MVC">
      <submenu label="&amp;Log View (Trace all View notifications)">