Release version 8.

1 files changed, 183 insertions, 227 deletions

diff --git a/JokeMachine.wpr b/JokeMachine.wpr
index e2e685e..902ff5a 100644
--- a/JokeMachine.wpr
+++ b/JokeMachine.wpr
@@ -75,8 +75,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                0,
                                {'tree-state': {'tree-states': {'deep': {'col'\
         'umn-widths': [1.0],
-        'expanded-nodes': [(0,),
-                           (4,)],
+        'expanded-nodes': [(0,)],
         'selected-nodes': [],
         'top-node': (0,)}},
         'tree-style': 'deep'}}),
@@ -183,16 +182,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                'top-node': [('class def',
         loc('pages/edit.py'),
         'Edit')]},
-        loc('persistence/joke.py'): {'column-widths': [1.0],
-                                     'expanded-nodes': [],
-                                     'selected-nodes': [],
-                                     'top-node': [('class def',
-        loc('persistence/joke.py'),
-        'Joke')]},
-        u'All Classes': {'column-widths': [1.0],
-                         'expanded-nodes': [],
-                         'selected-nodes': [None],
-                         'top-node': None},
         loc('pages/joke.py'): {'column-widths': [1.0],
                                'expanded-nodes': [],
                                'selected-nodes': [],
@@ -205,12 +194,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'top-node': [('class def',
         loc('pages/preview.py'),
         'Preview')]},
-        loc('pages/submit.py'): {'column-widths': [1.0],
-                                 'expanded-nodes': [],
-                                 'selected-nodes': [],
-                                 'top-node': [('class def',
-        loc('pages/submit.py'),
-        'JokeEditor')]},
+        loc('persistence/joke.py'): {'column-widths': [1.0],
+                                     'expanded-nodes': [],
+                                     'selected-nodes': [],
+                                     'top-node': [('class def',
+        loc('persistence/joke.py'),
+        'Joke')]},
         loc('persistence/jokebook.py'): {'column-widths': [1.0],
         'expanded-nodes': [],
         'selected-nodes': [],
@@ -227,18 +216,28 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                           'expanded-nodes': [],
                           'selected-nodes': [],
                           'top-node': None},
-        loc('unit/test_persistence.py'): {'column-widths': [1.0],
-        'expanded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('unit/test_persistence.py'),
-                      'dump')]},
         loc('unit/unit.py'): {'column-widths': [1.0],
                               'expanded-nodes': [],
                               'selected-nodes': [],
                               'top-node': [('generic attribute',
         loc('unit/unit.py'),
         'bar')]},
+        u'All Classes': {'column-widths': [1.0],
+                         'expanded-nodes': [],
+                         'selected-nodes': [None],
+                         'top-node': None},
+        loc('pages/submit.py'): {'column-widths': [1.0],
+                                 'expanded-nodes': [],
+                                 'selected-nodes': [],
+                                 'top-node': [('class def',
+        loc('pages/submit.py'),
+        'JokeEditor')]},
+        loc('unit/test_persistence.py'): {'column-widths': [1.0],
+        'expanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('unit/test_persistence.py'),
+                      'dump')]},
         loc('util/decorators.py'): {'column-widths': [1.0],
                                     'expanded-nodes': [],
                                     'selected-nodes': [],
@@ -288,6 +287,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       1,
                       {'attrib-starts': [],
                        'first-line': 0,
+                       'history': {},
                        'sel-line': 0,
                        'sel-line-start': 0,
                        'selection_end': 0,
@@ -400,127 +400,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                       'selected-nodes': [(2,)],
                                       'top-node': (0,)}})],
         'primary_view_state': {'editor_states': {'bookmarks': ([(loc('gui/page.py'),
-        {'attrib-starts': [],
-         'first-line': 13,
-         'sel-line': 26,
-         'sel-line-start': 897,
-         'selection_end': 951,
-         'selection_start': 951},
-        1198688500.5701251),
-        (loc('NEWS'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 4,
-          'sel-line-start': 80,
-          'selection_end': 136,
-          'selection_start': 136},
-         1198688502.3278739),
-        (loc('JokeMachineActivity.py'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 0,
-          'sel-line-start': 0,
-          'selection_end': 0,
-          'selection_start': 0},
-         1198688502.6195641),
-        (loc('pages/joke.py'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 13,
-          'sel-line-start': 701,
-          'selection_end': 701,
-          'selection_start': 701},
-         1198688502.8020251),
-        (loc('JokeMachineActivity.py'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 0,
-          'sel-line-start': 0,
-          'selection_end': 0,
-          'selection_start': 0},
-         1198688503.4200201),
-        (loc('NEWS'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 4,
-          'sel-line-start': 80,
-          'selection_end': 136,
-          'selection_start': 136},
-         1198688503.6366811),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.make_imagebox',
-                             121)],
-          'first-line': 114,
-          'sel-line': 121,
-          'sel-line-start': 4086,
-          'selection_end': 4099,
-          'selection_start': 4099},
-         1198688503.812227),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.make_imagebox',
-                             121)],
-          'first-line': 122,
-          'sel-line': 126,
-          'sel-line-start': 4356,
-          'selection_end': 4406,
-          'selection_start': 4406},
-         1198688541.4588749),
-        (loc('gui/page.py'),
-         {'attrib-starts': [],
-          'first-line': 0,
-          'sel-line': 0,
-          'sel-line-start': 0,
-          'selection_end': 0,
-          'selection_start': 0},
-         1198688566.7947819),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.__do_clicked_image',
-                             291)],
-          'first-line': 265,
-          'sel-line': 314,
-          'sel-line-start': 12635,
-          'selection_end': 12642,
-          'selection_start': 12642},
-         1198688645.8151071),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.__do_clicked_image',
-                             291)],
-          'first-line': 265,
-          'sel-line': 314,
-          'sel-line-start': 12635,
-          'selection_end': 12654,
-          'selection_start': 12642},
-         1198688648.5252161),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.__do_clicked_choose_sound',
-                             319)],
-          'first-line': 290,
-          'sel-line': 339,
-          'sel-line-start': 13711,
-          'selection_end': 13717,
-          'selection_start': 13717},
-         1198688648.9200661),
-        (loc('gui/page.py'),
-         {'attrib-starts': [('Page',
-                             47),
-                            ('Page.__do_clicked_image',
-                             291)],
-          'first-line': 290,
-          'sel-line': 314,
-          'sel-line-start': 12635,
-          'selection_end': 12641,
-          'selection_start': 12641},
-         1198688650.4670839),
+        {'attrib-starts': [('Page',
+                            47),
+                           ('Page.__do_clicked_image',
+                            291)],
+         'first-line': 290,
+         'sel-line': 314,
+         'sel-line-start': 12635,
+         'selection_end': 12641,
+         'selection_start': 12641},
+        1198688650.4670839),
         (loc('gui/page.py'),
          {'attrib-starts': [('Page',
                              47),
@@ -581,70 +470,130 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 176,
           'selection_start': 176},
          1198749050.489059),
-        [loc('TODO'),
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 6,
+          'sel-line-start': 113,
+          'selection_end': 120,
+          'selection_start': 120},
+         1198749059.003253),
+        [loc('JokeMachineActivity.py'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 0,
+          'sel-line-start': 0,
+          'selection_end': 0,
+          'selection_start': 0},
+         1200219205.027808],
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 6,
+          'sel-line-start': 113,
+          'selection_end': 120,
+          'selection_start': 120},
+         1200223898.605392),
+        [loc('setup.py'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 5,
+          'sel-line-start': 127,
+          'selection_end': 176,
+          'selection_start': 176},
+         1200223901.154624],
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 6,
+          'sel-line-start': 113,
+          'selection_end': 120,
+          'selection_start': 120},
+         1200223903.682584),
+        [loc('gui/page.py'),
+         {'attrib-starts': [('Page',
+                             52),
+                            ('Page.__do_clicked_image',
+                             298)],
+          'first-line': 290,
+          'sel-line': 302,
+          'sel-line-start': 12058,
+          'selection_end': 12092,
+          'selection_start': 12092},
+         1200223905.3400071],
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 6,
+          'sel-line-start': 113,
+          'selection_end': 120,
+          'selection_start': 120},
+         1200223907.2725151),
+        [loc('../../../../opt/wing/resources/doc/en/TOC.idx'),
+         {'displayed-index': 0,
+          'viewer-state': {'history': [-1,
+                                       0],
+                           'history-pos': 1,
+                           'index': 0,
+                           'top': (0,
+                                   0)}},
+         1200223909.7620921],
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 6,
+          'sel-line-start': 113,
+          'selection_end': 120,
+          'selection_start': 120},
+         1200223911.379844),
+        [loc('pages/joke.py'),
          {'attrib-starts': [],
           'first-line': 0,
           'sel-line': 14,
-          'sel-line-start': 540,
-          'selection_end': 604,
-          'selection_start': 604},
-         1198749059.003253]],
+          'sel-line-start': 674,
+          'selection_end': 701,
+          'selection_start': 701},
+         1200223913.305218],
+        (loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 2,
+          'sel-line-start': 11,
+          'selection_end': 11,
+          'selection_start': 11},
+         1200223915.092206),
+        (loc('NEWS'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 0,
+          'sel-line-start': 0,
+          'selection_end': 541,
+          'selection_start': 0},
+         1200225339.2817719),
+        [loc('TODO'),
+         {'attrib-starts': [],
+          'first-line': 0,
+          'sel-line': 2,
+          'sel-line-start': 11,
+          'selection_end': 11,
+          'selection_start': 11},
+         1200227612.696142]],
         19),
         'current-loc': loc('TODO'),
-        'editor-states': {loc('JokeMachineActivity.py'): {'attrib-starts': [],
+        'editor-states': {loc('NEWS'): {'attrib-starts': [],
         'first-line': 0,
         'sel-line': 0,
         'sel-line-start': 0,
-        'selection_end': 0,
+        'selection_end': 541,
         'selection_start': 0},
-                          loc('NEWS'): {'attrib-starts': [],
-        'first-line': 0,
-        'sel-line': 2,
-        'sel-line-start': 18,
-        'selection_end': 78,
-        'selection_start': 78},
                           loc('TODO'): {'attrib-starts': [],
         'first-line': 0,
-        'sel-line': 5,
-        'sel-line-start': 75,
-        'selection_end': 120,
-        'selection_start': 120},
-                          loc('gui/page.py'): {'attrib-starts': [('Page',
-        47),
-        ('Page.__do_clicked_image',
-         291)],
-        'first-line': 290,
-        'sel-line': 295,
-        'sel-line-start': 11748,
-        'selection_end': 11782,
-        'selection_start': 11782},
-                          loc('pages/joke.py'): {'attrib-starts': [],
-        'first-line': 0,
-        'sel-line': 13,
-        'sel-line-start': 701,
-        'selection_end': 701,
-        'selection_start': 701},
-                          loc('setup.py'): {'attrib-starts': [],
-        'first-line': 0,
-        'sel-line': 5,
-        'sel-line-start': 127,
-        'selection_end': 176,
-        'selection_start': 176},
-                          loc('../../../../../../opt/wing/resources/doc/en/TOC.idx'): {''\
-        'displayed-index': 0,
-        'viewer-state': {'history': [-1,
-                                     0],
-                         'history-pos': 1,
-                         'index': 0,
-                         'top': (0,
-                                 0)}}},
+        'sel-line': 0,
+        'sel-line-start': 0,
+        'selection_end': 0,
+        'selection_start': 0}},
         'has-focus': True},
-                               'open_files': [u'JokeMachineActivity.py',
-        u'NEWS',
-        u'gui/page.py',
-        u'pages/joke.py',
-        u'setup.py',
-        u'../../../../../../opt/wing/resources/doc/en/TOC.idx',
+                               'open_files': [u'NEWS',
         u'TODO']},
         'split_percents': {0: 0.5},
         'splits': 2,
@@ -656,11 +605,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'user_data': {}},
         'window-alloc': (0,
                          0,
-                         1407,
+                         1247,
                          1120)}]}
 guimgr.recent-documents = [loc('TODO')]
 guimgr.visual-state = {loc('JokeMachineActivity.py'): {'attrib-starts': [],
-        'first-line': 0,
+        'first-line': 49,
         'sel-line': 0,
         'sel-line-start': 0,
         'selection_end': 0,
@@ -744,14 +693,14 @@ guimgr.visual-state = {loc('JokeMachineActivity.py'): {'attrib-starts': [],
         'selection_end': 0,
         'selection_start': 0},
                        loc('gui/page.py'): {'attrib-starts': [('Page',
-        47),
-        ('Page.make_listrow',
-         71)],
-        'first-line': 63,
-        'sel-line': 75,
-        'sel-line-start': 2246,
-        'selection_end': 2251,
-        'selection_start': 2251},
+        52),
+        ('Page.__do_clicked_image',
+         298)],
+        'first-line': 290,
+        'sel-line': 302,
+        'sel-line-start': 12058,
+        'selection_end': 12092,
+        'selection_start': 12092},
                        loc('gui/theme.py'): {'attrib-starts': [],
         'first-line': 94,
         'sel-line': 103,
@@ -822,10 +771,10 @@ guimgr.visual-state = {loc('JokeMachineActivity.py'): {'attrib-starts': [],
         'selection_start': 0},
                        loc('pages/joke.py'): {'attrib-starts': [],
         'first-line': 0,
-        'sel-line': 21,
-        'sel-line-start': 785,
-        'selection_end': 799,
-        'selection_start': 799},
+        'sel-line': 14,
+        'sel-line-start': 674,
+        'selection_end': 701,
+        'selection_start': 701},
                        loc('pages/page.py'): {'attrib-starts': [('Page',
         10),
         ('Page._make_textbox',
@@ -1010,44 +959,51 @@ guimgr.visual-state = {loc('JokeMachineActivity.py'): {'attrib-starts': [],
         'sel-line-start': 12121,
         'selection_end': 12389,
         'selection_start': 12121},
-                       loc('../../../../../../opt/wing/resources/builtin-pi-files/2.5/__builtin__.pi'): {''\
+                       loc('../../../../opt/wing/resources/builtin-pi-files/2.5/__builtin__.pi'): {''\
         'attrib-starts': [],
         'first-line': 1049,
         'sel-line': 1076,
         'sel-line-start': 33540,
         'selection_end': 33548,
         'selection_start': 33540},
-                       loc('unknown:<untitled> #1'): {'attrib-starts': [],
+                       loc('unknown:<untitled> #4'): {'attrib-starts': [],
         'first-line': 0,
-        'history': {},
-        'sel-line': 3,
-        'sel-line-start': 153,
-        'selection_end': 157,
-        'selection_start': 157},
-                       loc('unknown:<untitled> #2'): {'attrib-starts': [],
+        'sel-line': 0,
+        'sel-line-start': 0,
+        'selection_end': 4,
+        'selection_start': 4},
+                       loc('unknown:<untitled> #6'): {'attrib-starts': [],
         'first-line': 0,
         'sel-line': 0,
         'sel-line-start': 0,
         'selection_end': 4,
         'selection_start': 4},
-                       loc('unknown:<untitled> #5'): {'attrib-starts': [],
+                       loc('unknown:<untitled> #3'): {'attrib-starts': [],
         'first-line': 0,
         'sel-line': 0,
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
-                       loc('unknown:<untitled> #4'): {'attrib-starts': [],
+                       loc('unknown:<untitled> #1'): {'attrib-starts': [],
         'first-line': 0,
+        'history': {},
         'sel-line': 0,
         'sel-line-start': 0,
-        'selection_end': 4,
-        'selection_start': 4},
-                       loc('unknown:<untitled> #3'): {'attrib-starts': [],
+        'selection_end': 0,
+        'selection_start': 0},
+                       loc('unknown:<untitled> #5'): {'attrib-starts': [],
         'first-line': 0,
         'sel-line': 0,
         'sel-line-start': 0,
         'selection_end': 0,
-        'selection_start': 0}}
+        'selection_start': 0},
+                       loc('unknown:<untitled> #2'): {'attrib-starts': [],
+        'first-line': 0,
+        'history': {},
+        'sel-line': 3,
+        'sel-line-start': 153,
+        'selection_end': 157,
+        'selection_start': 157}}
 search.replace-history = [u'locale',
                           u'self.__parent',
                           u'self.__is_initiator',
@@ -1059,8 +1015,8 @@ search.replace-history = [u'locale',
                           u'joke_box',
                           u'__do_clicked_tab',
                           u'jokebuilder']
-search.search-history = [u'chooser.hide',
-                         u'.png',
+search.search-history = [u'.png',
+                         u'chooser.hide',
                          u'laugh',
                          u'audio',
                          u'locale',