fixed intro chapter

README.md

@@ -1,5 +1,18 @@
-# tk-tutorial
-Create OOP applications using the Tk interface.
+Introduction to Tk
+==================
 
-You can find the online tutorial here: 
-https://tk-tutorial.readthedocs.io/
+Tk is a **graphical user interface** (GUI) library. It allows to create windows, buttons and all the other graphical elements.
+
+This tutorial shows how to use **object-oriented programming** (OOP)
+for making applications with the **Tk** framework.
+
+You can find the online tutorial here: https://tk-tutorial.readthedocs.io
+
+More tutorials
+--------------
+
+* https://opencv-tutorial.readthedocs.io
+* https://pygame.readthedocs.io
+* https://pymunk-tutorial.readthedocs.io
+* https://tk-tutorial.readthedocs.io
+* https://cocos2d-tutorial.readthedocs.io

docs/basic/basic.rst

@@ -4,4 +4,5 @@ Basic widgets
 * Button
 * Label
 * Entry
-* Frame
+* Frame
+

docs/concept/concept.rst

@@ -148,6 +148,6 @@ Automatic placement
 
 Widgets are placed automatically with the ``grid`` method.
 
-.. autoclass:: concept4.Demo
-
 .. image:: concept4.png
+
+.. literalinclude:: concept4.py

docs/index.rst

@@ -6,19 +6,13 @@
 Welcome to this Tk tutorial!
 ============================
 
-* https://opencv-tutorial.readthedocs
-* https://pygame.readthedocs.io
-* https://pymunk-tutorial.readthedocs.io
-* https://tk-tutorial.readthedocs.io
-* https://cocos2d-tutorial.readthedocs.io
-
-
 .. toctree::
    :maxdepth: 2
    :caption: Contents:
 
    intro/intro
    basic/basic
+   concept/concept
    event/event
    listbox/listbox
    menu/menu

docs/intro/intro.py

@@ -0,0 +1,36 @@
+import tkinter as tk
+import tkinter.ttk as ttk
+
+class Label(ttk.Label):
+    """Create a Label object."""
+    def __init__(self, text='Label', **kwargs):
+        super().__init__(App.stack[-1], text=text, **kwargs)
+        self.grid()
+
+class Button(ttk.Button):
+    """Create a Button object."""
+    def __init__(self, text='Button', **kwargs):
+        super().__init__(App.stack[-1], text=text, **kwargs)
+        self.grid()
+
+class App:
+    """Define the application class."""
+    stack = []
+
+    def __init__(self):
+        self.root = tk.Tk()
+        self.root.title('App')
+        App.stack.append(self.root)
+
+        Label('New Label')
+        Label()
+
+        Button('New Button')
+        Button()
+
+    def run(self):
+        """Run the main loop."""
+        self.root.mainloop()
+
+if __name__ == '__main__':
+    App().run()

docs/intro/intro.rst

@@ -4,7 +4,7 @@ Introduction to Tk
 Tk is a **graphical user interface** (GUI) library. It allows to create windows, buttons and all the 
 other graphical elements. 
 This tutorial shows how to use **object-oriented programming** (OOP) 
-for making applications using the **Tk** framework. 
+for making applications with the **Tk** framework. 
 
 
 Our first program
@@ -73,46 +73,68 @@ This is the result:
 
 .. literalinclude:: intro2.py
 
-Labels
-------
 
-Labels are used to add passive text to the window. 
-We define a new ``Label()`` class which is added automatically to the current
-context which is stored in the class variable ``App.stack[-1]``. 
-For all placement of widgets we are going to use the ``grid()`` method:
+Classic and new themed widgets
+------------------------------
 
-.. literalinclude:: tklib.py
-   :pyobject: Label
+The elements of a graphical user interface are called **widgets**. 
+In Tk there are two generations of widgets:
 
-This is a screen capture of the result.
+* the classic ``tk`` widgets
+* the new **themed** ``ttk`` widgets
 
-.. image:: intro3.png
+The new themed widgets can be found in the submodule ``tkinter.ttk``. 
+We import the classic and the new themed widgets with this import statement::
+
+    import tkinter as tk
+    import tkinter.ttk as ttk
+
+This creates a **classic label** and a new **themed label**::
+
+    tk.Label(self.root, text='tk.Label').pack()
+    ttk.Label(self.root, text='ttk.Label').pack()
+
+This creates a **classic button** and a new **themed button**::
+
+    tk.Button(self.root, text='tk.Button').pack()
+    ttk.Button(self.root, text='ttk.Button').pack()
 
+This is a screen capture of the result. 
+The new themed widgets have a gray background and the buttons have uniform size.
+
+.. image:: intro3.png
 
 :download:`intro3.py<intro3.py>`
 
 .. literalinclude:: intro3.py
 
+Defined our own widget class
+----------------------------
 
-Buttons
--------
+We are now going to define our own Tk widget classes.
+They have the following advantages:
 
-Buttons can be clicked and are used to execute a command associated with them.
-The following demo creates 4 buttons::
+* the **text** option has a default (Label, Button)
+* the **parent** object is automatically set (root)
+* all **keyword** arguments are passed on (kwargs)
+* the **themed** version is used when available (ttk)
+
+This is the new ``Label`` class:
 
-    class Demo(App):
-        def __init__(self):
-            super(Demo, self).__init__()
-            Label('Button demo',  font='Arial 24')
-            Button('Start', 'print("Start")')
-            Button('Stop', 'print("Stop")')
-            Button('Self', 'print(self)')
-            Button('Destroy', 'self.destroy()')
+.. literalinclude:: intro.py
+   :pyobject: Label
 
-.. automodule:: intro5
-   :members:
+This is the new ``Button`` class:
 
-This is a screen capture of the above program.
+.. literalinclude:: intro.py
+   :pyobject: Button
+
+
+Buttons
+-------
+
+Buttons can be clicked and are used to execute a command associated with them.
+The following demo creates 4 buttons.
 
 .. image:: intro5.png
 
@@ -121,55 +143,58 @@ This is a screen capture of the above program.
 * The **Self** button prints the button object string to the console
 * The **Destroy** button removes the button from the window
 
+:download:`intro5.py<intro5.py>`
+
+.. literalinclude:: intro5.py
+
 
 Radiobuttons
 ------------
 
-Radiobuttons are active elements which can be clicked and execute actions. Only one button is active at any one time.
+Radiobuttons are active elements which can be clicked and execute actions.
+Only one button is active at any one time.
 
-.. automodule:: intro6
-   :members:
+.. image:: intro6.png
 
-This is a screen capture of the above program.
+:download:`intro6.py<intro6.py>`
 
-.. image:: intro6.png
+.. literalinclude:: intro6.py
 
 
 Checkbuttons
 ------------
 
-Checkbuttons are active elements which can be clicked and execute actions. Multiple checkbuttons can be selected simultaneously.
+Checkbuttons are active elements which can be clicked and execute actions. 
+Multiple checkbuttons can be selected simultaneously.
 
-.. automodule:: intro7
-   :members:
+.. image:: intro7.png
 
-This is a screen capture of the above program.
+:download:`intro7.py<intro7.py>`
 
-.. image:: intro7.png
+.. literalinclude:: intro7.py
 
 
 Entry fields
 ------------
 
-Entry **entry** field presents the user with a single line text field where he can enter a string value.
+Entry **entry** field presents the user with a single line text field 
+where he can enter a string value.
 
-.. automodule:: intro8
-   :members:
+.. image:: intro8.png
 
-This is a screen capture of the above program.
+:download:`intro8.py<intro8.py>`
+
+.. literalinclude:: intro8.py
 
-.. image:: intro8.png
 
 Combobox
 --------
 
-A **combobox** combines a list of choices with an entry. The user can select from the list, but he can also enter directly a value.
-
-.. automodule:: intro9
-   :members:
-
-This is a screen capture of the above program.
+A **combobox** combines a list of choices with an entry. 
+The user can select from the list, but he can also enter directly a value.
 
 .. image:: intro9.png
 
+:download:`intro9.py<intro9.py>`
 
+.. literalinclude:: intro9.py

docs/intro/intro3.py

@@ -5,20 +5,13 @@ class App:
     """Define the application class."""
     def __init__(self):
         self.root = tk.Tk()
-        self.root.title('App Demo')
-        tk.Label(self.root, text='Placing multiple widgets').pack()
+        self.root.title('App')
 
-        tk.Label(self.root, text='Label').pack()
-        ttk.Label(self.root, text='Label').pack()
+        tk.Label(self.root, text='tk.Label').pack()
+        ttk.Label(self.root, text='ttk.Label').pack()
 
-        tk.Button(self.root, text='Button').pack()
-        ttk.Button(self.root, text='Button').pack()
-
-        tk.Radiobutton(self.root, text='Radiobutton').pack()
-        ttk.Radiobutton(self.root, text='Radiobutton').pack()
-
-        tk.Checkbutton(self.root, text='Checkbutton').pack()
-        ttk.Checkbutton(self.root, text='Checkbutton').pack()
+        tk.Button(self.root, text='tk.Button').pack()
+        ttk.Button(self.root, text='ttk.Button').pack()
 
     def run(self):
         """Run the main loop."""

docs/intro/intro5.py

@@ -1,5 +1,4 @@
 """Create buttons."""
-
 from tklib import *
 
 class Demo(App):
@@ -10,9 +9,6 @@ def __init__(self):
         Button('Stop', 'print("Stop")')
         Button('Self', 'print(self)')
         Button('Destroy', 'self.destroy()')
-        Button('root', 'print(App.root)')
-        Button('parent', 'print(App.stack[-1])')
-        Button('geometry', 'print(App.root.geometry())')
 
 if __name__ == '__main__':
     Demo().run()

docs/intro/intro6.py

@@ -1,5 +1,4 @@
 """Create radio buttons."""
-
 from tklib import *
 
 class Demo(App):
@@ -9,9 +8,6 @@ def __init__(self):
 
         Label('Select your favorite programming language')
         Radiobutton('Python;Perl;Ruby;Java;C++', 'print(self.item)')
-
-        Label('Select your favorite day of the week')
-        Radiobutton('Mon;Tue;Wed;Thu;Fri', 'print(self.item)')
 
 if __name__ == '__main__':
     Demo().run()

docs/intro/intro7.py

@@ -9,9 +9,6 @@ def __init__(self):
 
         Label('Select your favorite languages')
         Checkbox('Python;Perl;Ruby;Java;C++', 'print(self.selection)')
-
-        Label('Select your working days')
-        Checkbox('Mon;Tue;Wed;Thu;Fri', 'print(self.selection)')
 
 if __name__ == '__main__':
     Demo().run()