diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py index 1a1101eb..3f72768a 100644 --- a/pysollib/tile/menubar.py +++ b/pysollib/tile/menubar.py @@ -98,23 +98,6 @@ class PysolMenubarTk(PysolMenubarTkCommon): self.game.endGame(bookmark=1) self.game.quitGame(bookmark=1) - def toolbarConfig(self, w, v): - if self._cancelDrag(break_pause=False): return - self.app.opt.toolbar_vars[w] = v - self.app.toolbar.config(w, v) - self.top.update_idletasks() - - # - # stacks descriptions - # - - def mStackDesk(self, *event): - if self.game.stackdesc_list: - self.game.deleteStackDesc() - else: - if self._cancelDrag(break_pause=True): return - self.game.showStackDesc() - # # Tile (ttk) # diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index de84e4e2..bd2f01a3 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -73,6 +73,10 @@ class PysolMenubarTk(PysolMenubarTkCommon): def _connect_game_solver_dialog(self, game): return connect_game_solver_dialog(game) + def _calcWizardDialog(self): + from wizarddialog import WizardDialog + return WizardDialog + # # create the menubar # @@ -127,21 +131,4 @@ class PysolMenubarTk(PysolMenubarTkCommon): self.app.toolbar.setRelief(relief) self.top.update_idletasks() - def toolbarConfig(self, w, v): - if self._cancelDrag(break_pause=False): return - self.app.opt.toolbar_vars[w] = v - self.app.toolbar.config(w, v) - self.top.update_idletasks() - - # - # stacks descriptions - # - - def mStackDesk(self, *event): - if self.game.stackdesc_list: - self.game.deleteStackDesc() - else: - if self._cancelDrag(break_pause=True): return - self.game.showStackDesc() - diff --git a/pysollib/ui/tktile/menubar.py b/pysollib/ui/tktile/menubar.py index a3d15939..15ec76ed 100644 --- a/pysollib/ui/tktile/menubar.py +++ b/pysollib/ui/tktile/menubar.py @@ -1383,3 +1383,19 @@ Error while saving game. if self._cancelDrag(break_pause=False): return self.wizardDialog(edit=True) + def toolbarConfig(self, w, v): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_vars[w] = v + self.app.toolbar.config(w, v) + self.top.update_idletasks() + + # + # stacks descriptions + # + + def mStackDesk(self, *event): + if self.game.stackdesc_list: + self.game.deleteStackDesc() + else: + if self._cancelDrag(break_pause=True): return + self.game.showStackDesc()