summaryrefslogtreecommitdiff
path: root/docs/tutorial
diff options
context:
space:
mode:
authorIan Ward <ian@excess.org>2012-09-21 18:08:03 -0400
committerIan Ward <ian@excess.org>2012-09-21 18:08:03 -0400
commit9a35396200f0bbce28dcbb2257285b4f7d014a8e (patch)
treeb35b7b1a2e4d0edf9664f1813253b4a68a990d03 /docs/tutorial
parent49512cbedb38bfe42056d5bc6deaec90e6d23664 (diff)
downloadurwid-9a35396200f0bbce28dcbb2257285b4f7d014a8e.tar.gz
tutorial menu3 new screenshots, update titles
--HG-- branch : feature-sphinx
Diffstat (limited to 'docs/tutorial')
-rw-r--r--docs/tutorial/index.rst23
-rw-r--r--docs/tutorial/menu2.py.xdotool2
-rw-r--r--docs/tutorial/menu21.pngbin1240 -> 1257 bytes
-rw-r--r--docs/tutorial/menu22.pngbin1243 -> 1266 bytes
-rw-r--r--docs/tutorial/menu23.pngbin1499 -> 1510 bytes
-rw-r--r--docs/tutorial/menu24.pngbin1436 -> 1344 bytes
-rw-r--r--docs/tutorial/menu3.py2
-rw-r--r--docs/tutorial/menu3.py.xdotool4
-rw-r--r--docs/tutorial/menu31.pngbin654 -> 1217 bytes
-rw-r--r--docs/tutorial/menu32.pngbin643 -> 1544 bytes
-rw-r--r--docs/tutorial/menu33.pngbin569 -> 1869 bytes
-rw-r--r--docs/tutorial/menu34.pngbin381 -> 1233 bytes
12 files changed, 17 insertions, 14 deletions
diff --git a/docs/tutorial/index.rst b/docs/tutorial/index.rst
index dd3de0b..cebdd49 100644
--- a/docs/tutorial/index.rst
+++ b/docs/tutorial/index.rst
@@ -277,8 +277,8 @@ it in a subclass.
Menu Example
============
-Simple Menu with Buttons
-------------------------
+Simple Menu with Buttons and Overlay
+------------------------------------
We can create a very simple menu using a list of :class:`Button` widgets.
This program lets you choose an option then repeats what you chose.
@@ -290,8 +290,8 @@ This program lets you choose an option then repeats what you chose.
.. image:: menu12.png
.. image:: menu13.png
-Nested Menus
-------------
+Cascading Menu with Overlay and WidgetPlaceholder
+-------------------------------------------------
A nested menu effect can be created by having some buttons open new menus. This program
lets you choose an option from a nested menu then repeats what you chose.
@@ -304,8 +304,8 @@ lets you choose an option from a nested menu then repeats what you chose.
.. image:: menu23.png
.. image:: menu24.png
-Nested Menus with Custom Widgets
---------------------------------
+Horizontal Menu with Columns and WidgetWrap
+-------------------------------------------
We can create new widget classes for the menu elements we are creating. This program
is the mostly the same as the one above but with classes defined for each menu
@@ -315,10 +315,13 @@ default decorations
.. literalinclude:: menu3.py
:linenos:
-.. image:: menu31.png
-.. image:: menu32.png
-.. image:: menu33.png
-.. image:: menu34.png
+.. figure:: menu31.png
+
+.. figure:: menu32.png
+
+.. figure:: menu33.png
+
+.. figure:: menu34.png
"Adventure Game" in Menus
-------------------------
diff --git a/docs/tutorial/menu2.py.xdotool b/docs/tutorial/menu2.py.xdotool
index a87fc38..69c29b5 100644
--- a/docs/tutorial/menu2.py.xdotool
+++ b/docs/tutorial/menu2.py.xdotool
@@ -1,4 +1,4 @@
-windowsize --usehints $RXVTWINDOWID 32 14
+windowsize --usehints $RXVTWINDOWID 33 14
key --window $RXVTWINDOWID Return
key --window $RXVTWINDOWID Return Down
key --window $RXVTWINDOWID Return
diff --git a/docs/tutorial/menu21.png b/docs/tutorial/menu21.png
index 95406dc..e6e19c1 100644
--- a/docs/tutorial/menu21.png
+++ b/docs/tutorial/menu21.png
Binary files differ
diff --git a/docs/tutorial/menu22.png b/docs/tutorial/menu22.png
index 870ffed..92b79ef 100644
--- a/docs/tutorial/menu22.png
+++ b/docs/tutorial/menu22.png
Binary files differ
diff --git a/docs/tutorial/menu23.png b/docs/tutorial/menu23.png
index ae9faa7..f366450 100644
--- a/docs/tutorial/menu23.png
+++ b/docs/tutorial/menu23.png
Binary files differ
diff --git a/docs/tutorial/menu24.png b/docs/tutorial/menu24.png
index 53b9293..0623baf 100644
--- a/docs/tutorial/menu24.png
+++ b/docs/tutorial/menu24.png
Binary files differ
diff --git a/docs/tutorial/menu3.py b/docs/tutorial/menu3.py
index f6e3a9d..41198ba 100644
--- a/docs/tutorial/menu3.py
+++ b/docs/tutorial/menu3.py
@@ -82,5 +82,5 @@ class HorizontalBoxes(urwid.Columns):
top = HorizontalBoxes()
top.open_box(menu_top)
-loop = urwid.MainLoop(top, palette)
+loop = urwid.MainLoop(urwid.Filler(top, 'middle', 10), palette)
loop.run()
diff --git a/docs/tutorial/menu3.py.xdotool b/docs/tutorial/menu3.py.xdotool
index 88fbf69..12b25aa 100644
--- a/docs/tutorial/menu3.py.xdotool
+++ b/docs/tutorial/menu3.py.xdotool
@@ -1,4 +1,4 @@
-windowsize --usehints $RXVTWINDOWID 23 8
-key --window $RXVTWINDOWID Down
+windowsize --usehints $RXVTWINDOWID 80 12
+key --window $RXVTWINDOWID Return
key --window $RXVTWINDOWID Return Down
key --window $RXVTWINDOWID Return
diff --git a/docs/tutorial/menu31.png b/docs/tutorial/menu31.png
index 5304300..3be2a6a 100644
--- a/docs/tutorial/menu31.png
+++ b/docs/tutorial/menu31.png
Binary files differ
diff --git a/docs/tutorial/menu32.png b/docs/tutorial/menu32.png
index 8ddd497..46af0ec 100644
--- a/docs/tutorial/menu32.png
+++ b/docs/tutorial/menu32.png
Binary files differ
diff --git a/docs/tutorial/menu33.png b/docs/tutorial/menu33.png
index 5979e08..7e16e5e 100644
--- a/docs/tutorial/menu33.png
+++ b/docs/tutorial/menu33.png
Binary files differ
diff --git a/docs/tutorial/menu34.png b/docs/tutorial/menu34.png
index 53109bf..39fc2ce 100644
--- a/docs/tutorial/menu34.png
+++ b/docs/tutorial/menu34.png
Binary files differ