* Rename "borders" property to "border" 42/13942/5
Vincent COUVERT [Thu, 6 Mar 2014 16:03:43 +0000 (17:03 +0100)]
* Rename createBorders function to createBorder
* Move createBorder (+ related test) from graphics to gui
* Add help pages for borders.

Change-Id: I38f1c7fb35fb2636636cbe50224a54531982c78d

36 files changed:
scilab/CHANGES_5.5.X
scilab/modules/demo_tools/macros/demo_gui.sci
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/XMLDomLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/xmlloader/XmlSaver.java
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/locales/graphics.pot
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_border_property.c [moved from scilab/modules/graphics/src/c/getHandleProperty/get_borders_property.c with 87% similarity]
scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/set_border_property.c [moved from scilab/modules/graphics/src/c/getHandleProperty/set_borders_property.c with 99% similarity]
scilab/modules/graphics/tests/unit_tests/borders.dia.ref [deleted file]
scilab/modules/graphics/tests/unit_tests/borders.tst [deleted file]
scilab/modules/gui/demos/cb_uicontrol_plot3d.dem.sci
scilab/modules/gui/help/en_US/bevel_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/compound_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/createBorder.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/createBorderFont.xml
scilab/modules/gui/help/en_US/empty_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/etched_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/line_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/matte_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/help/en_US/titled_border_properties.xml [new file with mode: 0644]
scilab/modules/gui/locales/gui.pot
scilab/modules/gui/macros/createBorder.sci [moved from scilab/modules/graphics/macros/createBorders.sci with 77% similarity]
scilab/modules/gui/sci_gateway/c/sci_uicontrol.c
scilab/modules/gui/tests/unit_tests/borders.dia.ref [new file with mode: 0644]
scilab/modules/gui/tests/unit_tests/borders.tst [new file with mode: 0644]
scilab/modules/helptools/data/configuration/scilab_macros.txt
scilab/modules/io/macros/%_save.sci
scilab/modules/javasci/Makefile.in

index 8b1e7b2..87f4a76 100644 (file)
@@ -19,7 +19,7 @@ GUI Refactoring and Improvements
 
 * New uicontrols properties:
  - borders: Used to set some decoration properties on "frame" uicontrols.
-            These decorations can be created and initialized with the createBorders
+            These decorations can be created and initialized with the createBorder
             and the createBorderFont functions.
  - scrollable: Used to add scrolling capabilities on "frame" uicontrols.
  - groupname: Used to group "radiobutton" and "checkbox" uicontrols for an easier
index c931e18..3753e09 100644 (file)
@@ -59,9 +59,9 @@ function demo_gui()
     callback_close_str = "delete(get(""scilab_demo_fig""));";
     callback_close_str = callback_close_str + clear_vars_str + "clearglobal demolistlock demolist;";
 
-    b = get("frame_1", "borders");
+    b = get("frame_1", "border");
     b.title = _("Demonstrations");
-    set("frame_1", "borders", b);
+    set("frame_1", "border", b);
     set("listbox_1", "string", demolist(:, 1));
     set("listbox_1", "userdata", demolist);
 
@@ -120,9 +120,9 @@ function script_path = demo_gui_update()
 
         frame = get("frame_" + string(my_selframe_num+1));
 
-        b = frame.borders;
+        b = frame.border;
         b.title = my_data(my_index(1,1),1)
-        frame.borders = b;
+        frame.border = b;
 
         listbox = get("listbox_" + string(my_selframe_num+1));
         listbox.string = demo_fig.userdata.subdemolist(:, 1);
index bf5d97e..35fe28b 100644 (file)
@@ -67,7 +67,7 @@ public class XMLDomLoader {
 
         nameToGO.put("axes", __GO_AXES__);
 
-        nameToGO.put("borders", __GO_UI_FRAME_BORDER__);
+        nameToGO.put("border", __GO_UI_FRAME_BORDER__);
 
         /* internal */
         nameToGO.put("out", __NODE_OUT__);
index e670c3f..1762ec6 100644 (file)
@@ -221,11 +221,11 @@ public class XmlSaver {
         return elemAxes;
     }
 
-    private static Element createBorders(Document doc, Integer id) {
-        return createBorders(doc, id, "borders");
+    private static Element createBorder(Document doc, Integer id) {
+        return createBorder(doc, id, "border");
     }
 
-    private static Element createBorders(Document doc, Integer id, String borderName) {
+    private static Element createBorder(Document doc, Integer id, String borderName) {
         GraphicController controller = GraphicController.getController();
         FrameBorder border = (FrameBorder)controller.getObjectFromId(id);
 
@@ -233,72 +233,72 @@ public class XmlSaver {
             return null;
         }
 
-        Element elemBorders = doc.createElement(borderName);
+        Element elemBorder = doc.createElement(borderName);
 
-        setAttribute(elemBorders, "style", createAttribute(border.getStyleAsEnum().toString().toLowerCase()), "");
+        setAttribute(elemBorder, "style", createAttribute(border.getStyleAsEnum().toString().toLowerCase()), "");
 
         switch (border.getStyleAsEnum()) {
             case BEVEL: {
-                setAttribute(elemBorders, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
-                setAttribute(elemBorders, "hlout", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
-                setAttribute(elemBorders, "hlin", createAttribute(border.getHlIn()), createAttribute(defaultBorder.getHlIn()));
-                setAttribute(elemBorders, "shadowout", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
-                setAttribute(elemBorders, "shadowin", createAttribute(border.getShadowIn()), createAttribute(defaultBorder.getShadowIn()));
+                setAttribute(elemBorder, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
+                setAttribute(elemBorder, "hlout", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
+                setAttribute(elemBorder, "hlin", createAttribute(border.getHlIn()), createAttribute(defaultBorder.getHlIn()));
+                setAttribute(elemBorder, "shadowout", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
+                setAttribute(elemBorder, "shadowin", createAttribute(border.getShadowIn()), createAttribute(defaultBorder.getShadowIn()));
                 break;
             }
             case COMPOUND: {
-                Element out = createBorders(doc, border.getOutBorder(), "out");
+                Element out = createBorder(doc, border.getOutBorder(), "out");
                 if (out != null) {
-                    appendChild(elemBorders, out);
+                    appendChild(elemBorder, out);
                 }
 
-                Element in = createBorders(doc, border.getInBorder(), "in");
+                Element in = createBorder(doc, border.getInBorder(), "in");
                 if (in != null) {
-                    appendChild(elemBorders, in);
+                    appendChild(elemBorder, in);
                 }
                 break;
             }
             case EMPTY: {
-                setAttribute(elemBorders, "position", createAttribute(border.getPosition()), createAttribute(defaultBorder.getPosition()));
+                setAttribute(elemBorder, "position", createAttribute(border.getPosition()), createAttribute(defaultBorder.getPosition()));
                 break;
             }
             case ETCHED: {
-                setAttribute(elemBorders, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
-                setAttribute(elemBorders, "hl", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
-                setAttribute(elemBorders, "shadow", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
+                setAttribute(elemBorder, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
+                setAttribute(elemBorder, "hl", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
+                setAttribute(elemBorder, "shadow", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
                 break;
             }
             case LINE: {
-                setAttribute(elemBorders, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
-                setAttribute(elemBorders, "thickness", createAttribute(border.getThickness()), createAttribute(defaultBorder.getThickness()));
-                setAttribute(elemBorders, "rounded", createAttribute(border.getRounded()), createAttribute(defaultBorder.getRounded()));
+                setAttribute(elemBorder, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
+                setAttribute(elemBorder, "thickness", createAttribute(border.getThickness()), createAttribute(defaultBorder.getThickness()));
+                setAttribute(elemBorder, "rounded", createAttribute(border.getRounded()), createAttribute(defaultBorder.getRounded()));
                 break;
             }
             case MATTE: {
-                setAttribute(elemBorders, "position", createAttribute(border.getPosition()), createAttribute(defaultBorder.getPosition()));
-                setAttribute(elemBorders, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
+                setAttribute(elemBorder, "position", createAttribute(border.getPosition()), createAttribute(defaultBorder.getPosition()));
+                setAttribute(elemBorder, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
                 break;
             }
             case SOFTBEVEL: {
-                setAttribute(elemBorders, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
-                setAttribute(elemBorders, "hlout", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
-                setAttribute(elemBorders, "hlin", createAttribute(border.getHlIn()), createAttribute(defaultBorder.getHlIn()));
-                setAttribute(elemBorders, "shadowout", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
-                setAttribute(elemBorders, "shadowin", createAttribute(border.getShadowIn()), createAttribute(defaultBorder.getShadowIn()));
+                setAttribute(elemBorder, "type", createAttribute(border.getBorderType()), createAttribute(defaultBorder.getBorderType()));
+                setAttribute(elemBorder, "hlout", createAttribute(border.getHlOut()), createAttribute(defaultBorder.getHlOut()));
+                setAttribute(elemBorder, "hlin", createAttribute(border.getHlIn()), createAttribute(defaultBorder.getHlIn()));
+                setAttribute(elemBorder, "shadowout", createAttribute(border.getShadowOut()), createAttribute(defaultBorder.getShadowOut()));
+                setAttribute(elemBorder, "shadowin", createAttribute(border.getShadowIn()), createAttribute(defaultBorder.getShadowIn()));
                 break;
             }
             case TITLED: {
-                setAttribute(elemBorders, "title", createAttribute(border.getTitle()), createAttribute(defaultBorder.getTitle()));
-                setAttribute(elemBorders, "justification", createAttribute(border.getJustification()), createAttribute(defaultBorder.getJustification()));
-                setAttribute(elemBorders, "titleposition", createAttribute(border.getTitlePosition()), createAttribute(defaultBorder.getTitlePosition()));
-                setAttribute(elemBorders, "fontname", createAttribute(border.getFontName()), createAttribute(defaultBorder.getFontName()));
-                setAttribute(elemBorders, "fontangle", createAttribute(border.getFontAngle()), createAttribute(defaultBorder.getFontAngle()));
-                setAttribute(elemBorders, "fontsize", createAttribute(border.getFontSize()), createAttribute(defaultBorder.getFontSize()));
-                setAttribute(elemBorders, "fontweight", createAttribute(border.getFontWeight()), createAttribute(defaultBorder.getFontWeight()));
-                setAttribute(elemBorders, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
-                Element title = createBorders(doc, border.getTitleBorder(), "title");
+                setAttribute(elemBorder, "title", createAttribute(border.getTitle()), createAttribute(defaultBorder.getTitle()));
+                setAttribute(elemBorder, "justification", createAttribute(border.getJustification()), createAttribute(defaultBorder.getJustification()));
+                setAttribute(elemBorder, "titleposition", createAttribute(border.getTitlePosition()), createAttribute(defaultBorder.getTitlePosition()));
+                setAttribute(elemBorder, "fontname", createAttribute(border.getFontName()), createAttribute(defaultBorder.getFontName()));
+                setAttribute(elemBorder, "fontangle", createAttribute(border.getFontAngle()), createAttribute(defaultBorder.getFontAngle()));
+                setAttribute(elemBorder, "fontsize", createAttribute(border.getFontSize()), createAttribute(defaultBorder.getFontSize()));
+                setAttribute(elemBorder, "fontweight", createAttribute(border.getFontWeight()), createAttribute(defaultBorder.getFontWeight()));
+                setAttribute(elemBorder, "color", createAttribute(border.getColor()), createAttribute(defaultBorder.getColor()));
+                Element title = createBorder(doc, border.getTitleBorder(), "title");
                 if (title != null) {
-                    appendChild(elemBorders, title);
+                    appendChild(elemBorder, title);
                 }
                 break;
             }
@@ -307,7 +307,7 @@ public class XmlSaver {
                 break;
             }
         }
-        return elemBorders;
+        return elemBorder;
     }
 
     private static Element createUicontrol(Document doc, Integer id, boolean reverseChildren) {
@@ -407,11 +407,11 @@ public class XmlSaver {
 
         //only for frame type
         if (uic.getStyleAsEnum() == UicontrolStyle.FRAME) {
-            //Borders
-            Integer iBorders = uic.getFrameBorder();
-            Element borders = createBorders(doc, iBorders);
-            if (borders != null) {
-                appendChild(elemUi, createBorders(doc, iBorders));
+            //Border
+            Integer iBorder = uic.getFrameBorder();
+            Element border = createBorder(doc, iBorder);
+            if (border != null) {
+                appendChild(elemUi, createBorder(doc, iBorder));
             }
 
             //Layout
index 47467cc..9087df0 100644 (file)
@@ -336,8 +336,8 @@ src/c/getHandleProperty/set_constraints_property.c \
 src/c/getHandleProperty/set_rect_property.c \
 src/c/getHandleProperty/get_layout_options_property.c \
 src/c/getHandleProperty/set_layout_options_property.c \
-src/c/getHandleProperty/get_borders_property.c \
-src/c/getHandleProperty/set_borders_property.c \
+src/c/getHandleProperty/get_border_property.c \
+src/c/getHandleProperty/set_border_property.c \
 src/c/getHandleProperty/get_groupname_property.c \
 src/c/getHandleProperty/set_groupname_property.c \
 src/c/getHandleProperty/get_tabtitle_property.c \
index 712a8da..8ea33de 100644 (file)
@@ -483,8 +483,8 @@ am__objects_1 = src/c/libscigraphics_algo_la-GetCommandArg.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_rect_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_layout_options_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_layout_options_property.lo \
-       src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo \
-       src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo \
+       src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_groupname_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-set_groupname_property.lo \
        src/c/getHandleProperty/libscigraphics_algo_la-get_tabtitle_property.lo \
@@ -1281,8 +1281,8 @@ src/c/getHandleProperty/set_constraints_property.c \
 src/c/getHandleProperty/set_rect_property.c \
 src/c/getHandleProperty/get_layout_options_property.c \
 src/c/getHandleProperty/set_layout_options_property.c \
-src/c/getHandleProperty/get_borders_property.c \
-src/c/getHandleProperty/set_borders_property.c \
+src/c/getHandleProperty/get_border_property.c \
+src/c/getHandleProperty/set_border_property.c \
 src/c/getHandleProperty/get_groupname_property.c \
 src/c/getHandleProperty/set_groupname_property.c \
 src/c/getHandleProperty/get_tabtitle_property.c \
@@ -2586,10 +2586,10 @@ src/c/getHandleProperty/libscigraphics_algo_la-get_layout_options_property.lo:
 src/c/getHandleProperty/libscigraphics_algo_la-set_layout_options_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
-src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo:  \
+src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
-src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo:  \
+src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo:  \
        src/c/getHandleProperty/$(am__dirstamp) \
        src/c/getHandleProperty/$(DEPDIR)/$(am__dirstamp)
 src/c/getHandleProperty/libscigraphics_algo_la-get_groupname_property.lo:  \
@@ -3069,7 +3069,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_background_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_bar_layout_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_bar_width_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_borders_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_box_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_callback_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_callback_type_property.Plo@am__quote@
@@ -3236,7 +3236,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_background_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_bar_layout_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_bar_width_property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_borders_property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_border_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_box_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_callback_property.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_callback_type_property.Plo@am__quote@
@@ -5582,19 +5582,19 @@ src/c/getHandleProperty/libscigraphics_algo_la-set_layout_options_property.lo: s
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_layout_options_property.lo `test -f 'src/c/getHandleProperty/set_layout_options_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_layout_options_property.c
 
-src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo: src/c/getHandleProperty/get_borders_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_borders_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo `test -f 'src/c/getHandleProperty/get_borders_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_borders_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_borders_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_borders_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_borders_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo' libtool=yes @AMDEPBACKSLASH@
+src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo: src/c/getHandleProperty/get_border_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo `test -f 'src/c/getHandleProperty/get_border_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_border_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_border_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/get_border_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_borders_property.lo `test -f 'src/c/getHandleProperty/get_borders_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_borders_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_border_property.lo `test -f 'src/c/getHandleProperty/get_border_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_border_property.c
 
-src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo: src/c/getHandleProperty/set_borders_property.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_borders_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo `test -f 'src/c/getHandleProperty/set_borders_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_borders_property.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_borders_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_borders_property.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_borders_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo' libtool=yes @AMDEPBACKSLASH@
+src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo: src/c/getHandleProperty/set_border_property.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_border_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo `test -f 'src/c/getHandleProperty/set_border_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_border_property.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_border_property.Tpo src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-set_border_property.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/getHandleProperty/set_border_property.c' object='src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_borders_property.lo `test -f 'src/c/getHandleProperty/set_borders_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_borders_property.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/getHandleProperty/libscigraphics_algo_la-set_border_property.lo `test -f 'src/c/getHandleProperty/set_border_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/set_border_property.c
 
 src/c/getHandleProperty/libscigraphics_algo_la-get_groupname_property.lo: src/c/getHandleProperty/get_groupname_property.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscigraphics_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/getHandleProperty/libscigraphics_algo_la-get_groupname_property.lo -MD -MP -MF src/c/getHandleProperty/$(DEPDIR)/libscigraphics_algo_la-get_groupname_property.Tpo -c -o src/c/getHandleProperty/libscigraphics_algo_la-get_groupname_property.lo `test -f 'src/c/getHandleProperty/get_groupname_property.c' || echo '$(srcdir)/'`src/c/getHandleProperty/get_groupname_property.c
index 731d0a9..e7bf627 100644 (file)
@@ -234,7 +234,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_background_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_bar_layout_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_bar_width_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\get_borders_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\get_border_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_constraints_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_datatips_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_box_property.c" />
@@ -349,7 +349,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile Include="src\c\getHandleProperty\get_toolbar_property.c" />
     <ClCompile Include="src\c\getHandleProperty\get_use_color_material_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_ambient_color_property.c" />
-    <ClCompile Include="src\c\getHandleProperty\set_borders_property.c" />
+    <ClCompile Include="src\c\getHandleProperty\set_border_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_constraints_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_default_axes_property.c" />
     <ClCompile Include="src\c\getHandleProperty\set_diffuse_color_property.c" />
index 458a0c6..44efc03 100644 (file)
     <ClCompile Include="src\c\getHandleProperty\get_layout_options_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\get_borders_property.c">
+    <ClCompile Include="src\c\getHandleProperty\get_border_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\c\getHandleProperty\set_borders_property.c">
+    <ClCompile Include="src\c\getHandleProperty\set_border_property.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\c\getHandleProperty\get_groupname_property.c">
index a50f25a..504d608 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-03-13 10:58+0100\n"
+"Revision-Date: 2014-03-13 10:59+0100\n"
 
 # File: sci_gateway/c/gw_graphics.c, line: 131
 # File: src/nographics/nographics.c, line: 83
@@ -1486,10 +1486,10 @@ msgstr ""
 # File: src/c/getHandleProperty/get_axes_visible_property.c, line: 54
 # File: src/c/getHandleProperty/get_background_property.c, line: 43
 # File: src/c/getHandleProperty/get_bar_width_property.c, line: 42
-# File: src/c/getHandleProperty/get_borders_property.c, line: 53
-# File: src/c/getHandleProperty/get_borders_property.c, line: 68
-# File: src/c/getHandleProperty/get_borders_property.c, line: 169
-# File: src/c/getHandleProperty/get_borders_property.c, line: 266
+# File: src/c/getHandleProperty/get_border_property.c, line: 53
+# File: src/c/getHandleProperty/get_border_property.c, line: 68
+# File: src/c/getHandleProperty/get_border_property.c, line: 169
+# File: src/c/getHandleProperty/get_border_property.c, line: 266
 # File: src/c/getHandleProperty/get_box_property.c, line: 44
 # File: src/c/getHandleProperty/get_box_property.c, line: 65
 # File: src/c/getHandleProperty/get_box_property.c, line: 97
@@ -1708,7 +1708,7 @@ msgstr ""
 # File: src/c/getHandleProperty/set_axes_visible_property.c, line: 106
 # File: src/c/getHandleProperty/set_background_property.c, line: 55
 # File: src/c/getHandleProperty/set_bar_width_property.c, line: 56
-# File: src/c/getHandleProperty/set_borders_property.c, line: 153
+# File: src/c/getHandleProperty/set_border_property.c, line: 153
 # File: src/c/getHandleProperty/set_box_property.c, line: 97
 # File: src/c/getHandleProperty/set_box_property.c, line: 128
 # File: src/c/getHandleProperty/set_box_property.c, line: 135
@@ -3309,9 +3309,6 @@ msgstr ""
 
 #
 # File: macros/clf.sci, line: 40
-# File: macros/createBorders.sci, line: 25
-# File: macros/createBorders.sci, line: 161
-# File: macros/createBorders.sci, line: 200
 # File: macros/createConstraints.sci, line: 30
 # File: macros/createConstraints.sci, line: 55
 # File: macros/rotate.sci, line: 20
@@ -3367,7 +3364,6 @@ msgstr ""
 # File: macros/colordef.sci, line: 72
 # File: macros/comet.sci, line: 105
 # File: macros/comet3d.sci, line: 128
-# File: macros/createBorders.sci, line: 364
 # File: macros/createConstraints.sci, line: 100
 # File: macros/createLayoutOptions.sci, line: 56
 # File: macros/datatips/datatipSetStyle.sci, line: 47
@@ -3542,7 +3538,6 @@ msgid "%s: Colormap too small"
 msgstr ""
 
 #
-# File: macros/createBorders.sci, line: 17
 # File: macros/createConstraints.sci, line: 17
 # File: macros/createLayoutOptions.sci, line: 17
 #, c-format
@@ -3550,67 +3545,6 @@ msgid "%s: Wrong number of input argument(s): At least %d expected."
 msgstr ""
 
 #
-# File: macros/createBorders.sci, line: 42
-# File: macros/createBorders.sci, line: 277
-# File: macros/createBorders.sci, line: 282
-# File: macros/createBorders.sci, line: 287
-# File: macros/createBorders.sci, line: 292
-# File: macros/createBorders.sci, line: 327
-# File: macros/createBorders.sci, line: 333
-# File: macros/createBorders.sci, line: 339
-# File: macros/createBorders.sci, line: 345
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A integer expected.\n"
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 68
-# File: macros/createBorders.sci, line: 114
-#, c-format
-msgid "%s: Wrong number of input argument(s): %d, %d or %d expected."
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 172
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d: A integer or a string expected.\n"
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 206
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A border or a string expected.\n"
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 249
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A Font Border expected.\n"
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 267
-# File: macros/createBorders.sci, line: 299
-# File: macros/subplot.sci, line: 13
-#, c-format
-msgid "%s: Wrong number of input argument(s): %d or %d expected."
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 309
-# File: macros/createBorders.sci, line: 314
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A border expected.\n"
-msgstr ""
-
-#
-# File: macros/createBorders.sci, line: 321
-#, c-format
-msgid "%s: Wrong number of input argument(s): %d expected."
-msgstr ""
-
-#
 # File: macros/createConstraints.sci, line: 41
 # File: macros/createConstraints.sci, line: 60
 # File: macros/createConstraints.sci, line: 66
@@ -4456,6 +4390,12 @@ msgid ""
 msgstr ""
 
 #
+# File: macros/subplot.sci, line: 13
+#, c-format
+msgid "%s: Wrong number of input argument(s): %d or %d expected."
+msgstr ""
+
+#
 # File: macros/subplot.sci, line: 24
 #, c-format
 msgid ""
index 068b491..f5959c1 100755 (executable)
@@ -963,7 +963,7 @@ function %h_p(h)
                 l = l(1);
                 l = l(1);
             end
-            b = h.borders;
+            b = h.border;
             if type(b) == 16 then //tlist
                 b = b(1);
                 b = b(1);
@@ -1021,7 +1021,7 @@ function %h_p(h)
                 "Layout = "+sci2exp(h.layout)
                 "Layout_options = "+sci2exp(l)
                 "Constraints = "+sci2exp(c)
-                "Borders = "+sci2exp(b)
+                "Border = "+sci2exp(b)
                 "Margins = "+sci2exp(h.margins)
                 "Groupname = "+sci2exp(h.groupname)
                 "Scrollable = "+sci2exp(h.scrollable)
index c7186a6..f97fc0a 100755 (executable)
@@ -242,7 +242,7 @@ static getHashTableCouple propertyGetTable[] =
     {"constraints", get_constraints_property},
     {"rect", get_rect_property},
     {"layout_options", get_layout_options_property},
-    {"borders", get_borders_property},
+    {"border", get_border_property},
     {"groupname", get_groupname_property},
     {"title_position", get_title_position_property},
     {"title_scroll", get_title_scroll_property},
index 1ca1e17..862e6c4 100755 (executable)
@@ -243,7 +243,7 @@ static setHashTableCouple propertySetTable[] =
     {"constraints", set_constraints_property},
     {"rect", set_rect_property},
     {"layout_options", set_layout_options_property},
-    {"borders", set_borders_property},
+    {"border", set_border_property},
     {"groupname", set_groupname_property},
     {"title_position", set_title_position_property},
     {"title_scroll", set_title_scroll_property},
index d412810..5d944f9 100755 (executable)
@@ -189,7 +189,7 @@ int get_layout_property(void* _pvCtx, int iObjUID);
 int get_constraints_property(void* _pvCtx, int iObjUID);
 int get_rect_property(void* _pvCtx, int iObjUID);
 int get_layout_options_property(void* _pvCtx, int iObjUID);
-int get_borders_property(void* _pvCtx, int iObjUID);
+int get_border_property(void* _pvCtx, int iObjUID);
 int get_groupname_property(void* _pvCtx, int iObjUID);
 int get_title_position_property(void* _pvCtx, int iObjUID);
 int get_title_scroll_property(void* _pvCtx, int iObjUID);
 #include "returnPropertyList.h"
 
 /*------------------------------------------------------------------------*/
-int getBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getNoBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getLineBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getSoftBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getCommonBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID, int _iBevel);
-int getEtchedBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getTitledBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getEmptyBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getCompoundBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
-int getMatteBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getNoBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getLineBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getSoftBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getCommonBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID, int _iBevel);
+int getEtchedBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getTitledBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getEmptyBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getCompoundBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
+int getMatteBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID);
 /*------------------------------------------------------------------------*/
-int get_borders_property(void* _pvCtx, int iObjUID)
+int get_border_property(void* _pvCtx, int iObjUID)
 {
     int iBorder = 0;
     int* piBorder = &iBorder;
@@ -50,14 +50,14 @@ int get_borders_property(void* _pvCtx, int iObjUID)
     getGraphicObjectProperty(iObjUID, __GO_UI_FRAME_BORDER__, jni_int, (void **)&piBorder);
     if (piBorder == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "borders");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "border");
         return -1;
     }
 
-    return getBorders(_pvCtx, iRhs, 0, 0, iBorder);
+    return getBorder(_pvCtx, iRhs, 0, 0, iBorder);
 }
 /*------------------------------------------------------------------------*/
-int getBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     int iStyle = 0;
     int* piStyle = &iStyle;
@@ -65,7 +65,7 @@ int getBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
     getGraphicObjectProperty(_iObjUID, __GO_UI_FRAME_BORDER_STYLE__, jni_int, (void **)&piStyle);
     if (piStyle == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "borders");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "border");
         return -1;
     }
 
@@ -74,47 +74,47 @@ int getBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
     {
         default:
         {
-            return getNoBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getNoBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case LINE :
         {
-            return getLineBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getLineBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case BEVEL :
         {
-            return getBevelBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getBevelBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case SOFTBEVEL :
         {
-            return getSoftBevelBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getSoftBevelBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case ETCHED :
         {
-            return getEtchedBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getEtchedBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case TITLED :
         {
-            return getTitledBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getTitledBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case EMPTY :
         {
-            return getEmptyBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getEmptyBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case COMPOUND :
         {
-            return getCompoundBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getCompoundBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
         case MATTE :
         {
-            return getMatteBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
+            return getMatteBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID);
         }
         break;
     }
@@ -122,7 +122,7 @@ int getBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getNoBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getNoBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -150,7 +150,7 @@ int getNoBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUI
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getLineBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getLineBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -166,7 +166,7 @@ int getLineBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObj
     getGraphicObjectProperty(_iObjUID, __GO_UI_FRAME_BORDER_COLOR__, jni_string, (void **)&pstColor);
     if (pstColor == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "borders");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "border");
         return -1;
     }
 
@@ -231,17 +231,17 @@ int getLineBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObj
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
-    return getCommonBevelBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID, 1);
+    return getCommonBevelBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID, 1);
 }
 /*------------------------------------------------------------------------*/
-int getSoftBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getSoftBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
-    return getCommonBevelBorders(_pvCtx, _iVar, _piParent, _iPos, _iObjUID, 2);
+    return getCommonBevelBorder(_pvCtx, _iVar, _piParent, _iPos, _iObjUID, 2);
 }
 /*------------------------------------------------------------------------*/
-int getCommonBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID, int _iBevel)
+int getCommonBevelBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID, int _iBevel)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -263,7 +263,7 @@ int getCommonBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, in
     getGraphicObjectProperty(_iObjUID, __GO_UI_FRAME_BORDER_TYPE__, jni_int, (void **)&piType);
     if (piType == NULL)
     {
-        Scierror(999, _("'%s' property does not exist for this handle.\n"), "borders");
+        Scierror(999, _("'%s' property does not exist for this handle.\n"), "border");
         return -1;
     }
 
@@ -363,7 +363,7 @@ int getCommonBevelBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, in
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getEtchedBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getEtchedBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -451,7 +451,7 @@ int getEtchedBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iO
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getTitledBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getTitledBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -534,7 +534,7 @@ int getTitledBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iO
     if (piChildBorder)
     {
         //get child information and fill current list
-        if (getBorders(_pvCtx, _iVar, piAddrList, 2, iChildBorder))
+        if (getBorder(_pvCtx, _iVar, piAddrList, 2, iChildBorder))
         {
             return -1;
         }
@@ -620,7 +620,7 @@ int getTitledBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iO
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getEmptyBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getEmptyBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -680,7 +680,7 @@ int getEmptyBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iOb
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getCompoundBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getCompoundBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
@@ -717,12 +717,12 @@ int getCompoundBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _
     if (iListSize > 1)
     {
         //get child information and fill current list
-        if (getBorders(_pvCtx, _iVar, piAddrList, 2, iChildBorderOut))
+        if (getBorder(_pvCtx, _iVar, piAddrList, 2, iChildBorderOut))
         {
             return -1;
         }
 
-        if (getBorders(_pvCtx, _iVar, piAddrList, 3, iChildBorderIn))
+        if (getBorder(_pvCtx, _iVar, piAddrList, 3, iChildBorderIn))
         {
             return -1;
         }
@@ -731,7 +731,7 @@ int getCompoundBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int getMatteBorders(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
+int getMatteBorder(void* _pvCtx, int _iVar, int* _piParent, int _iPos, int _iObjUID)
 {
     SciErr sciErr;
     int* piAddrList = NULL;
index 5667a9f..342ab23 100755 (executable)
@@ -192,7 +192,7 @@ int set_layout_property(void* _pvCtx, int iObj, void* _pvData, int valueType, in
 int set_constraints_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_rect_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_layout_options_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
-int set_borders_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
+int set_border_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_groupname_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_title_position_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
 int set_title_scroll_property(void* _pvCtx, int iObj, void* _pvData, int valueType, int nbRow, int nbCol);
@@ -31,7 +31,7 @@
 #include "graphicObjectProperties.h"
 #include "BorderLayoutType.h"
 /*------------------------------------------------------------------------*/
-int clearBorders(int iObjUID);
+int clearBorder(int iObjUID);
 int createBorder(void* _pvCtx, int* _piAddrList, int _iParent);
 int createLineBorder(void* _pvCtx, int* _piAddrList, int _iObjUID);
 int createBevelBorder(void* _pvCtx, int* _piAddrList, int _iObjUID);
@@ -43,12 +43,12 @@ int createEmptyBorder(void* _pvCtx, int* _piAddrList, int _iObjUID);
 int createCompoundBorder(void* _pvCtx, int* _piAddrList, int _iObjUID);
 int createMatteBorder(void* _pvCtx, int* _piAddrList, int _iObjUID);
 /*------------------------------------------------------------------------*/
-int set_borders_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+int set_border_property(void* _pvCtx, int iObjUID, void* _pvData, int valueType, int nbRow, int nbCol)
 {
     //[] or tlist
     if (valueType == sci_matrix)
     {
-        return clearBorders(iObjUID);
+        return clearBorder(iObjUID);
     }
     else
     {
@@ -94,7 +94,7 @@ int createBorder(void* _pvCtx, int* _piAddrList, int _iParent)
     //depend of kind of tlist
     if (strcmp(pstType, "NoBorder") == 0)
     {
-        return clearBorders(_iParent);
+        return clearBorder(_iParent);
     }
     else if (strcmp(pstType, "LineBorder") == 0)
     {
@@ -133,7 +133,7 @@ int createBorder(void* _pvCtx, int* _piAddrList, int _iParent)
     return 0;
 }
 /*------------------------------------------------------------------------*/
-int clearBorders(int iObjUID)
+int clearBorder(int iObjUID)
 {
     BOOL status = FALSE;
     int iBorder = 0;
diff --git a/scilab/modules/graphics/tests/unit_tests/borders.dia.ref b/scilab/modules/graphics/tests/unit_tests/borders.dia.ref
deleted file mode 100644 (file)
index 2dcaa8c..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2014 - Scilab Enterprises - Antoine ELIAS
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-// <-- TEST WITH GRAPHIC -->
-l = list();
-//borders
-//none
-//l($+1) = createBorders("none");
-//empty
-l($+1) = createBorders("empty");
-l($+1) = createBorders("empty", 10, 20, 30, 40);
-//line
-l($+1) = createBorders("line", "blue");
-l($+1) = createBorders("line", "red", 2);
-//bevel
-l($+1) = createBorders("bevel", "raised");
-l($+1) = createBorders("bevel", "lowered", "blue", "red");
-l($+1) = createBorders("bevel", "lowered", "blue", "red", "magenta", "orange");
-// softbevel
-l($+1) = createBorders("softbevel", "raised");
-l($+1) = createBorders("softbevel", "lowered", "blue", "red");
-l($+1) = createBorders("softbevel", "lowered", "blue", "red", "magenta", "orange");
-//etched
-l($+1) = createBorders("etched");
-l($+1) = createBorders("etched", "raised");
-l($+1) = createBorders("etched", "blue", "red");
-l($+1) = createBorders("etched", "lowered", "blue", "red");
-//titled
-font1 = createBorderFont("Serif", 12, "bold");
-font2 = createBorderFont("Serif", 12, "normal", "italic");
-l($+1) = createBorders("titled", "title");
-l($+1) = createBorders("titled", createBorders("empty"));
-l($+1) = createBorders("titled", createBorders("line", "blue"), "title");
-l($+1) = createBorders("titled", createBorders("bevel", "raised"), "title", "center", "top");
-l($+1) = createBorders("titled", createBorders("matte", 1, 2, 3, 4, "pink"), "title", "center", "top", font1);
-l($+1) = createBorders("titled", createBorders("etched"), "title", "left", "top", font2, "blue");
-//compound
-l($+1) = createBorders("compound");
-l($+1) = createBorders("compound", createBorders("empty"), createBorders("etched"));
-//matte
-l($+1) = createBorders("matte", 4, 3, 2, 1, "yellow");
-//create a window with all type of frame border.
-f = figure( ...
-    "dockable", "off", ...
-    "menubar_visible", "off", ...
-    "infobar_visible", "off", ...
-    "toolbar_visible", "off", ...
-    "layout", "grid", ...
-    "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
-for i = 1:size(l)
-    u = uicontrol(f, "style", "frame", "borders", l(i));
-    assert_checkequal(u.borders, l(i));
-end
diff --git a/scilab/modules/graphics/tests/unit_tests/borders.tst b/scilab/modules/graphics/tests/unit_tests/borders.tst
deleted file mode 100644 (file)
index 02af2ff..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2014 - Scilab Enterprises - Antoine ELIAS
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- TEST WITH GRAPHIC -->
-
-
-l = list();
-//borders
-//none
-//l($+1) = createBorders("none");
-//empty
-l($+1) = createBorders("empty");
-l($+1) = createBorders("empty", 10, 20, 30, 40);
-//line
-l($+1) = createBorders("line", "blue");
-l($+1) = createBorders("line", "red", 2);
-//bevel
-l($+1) = createBorders("bevel", "raised");
-l($+1) = createBorders("bevel", "lowered", "blue", "red");
-l($+1) = createBorders("bevel", "lowered", "blue", "red", "magenta", "orange");
-// softbevel
-l($+1) = createBorders("softbevel", "raised");
-l($+1) = createBorders("softbevel", "lowered", "blue", "red");
-l($+1) = createBorders("softbevel", "lowered", "blue", "red", "magenta", "orange");
-//etched
-l($+1) = createBorders("etched");
-l($+1) = createBorders("etched", "raised");
-l($+1) = createBorders("etched", "blue", "red");
-l($+1) = createBorders("etched", "lowered", "blue", "red");
-//titled
-font1 = createBorderFont("Serif", 12, "bold");
-font2 = createBorderFont("Serif", 12, "normal", "italic");
-l($+1) = createBorders("titled", "title");
-l($+1) = createBorders("titled", createBorders("empty"));
-l($+1) = createBorders("titled", createBorders("line", "blue"), "title");
-l($+1) = createBorders("titled", createBorders("bevel", "raised"), "title", "center", "top");
-l($+1) = createBorders("titled", createBorders("matte", 1, 2, 3, 4, "pink"), "title", "center", "top", font1);
-l($+1) = createBorders("titled", createBorders("etched"), "title", "left", "top", font2, "blue");
-//compound
-l($+1) = createBorders("compound");
-l($+1) = createBorders("compound", createBorders("empty"), createBorders("etched"));
-//matte
-l($+1) = createBorders("matte", 4, 3, 2, 1, "yellow");
-
-//create a window with all type of frame border.
-
-f = figure( ...
-    "dockable", "off", ...
-    "menubar_visible", "off", ...
-    "infobar_visible", "off", ...
-    "toolbar_visible", "off", ...
-    "layout", "grid", ...
-    "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
-for i = 1:size(l)
-    u = uicontrol(f, "style", "frame", "borders", l(i));
-    assert_checkequal(u.borders, l(i));
-end
index 1fb53cd..420bd4c 100644 (file)
@@ -43,7 +43,7 @@ function uicontrol_plot3d()
     frame_left = uicontrol(demo_plot3d, ...
         "style", "frame", ...
         "constraints", createConstraints("gridbag", [1, 1, 1, 1], [0.4, 1], "both", "left", [0, 0], [0, 0]), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Control Panel"), "center", "below_top", createFontBorder("", 16, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Control Panel"), "center", "below_top", createFontBorder("", 16, "normal"), "black"), ...
         "backgroundcolor", [1 1 1], ...
         "layout", "gridbag");
 
@@ -58,7 +58,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 2, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Rotation angle"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Rotation angle"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
         "layout", "border");
 
     uicontrol(frame_angle, ...
@@ -81,7 +81,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 4, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Colormap"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Colormap"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
         "layout_options", createLayoutOptions("grid", [3, 1]));
 
     frame_colormap.layout = "grid";
@@ -123,7 +123,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 6, 1, 1], [0, 0], "both", "center"), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Background Color"), "center", "top", createFontBorder("", 11, "normal"), "black"), ..
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Background Color"), "center", "top", createFontBorder("", 11, "normal"), "black"), ..
         "layout", "border");
 
     uicontrol(frame_background, ...
@@ -146,7 +146,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 8, 1, 1], [1, 1], "both", "center"), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Show / Hide"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Show / Hide"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
         "layout_options", createLayoutOptions("grid", [4, 1]));
 
     frame_style.layout = "grid";
@@ -190,7 +190,7 @@ function uicontrol_plot3d()
         "style", "frame", ...
         "backgroundcolor", [1 1 1], ...
         "constraints", createConstraints("gridbag", [1, 10, 1, 1], [1, 0], "both", "center"), ...
-        "border", createBorders("titled", createBorders("line", "lightGray", 1), _("Title"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
+        "border", createBorder("titled", createBorder("line", "lightGray", 1), _("Title"), "center", "top", createFontBorder("", 11, "normal"), "black"), ...
         "layout", "border");
 
     uicontrol(frame_style, ...
diff --git a/scilab/modules/gui/help/en_US/bevel_border_properties.xml b/scilab/modules/gui/help/en_US/bevel_border_properties.xml
new file mode 100644 (file)
index 0000000..4153c3b
--- /dev/null
@@ -0,0 +1,102 @@
+<?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="en" xml:id="bevel_border_properties">
+    <refnamediv>
+        <refname>Bevel border properties</refname>
+    </refnamediv>
+    <refnamediv xml:id="softbevel_border_properties">
+        <refname>Soft bevel border properties</refname>
+        <refpurpose>Description of the soft-bevel and bevel borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            bevelBorder = createBorder("bevel", type)
+            bevelBorder = createBorder("bevel", type, hlouter, shadowouter)
+            bevelBorder = createBorder("bevel", type, hlouter, hlinner, shadowouter, shadowinner)
+
+            bevelBorder = createBorder("softbevel", type)
+            bevelBorder = createBorder("softbevel", type, hlouter, shadowouter)
+            bevelBorder = createBorder("softbevel", type, hlouter, hlinner, shadowouter, shadowinner)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>type</term>
+                <listitem>
+                    <para>"lowered" | "raised"</para>
+                    <para>The type of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>hlouter</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for the outer edge highlight.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>hlinner</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for the inner edge highlight.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>shadowouter</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for the outer shadow area.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>shadowinner</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for the inner shadow area.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>bevelBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a bevel border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/compound_border_properties.xml b/scilab/modules/gui/help/en_US/compound_border_properties.xml
new file mode 100644 (file)
index 0000000..b319c07
--- /dev/null
@@ -0,0 +1,73 @@
+<?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="en" xml:id="compound_border_properties">
+    <refnamediv>
+        <refname>Compound border properties</refname>
+        <refpurpose>Description of the compound borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            compoundBorder = createBorder("compound")
+            compoundBorder = createBorder("compound", outer, inner)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>outer</term>
+                <listitem>
+                    <para>Border object</para>
+                    <para>A border created by <link linkend="createBorder">createBorder</link> used as the outer edge of the compound border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>inner</term>
+                <listitem>
+                    <para>Border object</para>
+                    <para>A border created by <link linkend="createBorder">createBorder</link> used as the inner edge of the compound border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>compoundBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a compound border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/createBorder.xml b/scilab/modules/gui/help/en_US/createBorder.xml
new file mode 100644 (file)
index 0000000..54338c5
--- /dev/null
@@ -0,0 +1,115 @@
+<?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="en" xml:id="createBorder">
+    <refnamediv>
+        <refname>createBorder</refname>
+        <refpurpose>Create a border for a frame uicontrol.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            border = createBorder(borderType, varargin)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>borderType</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The type of the border to be created. Available types of borders are listed below and their specific properties are detailled on dedicated help page:</para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>"none": No border will be added to the frame (default). No property is available for this type.</para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "line": A simple <link linkend="line_border_properties">line border</link>.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "bevel": A <link linkend="bevel_border_properties">beveled border</link> using shades.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "softbevel": A <link linkend="softbevel_border_properties">soft beveled border</link> using shades with softened corners.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "etched": A <link linkend="etched_border_properties">etched style border</link>.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "titled": A <link linkend="titled_border_properties">border with a title</link>.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "empty": An <link linkend="empty_border_properties">empty border</link> that is not drawn but takes space.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "compound": A <link linkend="compound_border_properties">compound border</link> mixing other types of borders.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                "matte": A <link linkend="matte_border_properties">matte-look border</link>.
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>varargin</term>
+                <listitem>
+                    <para>
+                        All <literal>borderType</literal> specific properties.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>border</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 95f5604..1041e5b 100644 (file)
@@ -52,7 +52,7 @@
     <refsection>
         <title>Description</title>
         <para>
-        This function creates a "Border Font" to customize borders in <literal>frame</literal> uicontrols. See <link linkend="border_properties">border properties</link> for more details.
+        This function creates a "Border Font" to customize borders in <literal>frame</literal> uicontrols. See <link linkend="createBorder">createBorder</link> and related pages for more details.
         </para>
     </refsection>
     <refsection>
diff --git a/scilab/modules/gui/help/en_US/empty_border_properties.xml b/scilab/modules/gui/help/en_US/empty_border_properties.xml
new file mode 100644 (file)
index 0000000..a85b8c7
--- /dev/null
@@ -0,0 +1,87 @@
+<?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="en" xml:id="empty_border_properties">
+    <refnamediv>
+        <refname>Empty border properties</refname>
+        <refpurpose>Description of the empty borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            emptyBorder = createBorder("empty")
+            emptyBorder = createBorder("empty", top, left, bottom, right)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>top</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the top of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>left</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the left of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>bottom</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the bottom of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>right</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the right of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>emptyBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates an empty border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/etched_border_properties.xml b/scilab/modules/gui/help/en_US/etched_border_properties.xml
new file mode 100644 (file)
index 0000000..05f04d1
--- /dev/null
@@ -0,0 +1,82 @@
+<?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="en" xml:id="etched_border_properties">
+    <refnamediv>
+        <refname>Etched border properties</refname>
+        <refpurpose>Description of the etched borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            etchedBorder = createBorder("etched")
+            etchedBorder = createBorder("etched", type)
+            etchedBorder = createBorder("etched", hl, shadow)
+            etchedBorder = createBorder("etched", type, hl, shadow)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>type</term>
+                <listitem>
+                    <para>"lowered" | "raised"</para>
+                    <para>The type of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>hl</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for border highlights.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>shadow</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color used for the border shadows.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>etchedBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates an etched border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/line_border_properties.xml b/scilab/modules/gui/help/en_US/line_border_properties.xml
new file mode 100644 (file)
index 0000000..ee11a1d
--- /dev/null
@@ -0,0 +1,82 @@
+<?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="en" xml:id="line_border_properties">
+    <refnamediv>
+        <refname>Line border properties</refname>
+        <refpurpose>Description of the line borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            lineBorder = createBorder("line", color)
+            lineBorder = createBorder("line", color, thickness)
+            lineBorder = createBorder("line", color, thickness, rounded)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>color</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>thickness</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The thickness (in pixels) of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>rounded</term>
+                <listitem>
+                    <para>Boolean or String</para>
+                    <para>This property indicates if the created border angles must be rounded or not.</para>
+                    <para>Available string values are <literal>"on"</literal> and <literal>"off"</literal>.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>lineBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a line border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/matte_border_properties.xml b/scilab/modules/gui/help/en_US/matte_border_properties.xml
new file mode 100644 (file)
index 0000000..0ff393f
--- /dev/null
@@ -0,0 +1,93 @@
+<?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="en" xml:id="matte_border_properties">
+    <refnamediv>
+        <refname>Matte border properties</refname>
+        <refpurpose>Description of the matte borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            matteBorder = createBorder("matte", top, left, bottom, right, color)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>top</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the top of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>left</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the left of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>bottom</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the bottom of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>right</term>
+                <listitem>
+                    <para>Real integer value</para>
+                    <para>The width (in pixels) of the right of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>color</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The name of the color of the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>matteBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a matte border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
diff --git a/scilab/modules/gui/help/en_US/titled_border_properties.xml b/scilab/modules/gui/help/en_US/titled_border_properties.xml
new file mode 100644 (file)
index 0000000..cc24c0b
--- /dev/null
@@ -0,0 +1,106 @@
+<?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="en" xml:id="titled_border_properties">
+    <refnamediv>
+        <refname>Titled border properties</refname>
+        <refpurpose>Description of the titled borders properties.</refpurpose>
+    </refnamediv>
+    <refsynopsisdiv>
+        <title>Calling Sequence</title>
+        <synopsis>
+            titledBorder = createBorder("titled", title)
+            titledBorder = createBorder("titled", border)
+            titledBorder = createBorder("titled", border, title)
+            titledBorder = createBorder("titled", border, title, justification, position)
+            titledBorder = createBorder("titled", border, title, justification, position, font)
+            titledBorder = createBorder("titled", border, title, justification, position, font, color)
+        </synopsis>
+    </refsynopsisdiv>
+    <refsection>
+        <title>Arguments</title>
+        <variablelist>
+            <varlistentry>
+                <term>title</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The title of the border.</para>
+                    <para>If the <literal>border</literal> argument is not given, then a default border (based on current look and feel) will be created.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>border</term>
+                <listitem>
+                    <para>Border object</para>
+                    <para>A border created by <link linkend="createBorder">createBorder</link>.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>justification</term>
+                <listitem>
+                    <para>"left" | "center" | "right" | {"leading"} | "trailing"</para>
+                    <para>The justification of the title.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>position</term>
+                <listitem>
+                    <para>"above_top" | {"top"} | "below_top" | "above_bottom" | "bottom" | "below_bottom"</para>
+                    <para>The vertical position of the title related to the border.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>font</term>
+                <listitem>
+                    <para>Font object</para>
+                    <para>A border font created by <link linkend="createBorderFont">createBorderFont</link>.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>color</term>
+                <listitem>
+                    <para>String</para>
+                    <para>The color of the title.</para>
+                </listitem>
+            </varlistentry>
+            <varlistentry>
+                <term>titledBorder</term>
+                <listitem>
+                    <para>The created border.</para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Description</title>
+        <para>
+            This function creates a titled border for <literal>frame</literal> uicontrols. See <link linkend="uicontrol_properties">uicontrol properties</link> for more details.
+        </para>
+    </refsection>
+    <refsection role="see also">
+        <title>See Also</title>
+        <simplelist type="inline">
+            <member>
+                <link linkend="createBorder">createBorder</link>
+            </member>
+            <member>
+                <link linkend="createBorderFont">createBorderFont</link>
+            </member>
+            <member>
+                <link linkend="uicontrol">uicontrol</link>
+            </member>
+            <member>
+                <link linkend="uicontrol_properties">uicontrol_properties</link>
+            </member>
+        </simplelist>
+    </refsection>
+    <refsection>
+        <title>History</title>
+        <revhistory>
+            <revision>
+                <revnumber>5.5.0</revnumber>
+                <revremark>
+                    Function <function>createBorder</function> introduced.
+                </revremark>
+            </revision>
+        </revhistory>
+    </refsection>
+</refentry>
index 3db0f92..a18fa63 100644 (file)
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2014-03-13 10:58+0100\n"
+"Revision-Date: 2014-03-13 11:00+0100\n"
 
 # File: sci_gateway/c/gw_gui.c, line: 89
 #, c-format
@@ -4281,12 +4281,87 @@ msgid ""
 msgstr ""
 
 #
+# File: macros/createBorder.sci, line: 17
 # File: macros/createBorderFont.sci, line: 20
 #, c-format
 msgid "%s: Wrong number of input argument(s): At least %d expected."
 msgstr ""
 
 #
+# File: macros/createBorder.sci, line: 25
+# File: macros/createBorder.sci, line: 161
+# File: macros/createBorder.sci, line: 200
+#, c-format
+msgid "%s: Wrong number of input argument(s): %d to %d expected."
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 42
+# File: macros/createBorder.sci, line: 277
+# File: macros/createBorder.sci, line: 282
+# File: macros/createBorder.sci, line: 287
+# File: macros/createBorder.sci, line: 292
+# File: macros/createBorder.sci, line: 327
+# File: macros/createBorder.sci, line: 333
+# File: macros/createBorder.sci, line: 339
+# File: macros/createBorder.sci, line: 345
+#, c-format
+msgid "%s: Wrong type for input argument #%d: A integer expected.\n"
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 68
+# File: macros/createBorder.sci, line: 114
+#, c-format
+msgid "%s: Wrong number of input argument(s): %d, %d or %d expected."
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 172
+#, c-format
+msgid ""
+"%s: Wrong type for input argument #%d: A integer or a string expected.\n"
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 206
+#, c-format
+msgid "%s: Wrong type for input argument #%d: A border or a string expected.\n"
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 249
+#, c-format
+msgid "%s: Wrong type for input argument #%d: A Font Border expected.\n"
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 267
+# File: macros/createBorder.sci, line: 299
+#, c-format
+msgid "%s: Wrong number of input argument(s): %d or %d expected."
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 309
+# File: macros/createBorder.sci, line: 314
+#, c-format
+msgid "%s: Wrong type for input argument #%d: A border expected.\n"
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 321
+#, c-format
+msgid "%s: Wrong number of input argument(s): %d expected."
+msgstr ""
+
+#
+# File: macros/createBorder.sci, line: 356
+#, c-format
+msgid "%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"
+msgstr ""
+
+#
 # File: macros/createBorderFont.sci, line: 30
 # File: macros/createBorderFont.sci, line: 36
 # File: macros/createBorderFont.sci, line: 47
 //
 //
 
-function ret = createBorders(constType, varargin)
+function ret = createBorder(constType, varargin)
     [lhs,rhs]=argn(0)
 
     if rhs < 1 then
-        error(msprintf(gettext("%s: Wrong number of input argument(s): At least %d expected."), "createBorders", 1));
+        error(msprintf(gettext("%s: Wrong number of input argument(s): At least %d expected."), "createBorder", 1));
     end
 
     ret = [];
@@ -22,13 +22,13 @@ function ret = createBorders(constType, varargin)
         ret = tlist(["NoBorder"]);
     elseif constType == "line" then
         if rhs <> [2:4] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorders", 2, 4));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorder", 2, 4));
         end
 
         //color
         arg1 = varargin(1);
         if typeof(arg1) <> "string" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 2));
         end
 
         if rhs == 2 then
@@ -39,7 +39,7 @@ function ret = createBorders(constType, varargin)
         //thickness
         arg2 = varargin(2);
         if typeof(arg2) <> "constant" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 3));
         end
 
         if rhs == 3 then
@@ -51,7 +51,7 @@ function ret = createBorders(constType, varargin)
         arg3 = varargin(3);
         t = typeof(arg3);
         if (t <> "boolean" & t <> "string") | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A boolean expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A boolean expected.\n"), "createBorder", 4));
         end
 
         if t == "string" then
@@ -65,13 +65,13 @@ function ret = createBorders(constType, varargin)
         ret = tlist(["LineBorder", "color", "thickness", "rounded"], arg1, arg2, arg3);
     elseif constType == "bevel" then
         if rhs <> [2 4 6] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d, %d or %d expected."), "createBorders", 2, 4, 6));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d, %d or %d expected."), "createBorder", 2, 4, 6));
         end
 
         //type
         arg1 = varargin(1);
         if typeof(arg1) <> "string" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 2));
         end
 
         if rhs == 2 then
@@ -82,13 +82,13 @@ function ret = createBorders(constType, varargin)
         //hl or hl out
         arg2 = varargin(2);
         if typeof(arg2) <> "string" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 3));
         end
 
         //shadow or hl in
         arg3 = varargin(3);
         if typeof(arg3) <> "string" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 4));
         end
 
         if rhs == 4 then
@@ -99,25 +99,25 @@ function ret = createBorders(constType, varargin)
         //shadow out
         arg4 = varargin(4);
         if typeof(arg4) <> "string" | size(arg4, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 5));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 5));
         end
 
         //shadow in
         arg5 = varargin(5);
         if typeof(arg5) <> "string" | size(arg5, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 6));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 6));
         end
 
         ret = tlist(["BevelBorder", "type", "hlouter", "hlinner", "shadowouter", "shadowinner"], arg1, arg2, arg3, arg4, arg5);
     elseif constType == "softbevel" then
         if rhs <> [2 4 6] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d, %d or %d expected."), "createBorders", 2, 4, 6));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d, %d or %d expected."), "createBorder", 2, 4, 6));
         end
 
         //type
         arg1 = varargin(1);
         if typeof(arg1) <> "string" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 2));
         end
 
         if rhs == 2 then
@@ -128,13 +128,13 @@ function ret = createBorders(constType, varargin)
         //hl or hl out
         arg2 = varargin(2);
         if typeof(arg2) <> "string" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 3));
         end
 
         //shadow or hl in
         arg3 = varargin(3);
         if typeof(arg3) <> "string" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 4));
         end
 
         if rhs == 4 then
@@ -145,20 +145,20 @@ function ret = createBorders(constType, varargin)
         //shadow out
         arg4 = varargin(4);
         if typeof(arg4) <> "string" | size(arg4, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 5));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 5));
         end
 
         //shadow in
         arg5 = varargin(5);
         if typeof(arg5) <> "string" | size(arg5, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 6));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 6));
         end
 
         ret = tlist(["SoftBevelBorder", "type", "hlouter", "hlinner", "shadowouter", "shadowinner"], arg1, arg2, arg3, arg4, arg5);
-   elseif constType == "etched" then
+    elseif constType == "etched" then
 
         if rhs > 4 then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorders", 1, 4));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorder", 1, 4));
         end
 
         if rhs == 1 then
@@ -169,7 +169,7 @@ function ret = createBorders(constType, varargin)
         //type or color
         arg1 = varargin(1);
         if typeof(arg1) <> "string" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer or a string expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer or a string expected.\n"), "createBorder", 2));
         end
 
         if rhs == 2 then
@@ -180,7 +180,7 @@ function ret = createBorders(constType, varargin)
         //color
         arg2 = varargin(2);
         if typeof(arg2) <> "string" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 3));
         end
 
         if rhs == 3 then
@@ -191,19 +191,19 @@ function ret = createBorders(constType, varargin)
         //color
         arg3 = varargin(3);
         if typeof(arg3) <> "string" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 4));
         end
 
         ret = tlist(["EtchedBorder", "type", "hl", "shadow"], arg1, arg2, arg3);
     elseif constType == "titled" then
         if rhs <> [2:7] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorders", 2, 7));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d to %d expected."), "createBorder", 2, 7));
         end
 
         //string or border
         arg1 = varargin(1);
         if typeof(arg1) <> ["string", "LineBorder","BevelBorder","SoftBevelBorder","EtchedBorder","EmptyBorder","MatteBorder"] then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border or a string expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border or a string expected.\n"), "createBorder", 2));
         end
 
         if rhs == 2 then
@@ -218,7 +218,7 @@ function ret = createBorders(constType, varargin)
         //title
         arg2 = varargin(2);
         if typeof(arg2) <> "string" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 3));
         end
 
         if rhs == 3 then
@@ -229,13 +229,13 @@ function ret = createBorders(constType, varargin)
         //justification
         arg3 = varargin(3);
         if typeof(arg3) <> "string" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 4));
         end
 
         //position
         arg4 = varargin(4);
         if typeof(arg4) <> "string" | size(arg4, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 5));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 5));
         end
 
         if rhs == 5 then
@@ -246,25 +246,25 @@ function ret = createBorders(constType, varargin)
         //font
         arg5 = varargin(5);
         if typeof(arg5) <> "FontBorder" then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A Font Border expected.\n"), "createBorders", 6));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A Font Border expected.\n"), "createBorder", 6));
         end
 
         if rhs == 6 then
             ret = tlist(["TitledBorder", "border", "title", "justification", "position", "font"], ...
-                arg1, arg2, arg3, arg4, arg5);
+            arg1, arg2, arg3, arg4, arg5);
             return;
         end
 
         arg6 = varargin(6);
         if typeof(arg6) <> "string" | size(arg6, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 6));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 6));
         end
 
         ret = tlist(["TitledBorder", "border", "title", "justification", "position", "font", "color"], ...
-            arg1, arg2, arg3, arg4, arg5, arg6);
+        arg1, arg2, arg3, arg4, arg5, arg6);
     elseif constType == "empty" then
         if rhs <> [1 5] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected."), "createBorders", 1, 5));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected."), "createBorder", 1, 5));
         end
 
         if rhs == 1 then
@@ -274,29 +274,29 @@ function ret = createBorders(constType, varargin)
 
         arg1 = varargin(1);
         if typeof(arg1) <> "constant" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 2));
         end
 
         arg2 = varargin(2);
         if typeof(arg2) <> "constant" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 3));
         end
 
         arg3 = varargin(3);
         if typeof(arg3) <> "constant" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 4));
         end
 
         arg4 = varargin(4);
         if typeof(arg4) <> "constant" | size(arg4, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 5));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 5));
         end
 
         ret = tlist(["EmptyBorder", "top", "left", "bottom", "right"], arg1, arg2, arg3, arg4);
     elseif constType == "compound" then
 
         if rhs <> [1 3] then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected."), "createBorders", 1, 3));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected."), "createBorder", 1, 3));
         end
 
         if rhs == 1 then
@@ -306,61 +306,53 @@ function ret = createBorders(constType, varargin)
 
         arg1 = varargin(1);
         if typeof(arg1) <> ["LineBorder","BevelBorder","SoftBevelBorder","EtchedBorder","EmptyBorder","MatteBorder","TitledBorder"] then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border expected.\n"), "createBorder", 2));
         end
 
         arg2 = varargin(2);
         if typeof(arg2) <> ["LineBorder","BevelBorder","SoftBevelBorder","EtchedBorder","EmptyBorder","MatteBorder","TitledBorder"] then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A border expected.\n"), "createBorder", 3));
         end
 
         ret = tlist(["CompoundBorder", "outer", "inner"], arg1, arg2);
     elseif constType == "matte" then
 
         if rhs <> 6 then
-            error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected."), "createBorders", 6));
+            error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected."), "createBorder", 6));
         end
 
         //top
         arg1 = varargin(1);
         if typeof(arg1) <> "constant" | size(arg1, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 2));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 2));
         end
 
         //left
         arg2 = varargin(2);
         if typeof(arg2) <> "constant" | size(arg2, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 3));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 3));
         end
 
         //bottom
         arg3 = varargin(3);
         if typeof(arg3) <> "constant" | size(arg3, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 4));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 4));
         end
 
         //right
         arg4 = varargin(4);
         if typeof(arg4) <> "constant" | size(arg4, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorders", 5));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A integer expected.\n"), "createBorder", 5));
         end
 
         //color
         arg5 = varargin(5);
         if typeof(arg5) <> "string" | size(arg5, "*") <> 1 then
-            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorders", 6));
+            error(999, msprintf(_("%s: Wrong type for input argument #%d: A string expected.\n"), "createBorder", 6));
         end
 
         ret = tlist(["MatteBorder", "top", "left", "bottom", "right", "color"], arg1, arg2, arg3, arg4, arg5);
-
-    elseif constType == "help" | constType == "doc" then
-
-        //help based on printf
-        // /!\ do not translate, for localizated hepl, refer to online help /!\
-        printf("createBorders function is used to creates Uicontrol frame border :\n");
-        printf("Border type can be\n  - line\n  - bevel\n  - softbevel\n  - etched\n  - titled\n  - empty\n  - compound\n  - matte\n");
-        printf("For more information see Scilab help page help.scilab.org\n");
     else
-        error(999, msprintf(_("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"), "createBorders", 1, "line, bevel, softbevel, etched, titled, empty, compound, matte"));
+        error(999, msprintf(_("%s: Wrong value for input argument #%d: Must be in the set {%s}.\n"), "createBorder", 1, "line, bevel, softbevel, etched, titled, empty, compound, matte"));
     end
 endfunction
index 999e1c3..e996324 100644 (file)
@@ -74,7 +74,7 @@ static const char* propertiesNames[] =
     "tooltipstring",
     "layout",
     "layout_options",
-    "borders",
+    "border",
     "groupname",
     "title_position",
     "title_scroll",
diff --git a/scilab/modules/gui/tests/unit_tests/borders.dia.ref b/scilab/modules/gui/tests/unit_tests/borders.dia.ref
new file mode 100644 (file)
index 0000000..0cf32ee
--- /dev/null
@@ -0,0 +1,56 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+l = list();
+//borders
+//none
+//l($+1) = createBorder("none");
+//empty
+l($+1) = createBorder("empty");
+l($+1) = createBorder("empty", 10, 20, 30, 40);
+//line
+l($+1) = createBorder("line", "blue");
+l($+1) = createBorder("line", "red", 2);
+//bevel
+l($+1) = createBorder("bevel", "raised");
+l($+1) = createBorder("bevel", "lowered", "blue", "red");
+l($+1) = createBorder("bevel", "lowered", "blue", "red", "magenta", "orange");
+// softbevel
+l($+1) = createBorder("softbevel", "raised");
+l($+1) = createBorder("softbevel", "lowered", "blue", "red");
+l($+1) = createBorder("softbevel", "lowered", "blue", "red", "magenta", "orange");
+//etched
+l($+1) = createBorder("etched");
+l($+1) = createBorder("etched", "raised");
+l($+1) = createBorder("etched", "blue", "red");
+l($+1) = createBorder("etched", "lowered", "blue", "red");
+//titled
+font1 = createBorderFont("Serif", 12, "bold");
+font2 = createBorderFont("Serif", 12, "normal", "italic");
+l($+1) = createBorder("titled", "title");
+l($+1) = createBorder("titled", createBorder("empty"));
+l($+1) = createBorder("titled", createBorder("line", "blue"), "title");
+l($+1) = createBorder("titled", createBorder("bevel", "raised"), "title", "center", "top");
+l($+1) = createBorder("titled", createBorder("matte", 1, 2, 3, 4, "pink"), "title", "center", "top", font1);
+l($+1) = createBorder("titled", createBorder("etched"), "title", "left", "top", font2, "blue");
+//compound
+l($+1) = createBorder("compound");
+l($+1) = createBorder("compound", createBorder("empty"), createBorder("etched"));
+//matte
+l($+1) = createBorder("matte", 4, 3, 2, 1, "yellow");
+//create a window with all type of frame border.
+f = figure( ...
+    "dockable", "off", ...
+    "menubar_visible", "off", ...
+    "infobar_visible", "off", ...
+    "toolbar_visible", "off", ...
+    "layout", "grid", ...
+    "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
+for i = 1:size(l)
+    u = uicontrol(f, "style", "frame", "border", l(i));
+    assert_checkequal(u.borders, l(i));
+end
diff --git a/scilab/modules/gui/tests/unit_tests/borders.tst b/scilab/modules/gui/tests/unit_tests/borders.tst
new file mode 100644 (file)
index 0000000..5158fd7
--- /dev/null
@@ -0,0 +1,61 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Antoine ELIAS
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+
+
+l = list();
+//borders
+//none
+//l($+1) = createBorder("none");
+//empty
+l($+1) = createBorder("empty");
+l($+1) = createBorder("empty", 10, 20, 30, 40);
+//line
+l($+1) = createBorder("line", "blue");
+l($+1) = createBorder("line", "red", 2);
+//bevel
+l($+1) = createBorder("bevel", "raised");
+l($+1) = createBorder("bevel", "lowered", "blue", "red");
+l($+1) = createBorder("bevel", "lowered", "blue", "red", "magenta", "orange");
+// softbevel
+l($+1) = createBorder("softbevel", "raised");
+l($+1) = createBorder("softbevel", "lowered", "blue", "red");
+l($+1) = createBorder("softbevel", "lowered", "blue", "red", "magenta", "orange");
+//etched
+l($+1) = createBorder("etched");
+l($+1) = createBorder("etched", "raised");
+l($+1) = createBorder("etched", "blue", "red");
+l($+1) = createBorder("etched", "lowered", "blue", "red");
+//titled
+font1 = createBorderFont("Serif", 12, "bold");
+font2 = createBorderFont("Serif", 12, "normal", "italic");
+l($+1) = createBorder("titled", "title");
+l($+1) = createBorder("titled", createBorder("empty"));
+l($+1) = createBorder("titled", createBorder("line", "blue"), "title");
+l($+1) = createBorder("titled", createBorder("bevel", "raised"), "title", "center", "top");
+l($+1) = createBorder("titled", createBorder("matte", 1, 2, 3, 4, "pink"), "title", "center", "top", font1);
+l($+1) = createBorder("titled", createBorder("etched"), "title", "left", "top", font2, "blue");
+//compound
+l($+1) = createBorder("compound");
+l($+1) = createBorder("compound", createBorder("empty"), createBorder("etched"));
+//matte
+l($+1) = createBorder("matte", 4, 3, 2, 1, "yellow");
+
+//create a window with all type of frame border.
+
+f = figure( ...
+    "dockable", "off", ...
+    "menubar_visible", "off", ...
+    "infobar_visible", "off", ...
+    "toolbar_visible", "off", ...
+    "layout", "grid", ...
+    "layout_options", createLayoutOptions("grid", [4,0], [1 1]));
+for i = 1:size(l)
+    u = uicontrol(f, "style", "frame", "border", l(i));
+    assert_checkequal(u.borders, l(i));
+end
index 5ef1d4c..3928635 100644 (file)
@@ -1805,7 +1805,7 @@ contour2d
 contourf
 coolcolormap
 coppercolormap
-createBorders
+createBorder
 createConstraints
 createFontBorder
 createLayoutOptions
index 76acc22..03c53f2 100644 (file)
@@ -875,7 +875,7 @@ function [] = %_save(%__filename__, varargin)
         "layout", ...
         "layout_options", ...
         "constraints", ...
-        "borders", ...
+        "border", ...
         "margins", ...
         "groupname", ...
         "scrollable", ...
index 1ac86d9..7e7addd 100644 (file)
@@ -971,10 +971,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@distclean-local:
-@JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@install-html-local:
+@JAVASCI_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \