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

Got Accordion's Revenge to work correctly under Kivy.

Browse source
This commit is contained in:
Joe R 2021-07-24 21:03:51 -04:00
parent 8c41f7be61
commit 747b1fd60b
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pysollib/games/pushpin.py
View file

@ -380,9 +380,7 @@ class AccordionsRevenge(Accordion2):
def updateText(self): def updateText(self):
if self.preview > 1: if self.preview > 1:
return return
if self.finalrank == -1 and self.finalsuit == -1: if self.finalrank != -1 and self.finalsuit != -1:
self.texts.base_rank.config('')
else:
self.texts.base_rank.config(text=RANKS[self.finalrank] self.texts.base_rank.config(text=RANKS[self.finalrank]
+ ' - ' + SUITS_PL[self.finalsuit]) + ' - ' + SUITS_PL[self.finalsuit])

13
pysollib/kivy/menubar.py
View file

@ -589,6 +589,11 @@ class OptionsMenuDialog(LMenuDialog):
self.menubar.tkopt.shisen_show_hint, self.menubar.tkopt.shisen_show_hint,
self.menubar.mOptShisenShowHint) self.menubar.mOptShisenShowHint)
self.addCheckNode(tv, rg,
_('Deal all cards (in Accordion type games)'),
self.menubar.tkopt.accordion_deal_all,
self.menubar.mOptAccordionDealAll)
# submenu.add_separator() # submenu.add_separator()
# ------------------------------------------- # -------------------------------------------
@ -1238,6 +1243,7 @@ class PysolMenubarTk:
highlight_not_matching=BooleanVar(), highlight_not_matching=BooleanVar(),
mahjongg_show_removed=BooleanVar(), mahjongg_show_removed=BooleanVar(),
shisen_show_hint=BooleanVar(), shisen_show_hint=BooleanVar(),
accordion_deal_all=BooleanVar(),
sound=BooleanVar(), sound=BooleanVar(),
sound_sample_volume=IntVar(), sound_sample_volume=IntVar(),
sound_music_volume=IntVar(), sound_music_volume=IntVar(),
@ -1299,6 +1305,7 @@ class PysolMenubarTk:
tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) tkopt.shade_filled_stacks.set(opt.shade_filled_stacks)
tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed)
tkopt.shisen_show_hint.set(opt.shisen_show_hint) tkopt.shisen_show_hint.set(opt.shisen_show_hint)
tkopt.accordion_deal_all.set(opt.accordion_deal_all)
tkopt.sound.set(opt.sound) tkopt.sound.set(opt.sound)
tkopt.sound_sample_volume.set(opt.sound_sample_volume) tkopt.sound_sample_volume.set(opt.sound_sample_volume)
tkopt.sound_music_volume.set(opt.sound_music_volume) tkopt.sound_music_volume.set(opt.sound_music_volume)
@ -2096,6 +2103,12 @@ the next time you restart the %(app)s""") % {'app': TITLE})
self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get()
# self.game.updateMenus() # self.game.updateMenus()
def mOptAccordionDealAll(self, *args):
if self._cancelDrag(break_pause=False):
return
self.app.opt.accordion_deal_all = self.tkopt.accordion_deal_all.get()
# self.game.updateMenus()
def mOptCardset(self, *event): def mOptCardset(self, *event):
if self._cancelDrag(break_pause=False): if self._cancelDrag(break_pause=False):
return return