anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Kivy Version

Browse source 
- adjusted animation time settings
- some clean ups
This commit is contained in:
lufebe16 2023-11-15 11:33:02 +01:00
parent 953c3fc9cb
commit 9a4df67df3
6 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
buildozer/minimal.txt
View file

@ -17,6 +17,7 @@ cardset-matching
cardset-matching-xl cardset-matching-xl
cardset-matrix cardset-matrix
cardset-mid-winter-eve-8x8 cardset-mid-winter-eve-8x8
cardset-mini-ishido
cardset-mughal-ganjifa cardset-mughal-ganjifa
cardset-mughal-ganjifa-xl cardset-mughal-ganjifa-xl
cardset-neo cardset-neo

2
buildozer/mkcards
View file

@ -46,7 +46,7 @@ else
pushd repo pushd repo
git init git init
git remote add -t master origin https://github.com/shlomif/PySolFC-Cardsets.git git remote add -t master origin https://github.com/shlomif/PySolFC-Cardsets.git
git fetch --depth 1 origin ae08657f931328439c5697165503a6360a75a7a6 git fetch --depth 1 origin 47f089ea71c9e9e7e386e932699496f7e7bcf6a8
git checkout -q FETCH_HEAD git checkout -q FETCH_HEAD
popd popd

4
pysollib/game/__init__.py
View file

@ -1458,9 +1458,9 @@ class Game(object):
card.tkraise() card.tkraise()
c0 = cards[0] c0 = cards[0]
dx, dy = (x - c0.x), (y - c0.y) dx, dy = (x - c0.x), (y - c0.y)
base = float(self.app.opt.animations)
duration = base*base/5.0/10.0
for card in cards: for card in cards:
base = float(self.app.opt.animations)
duration = base*0.1
card.animatedMove(dx, dy, duration) card.animatedMove(dx, dy, duration)
for card in cards: for card in cards:
while card.animationIsRunning(): while card.animationIsRunning():

2
pysollib/kivy/LApp.py
View file

@ -182,7 +182,7 @@ class LAnimationMgr(object):
# offset = duration*1.2 # offset = duration*1.2
timedelay = offset * len(self.animations) timedelay = offset * len(self.animations)
# print('offset = %s'% offset) # print('offset = %s'% offset)
print('LAnimationMgr: timedelay = %s' % timedelay) # print('LAnimationMgr: timedelay = %s' % timedelay)
if widget in self.widgets: if widget in self.widgets:
# append additional animation to widget # append additional animation to widget

2
pysollib/kivy/menubar.py
View file

@ -1879,7 +1879,7 @@ class PysolMenubarTk:
def updateBookmarkMenuState(self): def updateBookmarkMenuState(self):
# LB: # LB:
print('updateBookmarkMenuState - fake') # print('updateBookmarkMenuState - fake')
return return
state = self._getEnabledState state = self._getEnabledState

22
pysollib/kivy/tkcanvas.py
View file

@ -292,7 +292,7 @@ class MfxCanvasImage(object):
self.addtag(group) self.addtag(group)
def __del__(self): def __del__(self):
print('MfxCanvasImage: __del__(%s)' % self.image) # print('MfxCanvasImage: __del__(%s)' % self.image)
self.canvas.clear_widgets([self.image]) self.canvas.clear_widgets([self.image])
def __str__(self): def __str__(self):
@ -302,7 +302,7 @@ class MfxCanvasImage(object):
pass pass
def tkraise(self, aboveThis=None): def tkraise(self, aboveThis=None):
print(self, ': tkraise, above =', aboveThis) # print(self, ': tkraise, above =', aboveThis)
abitm = None abitm = None
if aboveThis: if aboveThis:
@ -313,13 +313,13 @@ class MfxCanvasImage(object):
self.canvas.tag_raise(self.image, abitm) self.canvas.tag_raise(self.image, abitm)
def addtag(self, tag): def addtag(self, tag):
print('MfxCanvasImage: addtag %s' % tag.stack) # print('MfxCanvasImage: addtag %s' % tag.stack)
self.group = tag self.group = tag
if (self.image): if (self.image):
self.image.group = tag self.image.group = tag
def dtag(self, tag): def dtag(self, tag):
print('MfxCanvasImage: remtag %s' % tag.stack) # print('MfxCanvasImage: remtag %s' % tag.stack)
self.group = None self.group = None
if (self.image): if (self.image):
self.image.group = None self.image.group = None
@ -330,7 +330,7 @@ class MfxCanvasImage(object):
self.canvas.clear_widgets([self.image]) self.canvas.clear_widgets([self.image])
def move(self, dx, dy): def move(self, dx, dy):
print('MfxCanvasImage: move %s, %s' % (dx, dy)) # print('MfxCanvasImage: move %s, %s' % (dx, dy))
image = self.image image = self.image
dsize = image.coreSize dsize = image.coreSize
dpos = (image.corePos[0] + dx, image.corePos[1] + dy) dpos = (image.corePos[0] + dx, image.corePos[1] + dy)
@ -340,14 +340,14 @@ class MfxCanvasImage(object):
def makeAnimStart(self): def makeAnimStart(self):
def animStart(anim, widget): def animStart(anim, widget):
print('MfxCanvasImage: animStart %s' % self) # print('MfxCanvasImage: animStart %s' % self)
# nothing to do hiere # nothing to do hiere
pass pass
return animStart return animStart
def makeAnimEnd(self, dpos, dsize): def makeAnimEnd(self, dpos, dsize):
def animEnd(anim, widget): def animEnd(anim, widget):
print('MfxCanvasImage: animEnd %s' % self) # print('MfxCanvasImage: animEnd %s' % self)
self.animation = False self.animation = False
image = self.image image = self.image
image.pos, image.size = self.canvas.CoreToKivy(dpos, dsize) image.pos, image.size = self.canvas.CoreToKivy(dpos, dsize)
@ -393,7 +393,7 @@ class MfxCanvasImage(object):
class MfxCanvasLine(object): class MfxCanvasLine(object):
def __init__(self, canvas, *args, **kwargs): def __init__(self, canvas, *args, **kwargs):
print('MfxCanvasLine: %s %s' % (args, kwargs)) # print('MfxCanvasLine: %s %s' % (args, kwargs))
self.canvas = canvas self.canvas = canvas
line = LLine(canvas, args, **kwargs) line = LLine(canvas, args, **kwargs)
@ -404,11 +404,11 @@ class MfxCanvasLine(object):
self.widget = line self.widget = line
def delete_deferred(self, seconds): def delete_deferred(self, seconds):
print('MfxCanvasLine: delete_deferred(%s)' % seconds) # print('MfxCanvasLine: delete_deferred(%s)' % seconds)
Clock.schedule_once(lambda dt: self.delete(), seconds) Clock.schedule_once(lambda dt: self.delete(), seconds)
def delete(self): def delete(self):
print('MfxCanvasLine: delete()') # print('MfxCanvasLine: delete()')
self.canvas.clear_widgets([self.line]) self.canvas.clear_widgets([self.line])
@ -524,7 +524,7 @@ class MfxCanvas(Widget):
# self.tags = {} # bei basisklasse widget (ev. nur vorläufig) # self.tags = {} # bei basisklasse widget (ev. nur vorläufig)
self.wmain = wmain self.wmain = wmain
print('MfxCanvas: wmain = %s' % self.wmain) # print('MfxCanvas: wmain = %s' % self.wmain)
# Tkinter.Canvas.__init__(self, *args, **kw) # Tkinter.Canvas.__init__(self, *args, **kw)
self.preview = 0 self.preview = 0