Merge remote-tracking branch 'origin/v4' into v4

docs/source/conf.py

@@ -74,9 +74,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.0'
+version = '4.9'
 # The full version, including alpha/beta/rc tags.
-release = '4.0'
+release = '4.9.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/getting-started/the-basic.rst

@@ -1,20 +1,20 @@
-******************
-The basic
-******************
+==========
+The basics
+==========
 
 This page was based on the examples available at the github folder: `Tutorial - SimpleExamples <https://github.com/UmSenhorQualquer/pyforms/tree/master/tutorials/1.SimpleExamples>`_
 
 
 Prepare the application class
-==================================
+-----------------------------
 
 Create the Python file that will store your applications. 
 
 Example: **SimpleExample.py**
 
 
 Import the library
-____________________
+__________________
 
 
 Import the pyforms library, the BaseWidget and the Controls classes that you will need:
@@ -27,8 +27,8 @@ Import the pyforms library, the BaseWidget and the Controls classes that you wil
     from   pyforms.controls import ControlButton
 
 
-Create your application class.
-________________________________
+Create your application class
+_____________________________
 
 
 This class should inherit from the class BaseWidget.
@@ -60,10 +60,10 @@ SimpleExample1
 
 
 Add an action to the button
-***************************
+---------------------------
 
 Create the action
-===================
+_________________
 
 Create the class function that will work as the button action.
 
@@ -75,7 +75,7 @@ Create the class function that will work as the button action.
 
 
 Set the button action
-======================
+_____________________
 
 Configure the button to execute your function when pressed.  
 Inside the class constructor add the code:
@@ -125,7 +125,7 @@ The previous code produces the next window, after you had pressed the button:
 
 
 Organize your form Controls
-***************************
+---------------------------
 
 Use the BaseWidget.formset variable to organize the Controls inside the Window.  
 `Find here more details about the formset variable <http://pyforms.readthedocs.org/en/latest/api-documentation/basewidget/#important-variables>`_
@@ -179,8 +179,8 @@ Try now:
         }
 
 
-## **Add a main menu**
-***************************
+Add a main menu
+---------------
 
 To add a main menu to your application, first you need to define the functions that will work as the options actions.
 
@@ -234,7 +234,7 @@ After you just need to set the BaseWidget.mainmenu property inside your applicat
 
 
 Add popup menu to the Controls
-******************************
+------------------------------
 
 Create the functions that will work as the popup menu options actions, as you have than in the main menu chapter. After use the functions **add_popup_menu_option** or **add_popup_sub_menu_option** to add a popup menu or a popup submenu to your Control.
 
@@ -263,8 +263,9 @@ Result:
 .. image:: /_static/imgs/getting-started-4.png
 
 
-What next?
-***********
+
+What's next?
+------------
 
 Move to the `next chapter <http://pyforms.readthedocs.org/en/latest/getting-started/multiple-windows/>`_.
 _____________________________________________________________________________________________________________
@@ -277,4 +278,4 @@ ________________________________________________________________________________
 
 .. image:: /_static/imgs/Example2.png
 
-.. image:: /_static/imgs/Example3.png
+.. image:: /_static/imgs/Example3.png

environment.yml

@@ -17,6 +17,7 @@ dependencies:
     - Pillow
     - anyqt
     - pyqt5
+    - PyQtWebEngine
     - QScintilla
     - visvis
     - matplotlib

pyforms_gui/__init__.py

@@ -4,7 +4,7 @@
 __author__      = "Ricardo Ribeiro"
 __credits__     = ["Ricardo Ribeiro"]
 __license__     = "MIT"
-__version__     = "4.9"
+__version__     = "4.901.2"
 __maintainer__  = "Ricardo Ribeiro"
 __email__       = "ricardojvr@gmail.com"
 __status__      = "Development"

pyforms_gui/allcontrols.py

@@ -30,7 +30,7 @@
     from .controls.control_opengl import ControlOpenGL
 except Exception as e:
     logger.error( e )
-    logger.error('ControlOpenGL will not be work')
+    logger.error('ControlOpenGL will not work')
 from .controls.control_progress import ControlProgress
 from .controls.control_slider import ControlSlider
 from .controls.control_tableview import ControlTableView
@@ -47,7 +47,7 @@
     from .controls.control_web import ControlWeb
 except Exception as e:
     logger.error( e )
-    logger.error('ControlWeb will not be work')
+    logger.error('ControlWeb will not work')
     logger.error('QtWebEngine may be missing')
 from .controls.control_event_timeline.control_eventtimeline import ControlEventTimeline
 from .controls.control_events_graph.control_eventsgraph import ControlEventsGraph