Skip to content
This repository has been archived by the owner on May 24, 2021. It is now read-only.

Commit

Permalink
Merge branch 'feature-async'
Browse files Browse the repository at this point in the history
Conflicts:
	enaml/components/abstract_application.py
	enaml/components/container.py
	enaml/components/group_box.py
	enaml/components/include.py
	enaml/core/base_component.py
	enaml/widgets/form.py
	examples/old/employee/employee_view.enaml
  • Loading branch information
sccolbert committed Nov 16, 2012
2 parents 082ecea + 7632560 commit f86dad8
Show file tree
Hide file tree
Showing 797 changed files with 88,628 additions and 33,315 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/build
/dist
/docs/build
/docs/source/api_ref/widgets/*.rst

.gitignore~
*.orig
9 changes: 5 additions & 4 deletions docs/source/_templates/widget.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@ Qt
^^

.. inheritance-diagram::
{{ module|replace('components.', 'backends.qt.qt_') }}.Qt{{ objname }}
{{ module|replace('widgets.', 'qt.qt_') }}.Qt{{ objname }}
:parts: 1

.. autoclass:: {{ module|replace('components.', 'backends.qt.qt_') }}.Qt{{ objname }}
.. autoclass:: {{ module|replace('widgets.', 'qt.qt_') }}.Qt{{ objname }}


Wx
^^

.. inheritance-diagram::
{{ module|replace('components.', 'backends.wx.wx_') }}.WX{{ objname }}
{{ module|replace('widgets.', 'wx.wx_') }}.Wx{{ objname }}
:parts: 1

.. autoclass:: {{ module|replace('components.', 'backends.wx.wx_') }}.WX{{ objname }}
.. autoclass:: {{ module|replace('widgets.', 'wx.wx_') }}.Wx{{ objname }}

107 changes: 88 additions & 19 deletions docs/source/api_ref/enaml.core.rst
Original file line number Diff line number Diff line change
@@ -1,50 +1,119 @@
enaml.core
==========

The :py:mod:`enaml.core` package contains all of the core functionality of the
Enaml toolkit.
The :py:mod:`enaml.core` package contains all of Enaml's core functionality.


:mod:`toolkit` Module
---------------------
:mod:`compiler_helpers` Module
------------------------------

.. automodule:: enaml.core.toolkit
.. automodule:: enaml.core.compiler_helpers

:mod:`import_hooks` Module
--------------------------

.. automodule:: enaml.core.import_hooks
:mod:`declarative` Module
-------------------------
.. automodule:: enaml.core.declarative


:mod:`enaml_ast` Module
-----------------------

.. inheritance-diagram:: enaml.core.enaml_ast
:parts: 1

.. automodule:: enaml.core.enaml_ast


:mod:`enaml_compiler` Module
----------------------------

.. automodule:: enaml.core.enaml_compiler


:mod:`enaml_def` Module
-----------------------

.. automodule:: enaml.core.enaml_def


:mod:`expressions` Module
-------------------------

.. inheritance-diagram:: enaml.core.expressions.ExpressionScope
.. inheritance-diagram:: enaml.core.expressions.ExecutionScope
:parts: 1

.. inheritance-diagram:: enaml.core.expressions.TraitAttributeNotifier
.. inheritance-diagram:: enaml.core.expressions.NonlocalScope
:parts: 1

.. inheritance-diagram:: enaml.core.expressions.AbstractExpression
enaml.core.expressions.SimpleExpression
enaml.core.expressions.SubscriptionExpression
enaml.core.expressions.NotifyingExpression
enaml.core.expressions.DelegatingExpression
enaml.core.expressions.NotificationExpression
enaml.core.expressions.UpdateExpression
enaml.core.expressions.SubscriptionExpression
enaml.core.expressions.DelegationExpression
:parts: 1

.. automodule:: enaml.core.expressions
:special-members:
:no-undoc-members:


:mod:`item_model` Module
---------------------------------
:mod:`import_hooks` Module
--------------------------

.. automodule:: enaml.core.import_hooks


:mod:`inverters` Module
-----------------------

.. automodule:: enaml.core.inverters


:mod:`lexer` Module
-------------------

.. currentmodule:: enaml.core.lexer

.. autoclass:: EnamlLexer
:no-members:
:members: __init__, input, token, dedent, indent,
make_token_stream, create_strings,
annotate_indentation_state, synthesize_indentation_tokens,
add_endmarker


:mod:`monitors` Module
----------------------

.. automodule:: enaml.core.monitors


.. autoclass:: enaml.core.item_model.AbstractItemModel
:mod:`operator_context` Module
------------------------------

.. autoclass:: enaml.core.item_model.AbstractTableModel
.. automodule:: enaml.core.operator_context

.. autoclass:: enaml.core.item_model.AbstractListModel

.. autoclass:: enaml.core.item_model.ModelIndex
:mod:`operators` Module
-----------------------
.. automodule:: enaml.core.operators


:mod:`parser` Module
--------------------

.. automodule:: enaml.core.parser


:mod:`signaling` Module
-----------------------

.. automodule:: enaml.core.signaling


:mod:`trait_types` Module
-------------------------

.. automodule:: enaml.core.trait_types

32 changes: 0 additions & 32 deletions docs/source/api_ref/enaml.parsing.rst

This file was deleted.

48 changes: 30 additions & 18 deletions docs/source/api_ref/enaml.rst
Original file line number Diff line number Diff line change
@@ -1,38 +1,50 @@
enaml
=====

The top-level enaml package contains some utility modules used throughout the
Enaml library.
The top-level enaml package contains modules used throughout the Enaml library.

:mod:`enums` Module
-------------------

.. automodule:: enaml.enums

:mod:`exceptions` Module
:mod:`application` Module
-------------------------

.. inheritance-diagram:: enaml.exceptions
:parts: 1
.. automodule:: enaml.application

.. automodule:: enaml.exceptions

:mod:`guard` Module
-------------------------
:mod:`colors` Module
---------------------
.. automodule:: enaml.colors


:mod:`message` Module
---------------------
.. automodule:: enaml.message

.. inheritance-diagram:: enaml.guard
:parts: 1

.. automodule:: enaml.guard
:mod:`request` Module
---------------------
.. automodule:: enaml.request


:mod:`runner` Module
-------------------------
--------------------

.. automodule:: enaml.runner


:mod:`session` Module
---------------------

.. automodule:: enaml.session


:mod:`session_factory` Module
-----------------------------

.. automodule:: enaml.session_factory


:mod:`utils` Module
-------------------------
-------------------

.. automodule:: enaml.utils


39 changes: 0 additions & 39 deletions docs/source/api_ref/enaml.styling.rst

This file was deleted.

8 changes: 0 additions & 8 deletions docs/source/api_ref/enaml.util.rst

This file was deleted.

Loading

0 comments on commit f86dad8

Please sign in to comment.