diff --git a/data/images/demo/demo01.gif b/data/images/demo/classic/demo01.gif similarity index 100% rename from data/images/demo/demo01.gif rename to data/images/demo/classic/demo01.gif diff --git a/data/images/demo/demo01.png b/data/images/demo/classic/demo01.png similarity index 100% rename from data/images/demo/demo01.png rename to data/images/demo/classic/demo01.png diff --git a/data/images/demo/demo02.gif b/data/images/demo/classic/demo02.gif similarity index 100% rename from data/images/demo/demo02.gif rename to data/images/demo/classic/demo02.gif diff --git a/data/images/demo/demo02.png b/data/images/demo/classic/demo02.png similarity index 100% rename from data/images/demo/demo02.png rename to data/images/demo/classic/demo02.png diff --git a/data/images/demo/demo03.gif b/data/images/demo/classic/demo03.gif similarity index 100% rename from data/images/demo/demo03.gif rename to data/images/demo/classic/demo03.gif diff --git a/data/images/demo/demo03.png b/data/images/demo/classic/demo03.png similarity index 100% rename from data/images/demo/demo03.png rename to data/images/demo/classic/demo03.png diff --git a/data/images/demo/demo04.gif b/data/images/demo/classic/demo04.gif similarity index 100% rename from data/images/demo/demo04.gif rename to data/images/demo/classic/demo04.gif diff --git a/data/images/demo/demo04.png b/data/images/demo/classic/demo04.png similarity index 100% rename from data/images/demo/demo04.png rename to data/images/demo/classic/demo04.png diff --git a/data/images/demo/demo05.gif b/data/images/demo/classic/demo05.gif similarity index 100% rename from data/images/demo/demo05.gif rename to data/images/demo/classic/demo05.gif diff --git a/data/images/demo/demo05.png b/data/images/demo/classic/demo05.png similarity index 100% rename from data/images/demo/demo05.png rename to data/images/demo/classic/demo05.png diff --git a/data/images/demo/gold/demo01.gif b/data/images/demo/gold/demo01.gif new file mode 100644 index 00000000..cfdb1f1c Binary files /dev/null and b/data/images/demo/gold/demo01.gif differ diff --git a/data/images/demo/gold/demo01.png b/data/images/demo/gold/demo01.png new file mode 100644 index 00000000..cfdb1f1c Binary files /dev/null and b/data/images/demo/gold/demo01.png differ diff --git a/data/images/dialog/default/error.gif b/data/images/dialog/classic/error.gif similarity index 100% rename from data/images/dialog/default/error.gif rename to data/images/dialog/classic/error.gif diff --git a/data/images/dialog/default/error.png b/data/images/dialog/classic/error.png similarity index 100% rename from data/images/dialog/default/error.png rename to data/images/dialog/classic/error.png diff --git a/data/images/dialog/default/info.gif b/data/images/dialog/classic/info.gif similarity index 100% rename from data/images/dialog/default/info.gif rename to data/images/dialog/classic/info.gif diff --git a/data/images/dialog/default/info.png b/data/images/dialog/classic/info.png similarity index 100% rename from data/images/dialog/default/info.png rename to data/images/dialog/classic/info.png diff --git a/data/images/dialog/default/question.gif b/data/images/dialog/classic/question.gif similarity index 100% rename from data/images/dialog/default/question.gif rename to data/images/dialog/classic/question.gif diff --git a/data/images/dialog/default/question.png b/data/images/dialog/classic/question.png similarity index 100% rename from data/images/dialog/default/question.png rename to data/images/dialog/classic/question.png diff --git a/data/images/dialog/default/warning.gif b/data/images/dialog/classic/warning.gif similarity index 100% rename from data/images/dialog/default/warning.gif rename to data/images/dialog/classic/warning.gif diff --git a/data/images/dialog/default/warning.png b/data/images/dialog/classic/warning.png similarity index 100% rename from data/images/dialog/default/warning.png rename to data/images/dialog/classic/warning.png diff --git a/data/images/pause/pause01.gif b/data/images/pause/classic/pause01.gif similarity index 100% rename from data/images/pause/pause01.gif rename to data/images/pause/classic/pause01.gif diff --git a/data/images/pause/pause01.png b/data/images/pause/classic/pause01.png similarity index 100% rename from data/images/pause/pause01.png rename to data/images/pause/classic/pause01.png diff --git a/data/images/pause/pause02.gif b/data/images/pause/classic/pause02.gif similarity index 100% rename from data/images/pause/pause02.gif rename to data/images/pause/classic/pause02.gif diff --git a/data/images/pause/pause02.png b/data/images/pause/classic/pause02.png similarity index 100% rename from data/images/pause/pause02.png rename to data/images/pause/classic/pause02.png diff --git a/data/images/pause/pause03.gif b/data/images/pause/classic/pause03.gif similarity index 100% rename from data/images/pause/pause03.gif rename to data/images/pause/classic/pause03.gif diff --git a/data/images/pause/pause03.png b/data/images/pause/classic/pause03.png similarity index 100% rename from data/images/pause/pause03.png rename to data/images/pause/classic/pause03.png diff --git a/data/images/pause/gold/pause01.gif b/data/images/pause/gold/pause01.gif new file mode 100644 index 00000000..91137b5c Binary files /dev/null and b/data/images/pause/gold/pause01.gif differ diff --git a/data/images/pause/gold/pause01.png b/data/images/pause/gold/pause01.png new file mode 100644 index 00000000..42933aab Binary files /dev/null and b/data/images/pause/gold/pause01.png differ diff --git a/data/images/redeal.gif b/data/images/redealicons/classic/redeal.gif similarity index 100% rename from data/images/redeal.gif rename to data/images/redealicons/classic/redeal.gif diff --git a/data/images/redealicons/classic/redeal.png b/data/images/redealicons/classic/redeal.png new file mode 100644 index 00000000..ce81b6d6 Binary files /dev/null and b/data/images/redealicons/classic/redeal.png differ diff --git a/data/images/stopsign.gif b/data/images/redealicons/classic/stopsign.gif similarity index 100% rename from data/images/stopsign.gif rename to data/images/redealicons/classic/stopsign.gif diff --git a/data/images/redealicons/classic/stopsign.png b/data/images/redealicons/classic/stopsign.png new file mode 100644 index 00000000..04ed0c61 Binary files /dev/null and b/data/images/redealicons/classic/stopsign.png differ diff --git a/data/images/redeal.png b/data/images/redealicons/modern/redeal.png similarity index 100% rename from data/images/redeal.png rename to data/images/redealicons/modern/redeal.png diff --git a/data/images/stopsign.png b/data/images/redealicons/modern/stopsign.png similarity index 100% rename from data/images/stopsign.png rename to data/images/redealicons/modern/stopsign.png diff --git a/po/de_pysol.po b/po/de_pysol.po index 59bb5399..e20a696b 100644 --- a/po/de_pysol.po +++ b/po/de_pysol.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PySol 0.0.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:49-0500\n" +"PO-Revision-Date: 2023-11-11 18:27-0500\n" "Last-Translator: H. Schaekel \n" "Language-Team: German\n" "Language: de\n" @@ -5363,10 +5363,25 @@ msgstr "" msgid "Save games &geometry" msgstr "Spielgeometrie speichern" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "&Demo logo" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "" diff --git a/po/fr_pysol.po b/po/fr_pysol.po index 14f5d673..11105528 100644 --- a/po/fr_pysol.po +++ b/po/fr_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 1.02\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:49-0500\n" +"PO-Revision-Date: 2023-11-11 18:27-0500\n" "Last-Translator: Eric Rausch \n" "Language-Team: French\n" "Language: fr\n" @@ -5408,10 +5408,25 @@ msgstr "Barre d'&aide" msgid "Save games &geometry" msgstr "Enregistrer la &géométrie du jeu" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "Logo de &démo" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "Éc&ran de démarrage" diff --git a/po/it_pysol.po b/po/it_pysol.po index d6703585..68ef9f21 100644 --- a/po/it_pysol.po +++ b/po/it_pysol.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: it_pysol\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:49-0500\n" +"PO-Revision-Date: 2023-11-11 18:26-0500\n" "Last-Translator: Giuliano Colla \n" "Language-Team: Italiano \n" "Language: it\n" @@ -5472,10 +5472,25 @@ msgstr "Mostra barra di a&iuto" msgid "Save games &geometry" msgstr "Salva gioco e &geometria" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "&Demo logo" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "Splash sc&reen all'avvio" diff --git a/po/pl_pysol.po b/po/pl_pysol.po index 6d959e07..adf31ecc 100644 --- a/po/pl_pysol.po +++ b/po/pl_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PySolFC\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:49-0500\n" +"PO-Revision-Date: 2023-11-11 18:26-0500\n" "Last-Translator: Jerzy Trzeciak \n" "Language-Team: Polish \n" "Language: pl\n" @@ -5424,10 +5424,25 @@ msgstr "Pokaż pasek pomocy" msgid "Save games &geometry" msgstr "Zapisz układ &gier" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "&Demo logo" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "Ek&ran powitalny" diff --git a/po/pt_BR_pysol.po b/po/pt_BR_pysol.po index ad4f05c4..c0ac373a 100644 --- a/po/pt_BR_pysol.po +++ b/po/pt_BR_pysol.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:50-0500\n" +"PO-Revision-Date: 2023-11-11 18:25-0500\n" "Last-Translator: Matheus Knack \n" "Language-Team: \n" "Language: pt_BR\n" @@ -5430,10 +5430,25 @@ msgstr "Mostra &barra de ajuda" msgid "Save games &geometry" msgstr "Salvar jogos &geometria" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "&Logo da demo" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "Tela inicial de iniciali&zação" diff --git a/po/pysol.pot b/po/pysol.pot index 619d2ae9..3168dde8 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5157,10 +5157,25 @@ msgstr "" msgid "Save games &geometry" msgstr "" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 829b0514..3b1f24cc 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-12-10 10:19-0500\n" -"PO-Revision-Date: 2023-11-05 12:50-0500\n" +"PO-Revision-Date: 2023-11-11 18:25-0500\n" "Last-Translator: Skomoroh \n" "Language-Team: Russian \n" "Language: ru\n" @@ -5498,10 +5498,25 @@ msgstr "Показывать панель помощи" msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" +msgid "Othe&r graphics" +msgstr "" + #: pysollib/ui/tktile/menubar.py:637 msgid "&Demo logo" msgstr "Д&емо лого" +msgid "D&ialog icons" +msgstr "" + +msgid "&Show demo logo" +msgstr "" + +msgid "&Pause text" +msgstr "" + +msgid "&Redeal iconso" +msgstr "" + #: pysollib/ui/tktile/menubar.py:640 msgid "Startup splash sc&reen" msgstr "О&кно запуска" diff --git a/pysollib/app.py b/pysollib/app.py index 060982a9..5ce88348 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -508,6 +508,7 @@ class Application: def loadImages1(self): # load dialog images dirname = os.path.join("images", "logos") + self.gimages.logos = [] for f in ("joker07_40_774", "joker08_40_774", "joker07_50_774", @@ -515,11 +516,7 @@ class Application: "joker11_100_774", "joker10_100",): self.gimages.logos.append(self.dataloader.findImage(f, dirname)) - # if WIN_SYSTEM == 'win32': - # dirname = os.path.join('images', 'dialog', 'default') - # else: - # dirname = os.path.join('images', 'dialog', 'bluecurve') - dirname = os.path.join('images', 'dialog', 'remix') + dirname = os.path.join('images', 'dialog', self.opt.dialog_icon_style) for f in ('error', 'info', 'question', 'warning'): fn = self.dataloader.findImage(f, dirname) im = loadImage(fn) @@ -539,16 +536,27 @@ class Application: def loadImages2(self): # load canvas images - dirname = "images" + dirname = os.path.join("images", "redealicons", + self.opt.redeal_icon_style) # for f in ("noredeal", "redeal",): + self.gimages.redeal = [] for f in ("stopsign", "redeal",): self.gimages.redeal.append(self.dataloader.findImage(f, dirname)) - dirname = os.path.join("images", "demo") + dirname = os.path.join("images", "demo", self.opt.demo_logo_style) + self.gimages.demo = [] for f in ("demo01", "demo02", "demo03", "demo04", "demo05",): - self.gimages.demo.append(self.dataloader.findImage(f, dirname)) - dirname = os.path.join("images", "pause") + try: + self.gimages.demo.append(self.dataloader.findImage(f, dirname)) + except OSError: + pass + dirname = os.path.join("images", "pause", self.opt.pause_text_style) + self.gimages.pause = [] for f in ("pause01", "pause02", "pause03",): - self.gimages.pause.append(self.dataloader.findImage(f, dirname)) + try: + self.gimages.pause.append(self.dataloader.findImage(f, + dirname)) + except OSError: + pass # dirname = os.path.join("images", "stats") # for f in ("barchart",): # self.gimages.stats.append(self.dataloader.findImage(f, dirname)) diff --git a/pysollib/options.py b/pysollib/options.py index b8eaad29..3b8dc20e 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -95,6 +95,10 @@ shade = boolean shrink_face_down = boolean shade_filled_stacks = boolean demo_logo = boolean +demo_logo_style = string +pause_text_style = string +redeal_icon_style = string +dialog_icon_style = string tile_theme = string default_tile_theme = string toolbar = integer(0, 4) @@ -258,6 +262,10 @@ class Options: ('shrink_face_down', 'bool'), ('shade_filled_stacks', 'bool'), ('demo_logo', 'bool'), + ('demo_logo_style', 'str'), + ('pause_text_style', 'str'), + ('redeal_icon_style', 'str'), + ('dialog_icon_style', 'str'), ('tile_theme', 'str'), ('default_tile_theme', 'str'), ('toolbar', 'int'), @@ -357,6 +365,10 @@ class Options: self.shrink_face_down = True self.shade_filled_stacks = True self.demo_logo = True + self.demo_logo_style = 'classic' + self.pause_text_style = 'classic' + self.redeal_icon_style = 'modern' + self.dialog_icon_style = 'remix' self.tile_theme = 'default' self.default_tile_theme = 'default' self.toolbar = 1 # 0 == hide, 1,2,3,4 == top, bottom, lef, right diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py index c09da8c9..471fe651 100644 --- a/pysollib/ui/tktile/menubar.py +++ b/pysollib/ui/tktile/menubar.py @@ -86,6 +86,63 @@ def createStatusbarMenu(menubar, menu): command=lambda m=menubar, w=comp: m.mOptStatusbarConfig(w)) +def createOtherGraphicsMenu(menubar, menu): + tearoff = menu.cget('tearoff') + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'demo') + submenu = MfxMenu(menu, label=n_('&Demo logo'), tearoff=tearoff) + submenu.add_checkbutton( + label=n_("&Show demo logo"), variable=menubar.tkopt.demo_logo, + command=menubar.mOptDemoLogo) + submenu.add_separator() + styledirs = os.listdir(data_dir) + styledirs.sort() + for f in styledirs: + d = os.path.join(data_dir, f) + if os.path.isdir(d) and os.path.exists(os.path.join(d)): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton( + label=name, + variable=menubar.tkopt.demo_logo_style, + value=f, command=menubar.mOptDemoLogoStyle) + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'dialog') + submenu = MfxMenu(menu, label=n_('D&ialog icons'), tearoff=tearoff) + styledirs = os.listdir(data_dir) + styledirs.sort() + for f in styledirs: + d = os.path.join(data_dir, f) + if os.path.isdir(d) and os.path.exists(os.path.join(d)): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton( + label=name, + variable=menubar.tkopt.dialog_icon_style, + value=f, command=menubar.mOptDialogIconStyle) + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'pause') + submenu = MfxMenu(menu, label=n_('&Pause text'), tearoff=tearoff) + styledirs = os.listdir(data_dir) + styledirs.sort() + for f in styledirs: + d = os.path.join(data_dir, f) + if os.path.isdir(d) and os.path.exists(os.path.join(d)): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton( + label=name, + variable=menubar.tkopt.pause_text_style, + value=f, command=menubar.mOptPauseTextStyle) + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', + 'redealicons') + submenu = MfxMenu(menu, label=n_('&Redeal icons'), tearoff=tearoff) + styledirs = os.listdir(data_dir) + styledirs.sort() + for f in styledirs: + d = os.path.join(data_dir, f) + if os.path.isdir(d) and os.path.exists(os.path.join(d)): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton( + label=name, + variable=menubar.tkopt.redeal_icon_style, + value=f, command=menubar.mOptRedealIconStyle) + + def createResamplingMenu(menubar, menu): tearoff = menu.cget('tearoff') submenu = MfxMenu(menu, label=n_('R&esampling'), tearoff=tearoff) @@ -260,6 +317,10 @@ class PysolMenubarTkCommon: helpbar=tkinter.BooleanVar(), splashscreen=tkinter.BooleanVar(), demo_logo=tkinter.BooleanVar(), + demo_logo_style=tkinter.StringVar(), + pause_text_style=tkinter.StringVar(), + redeal_icon_style=tkinter.StringVar(), + dialog_icon_style=tkinter.StringVar(), mouse_type=tkinter.StringVar(), mouse_undo=tkinter.BooleanVar(), negative_bottom=tkinter.BooleanVar(), @@ -324,6 +385,10 @@ class PysolMenubarTkCommon: # tkopt.num_cards.set(opt.num_cards) # tkopt.helpbar.set(opt.helpbar) tkopt.demo_logo.set(opt.demo_logo) + tkopt.demo_logo_style.set(opt.demo_logo_style) + tkopt.pause_text_style.set(opt.pause_text_style) + tkopt.redeal_icon_style.set(opt.redeal_icon_style) + tkopt.dialog_icon_style.set(opt.dialog_icon_style) tkopt.splashscreen.set(opt.splashscreen) tkopt.mouse_type.set(opt.mouse_type) tkopt.mouse_undo.set(opt.mouse_undo) @@ -770,14 +835,15 @@ class PysolMenubarTkCommon: createToolbarMenu(self, submenu) submenu = MfxMenu(menu, label=n_("Stat&usbar")) createStatusbarMenu(self, submenu) + submenu = MfxMenu(menu, label=n_("Othe&r graphics")) + createOtherGraphicsMenu(self, submenu) if not USE_PIL: + menu.add_separator() menu.add_checkbutton( label=n_("Save games &geometry"), variable=self.tkopt.save_games_geometry, command=self.mOptSaveGamesGeometry) - menu.add_checkbutton( - label=n_("&Demo logo"), variable=self.tkopt.demo_logo, - command=self.mOptDemoLogo) + # menu.add_checkbutton( # label=n_("Startup splash sc&reen"), # variable=self.tkopt.splashscreen, @@ -1842,6 +1908,18 @@ Unsupported game for import. def mOptStatusbarConfig(self, w): self.statusbarConfig(w, self.tkopt.statusbar_vars[w].get()) + def mOptDemoLogoStyle(self, *event): + self.setDemoLogoStyle(self.tkopt.demo_logo_style.get()) + + def mOptDialogIconStyle(self, *event): + self.setDialogIconStyle(self.tkopt.dialog_icon_style.get()) + + def mOptPauseTextStyle(self, *event): + self.setPauseTextStyle(self.tkopt.pause_text_style.get()) + + def mOptRedealIconStyle(self, *event): + self.setRedealIconStyle(self.tkopt.redeal_icon_style.get()) + def mOptNumCards(self, *event): if self._cancelDrag(break_pause=False): return @@ -1929,6 +2007,47 @@ Unsupported game for import. self.game.updateStatus(player=self.app.opt.player) self.top.update_idletasks() + def setDemoLogoStyle(self, style): + if self._cancelDrag(break_pause=False): + return + self.app.opt.demo_logo_style = style + self.tkopt.demo_logo_style.set(style) # update radiobutton + self.app.loadImages2() + self.app.loadImages4() + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def setDialogIconStyle(self, style): + if self._cancelDrag(break_pause=False): + return + self.app.opt.dialog_icon_style = style + self.tkopt.dialog_icon_style.set(style) # update radiobutton + self.app.loadImages1() + self.app.loadImages4() + + def setPauseTextStyle(self, style): + if self._cancelDrag(break_pause=False): + return + self.app.opt.pause_text_style = style + self.tkopt.pause_text_style.set(style) # update radiobutton + self.app.loadImages2() + self.app.loadImages4() + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def setRedealIconStyle(self, style): + if self._cancelDrag(break_pause=False): + return + self.app.opt.redeal_icon_style = style + self.tkopt.redeal_icon_style.set(style) # update radiobutton + self.app.loadImages2() + self.app.loadImages4() + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + def wizardDialog(self, edit=False): from pysollib.wizardutil import write_game, reset_wizard WizardDialog = self._calcWizardDialog()