Update users guide for toolbars management part

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5e1b365697490cdb2e3dbb9c2a8ff195db3cec1..2718c5d084359a7ed7f6069fc4838e5cf8282657 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ IF(WIN32)
   CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib
 ENDIF(WIN32)
 
-SET (SHAPER_Version 9.2.0)
+SET (SHAPER_Version 9.2.0_Jan2019)
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
 OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON)

diff --git a/doc/gui/Introduction.rst b/doc/gui/Introduction.rst
index 73759b85a8d3f7b5c570a2ef381132109a7e50ba..2a8d9015c1f987455b3d7d03ef0021360d50f5c9 100644 (file)
--- a/doc/gui/Introduction.rst
+++ b/doc/gui/Introduction.rst
@@ -624,24 +624,24 @@ The following dialog box with existing toolbars appears:
 **Input fields**:\r
 \r
 - **Toolbars** window contains list of toolbars names. Number of commands in each tool bar is shown in brackets.\r
-- **Add** button creates a new toolbar. Click on **Add** button opens  :ref:`create_toolbar`;\r
+- **Add** button creates a new toolbar. Click on **Add** button opens :ref:`create_toolbar`;\r
 - **Edit**  button  calls :ref:`edit_toolbar` for currently selected tool bar;\r
-- **Delete** button removes currently selected tool bar. Click on **Delete** button opens  **Delete toolbar** dialog box. After confirmation by click **Yes** button the selected toolbar is deleted;\r
+- **Delete** button removes currently selected tool bar. Click on **Delete** button opens warning dialog box. After confirmation by click **Yes** button the selected toolbar is deleted. Click **No** button cancels removing of the selected toolbar;\r
 - **Reset** button restores modified tool bars structure to default state;\r
-- **Ok** button closes the dialog box, stores result of tool bars editing and updates tool bars of the module;\r
-- **Cancel** closes the dialog box without modification of tool bars.\r
+- **OK** button closes the dialog box, stores result of tool bars edition and updates Shaper tool bars;\r
+- **Cancel** button closes the dialog box without modification of tool bars.\r
 \r
 .. image:: images/delete_toolbar.png\r
    :align: center\r
 \r
 .. centered::\r
-   **Delete toolbar** dialog box\r
+    Warning dialog box\r
 \r
    \r
 .. _create_toolbar:\r
 \r
 **Create toolbar** dialog box\r
-^^^^^^^^^^^^^^^^^^^^^^^^^^^\r
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\r
 \r
 **Input fields** of **Create toolbar** dialog box:\r
 \r
@@ -652,8 +652,8 @@ The following dialog box with existing toolbars appears:
    **Create toolbar** dialog box\r
 \r
 - **Name of a new toolbar** defines name of the new tool bar. The name of tool bar has to be unique. If user defines a not unique name then a warning appears and a new tooolbar with not unique name is not created;\r
-- **Ok** button closes the dialog box and add a new tool bars of the module into  **Toolbars** window;\r
-- **Cancel** closes the dialog box without addition of a new tool bar.\r
+- **Ok** button closes the dialog box and add a new tool bar of the module into  **Toolbars** window;\r
+- **Cancel** button closes the dialog box without addition of a new tool bar.\r
 \r
 .. image:: images/name_toolbar.png\r
    :align: center\r
@@ -678,10 +678,11 @@ The following dialog box with existing toolbars appears:
 - **Toolbar name** non-editable field displays  name of modified tool bar;\r
 - **Out of toolbars** window contains list of commands which are not included into any tool bar and separator definition "------";\r
 - **In the toolbar** window contains list of commands which are defined in the current tool bar. Items in this window are listed according to order of commands in the toolbar; \r
-- **Right arrow** button transfers currently selected item from left window to right one. If right window contains a selected item then new item will be placed before the selected one. If there is no selected item in right window then new item will be added at the end of items list. In order to clear current selection in right window it is necessary to click in empty space or click by right button of the window.\r
-- **Left arrow** button removes currently selected item from right window and appends it to left window;\r
-- **Up** and **Down** buttons  change position of a selected command in right window;\r
+- **Right arrow** button transfers currently selected item from  **Out of toolbars** window to **In the toolbar** window and puts new item before the selected item in **In the toolbar** window.\r
+    If there is no selected item in **In the toolbar**  window then new item will be added at the end of items list. In order to clear current selection it is necessary to click in empty space of the window.\r
+- **Left arrow** button transfers currently selected item from **In the toolbar** window into **Out of toolbars** window;\r
+- **Up** and **Down** buttons  change position of selected command in **In the toolbar** window;\r
 - **Ok** button closes the dialog box, stores result of edition;\r
-- **Cancel** closes the dialog box without modification of tool bar content.\r
+- **Cancel**  button closes the dialog box without modification of tool bar content.\r
 \r
 \r

diff --git a/doc/gui/images/create_toolbar.png b/doc/gui/images/create_toolbar.png
index 182f652c9e676cd0151a046c7af929aab4f70f77..a41c811b488db8db771393872b47948483577a35 100644 (file)
Binary files a/doc/gui/images/create_toolbar.png and b/doc/gui/images/create_toolbar.png differ

diff --git a/doc/gui/images/delete_toolbar.png b/doc/gui/images/delete_toolbar.png
index 0acf516c65fe176e333d8f55637461faa9804c6f..316ed8538138645ea0e2e8e87ecb7f901af0cf7d 100644 (file)
Binary files a/doc/gui/images/delete_toolbar.png and b/doc/gui/images/delete_toolbar.png differ

diff --git a/doc/gui/images/name_toolbar.png b/doc/gui/images/name_toolbar.png
index 83a4ce0a6ad552d1f80c884b1f25bd48d726ecf1..a086945e3bfbb310b06c3e1707af0cf82fc7406e 100644 (file)
Binary files a/doc/gui/images/name_toolbar.png and b/doc/gui/images/name_toolbar.png differ