Add documentation for deal all cards option to Accordion type game rules

- Added new menu option to adjust font size in general.
- Fixed a bug with doubleclick moves addressed in #117.

html-src/rules/accordion.html

@@ -14,3 +14,9 @@ the card that is further to the left (in PySol, this is the card that is
 further from the deck) may be moved on top of the other.
 <p>
 The game is won when only one card remains.
+
+<h3>Notes</h3>
+<p>
+Accordion, and its related games, can be played with cards dealt manually
+by the player one at a time, or all cards dealt at once.  This option
+can be set in the options menu.

html-src/rules/decade.html

@@ -15,3 +15,11 @@ is won if all cards are removed.
 <p>
 In PySol, a sequence is removed by selecting the first and last
 card of the sequence.
+Royal Marriage, and its related games, can be played with cards dealt
+manually by the player one at a time, or all cards dealt at once.  This
+
+<h3>Notes</h3>
+<p>
+Decade, and its related games, can be played with cards dealt manually
+by the player one at a time, or all cards dealt at once.  This option
+can be set in the options menu.

html-src/rules/royalmarriage.html

@@ -11,9 +11,15 @@ To remove all cards between the king and queen of hearts
 The queen of hearts is placed on top of the deck and the king
 on the bottom.
 <p>
-Three cards are dealt from the stock, but additional cards may be
-dealt at any time.  If there are one or two cards between two cards
-of the same rank or suit, those cards may be removed.
+Cards are dealt from the stock in a sequence.  If there are one
+or two cards between two cards of the same rank or suit, those cards
+may be removed.
 <p>
 The game is won when the king of hearts is brought to his "bride",
 the queen, as in, all cards between them have been removed.
+
+<h3>Notes</h3>
+<p>
+Royal Marriage, and its related games, can be played with cards dealt
+manually by the player one at a time, or all cards dealt at once.  This
+option can be set in the options menu.

html-src/rules/sevenup.html

@@ -18,6 +18,10 @@ card of the sequence.
 
 <h3>Notes</h3>
 <p>
+Seven Up, and its related games, can be played with cards dealt manually by
+the player one at a time, or all cards dealt at once.  This option can be set in
+the options menu.
+<p>
 The average rank of the cards in a deck is 7, and the total of all cards of
 each suit is 91, which is a multiple of 7.  Thus, the total of all cards in the
 entire deck is 364, also a multiple of 7.

pysollib/game/__init__.py

@@ -2274,8 +2274,9 @@ class Game(object):
                     self.finishMove()
                     if self.checkForWin():
                         return 1
-            self.top.update_idletasks()
-            self.top.busyUpdate()
+            if self.top is not None:
+                self.top.update_idletasks()
+                self.top.busyUpdate()
         return 0
 
     def _autoDeal(self, sound=True):

pysollib/kivy/LApp.py

@@ -48,8 +48,10 @@ from kivy.uix.boxlayout import BoxLayout
 from kivy.uix.floatlayout import FloatLayout
 from kivy.uix.label import Label
 from kivy.uix.scrollview import ScrollView
+from kivy.uix.slider import Slider
 from kivy.uix.treeview import TreeView
 from kivy.uix.treeview import TreeViewLabel
+from kivy.uix.treeview import TreeViewNode
 from kivy.uix.widget import Widget
 from kivy.utils import platform
 
@@ -986,6 +988,31 @@ class LTreeRoot(TreeView, LBase):
 
         return ret
 
+class LTreeSliderNode(Slider, TreeViewNode, LBase):
+
+    def __init__(self, **kw):
+        self.variable = None
+        if 'variable' in kw:
+            self.variable = kw['variable']
+            del kw['variable']
+        if 'setup' in kw:
+            self.min  = kw['setup'][0]
+            self.max  = kw['setup'][1]
+            self.step = kw['setup'][2]
+            del kw['setup']
+
+        super(LTreeSliderNode, self).__init__(markup=True, **kw)
+        self.value = self.variable.value
+        self.height = '24sp'
+        self.background_width = '12sp'
+        self.background_height = '12sp'
+        self.cursor_height = '12sp'
+        self.cursor_width = '12sp'
+
+    def on_value(self,obj,val):
+        print (val)
+        self.variable.value = val
+
 
 class LTreeNode(ButtonBehavior, TreeViewLabel, LBase):
 
@@ -1710,13 +1737,12 @@ class LMainWindow(BoxLayout, LTkBase):
             # print(' - interval is', touch.double_tap_time)
             # print(' - distance betw. previous is', touch.double_tap_distance)
             AndroidScreenRotation.unlock()
-
         '''
         if touch.is_triple_tap:
             print('Touch is a triple tap !')
-            print(' - interval is', touch.triple_tap_time)
-            print(' - distance between previous is', touch.triple_tap_distance)
+            AndroidScreenRotation.unlock()
         '''
+
         # (Eventloop reentrancy check)
         if self.in_loop:
             return ret

pysollib/kivy/LObjWrap.py

@@ -40,7 +40,7 @@ class LObjWrap(EventDispatcher):
             self.bind(value=command)
 
     def on_value(self,inst,val):
-        logging.info("LObjWrap: %s = %s" % (self.ref,val))
+        # logging.info("LObjWrap: %s = %s" % (self.ref,val))
         if self.ref is not None:
             setattr(self.obj,self.ref,val)
 

pysollib/kivy/menubar.py

@@ -37,6 +37,7 @@ from pysollib.kivy.LApp import LScrollView
 from pysollib.kivy.LApp import LTopLevel
 from pysollib.kivy.LApp import LTreeNode
 from pysollib.kivy.LApp import LTreeRoot
+from pysollib.kivy.LApp import LTreeSliderNode
 from pysollib.kivy.LObjWrap import LBoolWrap
 from pysollib.kivy.LObjWrap import LListWrap
 from pysollib.kivy.LObjWrap import LNumWrap
@@ -133,6 +134,11 @@ class LMenuBase(object):
                       variable=auto_var, value=auto_val), rg)
         return rg1
 
+    def addSliderNode(self, tv, rg, auto_var, auto_setup):
+        rg1 = tv.add_node(
+            LTreeSliderNode(variable=auto_var, setup=auto_setup), rg)
+        return rg1
+
 # ************************************************************************
 # * Tree Generators
 # ************************************************************************
@@ -1259,6 +1265,38 @@ class LOptionsMenuGenerator(LTreeGenerator):
         # -------------------------------------------
         # general options
 
+        rg = tv.add_node(
+            LTreeNode(text=_('Font size')))
+        if rg:
+            self.addRadioNode(tv, rg,
+                              _('default'),
+                              self.menubar.tkopt.fontscale, 'default',
+                              None)
+            self.addRadioNode(tv, rg,
+                              _('tiny'),
+                              self.menubar.tkopt.fontscale, 'tiny',
+                              None)
+            self.addRadioNode(tv, rg,
+                              _('small'),
+                              self.menubar.tkopt.fontscale, 'small',
+                              None)
+            self.addRadioNode(tv, rg,
+                              _('normal'),
+                              self.menubar.tkopt.fontscale, 'normal',
+                              None)
+            self.addRadioNode(tv, rg,
+                              _('large'),
+                              self.menubar.tkopt.fontscale, 'large',
+                              None)
+            self.addRadioNode(tv, rg,
+                              _('huge'),
+                              self.menubar.tkopt.fontscale, 'huge',
+                              None)
+            '''
+            self.addSliderNode(tv, rg, self.menubar.tkopt.fontsizefactor,
+                               (0.7, 2.0, 0.1))
+            '''
+
         # self.addCheckNode(tv, None,
         #   'Save games geometry',
         #   self.menubar.tkopt.save_games_geometry,
@@ -1433,6 +1471,25 @@ class PysolMenubarTk:
         AndroidScreenRotation.unlock(toaster=False)
         print('unlock screen rotation')
 
+    def setFontScale(self, obj, val):
+        from kivy.metrics import Metrics
+        vals = {
+            'tiny':   0.833,
+            'small':  1.0,
+            'normal': 1.2,
+            'large':  1.44,
+            'huge':   1.728
+        }
+        if val == 'default':
+            Metrics.reset_metrics()
+        else:
+            Metrics.fontscale = vals[val]
+    '''
+    def setFontSize(self, obj, val):
+        from kivy.metrics import Metrics
+        Metrics.fontscale = val
+    '''
+
     def _createTkOpt(self):
         opt = self.app.opt
 
@@ -1536,6 +1593,8 @@ class PysolMenubarTk:
             save_games_geometry=LBoolWrap(opt, "save_games_geometry"),
             pause=LBoolWrap(self, "pause"),
             table_zoom=LListWrap(opt, "table_zoom"),
+            fontscale=LStringWrap(opt, "fontscale", self.setFontScale),
+            # fontsizefactor=LNumWrap(opt, "fontsizefactor", self.setFontSize),
             # cards
             cardset=LNumWrap(self, "cardset"),
             cardback=LNumWrap(self, "cardback"),
@@ -1554,9 +1613,10 @@ class PysolMenubarTk:
             self.tkopt.color_vars[k] = LStringWrap(self.cvo, k)
 
     def _setOptions(self):
-        # not supported
         self.tkopt.save_games_geometry.value = False
         self.getToolbarPos(None, Window.size)
+        self.setFontScale(None, self.tkopt.fontscale.value)
+        # self.setFontSize(None, self.tkopt.fontsizefactor.value)
         Window.bind(size=self.getToolbarPos)
 
     def getToolbarPos(self, obj, size):

pysollib/kivy/tkcanvas.py

@@ -653,21 +653,6 @@ class MfxCanvas(LImage):
         self.bind(pos=self.pos_update_widget)
         self.bind(size=self.size_update_widget)
 
-    def on_touch_down(self,touch):
-        ret = False
-        ret = super(MfxCanvas,self).on_touch_down(touch)
-        return ret
-
-    def on_touch_up(self,touch):
-        ret = False
-        ret = super(MfxCanvas,self).on_touch_up(touch)
-        return ret
-
-    def on_touch_move(self,touch):
-        ret = False
-        ret = super(MfxCanvas,self).on_touch_move(touch)
-        return ret
-
     def KivyToCoreP(self, pos, size, scale):
         cpos = pos
         cpos = (cpos[0] - self.pos[0], self.pos[1] +

pysollib/kivy/tkwidget.py

@@ -387,6 +387,7 @@ class LScatterFrame(Scatter):
         self.scale_min = 1.0
         self.scale_max = 2.2
         self.lock_pos = None
+        self.lock_chk = None
         self.offset = None
         self.tkopt = None
 
@@ -420,8 +421,10 @@ class LScatterFrame(Scatter):
                 dx = round(self.offset[0] * (self.bbox[1][0] - self.size[0]))
                 dy = round(self.offset[1] * (self.bbox[1][1] - self.size[1]))
                 self.pos = (self.parent.pos[0]-dx,self.parent.pos[1]-dy)
+                if self.lock_chk is None:
+                    Clock.schedule_once(lambda dt: self.chk_bnd()) # noqa
             self.lock_pos = None
-            print("_update",self.pos,self.size)
+            # print("_update",self.pos,self.size)
 
     def _updatesize(self,instance,value):
         self.inner.size = self.size
@@ -438,11 +441,21 @@ class LScatterFrame(Scatter):
         return False
 
     def on_touch_down(self, touch):
-        if touch.is_double_tap: return False
+        ret = False
         x,y = touch.pos
         if self.collide_point(x,y):
-            return super(LScatterFrame, self).on_touch_down(touch)
-        return False
+            if touch.is_double_tap:
+                # Do not use the event handling of scatter because scatter
+                # does not allow to propagate an unhandled double tap back
+                # to parent (it grabs the touch unseen if not
+                # handled by a child!).
+                touch.push()
+                touch.apply_transform_2d(self.to_local)
+                ret = self.inner.on_touch_down(touch)
+                touch.pop()
+            else:
+                ret = super(LScatterFrame, self).on_touch_down(touch)
+        return ret
 
     def on_touch_up(self, touch):
         if touch.grab_current == self:
@@ -466,6 +479,10 @@ class LScatterFrame(Scatter):
     def chk_bnd(self):
         # Keep the game on the screen.
 
+        # check and set lock
+        if self.lock_chk is not None: return
+        self.lock_chk = "locked"
+
         # limiting parameters:
         pos,size = self.bbox
         w,h = size
@@ -502,6 +519,9 @@ class LScatterFrame(Scatter):
             zoominfo = [zoom, 0.0, 0.0]
         self.tkopt.table_zoom.value = zoominfo
 
+        # remove lock
+        self.lock_chk = None
+
 
 class LScrollFrame(BoxLayout,StencilView):
     def __init__(self, **kw):

pysollib/options.py

@@ -324,6 +324,8 @@ class Options:
         ('display_win_message', 'bool'),
         ('language', 'str'),
         # ('table_zoom', 'list'),
+        ('fontscale', 'str'),
+        # ('fontsizefactor', 'float'),
         ]
 
     def __init__(self):
@@ -420,6 +422,8 @@ class Options:
         self.display_win_message = True
         self.language = ''
         self.table_zoom = [1.0, 0.0, 0.0]
+        self.fontscale = 'default'        # (kivy,  platform defaults)
+        # self.fontsizefactor = 1.0
         # sound
         self.sound = True
         self.sound_mode = 1

pysollib/stack.py

@@ -1689,7 +1689,7 @@ class DealRow_StackMethods:
             if flip:
                 self.game.flipMove(self)
             self.game.moveMove(1, self, r, frames=frames)
-        if frames > 0:
+        if frames > 0 and self.game.top is not None:
             self.game.top.update_idletasks()
             self.game.top.busyUpdate()
         self.game.leaveState(old_state)

setup.cfg

@@ -7,7 +7,7 @@ use_bzip2 = 1
 [flake8]
 extend-ignore = H101,H104,H201,H237,H301,H306,H403,H404,H405,
                 # remove some most ugly flakes:
-                E211,E225,E231,E302,E305,E701,E741,W293
+                E211,E221,E222,E225,E231,E302,E305,E701,E741,W293
 
 [sdist]
 force_manifest = 1