Renamed Align to WindowAlign. (It was confusing because of HorizontalAlign/VerticalAlign.)

8 files changed, 25 insertions, 23 deletions

diff --git a/docs/pages/reference.rst b/docs/pages/reference.rst
index e7a365f9..885b4cb7 100644
--- a/docs/pages/reference.rst
+++ b/docs/pages/reference.rst
@@ -140,8 +140,8 @@ Containers
 
 .. automodule:: prompt_toolkit.layout
     :members: Container, HSplit, VSplit, FloatContainer, Float, Window,
-        ConditionalContainer, ScrollOffsets, ColorColumn, to_container,
-        to_window, is_container, HorizontalAlign, VerticalAlign
+        WindowAlign, ConditionalContainer, ScrollOffsets, ColorColumn,
+        to_container, to_window, is_container, HorizontalAlign, VerticalAlign
 
 
 Controls
diff --git a/examples/full-screen/simple-demos/alignment.py b/examples/full-screen/simple-demos/alignment.py
index 2e56cc0e..eeb46973 100755
--- a/examples/full-screen/simple-demos/alignment.py
+++ b/examples/full-screen/simple-demos/alignment.py
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 
 from prompt_toolkit.application import Application
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout.containers import HSplit, Window, Align
+from prompt_toolkit.layout.containers import HSplit, Window, WindowAlign
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.layout import Layout
 
@@ -31,11 +31,11 @@ right_text = 'Right aligned text.\n\n' + LIPSUM
 
 
 body = HSplit([
-    Window(FormattedTextControl(left_text), align=Align.LEFT),
+    Window(FormattedTextControl(left_text), align=WindowAlign.LEFT),
     Window(height=1, char='-'),
-    Window(FormattedTextControl(center_text), align=Align.CENTER),
+    Window(FormattedTextControl(center_text), align=WindowAlign.CENTER),
     Window(height=1, char='-'),
-    Window(FormattedTextControl(right_text), align=Align.RIGHT),
+    Window(FormattedTextControl(right_text), align=WindowAlign.RIGHT),
 ])
 
 
diff --git a/examples/full-screen/split-screen.py b/examples/full-screen/split-screen.py
index 30f2a03b..50f90fa0 100755
--- a/examples/full-screen/split-screen.py
+++ b/examples/full-screen/split-screen.py
@@ -10,7 +10,7 @@ from __future__ import unicode_literals
 from prompt_toolkit.application import Application
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout.containers import VSplit, HSplit, Window, Align
+from prompt_toolkit.layout.containers import VSplit, HSplit, Window, WindowAlign
 from prompt_toolkit.layout.controls import BufferControl, FormattedTextControl
 from prompt_toolkit.layout.layout import Layout
 
@@ -59,7 +59,7 @@ root_container = HSplit([
     # The titlebar.
     Window(height=1,
            content=FormattedTextControl(get_titlebar_text),
-           align=Align.CENTER),
+           align=WindowAlign.CENTER),
 
     # Horizontal separator.
     Window(height=1, char='-', style='class:line'),
diff --git a/examples/full-screen/text-editor.py b/examples/full-screen/text-editor.py
index 6d8e8c0a..11a0425f 100755
--- a/examples/full-screen/text-editor.py
+++ b/examples/full-screen/text-editor.py
@@ -10,7 +10,7 @@ from prompt_toolkit.contrib.completers import PathCompleter
 from prompt_toolkit.eventloop import Future, ensure_future, Return, From
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.key_binding import KeyBindings
-from prompt_toolkit.layout.containers import Float, HSplit, VSplit, Window, Align, ConditionalContainer
+from prompt_toolkit.layout.containers import Float, HSplit, VSplit, Window, WindowAlign, ConditionalContainer
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import D
 from prompt_toolkit.layout.layout import Layout
@@ -121,7 +121,7 @@ body = HSplit([
         content=VSplit([
             Window(FormattedTextControl(get_statusbar_text), style='class:status'),
             Window(FormattedTextControl(get_statusbar_right_text),
-                   style='class:status.right', width=9, align=Align.RIGHT),
+                   style='class:status.right', width=9, align=WindowAlign.RIGHT),
         ], height=1),
         filter=Condition(lambda: ApplicationState.show_status_bar)),
 ])
diff --git a/prompt_toolkit/layout/__init__.py b/prompt_toolkit/layout/__init__.py
index 14148ae5..a65bcfb3 100644
--- a/prompt_toolkit/layout/__init__.py
+++ b/prompt_toolkit/layout/__init__.py
@@ -45,7 +45,7 @@ And one prepared menu:
 
 """
 from __future__ import unicode_literals
-from .containers import Container, HSplit, VSplit, FloatContainer, Float, Window, WindowRenderInfo, ConditionalContainer, ScrollOffsets, ColorColumn, to_container, to_window, is_container, HorizontalAlign, VerticalAlign
+from .containers import Container, HSplit, VSplit, FloatContainer, Float, Window, WindowAlign, WindowRenderInfo, ConditionalContainer, ScrollOffsets, ColorColumn, to_container, to_window, is_container, HorizontalAlign, VerticalAlign
 from .controls import BufferControl, SearchBufferControl, DummyControl, FormattedTextControl, UIControl, UIContent
 from .dimension import Dimension, D, sum_layout_dimensions, max_layout_dimensions, to_dimension, is_dimension
 from .layout import Layout, InvalidLayoutError, walk
@@ -74,6 +74,7 @@ __all__ = [
     'VSplit',
     'FloatContainer',
     'Float',
+    'WindowAlign',
     'Window',
     'WindowRenderInfo',
     'ConditionalContainer',
diff --git a/prompt_toolkit/layout/containers.py b/prompt_toolkit/layout/containers.py
index 8b9e95b1..55dc1686 100644
--- a/prompt_toolkit/layout/containers.py
+++ b/prompt_toolkit/layout/containers.py
@@ -30,6 +30,7 @@ __all__ = [
     'VSplit',
     'FloatContainer',
     'Float',
+    'WindowAlign',
     'Window',
     'WindowRenderInfo',
     'ConditionalContainer',
@@ -1106,7 +1107,7 @@ class ColorColumn(object):
 _in_insert_mode = vi_insert_mode | emacs_insert_mode
 
 
-class Align:
+class WindowAlign:
     " Alignment of Window content. "
     LEFT = 'LEFT'
     RIGHT = 'RIGHT'
@@ -1163,8 +1164,8 @@ class Window(Container):
     :param colorcolumns: A list of :class:`.ColorColumn` instances that
         describe the columns to be highlighted, or a callable that returns such
         a list.
-    :param align: :class:`.Align` value or callable that returns an
-        :class:`.Align` value. alignment of content.
+    :param align: :class:`.WindowAlign` value or callable that returns an
+        :class:`.WindowAlign` value. alignment of content.
     :param style: A style string. Style to be applied to all the cells in this
         window.
     :param char: (string) Character to be used for filling the background. This can also
@@ -1177,7 +1178,7 @@ class Window(Container):
                  allow_scroll_beyond_bottom=False, wrap_lines=False,
                  get_vertical_scroll=None, get_horizontal_scroll=None, always_hide_cursor=False,
                  cursorline=False, cursorcolumn=False, colorcolumns=None,
-                 align=Align.LEFT, style='', char=None):
+                 align=WindowAlign.LEFT, style='', char=None):
         assert content is None or isinstance(content, UIControl)
         assert is_dimension(width)
         assert is_dimension(height)
@@ -1187,7 +1188,7 @@ class Window(Container):
         assert get_vertical_scroll is None or callable(get_vertical_scroll)
         assert get_horizontal_scroll is None or callable(get_horizontal_scroll)
         assert colorcolumns is None or callable(colorcolumns) or isinstance(colorcolumns, list)
-        assert callable(align) or align in Align._ALL
+        assert callable(align) or align in WindowAlign._ALL
         assert callable(style) or isinstance(style, text_type)
         assert char is None or callable(char) or isinstance(char, text_type)
         assert z_index is None or isinstance(z_index, int)
@@ -1538,7 +1539,7 @@ class Window(Container):
                    width, vertical_scroll=0, horizontal_scroll=0,
                    wrap_lines=False, highlight_lines=False,
                    vertical_scroll_2=0, always_hide_cursor=False,
-                   has_focus=False, align=Align.LEFT):
+                   has_focus=False, align=WindowAlign.LEFT):
         """
         Copy the UIContent into the output screen.
         """
@@ -1569,11 +1570,11 @@ class Window(Container):
                 new_buffer_row = new_buffer[y + ypos]
 
                 # Align this line.
-                if align == Align.CENTER:
+                if align == WindowAlign.CENTER:
                     line_width = fragment_list_width(line)
                     if line_width < width:
                         x += (width - line_width) // 2
-                elif align == Align.RIGHT:
+                elif align == WindowAlign.RIGHT:
                     line_width = fragment_list_width(line)
                     if line_width < width:
                         x += width - line_width
diff --git a/prompt_toolkit/shortcuts/prompt.py b/prompt_toolkit/shortcuts/prompt.py
index df8f0a87..cc80aa31 100644
--- a/prompt_toolkit/shortcuts/prompt.py
+++ b/prompt_toolkit/shortcuts/prompt.py
@@ -45,7 +45,7 @@ from prompt_toolkit.key_binding.bindings.open_in_editor import load_open_in_edit
 from prompt_toolkit.key_binding.key_bindings import KeyBindings, DynamicKeyBindings, merge_key_bindings, ConditionalKeyBindings, KeyBindingsBase
 from prompt_toolkit.keys import Keys
 from prompt_toolkit.layout import Window, HSplit, FloatContainer, Float
-from prompt_toolkit.layout.containers import ConditionalContainer, Align
+from prompt_toolkit.layout.containers import ConditionalContainer, WindowAlign
 from prompt_toolkit.layout.controls import BufferControl, SearchBufferControl, FormattedTextControl
 from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.layout.layout import Layout
@@ -114,7 +114,7 @@ class _RPrompt(Window):
     def __init__(self, get_formatted_text):
         super(_RPrompt, self).__init__(
             FormattedTextControl(get_formatted_text),
-            align=Align.RIGHT,
+            align=WindowAlign.RIGHT,
             style='class:rprompt')
 
 
diff --git a/prompt_toolkit/widgets/base.py b/prompt_toolkit/widgets/base.py
index b7e92ccc..331e40ee 100644
--- a/prompt_toolkit/widgets/base.py
+++ b/prompt_toolkit/widgets/base.py
@@ -23,7 +23,7 @@ from prompt_toolkit.filters import to_filter
 from prompt_toolkit.formatted_text import to_formatted_text, Template, is_formatted_text
 from prompt_toolkit.formatted_text.utils import fragment_list_to_text
 from prompt_toolkit.key_binding.key_bindings import KeyBindings
-from prompt_toolkit.layout.containers import Window, VSplit, HSplit, FloatContainer, Float, Align, is_container
+from prompt_toolkit.layout.containers import Window, VSplit, HSplit, FloatContainer, Float, WindowAlign, is_container
 from prompt_toolkit.layout.controls import BufferControl, FormattedTextControl
 from prompt_toolkit.layout.dimension import Dimension as D
 from prompt_toolkit.layout.dimension import is_dimension, to_dimension
@@ -253,7 +253,7 @@ class Button(object):
 
         self.window = Window(
             self.control,
-            align=Align.CENTER,
+            align=WindowAlign.CENTER,
             height=1,
             width=width,
             style=get_style,